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

package/lib/contextual-screen-snapshot.js

@@ -1,7 +1,7 @@
 // Bounded display metadata supplied by the viewer. Never an authority token.
 var provenance = require('./session-provenance');
 var normalizeClientMessageId = require('./project-message-delivery').normalizeClientMessageId;
-var fields = { version: true, viewId: true, projectTitle: true, conversationTitle: true, projectSlug: true, sessionId: true, screen: true };
+var fields = { version: true, viewId: true, projectTitle: true, conversationTitle: true, projectSlug: true, sessionId: true, screen: true, workspace: true };
 function validate(value) {
   if (!value || typeof value !== 'object' || Array.isArray(value) || value.version !== 1 || Object.keys(value).some(function (key) { return !Object.prototype.hasOwnProperty.call(fields, key); })) throw new Error('Invalid contextual snapshot.');
   if (typeof value.viewId !== 'string' || !/^context-[A-Za-z0-9-]{1,90}$/.test(value.viewId)) throw new Error('Invalid snapshot view identity.');
@@ -10,7 +10,16 @@ function validate(value) {
   });
   if (value.sessionId !== null && (!Number.isSafeInteger(value.sessionId) || value.sessionId < 1)) throw new Error('Invalid snapshot conversation.');
   if (['Home', 'Project', 'Direct message'].indexOf(value.screen) < 0) throw new Error('Invalid snapshot screen.');
-  return Object.assign({}, value);
+  if (value.workspace != null) validateWorkspace(value.workspace);
+  return JSON.parse(JSON.stringify(value));
+}
+function validateWorkspace(value) {
+  function exact(item, keys) { return item && typeof item === 'object' && !Array.isArray(item) && Object.keys(item).length === keys.length && keys.every(function (key) { return Object.prototype.hasOwnProperty.call(item, key); }); }
+  function label(value) { return value === null || typeof value === 'string' && value.length <= 160 && !/[\u0000-\u001f\u007f]/.test(value); }
+  if (!exact(value, ['name', 'sessions', 'workbenches']) || !label(value.name) || !Array.isArray(value.sessions) || value.sessions.length > 32 || !Array.isArray(value.workbenches) || value.workbenches.length > 16 ||
+      !value.workbenches.every(function (name) { return typeof name === 'string' && label(name); }) || !value.sessions.every(function (session) {
+        return exact(session, ['sessionId', 'title', 'selected', 'focused']) && Number.isSafeInteger(session.sessionId) && session.sessionId > 0 && label(session.title) && typeof session.selected === 'boolean' && typeof session.focused === 'boolean';
+      })) throw new Error('Invalid contextual workspace metadata.');
 }
 function attachContextualScreenSnapshot(ctx) {
   function capture(ws, session, msg) {
@@ -19,11 +28,11 @@ function attachContextualScreenSnapshot(ctx) {
     function assertLive() {
       var owner = ctx.getProjectOwnerId(), actor = ws && ws._clayUser;
       var mate = ctx.isMate && ctx.matesModule.getMate(ctx.matesModule.buildMateCtx(owner), ctx.mateId);
-      if (!mate || mate.builtinKey !== 'clay' || mate.archived || mate.lifecycleDeletion || ctx.sm.sessions.get(session.localId) !== session || session.hidden || session.destroying || session.spawn || provenance.isWorker(session) || session.delegated || session._delegatedBy || session._pairDelegation || session._mcpForeignInput || session._mentionInProgress || session.homeDebatePlanning || session.debateSetupMode || session.mateCreationMode || session.sessionVisibility === 'shared') throw new Error('Snapshots require a private canonical Clay conversation.');
+      if (!mate || mate.archived || mate.lifecycleDeletion || ctx.sm.sessions.get(session.localId) !== session || session.hidden || session.destroying || session.spawn || provenance.isWorker(session) || session.delegated || session._delegatedBy || session._pairDelegation || session._mcpForeignInput || session._mentionInProgress || session.homeDebatePlanning || session.debateSetupMode || session.mateCreationMode || session.sessionVisibility === 'shared') throw new Error('Snapshots require a private owner Mate conversation.');
       if (ctx.usersModule.isMultiUser() && (!actor || actor.id !== owner || session.ownerId !== owner || mate.createdBy !== owner || !ctx.usersModule.findUserById(owner) || !ctx.usersModule.canAccessSession(owner, session, ctx.getProjectAccess()))) throw new Error('Snapshot ownership is unavailable.');
       if (!ctx.usersModule.isMultiUser() && (session.ownerId && session.ownerId !== owner || actor && actor.id !== owner && actor.id !== 'default')) throw new Error('Snapshot ownership changed.');
       if (!normalizeClientMessageId(msg.clientMessageId) || !msg.sessionOriginId || msg.sessionOriginId !== session.sessionOriginId || String(msg.sessionId) !== String(session.localId) || msg.projectSlug !== ctx.slug || msg.accountId !== (actor && actor.id || '_default')) throw new Error('Snapshot delivery identity changed.');
-      var current = JSON.stringify([mate.id, mate.createdAt, mate.createdBy, session.sessionOriginId]);
+      var current = JSON.stringify([mate.id, mate.builtinKey, mate.createdAt, mate.createdBy, session.sessionOriginId]);
       if (stamp && stamp !== current) throw new Error('Snapshot source identity changed.');
       stamp = current;
     }

package/lib/project-shared-browser.js

@@ -3,6 +3,7 @@ var crypto = require("crypto");
 var policy = require("./shared-browser-policy");
 var browserTools = require("./shared-browser-tools");
 var createRuntime = require("./shared-browser-runtime").createRuntime;
+var workspace = require('./shared-browser-workspace');
 
 function attachSharedBrowser(ctx) {
   var storageStore = ctx.storageStore || require("./shared-browser-storage").attachStorageStore(require("./config").CONFIG_DIR);
@@ -28,7 +29,7 @@ function attachSharedBrowser(ctx) {
     return identity ? JSON.stringify([identity.uid, identity.gid, identity.home]) : "default";
   }
   function recordAllowed(record, ws) {
-    try { return allowed(record.session, ws) && record.ownerId === record.session.ownerId && record.identity === identityKey(record.session); }
+    try { return allowed(record.session, ws) && record.ownerId === record.session.ownerId && record.identity === identityKey(record.session) && record.sourceStamp === workspace.sourceStamp(record.session); }
     catch (e) { return false; }
   }
   function requireAccess(session, ws) {
@@ -42,11 +43,21 @@ function attachSharedBrowser(ctx) {
   function sessionRecords(session) {
     return Array.from(records.values()).filter(function (record) { return record.session === session && recordAllowed(record); });
   }
-  function selectRecord(session, id) {
-    var tabs = sessionRecords(session);
+  function humanAllowed(session, record, ws) {
+    return allowed(session, ws) && recordAllowed(record, ws) &&
+      (record.session === session || workspace.linkedWorker(ctx, session, record.session));
+  }
+  function humanRecords(session, ws) {
+    return Array.from(records.values()).filter(function (record) { return humanAllowed(session, record, ws); });
+  }
+  function requireHumanRecord(session, record, ws) {
+    if (ctx.getSessionForWs(ws) !== session || !humanAllowed(session, record, ws)) throw new Error('Browser session expired');
+  }
+  function selectRecord(session, id, ws) {
+    var tabs = ws ? humanRecords(session, ws) : sessionRecords(session);
     if (id) {
       var record = records.get(id);
-      if (!record || record.session !== session || !recordAllowed(record)) throw new Error("Browser tab expired");
+      if (!record || tabs.indexOf(record) < 0) throw new Error("Browser tab expired");
       return record;
     }
     if (tabs.length > 1) throw new Error("Choose a browserId from status before operating a tab");
@@ -57,21 +68,28 @@ function attachSharedBrowser(ctx) {
     if (payload) ctx.sendTo(ws, payload);
   }
   function sendState(ws, session, record, present, focus) {
-    if (!ws || ws.readyState !== 1 || !allowed(session, ws) || (record && !recordAllowed(record, ws))) return;
-    sendBrowserMessage(ws, session, { type: "shared_browser_state", sessionId: session.localId, browser: projection(record), browsers: sessionRecords(session).map(projection), present: !!present, focus: !!focus });
+    if (!ws || ws.readyState !== 1 || !allowed(session, ws)) return;
+    var tabs = humanRecords(session, ws);
+    if (!record || tabs.indexOf(record) < 0) record = tabs[0] || null;
+    function humanProjection(tab) { return Object.assign({}, projection(tab), workspace.describe(tab)); }
+    sendBrowserMessage(ws, session, { type: "shared_browser_state", sessionId: session.localId, browser: record ? humanProjection(record) : null,
+      browsers: tabs.map(humanProjection), present: !!present && record && record.session === session, focus: !!focus });
   }
   function broadcast(record, present) {
     ctx.clients.forEach(function (ws) {
-      if (ctx.getSessionForWs(ws) === record.session) sendState(ws, record.session, record, present);
+      var session = ctx.getSessionForWs(ws);
+      if (session && (session.ownerId || null) === (record.ownerId || null)) sendState(ws, session, record, present);
     });
   }
   function watching(record, ws) {
-    return ws.readyState === 1 && viewers.get(ws) === record.id && ctx.getSessionForWs(ws) === record.session && recordAllowed(record, ws);
+    var viewer = viewers.get(ws);
+    return ws.readyState === 1 && viewer && viewer.id === record.id && ctx.getSessionForWs(ws) === viewer.session &&
+      viewer.sourceStamp === workspace.sourceStamp(viewer.session) && humanAllowed(viewer.session, record, ws);
   }
   function visibility(record) {
     if (!record.runtime) return;
     var visible = false;
-    viewers.forEach(function (id, ws) { if (id === record.id && watching(record, ws)) visible = true; });
+    viewers.forEach(function (viewer, ws) { if (viewer.id === record.id && watching(record, ws)) visible = true; });
     record.runtime.viewing(visible);
   }
   function end(record, reason) {
@@ -114,7 +132,10 @@ function attachSharedBrowser(ctx) {
       record.frame = { type: "shared_browser_frame", sessionId: record.session.localId, browserId: record.id,
         data: message.data, width: record.width, height: record.height };
       viewers.forEach(function (id, ws) {
-        if (watching(record, ws) && ws.bufferedAmount < 1024 * 1024) sendBrowserMessage(ws, record.session, record.frame);
+        if (watching(record, ws) && ws.bufferedAmount < 1024 * 1024) {
+          var session = viewers.get(ws).session;
+          sendBrowserMessage(ws, session, Object.assign({}, record.frame, { sessionId: session.localId }));
+        }
       });
       visibility(record);
     } else broadcast(record);
@@ -136,7 +157,7 @@ function attachSharedBrowser(ctx) {
     var active = 0;
     records.forEach(function (record) { if (record.runtime && record.ownerId === session.ownerId) active++; });
     if (active >= 4) throw new Error("End another browser before opening more than four active tabs");
-    var record = { session: session, ownerId: session.ownerId, identity: identityKey(session), id: crypto.randomUUID(), phase: "starting", control: "agent", epoch: 0,
+    var record = { session: session, sourceStamp: workspace.sourceStamp(session), ownerId: session.ownerId, identity: identityKey(session), id: crypto.randomUUID(), phase: "starting", control: "agent", epoch: 0,
       cookieOwner: ctx.isMate ? (ctx.ownerId || session.ownerId || "default") : null, incognito: temporary, url: "", width: 1280, height: 800, touched: Date.now(), runtime: null, frame: null };
     record.ready = new Promise(function (resolve, reject) { record.resolveReady = resolve; record.rejectReady = reject; });
     record.ready.catch(function () {});
@@ -150,7 +171,8 @@ function attachSharedBrowser(ctx) {
     broadcast(record, true);
     return record;
   }
-  async function changeControl(record, control) {
+  async function changeControl(record, control, validate) {
+    if (validate) validate();
     if (!record.runtime) throw new Error("Open a browser first");
     record.control = control;
     activityHistory.interruptActivity(record); record.pointer = null;
@@ -161,8 +183,12 @@ function attachSharedBrowser(ctx) {
     broadcast(record);
     try {
       await record.runtime.control(epoch);
-      if (record.runtime && record.epoch === epoch) { record.handoff = false; broadcast(record); }
     } catch (e) { if (record.runtime && record.epoch === epoch) end(record, e.message); }
+    if (record.runtime && record.epoch === epoch) {
+      record.handoff = false;
+      if (validate) validate();
+      broadcast(record);
+    }
 
   }
   // Finish is a serialized boundary: it waits for earlier queued work in the browser worker, then
@@ -179,7 +205,8 @@ function attachSharedBrowser(ctx) {
     record.touched = Date.now(); broadcast(record);
     return projection(record);
   }
-  async function run(session, record, actor, action, event, intent, presentationStart) {
+  async function run(session, record, actor, action, event, intent, presentationStart, validate) {
+    if (validate) validate();
     requireAccess(session);
     if (!record || !record.runtime || !recordAllowed(record)) throw new Error("Open a browser first");
     if (record.handoff) throw new Error("Browser control is changing; wait for the handoff");
@@ -192,6 +219,7 @@ function attachSharedBrowser(ctx) {
     await record.ready;
     if (actor === "agent" && Number(session._sdkQueryGeneration || 0) !== generation) throw new Error("Browser request belongs to an older query");
     requireAccess(session);
+    if (validate) validate();
     if (!recordAllowed(record) || !record.runtime || record.epoch !== epoch) throw new Error("Browser control changed; retry after the handoff");
     record.touched = Date.now();
     var result;
@@ -203,6 +231,7 @@ function attachSharedBrowser(ctx) {
       throw error;
     }
     requireAccess(session);
+    if (validate) validate();
     if (actor === "agent" && Number(session._sdkQueryGeneration || 0) !== generation) throw new Error("Browser result belongs to an older query");
     if (!recordAllowed(record) || records.get(record.id) !== record || record.epoch !== epoch) throw new Error("Browser control changed during the action");
     if (result && result.url !== undefined) record.url = policy.visibleUrl(result.url);
@@ -268,7 +297,13 @@ function attachSharedBrowser(ctx) {
   function handleMessage(ws, msg) {
     if (!msg.type || msg.type.indexOf("shared_browser_") !== 0) return false;
     var session = ctx.getSessionForWs(ws);
+    var requestStamp = workspace.sourceStamp(session), requestBinding = ws._clayPaneActivation;
     Promise.resolve().then(async function () {
+      function validateRecord() {
+        if (requestStamp !== workspace.sourceStamp(session) || requestBinding !== ws._clayPaneActivation ||
+            requestBinding && (!ws._clayPaneActivationValid || !ws._clayPaneActivationValid())) throw new Error('Browser session changed');
+        requireHumanRecord(session, record, ws);
+      }
       requireAccess(session, ws);
       if (String(msg.sessionId) !== String(session.localId)) throw new Error("Browser session changed");
       var record;
@@ -285,26 +320,35 @@ function attachSharedBrowser(ctx) {
       if (msg.type === "shared_browser_open") {
         var targetUrl = msg.url === undefined ? null : policy.browserUrl(msg.url);
         if (targetUrl) record = await openLinkedPage(session, targetUrl, msg.incognito);
-        else record = create(session, "user", msg.newTab === true, msg.incognito);
+        else {
+          var existing = msg.newTab !== true && msg.incognito === undefined && humanRecords(session, ws).filter(function (tab) { return !!tab.runtime; });
+          record = existing && (existing.find(function (tab) { return tab.session === session; }) || existing[0]) || create(session, "user", msg.newTab === true, msg.incognito);
+        }
         sendState(ws, session, record, true, true); return;
       }
-      record = selectRecord(session, msg.browserId);
+      record = selectRecord(session, msg.browserId, ws);
       if (!record || !recordAllowed(record, ws) || msg.browserId !== record.id) throw new Error("Browser session expired");
+      validateRecord();
       if (msg.type === "shared_browser_view") {
-        if (msg.visible) { var previous = records.get(viewers.get(ws)); viewers.set(ws, record.id); if (previous && previous !== record) visibility(previous); if (record.frame) sendBrowserMessage(ws, record.session, record.frame); }
+        if (msg.visible) {
+          var previousViewer = viewers.get(ws), previous = previousViewer && records.get(previousViewer.id);
+          viewers.set(ws, { id: record.id, session: session, sourceStamp: workspace.sourceStamp(session) });
+          if (previous && previous !== record) visibility(previous);
+          if (record.frame) sendBrowserMessage(ws, session, Object.assign({}, record.frame, { sessionId: session.localId }));
+        }
         else viewers.delete(ws);
         visibility(record);
       } else if (msg.type === "shared_browser_control") {
         if (!["agent", "user"].includes(msg.control)) throw new Error("Invalid control mode");
-        await changeControl(record, msg.control);
+        await changeControl(record, msg.control, validateRecord);
       } else if (msg.type === "shared_browser_close") {
         end(record); records.delete(record.id);
         sendState(ws, session, sessionRecords(session)[0]);
-        ctx.clients.forEach(function (peer) { if (peer !== ws && ctx.getSessionForWs(peer) === session) sendState(peer, session, sessionRecords(session)[0]); });
+        broadcast(record);
       } else if (msg.type === "shared_browser_end") end(record);
       else if (msg.type === "shared_browser_input") {
         if (msg.epoch !== record.epoch) throw new Error("Browser control changed");
-        await run(session, record, "user", "action", policy.validateAction(msg.event));
+        await run(session, record, "user", "action", policy.validateAction(msg.event), null, null, validateRecord);
       }
     }).catch(function (e) {
       if (ws.readyState === 1) ctx.sendTo(ws, { type: "shared_browser_error", sessionId: msg.sessionId, error: e.message, requestId: msg.requestId });
@@ -312,7 +356,7 @@ function attachSharedBrowser(ctx) {
     return true;
   }
   var sweep = setInterval(function () {
-    viewers.forEach(function (id, ws) { if (ws.readyState !== 1) viewers.delete(ws); });
+    viewers.forEach(function (viewer, ws) { var record = records.get(viewer.id); if (!record || !watching(record, ws)) viewers.delete(ws); });
     records.forEach(function (record, key) {
       if (!recordAllowed(record)) { end(record, "Browser session is no longer available"); records.delete(key); }
       else if (Date.now() - record.touched > 30 * 60 * 1000) { end(record, "Browser expired after 30 minutes without activity"); records.delete(key); }
@@ -330,6 +374,10 @@ function attachSharedBrowser(ctx) {
     });
   }
   return {
+    refresh: function () {
+      viewers.forEach(function (viewer, ws) { var record = records.get(viewer.id); if (!record || !watching(record, ws)) { viewers.delete(ws); if (record) visibility(record); } });
+      ctx.clients.forEach(function (ws) { var session = ctx.getSessionForWs(ws); if (session) sendState(ws, session); });
+    },
     handleMessage: handleMessage,
     getToolDefs: getToolDefs,
     getSystemPrompt: function () { return browserTools.PROMPT; },

package/lib/project.js

@@ -692,6 +692,7 @@ function createProjectContext(opts) {
     usersModule: usersModule,
     multiWorkerFeature: multiWorkerGate,
     onPairChanged: function (group) {
+      if (_sharedBrowser) _sharedBrowser.refresh();
       if (!sdk || !group || !Array.isArray(group.members)) return;
       for (var i = 0; i < group.members.length; i++) {
         sdk.refreshSessionRuntime(sm.sessions.get(group.members[i]));
@@ -822,6 +823,7 @@ function createProjectContext(opts) {
     getSessionForWs: getSessionForWs,
   });
   var _sharedBrowser = attachSharedBrowser({
+    getWorkerGroup: function (id) { return _splitGroups.store.groupForMember(id); },
     studioPresentation: _studioPresentation,
     sendToSession: sendToSession,
     getPresentation: function (session) { return _workspaceQuery && _workspaceQuery.getPresentation(session); },

package/lib/public/css/issues.css

@@ -50,7 +50,7 @@
 .issue-evidence { padding-top: 18px; border-top: 1px solid var(--border-subtle); font-size: 13px; line-height: 1.65; }
 #issues-panel .issue-discussion { margin-top: 30px; padding-top: 18px; border-top: 1px solid var(--border-subtle); }
 .issue-discussion h3 > span { margin-left: 4px; font: 11px var(--font-mono); color: var(--text-dimmer); }
-#issues-panel .issue-comment { padding: 10px 12px; margin-bottom: 8px; border: 1px solid var(--border-subtle); border-radius: 9px; background: var(--bg-alt); }
+:is(#issues-panel, #linear-panel) .issue-comment { padding: 10px 12px; margin-bottom: 8px; border: 1px solid var(--border-subtle); border-radius: 9px; background: var(--bg-alt); }
 .issue-comment-meta { margin-bottom: 5px; color: var(--text-dimmer); font: 10.5px/1.4 var(--font-mono); }
 .issue-comment .markdown-body { font-size: 13px; line-height: 1.55; overflow-wrap: anywhere; }
 .issue-comment .markdown-body > :first-child { margin-top: 0; }

package/lib/public/css/linear.css

@@ -1,7 +1,6 @@
-/* Linear workbench: mirrors #issues-panel / #terminal-container shell, header and controls. */
-#linear-panel { position: relative; width: 50%; max-width: 720px; min-width: 360px; height: calc(100% - 16px); margin: 8px 8px 8px 10px; min-height: 0; align-self: center; display: flex; flex-direction: column; background: var(--bg); color: var(--text); border: 1px solid var(--border); border-radius: 12px; overflow: hidden; flex-shrink: 0; }
+/* Issue-specific content; the shared workbench shell owns window geometry. */
+#linear-panel { min-height: 0; display: flex; flex-direction: column; background: var(--bg); color: var(--text); overflow: hidden; }
 #linear-panel.hidden { display: none; }
-#linear-panel .linear-topbar { height: 48px; box-sizing: border-box; display: flex; align-items: center; gap: 12px; padding: 0 16px; border-bottom: 1px solid var(--border-subtle); flex: 0 0 auto; }
 #linear-panel .linear-title { display: inline-flex; align-items: center; gap: 7px; font-weight: 700; flex: 1; }
 
 #linear-panel .linear-window-actions { display: inline-flex; align-items: center; gap: 6px; margin-left: auto; }
@@ -9,8 +8,6 @@
 #linear-panel button:hover { background: var(--bg-hover, rgba(128,128,128,.12)); color: var(--text); }
 #linear-panel button:disabled { opacity: .5; cursor: default; }
 #linear-panel :focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; }
-#linear-panel .linear-icon-btn { width: 30px; height: 30px; display: inline-flex; align-items: center; justify-content: center; padding: 0; border-radius: 7px; }
-#linear-panel .linear-icon-btn .lucide { display: block; width: 15px; height: 15px; }
 .linear-notice { margin: 0; padding: 0 16px; color: var(--text-muted); font-size: 12px; }
 .linear-notice:not(:empty) { padding: 8px 16px; }
 .linear-content { overflow: auto; min-height: 0; flex: 1; }
@@ -21,12 +18,9 @@
 .linear-actions button { font-size: 12px; line-height: normal; }
 #linear-panel a { color: var(--link); }
 #linear-panel .issue-row { width: 100%; text-align: left; }
-#linear-panel .issue-discussion article { padding: 14px 0; border-top: 1px solid var(--border-subtle); }
-#linear-panel .issue-discussion article > strong { display: block; margin-bottom: 4px; font-size: 13px; }
 #linear-panel .issue-doc-body, #linear-panel .issue-doc-body .md-content { overflow-wrap: anywhere; }
 #linear-panel .issue-doc-body .md-content { font-size: 14px; line-height: 1.7; }
 #linear-panel .issue-discussion .md-content { font-size: 13px; line-height: 1.6; }
-#linear-panel .issue-detail .issue-doc-title { font-size: clamp(20px, 2vw, 26px); line-height: 1.2; }
 #linear-panel .md-content > :first-child { margin-top: 0; }
 #linear-panel .md-content > :last-child { margin-bottom: 0; }
 #linear-panel .md-content h1, #linear-panel .md-content h2, #linear-panel .md-content h3 { margin: 1.3em 0 .5em; font-family: var(--font-display); }
@@ -36,7 +30,6 @@
 #linear-panel .md-content pre { overflow-x: auto; max-width: 100%; }
 #linear-panel .md-content table { display: block; max-width: 100%; overflow-x: auto; }
 #linear-panel .md-content img { max-width: 100%; }
-@media (max-width: 1023px) { #linear-panel { position: fixed; inset: 0; z-index: 300; width: 100%; max-width: none; min-width: 0; height: 100%; margin: 0; border: 0; border-radius: 0; padding-top: var(--safe-top, 0px); padding-bottom: var(--safe-bottom, 0px); box-sizing: border-box; } #linear-panel button { min-height: 36px; } #linear-panel .linear-icon-btn { width: 36px; } }
 @media (max-width: 767px) { #linear-panel .issue-detail { padding: 20px 16px 40px; } }
 .session-linear-link { max-width: 360px; min-width: 0; flex-shrink: 1; }
 .session-linear-link > span { white-space: nowrap; }
@@ -49,22 +42,15 @@
   #header-github-links:has(.session-linear-link) { max-width: 170px; }
   #header-github-links .linear-work-title, #header-github-links .linear-work-state { display: none; }
 }
-#linear-panel .linear-session-pills { display: flex; flex-wrap: wrap; gap: 8px; }
-#linear-panel .linear-session-pill { display: inline-flex; align-items: flex-start; gap: 7px; max-width: 100%; box-sizing: border-box; padding: 6px 12px; border-radius: 999px; text-align: left; font-size: 13px; line-height: 1.4; color: var(--text); background: var(--bg-alt); border: 1px solid var(--border); }
-#linear-panel .linear-session-pill .lucide { width: 14px; height: 14px; flex: none; margin-top: 2px; color: var(--accent); }
-#linear-panel .linear-session-pill > span { min-width: 0; overflow-wrap: anywhere; }
-#linear-panel .linear-session-pill:hover { background: color-mix(in srgb, var(--accent) 10%, var(--bg-alt)); border-color: color-mix(in srgb, var(--accent) 40%, var(--border)); }
-#linear-panel .linear-session-pill:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; }
 .linear-work-brand { display: inline-flex; align-items: center; flex: none; color: inherit; }
 .linear-work-brand svg { width: 13px; height: 13px; }
 
-#linear-panel .linear-title .linear-work-brand svg { width: 16px; height: 16px; }
+#linear-panel .linear-title .linear-work-brand svg { width: 14px; height: 14px; }
 #linear-panel a.linear-icon-btn { color: var(--text-secondary); text-decoration: none; border: 1px solid var(--border); background: var(--bg-alt); box-sizing: border-box; }
 #linear-panel a.linear-icon-btn:hover { background: var(--bg-hover, rgba(128,128,128,.12)); color: var(--text); }
 #linear-panel [data-linear-external][hidden] { display: none; }
 #linear-panel .linear-conversations { margin: 22px 0 26px; }
 #linear-panel .linear-conversations h3 { font-size: 12px; font-weight: 600; color: var(--text-secondary); margin: 0 0 10px; }
-#linear-panel .linear-action-chip { background: transparent; border-style: dashed; color: var(--text-secondary); }
 #linear-panel .linear-sharing-hint { font-size: 11px; line-height: 1.5; color: var(--text-muted); margin: 10px 0 0; }
 @media (max-width: 1023px) { #linear-panel a.linear-icon-btn { height: 36px; } }
 
@@ -73,19 +59,16 @@
 #linear-panel .linear-issue-id { padding: 4px 7px; border-radius: 5px; background: var(--bg-alt); color: var(--text-secondary); font-family: var(--font-mono); font-weight: 500; letter-spacing: .015em; overflow-wrap: anywhere; }
 #linear-panel .linear-issue-status { padding: 3px 8px; border: 1px solid var(--border); border-radius: 999px; color: var(--text-secondary); overflow-wrap: anywhere; }
 
-#linear-panel .linear-title { min-width: 0; gap: 9px; height: 30px; font-size: 13px; line-height: 20px; font-weight: 600; }
+#linear-panel .linear-title { min-width: 0; gap: 7px; height: auto; font-size: 11px; line-height: 20px; font-weight: 600; }
 #linear-panel .linear-window-actions { flex-shrink: 0; }
-#linear-panel .linear-header-issue { display: inline-flex; align-items: center; gap: 5px; flex-shrink: 0; height: 30px; box-sizing: border-box; padding: 0 5px; border-radius: 5px; color: var(--text-secondary); text-decoration: none; font: inherit; }
+#linear-panel .linear-header-issue { display: inline-flex; align-items: center; gap: 5px; flex-shrink: 0; height: 24px; box-sizing: border-box; padding: 0 5px; border-radius: 5px; color: var(--text-secondary); text-decoration: none; font: inherit; }
 #linear-panel .linear-header-issue .lucide { display: block; width: 12px; height: 12px; color: inherit; }
 #linear-panel .linear-header-issue:hover { color: var(--text); background: var(--bg-alt); }
-#linear-panel .linear-window-title { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-size: 13px; line-height: 20px; font-weight: 600; }
+#linear-panel .linear-window-title { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-size: 11px; line-height: 20px; font-weight: 500; }
 
-#linear-panel .issue-discussion .linear-comment { margin: 12px 0; padding: 16px; border: 1px solid var(--border-subtle); border-radius: 10px; background: var(--bg-alt); }
-#linear-panel .linear-comment > header { display: flex; align-items: baseline; flex-wrap: wrap; gap: 8px; margin-bottom: 10px; font-size: 13px; }
+#linear-panel .linear-comment > header { display: flex; align-items: baseline; flex-wrap: wrap; gap: 8px; margin-bottom: 5px; }
 #linear-panel .linear-comment > header strong { font-weight: 600; }
-#linear-panel .linear-comment time { color: var(--text-muted); font-size: 11px; }
 #linear-panel .linear-comment .issue-doc-body { margin: 0; }
-@media (max-width: 767px) { #linear-panel .issue-discussion .linear-comment { padding: 12px; } }
 
 #linear-panel .linear-title > .linear-work-brand { height: 20px; align-items: center; }
 #linear-panel .linear-title > .linear-work-brand svg { display: block; }

package/lib/public/css/menus.css

@@ -250,8 +250,8 @@
   position: absolute;
   top: -4px;
   right: -4px;
-  background: var(--success);
-  color: #fff;
+  background: var(--brand-green);
+  color: var(--brand-ink);
   font-size: 9px;
   font-weight: 700;
   min-width: 14px;

package/lib/public/css/notifications-center.css

@@ -11,8 +11,8 @@
   position: absolute;
   top: -3px;
   right: -3px;
-  background: var(--error, #e53935);
-  color: #fff;
+  background: var(--brand-coral);
+  color: var(--brand-ink);
   font-size: 9px;
   font-weight: 700;
   min-width: 15px;

package/lib/public/css/split-view-layout.css

@@ -258,22 +258,6 @@ body.split-view-resizing .split-pane-frame { pointer-events: none; }
 .split-view-worker-name { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 .split-view-worker-identity { flex-shrink: 0; white-space: nowrap; }
 .split-view-worker-generation { flex-shrink: 0; color: var(--text-dimmer); white-space: nowrap; }
-.split-view-worker-controls {
-  appearance: none;
-  flex: 0 0 auto;
-  height: 22px;
-  margin-left: auto;
-  padding: 3px 6px;
-  border: 1px solid transparent;
-  border-radius: 5px;
-  background: transparent;
-  color: var(--text-muted);
-  font: inherit;
-  font-size: 10px;
-  cursor: pointer;
-}
-.split-view-worker-controls:hover { background: var(--sidebar-hover); color: var(--text); }
-.split-view-worker-controls:focus-visible { outline: 2px solid var(--accent); outline-offset: -2px; }
 .split-view-worker-dot { width: 5px; height: 5px; flex: 0 0 5px; border-radius: 50%; background: var(--text-dimmer); }
 .split-view-worker-dot[data-state="working"] { background: var(--brand-green); }
 .split-view-worker-dot[data-state="waiting"] { background: var(--brand-gold); }

package/lib/public/css/tool-pane.css

@@ -122,3 +122,15 @@
 #main-panels > .workbench-pane-shell > .tool-pane-header .workbench-pane-actions button[aria-pressed="true"] { background: var(--accent-bg); color: var(--accent); }
 
 .file-instance:not([data-workbench-placement="docked"]) [data-action="pin"] { display: none; }
+
+/* Related conversations and actions share the compact workbench control recipe. */
+.workbench-related-links { display: flex; flex-wrap: wrap; gap: 6px; }
+#main-panels .workbench-related-link { display: inline-flex; align-items: center; gap: 6px; min-height: 28px; max-width: 100%; box-sizing: border-box; padding: 3px 8px; border: 1px solid var(--border); border-radius: 6px; background: var(--bg-alt); color: var(--text-secondary); text-align: left; font-size: 12px; line-height: 20px; }
+#main-panels .workbench-related-link > span { min-width: 0; overflow-wrap: anywhere; }
+#main-panels .workbench-related-link svg { width: 13px; height: 13px; flex: none; }
+#main-panels .workbench-related-link:hover { background: var(--sidebar-hover); color: var(--text); }
+@media (max-width: 1023px) {
+  #main-panels > .workbench-pane-shell { position: fixed; inset: 0; z-index: 300; width: 100%; max-width: none; min-width: 0; height: 100%; margin: 0; border: 0; border-radius: 0; padding-top: var(--safe-top, 0px); padding-bottom: var(--safe-bottom, 0px); box-sizing: border-box; }
+  #main-panels > .workbench-pane-shell [data-workbench-window] { display: none; }
+  #main-panels .workbench-related-link { min-height: 36px; }
+}

package/lib/public/modules/contextual-clay-session.js

@@ -146,9 +146,9 @@ export function contextualScreenReference() {
   if (!enabled() || window.parent === window) return null;
   try {
     var surface = window.parent.document.getElementById('contextual-clay');
-    if (!surface || !window.frameElement || window.frameElement.hidden || window.frameElement.dataset.canonical !== 'true' || !surface.contains(window.frameElement)) return null;
+    if (!surface || !window.frameElement || window.frameElement.hidden || !surface.contains(window.frameElement)) return null;
     var reference = JSON.parse(surface.dataset.screenReference || 'null');
     if (!reference || reference.ownerId !== (store.get('myUserId') || null)) return null;
-    return { version: 1, viewId: typeof reference.viewId === 'string' ? reference.viewId.slice(0, 100) : null, projectTitle: typeof reference.projectTitle === 'string' ? reference.projectTitle.slice(0, 160) : null, conversationTitle: typeof reference.conversationTitle === 'string' ? reference.conversationTitle.slice(0, 160) : null, projectSlug: typeof reference.projectSlug === 'string' ? reference.projectSlug.slice(0, 160) : null, sessionId: Number.isSafeInteger(reference.sessionId) ? reference.sessionId : null, screen: String(reference.screen || '').slice(0, 40) };
+    return { version: 1, viewId: typeof reference.viewId === 'string' ? reference.viewId.slice(0, 100) : null, projectTitle: typeof reference.projectTitle === 'string' ? reference.projectTitle.slice(0, 160) : null, conversationTitle: typeof reference.conversationTitle === 'string' ? reference.conversationTitle.slice(0, 160) : null, projectSlug: typeof reference.projectSlug === 'string' ? reference.projectSlug.slice(0, 160) : null, sessionId: Number.isSafeInteger(reference.sessionId) ? reference.sessionId : null, screen: String(reference.screen || '').slice(0, 40), workspace: reference.workspace || null };
   } catch (error) { return null; }
 }

package/lib/public/modules/contextual-mate-context.js

@@ -1,3 +1,4 @@
+import { contextualViewMetadata } from './contextual-view-metadata.js';
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
 import { contextualFrame } from './contextual-mate-identity.js';
@@ -7,7 +8,7 @@ function identity(frame) {
 }
 function contextKey(frame, canonical) {
   var current = identity(frame);
-  return JSON.stringify([store.get('currentSlug'), store.get('activeSessionId'), store.get('sessionOriginId'), store.get('activeProjectSlug'), store.get('sessionActivatedProjectSlug'), store.get('replayingHistory'), (store.get('contextualClay') || {}).mode, store.get('homeShellVisible'), store.get('projectsHubVisible'), store.get('dmMode'), store.get('rightWorkbenchOwner'), store.get('homeSubSurface'), store.get('rightWorkbenchRevision'), store.get('myUserId'), store.get('connected'), current && current.mateId, current && current.sessionId, current && (canonical ? current.connected : current.ready), canonical && current && current.sessionOriginId]);
+  return JSON.stringify([store.get('currentSlug'), store.get('activeSessionId'), store.get('sessionOriginId'), store.get('activeProjectSlug'), store.get('sessionActivatedProjectSlug'), store.get('replayingHistory'), (store.get('contextualClay') || {}).mode, store.get('homeShellVisible'), store.get('projectsHubVisible'), store.get('dmMode'), store.get('rightWorkbenchOwner'), store.get('homeSubSurface'), store.get('rightWorkbenchRevision'), store.get('projectSplitViewActiveId'), JSON.stringify(contextualViewMetadata()), store.get('myUserId'), store.get('connected'), current && current.mateId, current && current.sessionId, current && (canonical ? current.connected : current.ready), canonical && current && current.sessionOriginId]);
 }
 export function updateMateContext(surface, mate, frame, snapshot) {
   var current = identity(frame), ws = getWs(), key = contextKey(frame, mate && mate.builtinKey === 'clay'), prepared = store.get('contextualPrepared');
@@ -18,7 +19,7 @@ export function updateMateContext(surface, mate, frame, snapshot) {
   capabilities.textContent = "I can control Clay Studio for you—manage projects, coordinate work, set up schedules, and navigate your workspace. Just tell me what you’d like done.";
   var privateWorkspace = (store.get('currentSlug') || '').indexOf('mate-') === 0;
   var parentReady = store.get('activeProjectSlug') === store.get('currentSlug') && store.get('sessionActivatedProjectSlug') === store.get('currentSlug') && !store.get('replayingHistory');
-  var available = (store.get('contextualClay') || {}).mode === 'popover' && parentReady && !canonical && !privateWorkspace && current && current.ready && store.get('connected') && !store.get('homeShellVisible') && !store.get('projectsHubVisible') && !store.get('dmMode') && !store.get('rightWorkbenchOwner') && ws && ws.readyState === 1;
+  var available = (store.get('contextualClay') || {}).mode === 'popover' && parentReady && !canonical && !privateWorkspace && current && current.ready && store.get('connected') && !store.get('homeShellVisible') && !store.get('projectsHubVisible') && !store.get('dmMode') && ws && ws.readyState === 1;
   var changed = !prepared || prepared.key !== key || prepared.socket !== ws;
   if (changed) {
     var requestId = 'context-' + crypto.randomUUID();
@@ -26,7 +27,7 @@ export function updateMateContext(surface, mate, frame, snapshot) {
   }
   // Stamp the reference before publishing a new preparation: store subscribers
   // may render synchronously, and the composer must never see the prior view ID.
-  snapshot = Object.assign({}, snapshot, { viewId: prepared.requestId });
+  snapshot = Object.assign({}, snapshot, { viewId: prepared.requestId, workspace: contextualViewMetadata() });
   surface.dataset.screenReference = JSON.stringify(snapshot);
   if (changed) {
     store.set({ contextualPrepared: prepared });
@@ -37,6 +38,7 @@ export function updateMateContext(surface, mate, frame, snapshot) {
   var label = surface.querySelector('[data-clay-context]');
   var detail = surface.querySelector('.contextual-clay-context p');
   var summary = ready ? prepared.summary.project + ' / ' + prepared.summary.conversation : null;
+  var viewName = snapshot.workspace && snapshot.workspace.name;
   var projectName = (ready && prepared.summary.project) || snapshot.projectTitle || snapshot.screen || 'Current view';
   if (canonical) {
     var currentSummary = (snapshot.projectTitle || snapshot.screen || 'Current view') + (snapshot.conversationTitle ? ' / ' + snapshot.conversationTitle : '');
@@ -51,6 +53,8 @@ export function updateMateContext(surface, mate, frame, snapshot) {
     detail.textContent = ready ? (shared && shared.viewId === prepared.requestId ? 'Shared with your last message: ' : 'With your next message: ') + summary + '. This Mate can read up to 20 text turns from this selected conversation and request to open it in this window after your review. Tool results, attachments and hidden entries are excluded.' : 'Current view: ' + projectName + '. This view has no supported conversation context. Open an accessible project conversation to share it with your next message.';
     detail.textContent += '\nNo continuous screen capture. Issues, documents, other tabs, files and settings are unavailable through this context.';
   }
+  if (viewName) detail.textContent += '\nView: ' + viewName + '.';
+  detail.textContent += '\nEach message also includes current View, session titles and open workbench names as display metadata. Workbench contents are not included.';
   if (prepared.status === 'expired' && !canonical) { contextStatus = 'Expired'; detail.textContent = 'This five-minute context has expired. Close and reopen this Mate to prepare a fresh snapshot. No previous navigation request will replay.'; }
   if (shared) detail.textContent += '\nLast submitted: ' + shared.summary.project + ' / ' + shared.summary.conversation + ((canonical ? sameSnapshot : shared.viewId === prepared.requestId) ? '.' : canonical ? '. The view or connection has changed; that snapshot is stale.' : '. Your view has changed; that context is stale.');
   var projectLabel = label.querySelector('[data-context-project]');

package/lib/public/modules/contextual-view-metadata.js

@@ -0,0 +1,23 @@
+import { store } from './store.js';
+import { getCachedSessions } from './sidebar-sessions.js';
+
+function label(value) { return typeof value === 'string' ? value.replace(/[\u0000-\u001f\u007f]/g, ' ').slice(0, 160) : null; }
+
+// Display labels only. Conversation access remains bound to the authenticated
+// selected session; this snapshot never grants access to another pane or tool.
+export function contextualViewMetadata() {
+  var state = store.snap();
+  if (state.paneMode || state.homeShellVisible || state.projectsHubVisible || state.dmMode ||
+      state.activeProjectSlug !== state.currentSlug || state.sessionActivatedProjectSlug !== state.currentSlug || state.replayingHistory) return null;
+  var view = (state.projectSplitViews || []).find(function (item) { return item.id === state.projectSplitViewActiveId; });
+  var sessions = getCachedSessions() || [];
+  var refs = view ? view.sessions || [] : sessions.filter(function (item) { return item.id === state.activeSessionId; });
+  var owners = (state.rightWorkbenchDockedOwners || []).concat(state.rightWorkbenchOwner || []).filter(function (name, index, all) { return all.indexOf(name) === index; });
+  return { name: label(view && view.name),
+    sessions: refs.slice(0, 32).map(function (ref) {
+      var session = sessions.find(function (item) { return item.id === ref.id && (!ref.sessionOriginId || item.sessionOriginId === ref.sessionOriginId); });
+      return session ? { sessionId: session.id, title: label(session.title), selected: session.id === state.activeSessionId,
+        focused: !!state.projectSplitViewFocusedOrigin && session.sessionOriginId === state.projectSplitViewFocusedOrigin } : null;
+    }).filter(Boolean),
+    workbenches: owners.slice(0, 16).map(label) };
+}

package/lib/public/modules/linear-panel.js

@@ -70,7 +70,7 @@ function chronologicalComments(comments) {
 function commentMarkup(comment) {
   var date = new Date(comment.createdAt);
   var timestamp = Number.isFinite(date.getTime()) ? '<time datetime="' + esc(date.toISOString()) + '" title="' + esc(date.toLocaleString()) + '">' + esc(date.toLocaleDateString(undefined, { month: 'short', day: 'numeric', year: 'numeric' })) + '</time>' : '';
-  return '<article class="linear-comment"><header><strong>' + esc(comment.author) + '</strong>' + timestamp + '</header><div class="issue-doc-body">' + prose(comment.body) + '</div></article>';
+  return '<article class="issue-comment linear-comment"><header class="issue-comment-meta"><strong>' + esc(comment.author) + '</strong>' + timestamp + '</header><div class="issue-doc-body">' + prose(comment.body) + '</div></article>';
 }
 function renderIssue() {
   var issue = store.get('linearIssue'), sessions = store.get('linearMatches') || [];
@@ -80,10 +80,10 @@ function renderIssue() {
   var linked = !!(active && (active.linearLinks || []).some(function (item) { return item.url === issue.url; }));
   var prs = active && linked ? (active.githubLinks || []).filter(function (item) { return item.kind === 'pr' && /^https:\/\/github\.com\/[^/]+\/[^/]+\/pull\/[1-9][0-9]*$/.test(item.url); }) : [];
   content().innerHTML = '<article class="issue-detail"><div class="linear-issue-meta"><span class="linear-issue-id" aria-label="Issue identifier">' + esc(issue.identifier) + '</span>' + (issue.stateName ? '<span class="linear-issue-status" aria-label="Status">' + esc(issue.stateName) + '</span>' : '') + '</div><h2 class="issue-doc-title">' + esc(issue.title) + '</h2>' +
-    '<section class="linear-conversations"><h3>Linked conversations</h3><div class="linear-session-pills">' +
-    sessions.map(function (item) { return '<button type="button" class="linear-session-pill" data-linear-session="' + esc(item.sessionId) + '"><i data-lucide="message-square"></i><span>' + esc(item.title || 'Open conversation') + '</span></button>'; }).join('') +
-    '<button type="button" class="linear-session-pill linear-action-chip" data-linear-link' + (!store.get('activeSessionId') ? ' disabled' : '') + '><i data-lucide="' + (linked ? 'unlink' : 'plus') + '"></i><span>' + (linked ? 'Unlink this conversation' : 'Link this conversation') + '</span></button>' +
-    (!sessions.length ? '<button type="button" class="linear-session-pill linear-action-chip" data-linear-start><i data-lucide="plus"></i><span>Start work</span></button>' : '') +
+    '<section class="linear-conversations"><h3>Linked conversations</h3><div class="workbench-related-links linear-session-pills">' +
+    sessions.map(function (item) { return '<button type="button" class="workbench-related-link linear-session-pill" data-linear-session="' + esc(item.sessionId) + '"><i data-lucide="message-square"></i><span>' + esc(item.title || 'Open conversation') + '</span></button>'; }).join('') +
+    '<button type="button" class="workbench-related-link linear-session-pill linear-action-chip" data-linear-link' + (!store.get('activeSessionId') ? ' disabled' : '') + '><i data-lucide="' + (linked ? 'unlink' : 'plus') + '"></i><span>' + (linked ? 'Unlink this conversation' : 'Link this conversation') + '</span></button>' +
+    (!sessions.length ? '<button type="button" class="workbench-related-link linear-session-pill linear-action-chip" data-linear-start><i data-lucide="plus"></i><span>Start work</span></button>' : '') +
     '</div><p class="linear-sharing-hint">Linked issue titles and status are visible to conversation viewers.</p></section>' +
     (prs.length ? '<section><h3>GitHub pull requests</h3>' + prs.map(function (pr) { return '<a target="_blank" rel="noopener noreferrer" href="' + esc(pr.url) + '">PR #' + esc(pr.number) + ' · ' + esc(pr.title) + '</a>'; }).join('<br>') + '</section>' : '') +
     '<div class="issue-doc-body">' + prose(issue.description) + '</div><section class="issue-discussion"><h3>Comments</h3>' +

package/lib/public/modules/pane-activation.js

@@ -111,7 +111,7 @@ export function filterPaneActivation(message) {
   var pending = store.get('panePendingBinding'), committed = store.get('paneCommittedBinding');
   if (message.type === 'pane_activation_rejected') { failed(message.requestId); return true; }
   if (!pending && !committed) return !!message.paneActivation;
-  if (['session_list', 'split_groups', 'session_presence', 'pong', 'account_auth_required', 'project_removed', 'project_access_revoked'].indexOf(message.type) >= 0 && !message.paneActivation) return false;
+  if (['session_list', 'split_groups', 'session_presence', 'mate_list', 'mate_updated', 'mate_deleted', 'pong', 'account_auth_required', 'project_removed', 'project_access_revoked'].indexOf(message.type) >= 0 && !message.paneActivation) return false;
   var expected = pending || committed;
   if (!samePaneBinding(expected, message.paneActivation)) return true;
   if (message.type === 'pane_activation_started') return true;
@@ -139,6 +139,10 @@ export function filterPaneActivation(message) {
       clearDeadline();
       store.set({ paneCommittedBinding: expected, panePendingBinding: null, paneReady: true });
       block(false);
+      // Initial owner metadata may have arrived during activation. Read it again
+      // after committing; session-bound actions still require their live gesture.
+      var socket = getWs();
+      if (socket && socket.readyState === 1) socket.send(JSON.stringify({ type: 'mate_list' }));
       if (typeof performance !== 'undefined' && performance.mark) { performance.clearMarks('clay:pane-ready'); performance.mark('clay:pane-ready'); }
       var frame = window.frameElement;
       if (frame) frame.dispatchEvent(new window.parent.CustomEvent('clay-pane-ready'));

package/lib/public/modules/shared-browser-tabs.js

@@ -5,7 +5,7 @@ export function renderBrowserTabs(el, select, send) {
   var bar = el.querySelector('.shared-browser-tabs');
   var tabs = store.get('sharedBrowsers') || [];
   var selected = store.get('sharedBrowser');
-  var key = JSON.stringify([tabs.map(function (tab) { return [tab.id, tab.url, tab.control, tab.phase, tab.incognito, tab.personalCookiesAvailable]; }), selected && selected.id, store.get('connected')]);
+  var key = JSON.stringify([tabs.map(function (tab) { return [tab.id, tab.url, tab.control, tab.phase, tab.incognito, tab.personalCookiesAvailable, tab.sourceSessionId, tab.sourceRole, tab.sourceTitle, tab.sourceGeneration]; }), selected && selected.id, store.get('connected')]);
   if (bar.dataset.key === key) return;
   var focused = bar.contains(document.activeElement) ? document.activeElement : null;
   var focusedId = focused && focused.dataset.browserId, focusedAction = focused && focused.dataset.tabAction;
@@ -23,8 +23,10 @@ export function renderBrowserTabs(el, select, send) {
     button.setAttribute('aria-selected', String(active)); button.tabIndex = active ? 0 : -1;
     var title = 'New tab';
     try { if (tab.url) title = new URL(tab.url).hostname || 'New tab'; } catch (e) {}
+    var source = tab.sourceRole === 'worker' ? 'Worker #' + tab.sourceSessionId : '';
+    if (source) title = source + ' · ' + title;
     var mode = tab.phase === 'ended' ? 'Ended' : tab.phase === 'starting' ? 'Starting' : tab.control === 'agent' ? 'You and Clay can control this tab' : 'Only you can control this tab. Clay is paused.';
-    var description = title + ' · ' + (tab.incognito === false ? 'Personal browser' : 'Incognito') + ' · ' + mode;
+    var description = title + (source ? ' · ' + tab.sourceTitle + ' · Gen ' + tab.sourceGeneration : '') + ' · ' + (tab.incognito === false ? 'Personal browser' : 'Incognito') + ' · ' + mode;
     var label = document.createElement('span'); label.className = 'shared-browser-tab-label'; label.textContent = title;
     button.innerHTML = iconHtml(tab.personalCookiesAvailable && tab.incognito ? 'glasses' : 'globe');
     button.appendChild(label); button.setAttribute('aria-label', description); button.setAttribute('data-tip', description);