pilotswarm 0.5.13 → 0.5.15

package/ui/core/src/history.js

@@ -353,16 +353,33 @@ export function dedupeChatMessages(chat = []) {
     return deduped;
 }
 
+// In a multi-writer session the runtime prepends a `[FROM: name (relation)]`
+// attribution line to the prompt so the agent knows who is speaking. The chat
+// pane conveys the same thing through the message's speaker label + color, so
+// strip the raw marker from the DISPLAY text (the structured `sender` below
+// drives the label). Only a leading marker is removed.
+function stripLeadingSenderMarker(text) {
+    return typeof text === "string"
+        ? text.replace(/^\[FROM:[^\]\n]*\]\n?/, "")
+        : text;
+}
+
 function buildChatMessage(event, role) {
     const rawText = messageTextFromEvent(event);
     const sessionMessageCard = buildSessionMessageChatCard(event, rawText);
     if (sessionMessageCard) return sessionMessageCard;
 
-    const text = extractVisibleChatText(rawText, role);
+    const text = stripLeadingSenderMarker(extractVisibleChatText(rawText, role));
     if (!hasVisibleMessageText(text)) return null;
     const clientMessageIds = Array.isArray(event?.data?.clientMessageIds)
         ? event.data.clientMessageIds.filter((id) => typeof id === "string" && id)
         : [];
+    // Structured sender identity (security model): who sent this message. The
+    // chat selector uses it to label the line with the sender's name and a
+    // distinct color when it is not the current viewer.
+    const sender = event?.data?.sender && typeof event.data.sender === "object"
+        ? event.data.sender
+        : null;
     return {
         id: `${event.sessionId}:${event.seq}`,
         role: deriveChatRole(event, role, text),
@@ -370,6 +387,7 @@ function buildChatMessage(event, role) {
         time: formatTimestamp(event.createdAt),
         createdAt: event.createdAt instanceof Date ? event.createdAt.getTime() : new Date(event.createdAt).getTime(),
         ...(clientMessageIds.length > 0 ? { clientMessageIds } : {}),
+        ...(sender ? { sender } : {}),
     };
 }
 

package/ui/core/src/reducer.js

@@ -324,6 +324,12 @@ function resolveVisibleActiveSessionId(state, fallbackSessions = []) {
     if (currentSessionId && visibleRows.some((row) => row.sessionId === currentSessionId)) {
         return currentSessionId;
     }
+    // A navigation intent (deep link) owns selection until it is cleared by
+    // manual navigation or a filter change. While one exists — pending target
+    // still loading, or failed — never fall back to a default selection.
+    if (state.sessions?.navigationIntent) {
+        return currentSessionId;
+    }
     if (currentSessionId && state.sessions?.byId?.[currentSessionId] && !hasSessionVisibilityFilter(state.sessions)) {
         return currentSessionId;
     }
@@ -361,20 +367,67 @@ function updateUiForSessionSelection(state, nextActiveSessionId) {
 }
 
 function applyVisibleSessionSelection(state, nextSessions) {
+    let sessions = nextSessions;
+
+    // Navigation intent (deep link) outranks in-memory selection and profile
+    // activeSessionId: once its target session is present, latch the selection
+    // onto it and mark the intent resolved.
+    const intent = sessions.navigationIntent || null;
+    const intentTargetId = intent && intent.status !== "failed" && sessions.byId?.[intent.sessionId]
+        ? intent.sessionId
+        : null;
+    if (intentTargetId) {
+        sessions = {
+            ...sessions,
+            activeSessionId: intentTargetId,
+            navigationIntent: intent.status === "resolved"
+                ? intent
+                : { sessionId: intent.sessionId, status: "resolved" },
+        };
+    }
+
+    // Expand ancestors BEFORE resolving visibility: a selected session inside
+    // a collapsed group/parent is absent from the flat tree, so resolving
+    // first would drop the selection instead of revealing it.
+    const selectionCandidateId = sessions.activeSessionId || null;
+    if (selectionCandidateId && sessions.byId?.[selectionCandidateId]) {
+        const expandedCollapsedIds = reconcileCollapsedIdsForActiveSession(sessions.collapsedIds, sessions.byId, selectionCandidateId);
+        if (!setsEqual(expandedCollapsedIds, sessions.collapsedIds)) {
+            sessions = {
+                ...sessions,
+                collapsedIds: expandedCollapsedIds,
+                flat: buildSessionTree(Object.values(sessions.byId || {}), expandedCollapsedIds, sessions.orderById, sessions.pinnedIds),
+            };
+        }
+    }
+
+    // A resolved intent target excluded by the current filters gets a
+    // transient exception so the linked session is shown anyway. Never
+    // persisted; cleared on manual navigation or filter change.
+    if (intentTargetId && sessions.filterExceptionId !== intentTargetId) {
+        const probeRows = selectSessionRows({ ...state, sessions });
+        if (!probeRows.some((row) => row.sessionId === intentTargetId)) {
+            sessions = {
+                ...sessions,
+                filterExceptionId: intentTargetId,
+            };
+        }
+    }
+
     const nextState = {
         ...state,
-        sessions: nextSessions,
+        sessions,
     };
-    const nextActiveSessionId = resolveVisibleActiveSessionId(nextState, Object.values(nextSessions.byId || {}));
-    const nextCollapsedIds = reconcileCollapsedIdsForActiveSession(nextSessions.collapsedIds, nextSessions.byId, nextActiveSessionId);
-    const collapsedChanged = !setsEqual(nextCollapsedIds, nextSessions.collapsedIds);
+    const nextActiveSessionId = resolveVisibleActiveSessionId(nextState, Object.values(sessions.byId || {}));
+    const nextCollapsedIds = reconcileCollapsedIdsForActiveSession(sessions.collapsedIds, sessions.byId, nextActiveSessionId);
+    const collapsedChanged = !setsEqual(nextCollapsedIds, sessions.collapsedIds);
     const reconciledSessions = collapsedChanged
         ? {
-            ...nextSessions,
+            ...sessions,
             collapsedIds: nextCollapsedIds,
-            flat: buildSessionTree(Object.values(nextSessions.byId || {}), nextCollapsedIds, nextSessions.orderById, nextSessions.pinnedIds),
+            flat: buildSessionTree(Object.values(sessions.byId || {}), nextCollapsedIds, sessions.orderById, sessions.pinnedIds),
         }
-        : nextSessions;
+        : sessions;
     return {
         sessions: {
             ...reconciledSessions,
@@ -515,7 +568,15 @@ export function appReducer(state, action) {
                 && (settings.chatViewMode === "summary" || settings.chatViewMode === "transcript");
             const hasPins = Object.prototype.hasOwnProperty.call(settings, "pinnedSessionIds");
             const hasCollapsed = Object.prototype.hasOwnProperty.call(settings, "collapsedSessionIds");
-            const hasActive = Object.prototype.hasOwnProperty.call(settings, "activeSessionId");
+            // A pending/resolved deep-link intent outranks the profile's
+            // persisted activeSessionId — a remote profile poll must not
+            // yank selection away from the linked session.
+            const navigationIntentLatched = Boolean(
+                state.sessions.navigationIntent
+                && state.sessions.navigationIntent.status !== "failed",
+            );
+            const hasActive = Object.prototype.hasOwnProperty.call(settings, "activeSessionId")
+                && !navigationIntentLatched;
             const hasLoadedSessions = Object.keys(state.sessions.byId || {}).length > 0;
             const nextLayout = hasLayout
                 ? {
@@ -693,6 +754,10 @@ export function appReducer(state, action) {
                 const nextSessions = {
                     ...state.sessions,
                     filterQuery: typeof action.query === "string" ? action.query : "",
+                    // A filter change is an explicit user action: it releases
+                    // the deep-link latch and its transient filter exception.
+                    navigationIntent: null,
+                    filterExceptionId: null,
                 };
                 const selection = applyVisibleSessionSelection(state, nextSessions);
                 return {
@@ -708,6 +773,8 @@ export function appReducer(state, action) {
                     ...state.sessions,
                     ownerFilterExplicit: true,
                     ownerFilter: normalizeSessionOwnerFilter(action.filter),
+                    navigationIntent: null,
+                    filterExceptionId: null,
                 };
                 const selection = applyVisibleSessionSelection(state, nextSessions);
                 return {
@@ -717,6 +784,39 @@ export function appReducer(state, action) {
                 };
             }
 
+        case "sessions/navigationIntent": {
+            const sessionId = String(action.sessionId || "").trim();
+            if (!sessionId) return state;
+            const nextSessions = {
+                ...state.sessions,
+                navigationIntent: { sessionId, status: "pending" },
+                filterExceptionId: null,
+            };
+            const selection = applyVisibleSessionSelection(state, nextSessions);
+            return {
+                ...state,
+                sessions: selection.sessions,
+                ui: selection.ui,
+            };
+        }
+
+        case "sessions/navigationIntentFailed": {
+            const intent = state.sessions.navigationIntent;
+            const sessionId = String(action.sessionId || "").trim();
+            if (!intent || (sessionId && intent.sessionId !== sessionId)) return state;
+            return {
+                ...state,
+                sessions: {
+                    ...state.sessions,
+                    navigationIntent: {
+                        sessionId: intent.sessionId,
+                        status: "failed",
+                        errorKind: action.errorKind === "not_found" ? "not_found" : "network",
+                    },
+                },
+            };
+        }
+
         case "ui/modalSelection": {
             const modal = state.ui.modal;
             if (!modal) return state;
@@ -991,15 +1091,28 @@ export function appReducer(state, action) {
             if (previousActiveId && previousActiveId !== action.sessionId) {
                 savedChatScroll[previousActiveId] = Number(state.ui.scroll?.chat) || 0;
             }
+            // Manual navigation to a different session releases the deep-link
+            // latch and its transient filter exception.
+            const releasesNavigationLatch = Boolean(
+                state.sessions.navigationIntent
+                && state.sessions.navigationIntent.sessionId !== action.sessionId,
+            );
             return {
                 ...state,
                 sessions: {
                     ...state.sessions,
                     activeSessionId: action.sessionId,
+                    ...(releasesNavigationLatch
+                        ? { navigationIntent: null, filterExceptionId: null }
+                        : {}),
                 },
                 ui: {
                     ...state.ui,
                     chatScrollBySession: savedChatScroll,
+                    // Status notices are per-moment, usually per-session (send
+                    // refusals, access hints) — a stale one must not follow the
+                    // user to the next session.
+                    statusText: previousActiveId !== action.sessionId ? "" : state.ui.statusText,
                     scroll: {
                         ...state.ui.scroll,
                         chat: Number(savedChatScroll[action.sessionId]) || 0,

package/ui/core/src/selectors.js

@@ -32,6 +32,8 @@ export const ACTIVE_HIGHLIGHT_BACKGROUND = "activeHighlightBackground";
 export const ACTIVE_HIGHLIGHT_FOREGROUND = "activeHighlightForeground";
 const USER_CHAT_COLOR = "userChat";
 const USER_CHAT_LABEL_COLOR = "userChatLabel";
+// Speaker label for a message from another person in a shared session.
+const OTHER_PERSON_CHAT_LABEL_COLOR = "otherUserChatLabel";
 
 const totalDescendantCountsCache = new WeakMap();
 const visibleDescendantCountsCache = new WeakMap();
@@ -348,6 +350,10 @@ function matchesOwnerFilterDirect(session, ownerFilter = {}, auth = {}, ownerOve
     if (ownerKey === SYSTEM_OWNER_KEY) return ownerFilter.includeSystem === true;
     const currentUserKey = ownerKeyForOwner(auth?.principal);
     if (ownerFilter.includeMe && currentUserKey && ownerKey === currentUserKey) return true;
+    // "Shared with me": any non-system session owned by someone else. The
+    // catalog is viewer-scoped server-side, so a foreign owner implies the
+    // session was shared with (or is otherwise readable by) the viewer.
+    if (ownerFilter.includeShared === true && ownerKey !== currentUserKey) return true;
     return Array.isArray(ownerFilter.ownerKeys) && ownerFilter.ownerKeys.includes(ownerKey);
 }
 
@@ -613,9 +619,13 @@ function buildSessionRowView(entry, session, state, totalDescendantCounts, visib
     const titleRuns = [...prefixRuns];
     // Owner chip — only when the list actually surfaces more than one human
     // owner (shouldDecorateSessionOwners). Otherwise it's noise on every row.
+    // Bracketed + bold so it reads as an owner badge, not part of the title.
+    // The current viewer's own sessions get a distinct color so "mine" pops.
     if (shouldDecorateSessionOwners(state) && !session?.isSystem && !session?.isGroup) {
         const initials = effectiveOwner ? ownerInitials(effectiveOwner) : "?";
-        titleRuns.push({ text: `${initials} · `, color: "cyan" });
+        const viewerKey = ownerKeyForOwner(state?.auth?.principal);
+        const isMine = viewerKey && ownerKeyForOwner(effectiveOwner) === viewerKey;
+        titleRuns.push({ text: `[${initials}] `, color: isMine ? "green" : "cyan", bold: true });
     }
     if (hasRealTitle) {
         titleRuns.push({ text: rawTitle, color: mainColor, bold: Boolean(session?.isSystem || session?.isGroup) });
@@ -682,6 +692,15 @@ function buildSessionRowView(entry, session, state, totalDescendantCounts, visib
         const childCount = totalDescendantCounts?.[session?.sessionId];
         if (childCount) { pushSep(); detailRuns.push({ text: `${childCount} child${childCount === 1 ? "" : "ren"}`, color: "gray" }); }
         if (cronBadge) { pushSep(); detailRuns.push({ text: cronBadge.text, color: cronBadge.color }); }
+        // Shared-session marker (security model): private needs no marker;
+        // shared_read/shared_write surface here in the selected-row details.
+        if (session?.visibility === "shared_read" || session?.visibility === "shared_write") {
+            pushSep();
+            detailRuns.push({
+                text: session.visibility === "shared_write" ? "shared·write" : "shared·read",
+                color: "magenta",
+            });
+        }
     }
 
     // Flat runs for the TUI: title + (for titled rows) dim age + context.
@@ -713,6 +732,31 @@ function matchesSearchQuery(value, query) {
     return String(value || "").toLowerCase().includes(normalizedQuery);
 }
 
+// The transient deep-link filter exception covers the linked session AND its
+// ancestor chain (real parents plus the synthetic group:<id> row) so the
+// linked row renders with its tree context instead of as an orphan.
+function collectFilterExceptionIds(sessions) {
+    const exceptionId = sessions?.filterExceptionId || null;
+    const byId = sessions?.byId || {};
+    if (!exceptionId || !byId[exceptionId]) return null;
+    const ids = new Set([exceptionId]);
+    let current = byId[exceptionId];
+    let hops = 0;
+    while (current && hops < 16) {
+        let parentId = null;
+        if (current.parentSessionId && byId[current.parentSessionId]) {
+            parentId = current.parentSessionId;
+        } else if (!current.isGroup && current.groupId && byId[`group:${current.groupId}`]) {
+            parentId = `group:${current.groupId}`;
+        }
+        if (!parentId || ids.has(parentId)) break;
+        ids.add(parentId);
+        current = byId[parentId];
+        hops += 1;
+    }
+    return ids;
+}
+
 export function selectSessionRows(state) {
     const totalDescendantCounts = getTotalDescendantCounts(state.sessions.byId);
     const visibleDescendantCounts = getVisibleDescendantCounts(state.sessions.flat, state.sessions.byId);
@@ -721,6 +765,7 @@ export function selectSessionRows(state) {
     const auth = state.auth || {};
     const pinnedSet = new Set(Array.isArray(state.sessions?.pinnedIds) ? state.sessions.pinnedIds : []);
     const selectedSet = new Set(Array.isArray(state.sessions?.selectedIds) ? state.sessions.selectedIds : []);
+    const filterExceptionIds = collectFilterExceptionIds(state.sessions);
 
     return state.sessions.flat.map((entry) => {
         const session = state.sessions.byId[entry.sessionId];
@@ -742,6 +787,7 @@ export function selectSessionRows(state) {
             canPin: canPinSessionRow(session),
         };
     }).filter((row) => {
+        if (filterExceptionIds?.has(row.sessionId)) return true;
         const session = state.sessions.byId[row.sessionId];
         if (!matchesOwnerFilter(session, ownerFilter, auth, state.sessions.byId)) return false;
         const effectiveOwner = effectiveSessionOwner(session, state.sessions.byId);
@@ -791,6 +837,39 @@ export function selectActiveSession(state) {
     return sessionId ? state.sessions.byId[sessionId] || null : null;
 }
 
+export function selectNavigationIntent(state) {
+    return state.sessions?.navigationIntent || null;
+}
+
+/**
+ * Deep-link failure state for renderers. `not_found` deliberately covers both
+ * unknown and inaccessible sessions (no existence oracle); network/server
+ * failures keep a retryable flavor.
+ */
+export function selectNavigationError(state) {
+    const intent = state.sessions?.navigationIntent;
+    if (!intent || intent.status !== "failed") return null;
+    const errorKind = intent.errorKind === "not_found" ? "not_found" : "network";
+    return {
+        sessionId: intent.sessionId,
+        errorKind,
+        retryable: errorKind === "network",
+        message: errorKind === "not_found"
+            ? "This session was not found or has not been shared with you."
+            : "Could not load the linked session. Check your connection and try again.",
+    };
+}
+
+/**
+ * Status copy for the transient deep-link filter exception — non-null while a
+ * linked session is being shown despite the current filters excluding it.
+ */
+export function selectSessionFilterExceptionNotice(state) {
+    const exceptionId = state.sessions?.filterExceptionId || null;
+    if (!exceptionId || !state.sessions?.byId?.[exceptionId]) return null;
+    return "Showing linked session outside your current filters.";
+}
+
 /**
  * True when the session row is actively running a turn that Stop can target.
  * Applies to user AND system sessions; group/container rows are not sessions.
@@ -868,9 +947,11 @@ function buildPendingOutboxMessage(sessionId, item) {
         createdAt: Number(item.createdAt) || Date.now(),
         pendingPhase: item.phase === "cancelling"
             ? "cancelling"
-            : item.phase === "queued"
-                ? "queued"
-                : "pending",
+            : item.phase === "rejected"
+                ? "rejected"
+                : item.phase === "queued"
+                    ? "queued"
+                    : "pending",
     };
 }
 
@@ -1281,20 +1362,44 @@ function prefixRuns(text, color = "gray", options = {}) {
     }];
 }
 
-function buildChatMessagePrefix(message) {
+function buildChatMessagePrefix(message, options = {}) {
     const time = formatTimestamp(message?.createdAt || message?.time);
-    const roleLabel = message?.role === "user"
-        ? "You"
+    // A user.message is labeled from the CURRENT VIEWER's perspective: "You"
+    // for the viewer's own messages, the sender's name for anyone else. When
+    // the sender is the session owner, an "(owner)" tag is appended — so the
+    // viewing owner sees "You (owner):" and everyone else sees "Alice (owner):".
+    // A distinct color marks messages from other people.
+    const sender = message?.sender;
+    const senderKey = sender?.kind === "user" ? ownerKeyForOwner(sender) : null;
+    const viewerKey = options?.viewerKey || null;
+    const ownerKey = options?.ownerKey || null;
+    // Only distinguish speakers / show the owner tag in a SHARED session — a
+    // private solo session stays plain "You" / "Agent" (no noise).
+    const sharedContext = options?.sharedContext === true;
+    const isUser = message?.role === "user";
+    const isSelf = isUser && senderKey && viewerKey && senderKey === viewerKey;
+    const fromOtherPerson = sharedContext && isUser && senderKey && !isSelf;
+    // Owner tag: the sender is the session owner (or, for a sender-less own
+    // message, the viewer themselves is the owner).
+    const senderIsOwner = sharedContext && isUser && ownerKey && (
+        (senderKey && senderKey === ownerKey)
+        || (!senderKey && viewerKey && viewerKey === ownerKey)
+    );
+    const ownerSuffix = senderIsOwner ? " (owner)" : "";
+
+    const roleLabel = isUser
+        ? ((fromOtherPerson ? (sender.display || sender.subject || "User") : "You") + ownerSuffix)
         : message?.role === "assistant"
             ? "Agent"
             : message?.role === "system"
                 ? "System"
                 : "PilotSwarm";
 
-    // 3-state delivery glyph for user messages:
+    // Delivery glyph for user messages:
     //   ○   pending  — client outbox, not yet durable
     //   ✓   queued   — durably enqueued, waiting for orchestration to drain
     //   x   cancelling — durable cancel requested, waiting for runtime outcome
+    //   x   rejected — server refused the send (authz); auto-dropped shortly
     //   ✓✓  sent     — persisted as user.message in CMS, LLM has it
     let glyph = null;
     let glyphColor = null;
@@ -1304,7 +1409,7 @@ function buildChatMessagePrefix(message) {
     } else if (message?.pendingPhase === "queued") {
         glyph = "✓";
         glyphColor = "cyan";
-    } else if (message?.pendingPhase === "cancelling") {
+    } else if (message?.pendingPhase === "cancelling" || message?.pendingPhase === "rejected") {
         glyph = "x";
         glyphColor = "red";
     } else if (message?.role === "user" && !message?.optimistic && !message?.pendingPhase) {
@@ -1324,8 +1429,10 @@ function buildChatMessagePrefix(message) {
         ? "yellow"
         : message?.pendingPhase === "queued"
             ? "cyan"
-            : message?.pendingPhase === "cancelling"
+            : message?.pendingPhase === "cancelling" || message?.pendingPhase === "rejected"
                 ? "red"
+            : fromOtherPerson
+                ? OTHER_PERSON_CHAT_LABEL_COLOR
             : message?.role === "user"
                 ? USER_CHAT_LABEL_COLOR
         : message?.role === "assistant"
@@ -1907,7 +2014,7 @@ function buildChatMessageLines(message, maxWidth, options = {}) {
             ? "red"
             : message?.role === "user" ? USER_CHAT_COLOR : null,
     );
-    const prefix = options.skipPrefix ? [] : buildChatMessagePrefix(message);
+    const prefix = options.skipPrefix ? [] : buildChatMessagePrefix(message, options);
 
     if (tintedMarkdownLines.length === 0) {
         return prefix.length > 0 ? [prefix] : [];
@@ -2120,7 +2227,26 @@ export function selectChatLines(state, maxWidth = 80, options = {}) {
         return [{ text: "No messages yet.", color: "gray" }];
     }
 
-    const buildOptions = options?.tableMode ? { tableMode: options.tableMode } : {};
+    // The current viewer's identity key — a user.message whose sender differs
+    // is labeled with the sender's name (others) vs "You" (the viewer). The
+    // session owner's messages additionally carry an "(owner)" tag.
+    const viewerKey = ownerKeyForOwner(state?.auth?.principal);
+    const activeSessionId = state?.sessions?.activeSessionId;
+    const activeSession = activeSessionId ? state?.sessions?.byId?.[activeSessionId] : null;
+    const ownerKey = ownerKeyForOwner(activeSession?.owner);
+    // A shared context = the session is shared deployment-wide, or the viewer
+    // is not its owner (someone shared it with them). Only then does the
+    // transcript name speakers and tag the owner.
+    const sharedContext = Boolean(activeSession && (
+        (activeSession.visibility && activeSession.visibility !== "private")
+        || (ownerKey && viewerKey && ownerKey !== viewerKey)
+    ));
+    const buildOptions = {
+        ...(options?.tableMode ? { tableMode: options.tableMode } : {}),
+        ...(viewerKey ? { viewerKey } : {}),
+        ...(ownerKey ? { ownerKey } : {}),
+        ...(sharedContext ? { sharedContext: true } : {}),
+    };
     const lines = [];
     for (const [index, message] of messages.entries()) {
         const messageLines = buildChatMessageLines(message, maxWidth, buildOptions);
@@ -2145,10 +2271,12 @@ export function selectOutboxOverlayLines(state, maxWidth = 80, options = {}) {
     const queuedCount = messages.filter((message) => message.pendingPhase === "queued").length;
     const pendingCount = messages.filter((message) => message.pendingPhase === "pending").length;
     const cancellingCount = messages.filter((message) => message.pendingPhase === "cancelling").length;
+    const rejectedCount = messages.filter((message) => message.pendingPhase === "rejected").length;
     const parts = [];
     if (pendingCount > 0) parts.push(`${pendingCount} pending`);
     if (queuedCount > 0) parts.push(`${queuedCount} queued`);
     if (cancellingCount > 0) parts.push(`${cancellingCount} cancelling`);
+    if (rejectedCount > 0) parts.push(`${rejectedCount} rejected`);
     const label = parts.length > 0 ? parts.join(" · ") : "queued prompts";
     const labelText = ` queued prompts: ${label} `;
     const rightRule = Math.max(1, safeWidth - labelText.length);
@@ -2969,6 +3097,12 @@ export function selectStatusBar(state) {
             right: "type title · left/right move · enter save · esc cancel",
         };
     }
+    if (state.ui.modal?.type === "shareSession") {
+        return {
+            left: "Share the selected session",
+            right: "name [r|w] grants · -name revokes · enter apply · esc close",
+        };
+    }
     if (state.ui.modal?.type === "artifactPicker") {
         return {
             left: "Select a linked artifact or URL",
@@ -3040,7 +3174,7 @@ export function selectStatusBar(state) {
     const chatViewMode = state.ui?.chatViewMode === "summary" ? "summary" : "transcript";
     const chatViewHint = chatViewMode === "summary" ? "s transcript" : "s summary";
     const hints = {
-        [FOCUS_REGIONS.SESSIONS]: `up/down switch · ctrl-u/ctrl-d page · ctrl-g move group · f filter · P pin · V select · d done · D delete · r refresh · t title · ${fullscreenHint} · [/] resize pane · {/} columns · T themes · ? help · a linked items · drag copy · tab next pane · p prompt`,
+        [FOCUS_REGIONS.SESSIONS]: `up/down switch · ctrl-u/ctrl-d page · ctrl-g move group · f filter · P pin · V select · d done · D delete · r refresh · t title · v visibility · S share · [/] resize pane · {/} columns · T themes · ? help · a linked items · drag copy · tab next pane · p prompt`,
         [FOCUS_REGIONS.CHAT]: `${chatViewHint} · j/k scroll · ctrl-u/ctrl-d page · e older history · g/G top/bottom · d done · ${fullscreenHint} · [/] resize pane · {/} columns · T themes · ? help · a linked items · drag copy · tab next pane · p prompt`,
         [FOCUS_REGIONS.INSPECTOR]: state.ui.inspectorTab === "logs"
             ? `j/k scroll · ctrl-u/ctrl-d page · g/G top/bottom · d done · t tail · f filter · ${fullscreenHint} · left/right tab · [/] resize pane · {/} columns · T themes · ? help · a linked items · drag copy · tab next pane`
@@ -4324,6 +4458,59 @@ export function selectRenameSessionModal(state, maxWidth = 76) {
     };
 }
 
+export function selectShareSessionModal(state, maxWidth = 76) {
+    const modal = state.ui.modal;
+    if (!modal || modal.type !== "shareSession") return null;
+
+    const value = String(modal.value || "");
+    const shares = Array.isArray(modal.shares) ? modal.shares : [];
+    const detailsLines = [
+        [{
+            text: "General: ",
+            color: "gray",
+        }, {
+            text: String(modal.visibility || "private"),
+            color: "white",
+            bold: true,
+        }],
+        ...(shares.length === 0
+            ? [[{ text: "No individual grants.", color: "gray" }]]
+            : shares.map((row) => [{
+                text: `${row.displayName || row.subject}  `,
+                color: "white",
+            }, {
+                text: `can ${row.access}`,
+                color: "gray",
+            }])),
+    ];
+
+    return {
+        title: modal.title || "Share Session",
+        value,
+        cursorIndex: Math.max(0, Math.min(Number(modal.cursorIndex) || 0, value.length)),
+        placeholder: "Name, email, or id",
+        helpTitle: "Share Rules",
+        helpLines: [
+            [{
+                text: "name-or-email [r|w] grants · -name revokes · Enter apply · Esc close",
+                color: "gray",
+            }],
+            [{
+                text: "Grantee needn't have signed in — an email grant binds at their first sign-in.",
+                color: "gray",
+            }],
+        ],
+        detailsLines,
+        idealWidth: Math.min(
+            Math.max(
+                56,
+                ...detailsLines.map((line) => flattenRunsLength(line) + 6),
+            ),
+            maxWidth,
+        ),
+    };
+}
+
 export function selectSessionGroupNameModal(state, maxWidth = 76) {
     const modal = state.ui.modal;
     if (!modal || modal.type !== "sessionGroupName") return null;
@@ -4517,6 +4704,7 @@ function isOwnerFilterItemSelected(item, ownerFilter = {}, auth = {}) {
     if (item.kind === "system") return ownerFilter?.includeSystem === true;
     if (item.kind === "unowned") return ownerFilter?.includeUnowned === true;
     if (item.kind === "me") return ownerFilter?.includeMe === true && Boolean(ownerKeyForOwner(auth?.principal));
+    if (item.kind === "shared") return ownerFilter?.includeShared === true;
     if (item.kind === "owner") return Array.isArray(ownerFilter?.ownerKeys) && ownerFilter.ownerKeys.includes(item.ownerKey);
     return false;
 }
@@ -5825,7 +6013,7 @@ const KEYBINDING_HELP = [
         ["p", "focus the prompt"],
         ["[  ]", "shrink / grow the focused pane"],
         ["{  }", "grow left / right column"],
-        ["v", "fullscreen the focused pane"],
+        ["v", "fullscreen the focused pane (sessions pane: cycle visibility)"],
         ["n / r", "new session / refresh"],
         ["a", "linked items — artifacts to download, links to open"],
         ["m", "cycle inspector tab"],
@@ -5843,6 +6031,8 @@ const KEYBINDING_HELP = [
         ["+ / -", "expand / collapse subtree"],
         ["t", "rename"],
         ["P", "pin / unpin"],
+        ["v", "cycle visibility (private / shared read / shared write)"],
+        ["S", "share — grant / revoke individual access"],
         ["V / space", "select mode / toggle selection"],
         ["f", "filter"],
     ] },

package/ui/core/src/state.js

@@ -13,6 +13,7 @@ export function normalizeSessionOwnerFilter(filter) {
         includeSystem: filter?.includeSystem === true,
         includeUnowned: filter?.includeUnowned === true,
         includeMe: filter?.includeMe === true,
+        includeShared: filter?.includeShared === true,
         ownerKeys,
     };
 }
@@ -180,6 +181,8 @@ export function createInitialState({ mode = "local", branding = null, themeId =
             filterQuery: "",
             ownerFilterExplicit: hasStoredSessionOwnerFilter,
             ownerFilter: normalizeSessionOwnerFilter(sessionOwnerFilter),
+            navigationIntent: null,
+            filterExceptionId: null,
         },
         history: {
             bySessionId: new Map(),

package/ui/core/src/themes/helpers.js

@@ -57,6 +57,10 @@ export function createTheme({ id, label, description, page, terminal, tui = {} }
         cyan: terminal?.cyan || "#55ffff",
         userChat: "#ffd866",
         userChatLabel: "#ffec99",
+        // Speaker label for a message from ANOTHER person in a shared session
+        // (distinct from the viewer's gold "You", the agent's green, and
+        // System's yellow). Every theme inherits this; a theme may override it.
+        otherUserChatLabel: terminal?.brightMagenta || terminal?.magenta || "#c9a3ff",
         activeHighlightBackground: terminal?.blue || "#5555ff",
         activeHighlightForeground: terminal?.background || "#000000",
         selectionBackground: terminal?.cursor || terminal?.blue || "#5555ff",