Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(splits): no duplicate entity instances (#6579)
Peter Chinman32f4ba97f7e4
diff --git a/apps/web/src/components/app/PreviewPanel.tsx b/apps/web/src/components/app/PreviewPanel.tsxindex d6c12715eb..114c9e9ebc 100644--- a/apps/web/src/components/app/PreviewPanel.tsx+++ b/apps/web/src/components/app/PreviewPanel.tsx@@ -1,25 +1,9 @@import {- type CalendarPreviewSelection,- type ChannelPreviewSelection,- calendarBlockParamsForEntity,- getChannelEntityTarget,navigateCalendarEntityToTarget,navigateChannelEntityToTarget,- type ReminderPreviewSelection,- reminderSplitTarget,} from '@app/features/next-soup/utils';-import { CALENDAR_BLOCK_ID } from '@block-calendar/types';-import { getChannelParams } from '@block-channel/utils/link';-import type {- BlockAliasContext,- BlockComponentProps,- BlockName,-} from '@core/block';-import { fileTypeToResolvedBlockName } from '@core/constant/allBlocks';-import { USE_MACRO_PR_SUMMARY_BLOCK } from '@core/constant/featureFlags';import { useHotkeyDOMScope } from '@core/hotkey/hotkeys';import type { BlockOrchestrator } from '@core/orchestrator';-import type { DocumentEntity, ForeignEntity } from '@entity';import { createContextProvider } from '@solid-primitives/context';import {createMemo,@@ -29,10 +13,15 @@ import {on,Show,Suspense,- untrack,} from 'solid-js';import { Dynamic } from 'solid-js/web';-import { match, P } from 'ts-pattern';+import {+ type PreviewPanelSelection,+ previewBlockTarget,+} from './previewTarget';++export type { PreviewPanelSelection } from './previewTarget';+import { ViewShell } from '../view-shell/ViewShell';import {createPriorityCollapseController,@@ -43,37 +32,6 @@ import {type SplitPanelContextType,} from './split-layout/context';-type IdOnlyPreviewSelection = {- id: string;- type:- | 'agent_session'- | 'automation'- | 'call'- | 'chat'- | 'crm_company'- | 'crm_contact'- | 'email'- | 'project';-};--type DocumentPreviewSelection = Pick<- DocumentEntity,- 'id' | 'type' | 'fileType' | 'subType'->;--type ForeignPreviewSelection = Pick<- ForeignEntity,- 'id' | 'type' | 'foreignSource'->;--export type PreviewPanelSelection =- | IdOnlyPreviewSelection- | DocumentPreviewSelection- | ForeignPreviewSelection- | ChannelPreviewSelection- | CalendarPreviewSelection- | ReminderPreviewSelection;-export const [PreviewPanelContext, useMaybePreviewPanel] =createContextProvider((props: {@@ -94,13 +52,6 @@ export type PreviewPanelProps = {headerLeading?: JSX.Element;};-type PreviewBlockTarget = {- blockType: BlockName;- blockId: string;- aliasContext: BlockAliasContext | undefined;- params?: BlockComponentProps[BlockName];-};-function PreviewPanelContent(props: PreviewPanelProps & { selectedEntity: PreviewPanelSelection }) {@@ -116,98 +67,11 @@ function PreviewPanelContent(>((previous) => {const entity = props.selectedEntity;- const target = match(entity)- .returnType<PreviewBlockTarget>()- .with(- { type: 'document', fileType: 'md', subType: { type: 'task' } },- (task) => ({- blockType: fileTypeToResolvedBlockName(task.fileType),- blockId: task.id,- aliasContext: {- alias: 'task',- baseType: 'md',- } satisfies BlockAliasContext,- })- )- .with(- { type: 'document', fileType: 'md', subType: { type: 'snippet' } },- (snippet) => ({- blockType: fileTypeToResolvedBlockName(snippet.fileType),- blockId: snippet.id,- aliasContext: {- alias: 'snippet',- baseType: 'md',- } satisfies BlockAliasContext,- })- )- .with({ type: 'document' }, (document) => ({- blockType: fileTypeToResolvedBlockName(document.fileType),- blockId: document.id,- aliasContext: undefined,- }))- .with(- { type: P.union('channel_message', 'channel_thread') },- (message) => {- const channelTarget = untrack(() => getChannelEntityTarget(message));- return {- blockType: 'channel',- blockId: message.channelId,- aliasContext: undefined,- params:- channelTarget?.kind === 'message'- ? getChannelParams(- channelTarget.messageId,- channelTarget.threadId- )- : undefined,- };- }- )- .with({ type: 'foreign' }, (foreignEntity) => ({- blockType:- USE_MACRO_PR_SUMMARY_BLOCK &&- foreignEntity.foreignSource === 'github_pull_request'- ? 'pr'- : 'unknown',- blockId: foreignEntity.id,- aliasContext: undefined,- }))- .with({ type: 'crm_company' }, (company) => ({- blockType: 'company',- blockId: company.id,- aliasContext: undefined,- }))- .with({ type: 'crm_contact' }, (contact) => ({- blockType: 'contact',- blockId: contact.id,- aliasContext: undefined,- }))- .with({ type: 'calendar_event' }, (calendarEvent) => ({- blockType: 'calendar',- blockId: CALENDAR_BLOCK_ID,- aliasContext: undefined,- params: untrack(() => calendarBlockParamsForEntity(calendarEvent)),- }))- .with({ type: 'reminder' }, (reminder) => {- const reminderTarget = reminderSplitTarget(reminder);- return {- blockType: fileTypeToResolvedBlockName(reminderTarget?.type),- blockId: reminderTarget?.id ?? reminder.id,- aliasContext: undefined,- };- })- .otherwise((fallbackEntity) => ({- blockType: fileTypeToResolvedBlockName(fallbackEntity.type),- blockId: fallbackEntity.id,- aliasContext: undefined,- }));+ const target = previewBlockTarget(entity);if (previous?.type === target.blockType && previous.id === target.blockId) {return previous;}- if (props.orchestrator.isBlockMounted(target.blockType, target.blockId)) {- return undefined;- }return props.orchestrator.createBlockInstance(target.blockType,@@ -349,14 +213,7 @@ function PreviewPanelContent(onFocusOut={props.onFocusOut}><Suspense>- <Show- when={blockInstance()}- fallback={- <div class="flex size-full items-center justify-center text-sm text-ink-muted">- Content already open.- </div>- }- >+ <Show when={blockInstance()}>{(instance) => <Dynamic component={instance().element} />}</Show></Suspense>@@ -367,7 +224,10 @@ function PreviewPanelContent();}-/** Renders a selected entity's actual block inside an inline preview surface. */+/**+ * Renders an admitted selection. Hosts use createPreviewSelectionGuard before+ * changing selection so conflicts never replace their current detail view.+ */export function PreviewPanel(props: PreviewPanelProps) {return (<div class="flex size-full min-h-0">diff --git a/apps/web/src/components/app/app-sidebar/sidebar.tsx b/apps/web/src/components/app/app-sidebar/sidebar.tsxindex 672d9471fe..8946f5dbb4 100644--- a/apps/web/src/components/app/app-sidebar/sidebar.tsx+++ b/apps/web/src/components/app/app-sidebar/sidebar.tsx@@ -1778,7 +1778,7 @@ export const SidebarOpenInSplitMenu = (props: SidebarOpenInSplitMenuProps) => {allowDuplicate: true,referredFrom: 'sidebar',});- props.onOpened?.(split, 'new-split');+ if (split) props.onOpened?.(split, 'new-split');};const openFullscreen = () => {diff --git a/apps/web/src/components/app/createPreviewSelectionGuard.test.tsx b/apps/web/src/components/app/createPreviewSelectionGuard.test.tsxnew file mode 100644index 0000000000..6d687f952b--- /dev/null+++ b/apps/web/src/components/app/createPreviewSelectionGuard.test.tsx@@ -0,0 +1,90 @@+import {+ NavigationStack,+ useNavigationStack,+} from '@app/components/navigation-stack/NavigationStack';+import { toast } from '@core/component/Toast/Toast';+import { createContentInstanceRegistry } from '@core/contentInstanceRegistry';+import { render } from '@solidjs/testing-library';+import { beforeEach, expect, it, vi } from 'vitest';+import { createPreviewSelectionGuard } from './createPreviewSelectionGuard';+import type { PreviewPanelSelection } from './previewTarget';++const app = vi.hoisted(() => ({ orchestrator: {} as Record<string, unknown> }));+vi.mock('./GlobalAppState', () => ({+ useGlobalBlockOrchestrator: () => app.orchestrator,+}));+vi.mock('@core/component/Toast/Toast', () => ({ toast: { alert: vi.fn() } }));+vi.mock('@core/constant/allBlocks', () => ({+ resolveBlockAlias: (type: string) => (type === 'task' ? 'md' : type),+}));+vi.mock('./previewTarget', () => ({+ previewBlockTarget: (entity: PreviewPanelSelection) => ({+ blockType: entity.type === 'document' ? entity.fileType : entity.type,+ blockId: entity.id,+ }),+}));++beforeEach(() => {+ app.orchestrator = { contentInstances: createContentInstanceRegistry() };+ vi.mocked(toast.alert).mockClear();+});++function setup() {+ let stack!: ReturnType<typeof useNavigationStack<PreviewPanelSelection>>;+ function Capture() {+ stack = useNavigationStack<PreviewPanelSelection>();+ return null;+ }+ function App() {+ const guard = createPreviewSelectionGuard();+ return (+ <NavigationStack.Root<PreviewPanelSelection> beforeChange={guard}>+ <Capture />+ </NavigationStack.Root>+ );+ }+ const view = render(App);+ return { stack, ...view };+}++it('rejects a second detail selection without changing its current entry and releases on close', () => {+ const first = setup();+ const second = setup();+ first.stack.reset({ type: 'email', id: 'one' });+ second.stack.reset({ type: 'email', id: 'two' });+ const current = second.stack.active();+ expect(second.stack.reset({ type: 'email', id: 'one' })).toBeUndefined();+ expect(second.stack.active()).toBe(current);+ expect(toast.alert).toHaveBeenCalledWith('Content already open');+ first.stack.clear();+ expect(second.stack.reset({ type: 'email', id: 'one' })).toBeDefined();+ first.unmount();+ second.unmount();+});++it('blocks breadcrumbs back to content opened elsewhere without changing history', () => {+ const first = setup();+ const second = setup();+ first.stack.push({ type: 'email', id: 'one' });+ first.stack.push({ type: 'email', id: 'two' });+ second.stack.reset({ type: 'email', id: 'one' });+ first.stack.pop();+ expect(first.stack.active()?.data.id).toBe('two');+ expect(first.stack.entries).toHaveLength(2);+ second.unmount();+ first.stack.pop();+ expect(first.stack.active()?.data.id).toBe('one');+ first.unmount();+});++it('treats Markdown as single-instance and allows revisiting the owning preview', () => {+ const first = setup();+ const second = setup();+ const document = { type: 'document', fileType: 'md', id: 'doc' } as const;+ expect(first.stack.reset(document)).toBeDefined();+ expect(second.stack.reset(document)).toBeUndefined();+ expect(toast.alert).toHaveBeenCalledWith('Content already open');+ expect(first.stack.reset(document)).toBeDefined();+ first.unmount();+ second.unmount();+});diff --git a/apps/web/src/components/app/createPreviewSelectionGuard.ts b/apps/web/src/components/app/createPreviewSelectionGuard.tsnew file mode 100644index 0000000000..d1df011967--- /dev/null+++ b/apps/web/src/components/app/createPreviewSelectionGuard.ts@@ -0,0 +1,30 @@+import { toast } from '@core/component/Toast/Toast';+import type { ContentIdentity } from '@core/contentInstanceRegistry';+import { onCleanup } from 'solid-js';+import { useGlobalBlockOrchestrator } from './GlobalAppState';+import {+ type PreviewPanelSelection,+ previewBlockTarget,+} from './previewTarget';++/** Call before changing selection. A rejected selection leaves the current preview intact. */+export function createPreviewSelectionGuard() {+ const registry = useGlobalBlockOrchestrator().contentInstances;+ const owner = Symbol('inline-preview');+ let current: ContentIdentity | undefined;+ const unregister = registry.register(() =>+ current ? [{ owner, content: current }] : []+ );+ onCleanup(unregister);++ return (selection: PreviewPanelSelection | undefined) => {+ const target = selection && previewBlockTarget(selection);+ const next = target && { type: target.blockType, id: target.blockId };+ if (next && registry.isOpenElsewhere(next, owner)) {+ toast.alert('Content already open');+ return false;+ }+ current = next;+ return true;+ };+}diff --git a/apps/web/src/components/app/previewTarget.ts b/apps/web/src/components/app/previewTarget.tsnew file mode 100644index 0000000000..601834e4b7--- /dev/null+++ b/apps/web/src/components/app/previewTarget.ts@@ -0,0 +1,142 @@+import {+ type CalendarPreviewSelection,+ type ChannelPreviewSelection,+ calendarBlockParamsForEntity,+ getChannelEntityTarget,+ type ReminderPreviewSelection,+ reminderSplitTarget,+} from '@app/features/next-soup/utils';+import { CALENDAR_BLOCK_ID } from '@block-calendar/types';+import { getChannelParams } from '@block-channel/utils/link';+import type {+ BlockAliasContext,+ BlockComponentProps,+ BlockName,+} from '@core/block';+import { fileTypeToResolvedBlockName } from '@core/constant/allBlocks';+import { USE_MACRO_PR_SUMMARY_BLOCK } from '@core/constant/featureFlags';+import type { DocumentEntity, ForeignEntity } from '@entity';+import { untrack } from 'solid-js';+import { match, P } from 'ts-pattern';++type IdOnlyPreviewSelection = {+ id: string;+ type:+ | 'agent_session'+ | 'automation'+ | 'call'+ | 'chat'+ | 'crm_company'+ | 'crm_contact'+ | 'email'+ | 'project';+};++type DocumentPreviewSelection = Pick<+ DocumentEntity,+ 'id' | 'type' | 'fileType' | 'subType'+>;++type ForeignPreviewSelection = Pick<+ ForeignEntity,+ 'id' | 'type' | 'foreignSource'+>;++export type PreviewPanelSelection =+ | IdOnlyPreviewSelection+ | DocumentPreviewSelection+ | ForeignPreviewSelection+ | ChannelPreviewSelection+ | CalendarPreviewSelection+ | ReminderPreviewSelection;++type PreviewBlockTarget = {+ blockType: BlockName;+ blockId: string;+ aliasContext: BlockAliasContext | undefined;+ params?: BlockComponentProps[BlockName];+};++export function previewBlockTarget(+ entity: PreviewPanelSelection+): PreviewBlockTarget {+ return match(entity)+ .returnType<PreviewBlockTarget>()+ .with(+ { type: 'document', fileType: 'md', subType: { type: 'task' } },+ (task) => ({+ blockType: fileTypeToResolvedBlockName(task.fileType),+ blockId: task.id,+ aliasContext: {+ alias: 'task',+ baseType: 'md',+ } satisfies BlockAliasContext,+ })+ )+ .with(+ { type: 'document', fileType: 'md', subType: { type: 'snippet' } },+ (snippet) => ({+ blockType: fileTypeToResolvedBlockName(snippet.fileType),+ blockId: snippet.id,+ aliasContext: {+ alias: 'snippet',+ baseType: 'md',+ } satisfies BlockAliasContext,+ })+ )+ .with({ type: 'document' }, (document) => ({+ blockType: fileTypeToResolvedBlockName(document.fileType),+ blockId: document.id,+ aliasContext: undefined,+ }))+ .with({ type: P.union('channel_message', 'channel_thread') }, (message) => {+ const channelTarget = untrack(() => getChannelEntityTarget(message));+ return {+ blockType: 'channel',+ blockId: message.channelId,+ aliasContext: undefined,+ params:+ channelTarget?.kind === 'message'+ ? getChannelParams(channelTarget.messageId, channelTarget.threadId)+ : undefined,+ };+ })+ .with({ type: 'foreign' }, (foreignEntity) => ({+ blockType:+ USE_MACRO_PR_SUMMARY_BLOCK &&+ foreignEntity.foreignSource === 'github_pull_request'+ ? 'pr'+ : 'unknown',+ blockId: foreignEntity.id,+ aliasContext: undefined,+ }))+ .with({ type: 'crm_company' }, (company) => ({+ blockType: 'company',+ blockId: company.id,+ aliasContext: undefined,+ }))+ .with({ type: 'crm_contact' }, (contact) => ({+ blockType: 'contact',+ blockId: contact.id,+ aliasContext: undefined,+ }))+ .with({ type: 'calendar_event' }, (calendarEvent) => ({+ blockType: 'calendar',+ blockId: CALENDAR_BLOCK_ID,+ aliasContext: undefined,+ params: untrack(() => calendarBlockParamsForEntity(calendarEvent)),+ }))+ .with({ type: 'reminder' }, (reminder) => {+ const reminderTarget = reminderSplitTarget(reminder);+ return {+ blockType: fileTypeToResolvedBlockName(reminderTarget?.type),+ blockId: reminderTarget?.id ?? reminder.id,+ aliasContext: undefined,+ };+ })+ .otherwise((fallbackEntity) => ({+ blockType: fileTypeToResolvedBlockName(fallbackEntity.type),+ blockId: fallbackEntity.id,+ aliasContext: undefined,+ }));+}diff --git a/apps/web/src/components/app/split-layout/history.ts b/apps/web/src/components/app/split-layout/history.tsindex 142182a6ca..f15ffa226e 100644--- a/apps/web/src/components/app/split-layout/history.ts+++ b/apps/web/src/components/app/split-layout/history.ts@@ -22,7 +22,10 @@ export type History<T extends object> = {* (e.g. captured per-entry state) before navigating away.*/replaceCurrent: (next: T) => void;- remove: (predicate: (item: T) => boolean) => T | null;+ remove: (+ predicate: (item: T) => boolean,+ canActivate?: (item: T) => boolean+ ) => T | null;};const inc = (x: number) => x + 1;@@ -112,7 +115,10 @@ export function createHistory<T extends object>(): History<T> {return items()[index()];};- const remove = (predicate: (item: T) => boolean) => {+ const remove = (+ predicate: (item: T) => boolean,+ canActivate?: (item: T) => boolean+ ) => {const prevItems = items();const prevIndex = index();@@ -142,6 +148,8 @@ export function createHistory<T extends object>(): History<T> {newIndex = nextItems.length - 1;}+ const next = nextItems[newIndex];+ if (next && canActivate?.(next) === false) return null;batch(() => {setItems(nextItems);setIndex(newIndex);diff --git a/apps/web/src/components/app/split-layout/layoutManager.ts b/apps/web/src/components/app/split-layout/layoutManager.tsindex c4264970d0..3818dcdac6 100644--- a/apps/web/src/components/app/split-layout/layoutManager.ts+++ b/apps/web/src/components/app/split-layout/layoutManager.ts@@ -1,5 +1,8 @@import { LIST_VIEW_ID, type ListView } from '@app/constants/list-views';-import { agentsRouteSegments } from '@app/features/agents-view/core/route';+import {+ agentsRouteSegments,+ parseAgentsRoute,+} from '@app/features/agents-view/core/route';import type {BlockAlias,BlockAliasContext,@@ -10,6 +13,7 @@ import type { ResizeZoneCtx } from '@core/component/Resize/types';import { toast } from '@core/component/Toast/Toast';import { isBlockAlias, resolveBlockAlias } from '@core/constant/allBlocks';import { settingsTabToSlug } from '@core/constant/settingsTabsConfig';+import { sameContentIdentity } from '@core/contentInstanceRegistry';import { isTouchDevice } from '@core/mobile/isTouchDevice';import type {BlockInstanceHandle,@@ -23,6 +27,7 @@ import {createMemo,createSignal,type JSXElement,+ onCleanup,} from 'solid-js';import { createStore, produce, reconcile, type Store } from 'solid-js/store';import { match } from 'ts-pattern';@@ -193,6 +198,7 @@ export type SplitState = {export type CreateNewSplitOptions = {content?: SplitContent;activate?: boolean;+ /** Shell components only; entity blocks are always single-instance. */allowDuplicate?: boolean;referredFrom: ReferredFrom;insertIndex?: number;@@ -207,6 +213,7 @@ export type OpenWithSplitOptions = {mergeHistory?: boolean;activate?: boolean;referredFrom?: ReferredFrom;+ /** Shell components only; entity blocks are always single-instance. */allowDuplicate?: boolean;replaceWhenFull?: boolean;/** If true, prefers opening in a new split. May still replace if layout is at capacity. */@@ -333,7 +340,7 @@ export type SplitManager = {canSwapSplit: (id: SplitId, direction: 'left' | 'right') => boolean;/** Create a new split with the provided initial content and activate it */- createNewSplit: (options: CreateNewSplitOptions) => SplitHandle;+ createNewSplit: (options: CreateNewSplitOptions) => SplitHandle | undefined;openWithSplit: (content: SplitContent,@@ -368,7 +375,7 @@ export type SplitManager = {replaceAllSplits: (content: SplitContent,options?: { referredFrom?: ReferredFrom }- ) => SplitHandle;+ ) => SplitHandle | undefined;/** Check if a split exists by its split id */hasSplit: (type: SplitContentType, id: string) => boolean;@@ -392,7 +399,9 @@ export type SplitManager = {setResizeContext: (cts: ResizeZoneCtx) => void;/** Create a temporary popover split that renders content in a modal dialog */- createPopoverSplit: (options: PopoverSplitOptions) => PopoverSplitHandle;+ createPopoverSplit: (+ options: PopoverSplitOptions+ ) => PopoverSplitHandle | undefined;/** Get all active popover splits */getActivePopovers: () => PopoverSplitHandle[];@@ -638,11 +647,22 @@ function sameIdentity(a: SplitContent, b: SplitContent): boolean {return a.id === b.id;}-function sameNonComponentIdentity(a: SplitContent, b: SplitContent): boolean {- if (a.type === 'component' || b.type === 'component') return false;- // check on the resolved block so you cannot open `/md/{ID}/task{ID}`- if (resolveBlockAlias(a.type) !== resolveBlockAlias(b.type)) return false;- return a.id === b.id;+function contentIdentity(content: SplitContent) {+ const route =+ content.type === 'component' ? parseAgentsRoute(content.id) : undefined;+ return route+ ? {+ type:+ route.conversation.type === 'agent_session'+ ? ('agent' as const)+ : ('chat' as const),+ id: route.conversation.id,+ }+ : content;+}++function sameEntityContent(a: SplitContent, b: SplitContent): boolean {+ return sameContentIdentity(contentIdentity(a), contentIdentity(b));}function isDuplicateSplit(@@ -652,7 +672,7 @@ function isDuplicateSplit(): boolean {return splits.filter((s) => !isExcluded(s))- .some((split) => sameNonComponentIdentity(split.content, content));+ .some((split) => sameEntityContent(split.content, content));}export function createSplitLayout(@@ -694,6 +714,27 @@ export function createSplitLayout(popovers: new Map(),});+ const contentInstances = orchestrator.contentInstances;+ const unregisterContentInstances = contentInstances.register(() => [+ ...state.splits.map((split) => ({+ owner: split.id,+ content: contentIdentity(split.content),+ })),+ ...[...state.popovers.values()]+ .filter((popover) => popover.isOpen)+ .map((popover) => ({+ owner: popover.id,+ content: contentIdentity(popover.content),+ })),+ ]);+ onCleanup(unregisterContentInstances);+ const canOpenContent = (content: SplitContent, owner?: SplitId) => {+ if (!contentInstances.isOpenElsewhere(contentIdentity(content), owner))+ return true;+ toast.alert('Content already open');+ return false;+ };+const [resizeContext, setResizeContext] = createSignal<ResizeZoneCtx>();let exclusionFilter: ((split: SplitState) => boolean) | undefined;@@ -910,6 +951,8 @@ export function createSplitLayout(const split = state.splits[i];if (!split.history.canGoBack()) return;+ if (!canOpenContent(split.history.items[split.history.index - 1], id))+ return;batch(() => {captureCurrentEntryState(split);@@ -952,7 +995,9 @@ export function createSplitLayout(// on to an entry that can actually be shown.const prev = split.history.backTo((content) =>- predicate(content) && !isDuplicateSplit(otherSplits, content)+ predicate(content) &&+ !isDuplicateSplit(otherSplits, content) &&+ !contentInstances.isOpenElsewhere(contentIdentity(content), id));if (!prev) return;@@ -970,6 +1015,8 @@ export function createSplitLayout(const split = state.splits[i];if (!split.history.canGoForward()) return;+ if (!canOpenContent(split.history.items[split.history.index + 1], id))+ return;batch(() => {captureCurrentEntryState(split);@@ -990,7 +1037,9 @@ export function createSplitLayout(if (i < 0) return console.error(`Split with id ${id} not found`);const split = state.splits[i];- const next = split.history.remove(predicate);+ const next = split.history.remove(predicate, (content) =>+ canOpenContent(content, id)+ );if (!next) return;reattach(split, next, undefined, 'replace');@@ -1012,6 +1061,7 @@ export function createSplitLayout(if (i < 0) return console.error(`Split with id ${id} not found`);const content = attachAliasContext(next);+ if (!canOpenContent(content, id)) return;const split = state.splits[i];batch(() => {@@ -1064,6 +1114,7 @@ export function createSplitLayout(}const next: SplitContent = { ...current, id: nextId, params: undefined };+ if (!canOpenContent(next, id)) return;batch(() => {split.history.replaceCurrent(next);@@ -1324,31 +1375,26 @@ export function createSplitLayout(};};- function createNewSplit(options: CreateNewSplitOptions): SplitHandle {- const {- content,- activate,- referredFrom,- allowDuplicate,- initialHistory,- insertIndex,- } = options;+ function createNewSplit(+ options: CreateNewSplitOptions+ ): SplitHandle | undefined {+ const { content, activate, referredFrom, initialHistory, insertIndex } =+ options;const initialContent = content ?? DEFAULT_SPLIT_CONTENT;const isDefault = sameContent(initialContent, DEFAULT_SPLIT_CONTENT);- if (- !allowDuplicate &&- isDuplicateSplit(state.splits, initialContent, isExcluded)- ) {+ if (isDuplicateSplit(state.splits, initialContent, isExcluded)) {const existingSplit = state.splits.find(- (s) =>- s.content.type === initialContent.type &&- s.content.id === initialContent.id+ (s) => !isExcluded(s) && sameEntityContent(s.content, initialContent));- return getSplit(existingSplit!.id)!;+ const handle = getSplit(existingSplit!.id)!;+ if (activate) handle.activate();+ toast.alert('Content already open');+ return handle;}+ if (!canOpenContent(initialContent)) return;const split = buildSplit({initialContent,isDefault,@@ -1768,7 +1814,10 @@ export function createSplitLayout(id: string): SplitHandle | undefined {const match = state.splits.find(- (s) => s.content.type === type && s.content.id === id && !isExcluded(s)+ (s) =>+ (sameEntityContent(s.content, { type, id }) ||+ (s.content.type === type && s.content.id === id)) &&+ !isExcluded(s));if (!match) return;return getSplit(match.id);@@ -1833,6 +1882,17 @@ export function createSplitLayout(continue;}+ if (+ isDuplicateSplit(resultSplits, newSplits[i]) ||+ !canOpenContent(newSplits[i])+ ) {+ const previous = visibleSplits[i];+ if (previous && !usedIds.has(previous.id)) {+ resultSplits.push(previous);+ usedIds.add(previous.id);+ }+ continue;+ }const newSplit = buildSplit({initialContent: newSplits[i],referredFrom: null,@@ -1903,7 +1963,8 @@ export function createSplitLayout(// Popover split functionsfunction createPopoverSplit(options: PopoverSplitOptions- ): PopoverSplitHandle {+ ): PopoverSplitHandle | undefined {+ if (!canOpenContent(options.content)) return;const id = `popover-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;// Acquire focus lock BEFORE any state updates to capture the correct element@@ -2026,16 +2087,12 @@ export function createSplitLayout(content: SplitContent,options: OpenWithSplitOptions = {}): SplitHandle | undefined {- // Inline previews register with the orchestrator without owning a split.- // Preserve that mount instead of attaching its shared handle a second time.- if (- content.type !== 'component' &&- !getSplitByContent(content.type, content.id) &&- orchestrator.isBlockMounted(resolveBlockAlias(content.type), content.id)- ) {- toast.alert('Content already open.');- return undefined;- }+ // Include the mobile background split: its navigation interceptor promotes+ // an existing mount instead of opening another instance.+ const current = state.splits.find((split) =>+ sameEntityContent(split.content, content)+ );+ if (!canOpenContent(content, current?.id)) return;if (options.reopen === 'latest') {// Fire-and-forget so it covers every open path (fresh mount, duplicate@@ -2112,7 +2169,11 @@ export function createSplitLayout(? previewPair: undefined;- if (!options.allowDuplicate && existingSplit && !promotedPreviewPair) {+ if (+ existingSplit &&+ !promotedPreviewPair &&+ (contentIdentity(content).type !== 'component' || !options.allowDuplicate)+ ) {// A controller selection can resolve to content already mounted in its// own viewer (notably two rows from one channel). Refresh the viewer's// merged history entry so per-entry source metadata follows the latest@@ -2187,7 +2248,11 @@ export function createSplitLayout(function replaceAllSplits(content: SplitContent,options: { referredFrom?: ReferredFrom } = {}- ): SplitHandle {+ ): SplitHandle | undefined {+ if (+ !canOpenContent(content, getSplitByContent(content.type, content.id)?.id)+ )+ return;const visibleSplits = state.splits.filter((split) => !isExcluded(split));const splitToKeep =visibleSplits.find((split) => sameContent(split.content, content)) ??diff --git a/apps/web/src/components/app/split-layout/mobile/createMobileSwipeLayout.ts b/apps/web/src/components/app/split-layout/mobile/createMobileSwipeLayout.tsindex 53dce4bcf4..2f84b90e87 100644--- a/apps/web/src/components/app/split-layout/mobile/createMobileSwipeLayout.ts+++ b/apps/web/src/components/app/split-layout/mobile/createMobileSwipeLayout.ts@@ -131,7 +131,7 @@ export function createMobileSwipeLayout(referredFrom,});- setNewFgSlotId(newFgHandle.id);+ setNewFgSlotId(newFgHandle?.id);});if (forwardNavigationTrigger) {diff --git a/apps/web/src/components/app/split-layout/tests/layoutManager.test.ts b/apps/web/src/components/app/split-layout/tests/layoutManager.test.tsindex eb020bb064..74d3658ed3 100644--- a/apps/web/src/components/app/split-layout/tests/layoutManager.test.ts+++ b/apps/web/src/components/app/split-layout/tests/layoutManager.test.ts@@ -1,3 +1,4 @@+import { agentsRouteId } from '@app/features/agents-view/core/route';import {getListNavigationSource,listNavigationSourceId,@@ -6,6 +7,7 @@ import {} from '@app/features/soup/collection/list-navigation-source';import type { ResizeZoneCtx } from '@core/component/Resize/types';import { toast } from '@core/component/Toast/Toast';+import { createContentInstanceRegistry } from '@core/contentInstanceRegistry';import type { BlockOrchestrator } from '@core/orchestrator';import { createRoot } from 'solid-js';import { beforeAll, describe, expect, it, vi } from 'vitest';@@ -53,6 +55,7 @@ beforeAll(() => {function createMockOrchestrator(): BlockOrchestrator {return {+ contentInstances: createContentInstanceRegistry(),isBlockMounted: vi.fn(() => false),createBlockInstance: vi.fn((_type, id, _splitId) => ({node: { type: 'mock-node', id },@@ -64,13 +67,103 @@ function createMockOrchestrator(): BlockOrchestrator {}describe('layoutManager', () => {+ it.each([true, false, undefined])(+ 'honors activate=%s when direct split creation finds an existing entity',+ (activate) => {+ createRoot((dispose) => {+ const content = { type: 'email', id: 'already-open' } as const;+ const manager = createSplitLayout(createMockOrchestrator(), [+ content,+ { type: 'component', id: 'inbox' },+ ]);+ const [existing, other] = manager.splits();+ manager.activateSplit(other.id);+ vi.mocked(toast.alert).mockClear();++ const result = manager.createNewSplit({+ content,+ activate,+ allowDuplicate: true,+ referredFrom: 'sidebar',+ });++ expect(result?.id).toBe(existing.id);+ expect(manager.splits()).toHaveLength(2);+ expect(manager.activeSplitId()).toBe(activate ? existing.id : other.id);+ expect(toast.alert).toHaveBeenCalledWith('Content already open');+ dispose();+ });+ }+ );++ it.each([+ { mode: 'chat', type: 'agent_session', block: 'agent' },+ { mode: 'code', type: 'agent_session', block: 'agent' },+ { mode: 'chat', type: 'chat', block: 'chat' },+ ] as const)(+ 'reuses $mode $type conversations across Agents routes and blocks',+ ({ mode, type, block }) => {+ const route: SplitContent = {+ type: 'component',+ id: agentsRouteId({ mode, conversation: { type, id: 'conversation' } }),+ };+ const entity: SplitContent = { type: block, id: 'conversation' };+ for (const [initial, target] of [+ [route, entity],+ [entity, route],+ ]) {+ createRoot((dispose) => {+ const orchestrator = createMockOrchestrator();+ const manager = createSplitLayout(orchestrator, [+ initial,+ { type: 'component', id: 'inbox' },+ ]);+ const [existing, other] = manager.splits();+ const mount = existing.mount;+ expect(manager.getSplitByContent(target.type, target.id)?.id).toBe(+ existing.id+ );++ manager.activateSplit(other.id);+ const direct = manager.createNewSplit({+ content: target,+ activate: true,+ allowDuplicate: true,+ referredFrom: 'sidebar',+ });+ expect(direct?.id).toBe(existing.id);+ expect(manager.activeSplitId()).toBe(existing.id);++ manager.activateSplit(other.id);+ const opened = manager.openWithSplit(target, {+ activate: true,+ allowDuplicate: true,+ handle: manager.getSplit(other.id),+ });+ expect(opened?.id).toBe(existing.id);+ expect(manager.activeSplitId()).toBe(existing.id);+ expect(manager.splits()).toHaveLength(2);+ expect(existing.mount).toBe(mount);+ expect(existing.content).toEqual(initial);+ expect(other.content).toEqual({ type: 'component', id: 'inbox' });+ dispose();+ });+ }+ }+ );+it('rejects opening a previewed block until its mount is released', () => {createRoot((dispose) => {const orchestrator = createMockOrchestrator();const manager = createSplitLayout(orchestrator, [{ type: 'component', id: 'inbox' },]);- vi.mocked(orchestrator.isBlockMounted).mockReturnValue(true);+ const release = orchestrator.contentInstances.register(() => [+ {+ owner: 'preview',+ content: { type: 'channel', id: 'preview-channel' },+ },+ ]);expect(manager.openWithSplit(@@ -80,9 +173,9 @@ describe('layoutManager', () => {).toBeUndefined();expect(manager.splits()).toHaveLength(1);expect(orchestrator.createBlockInstance).not.toHaveBeenCalled();- expect(toast.alert).toHaveBeenCalledWith('Content already open.');+ expect(toast.alert).toHaveBeenCalledWith('Content already open');- vi.mocked(orchestrator.isBlockMounted).mockReturnValue(false);+ release();manager.openWithSplit({ type: 'channel', id: 'preview-channel' },{ preferNewSplit: true }@@ -93,6 +186,59 @@ describe('layoutManager', () => {});});+ it('blocks detail-owned email through direct split creation, replacement, and history', () => {+ createRoot((dispose) => {+ const orchestrator = createMockOrchestrator();+ const manager = createSplitLayout(orchestrator, [+ { type: 'email', id: 'one' },+ ]);+ const handle = manager.getSplit(manager.splits()[0].id)!;+ handle.replace({ next: { type: 'email', id: 'two' } });+ const release = orchestrator.contentInstances.register(() => [+ { owner: 'detail', content: { type: 'email', id: 'one' } },+ ]);+ expect(+ manager.createNewSplit({+ content: { type: 'email', id: 'one' },+ referredFrom: null,+ allowDuplicate: true,+ })+ ).toBeUndefined();+ handle.replace({ next: { type: 'email', id: 'one' } });+ handle.goBack();+ handle.removeFromHistory((content) => content.id === 'two');+ expect(handle.content().id).toBe('two');+ expect(handle.history()).toHaveLength(2);+ release();+ handle.goBack();+ expect(handle.content().id).toBe('one');+ dispose();+ });+ });++ it('exposes split ownership before block mount and releases it on close', () => {+ createRoot((dispose) => {+ const orchestrator = createMockOrchestrator();+ const manager = createSplitLayout(orchestrator, [+ { type: 'email', id: 'one' },+ ]);+ expect(+ orchestrator.contentInstances.isOpenElsewhere({+ type: 'email',+ id: 'one',+ })+ ).toBe(true);+ manager.removeSplit(manager.splits()[0].id);+ expect(+ orchestrator.contentInstances.isOpenElsewhere({+ type: 'email',+ id: 'one',+ })+ ).toBe(false);+ dispose();+ });+ });+describe('swapSplit', () => {it('swaps adjacent splits and delegates the panel reorder to Resize', () => {createRoot((dispose) => {@@ -346,19 +492,19 @@ describe('layoutManager', () => {createRoot((dispose) => {const manager = createSplitLayout(createMockOrchestrator(), [{ type: 'component', id: 'inbox' },- { type: 'md', id: 'doc-1' },+ { type: 'email', id: 'other' },]);const [listSplitState, docSplitState] = manager.splits();const listSplit = manager.getSplit(listSplitState.id)!;const docSplit = manager.getSplit(docSplitState.id)!;- // The list split walks through doc-1 — which the other split is- // already showing — before landing on a channel.- listSplit.replace({ next: { type: 'md', id: 'doc-1' } });+ // Visit the email, navigate away, then open it in the other split.+ listSplit.replace({ next: { type: 'email', id: 'doc-1' } });listSplit.replace({ next: { type: 'channel', id: 'ch-1' } });+ docSplit.replace({ next: { type: 'email', id: 'doc-1' } });const moved = listSplit.goBackTo(- (content) => content.type === 'md' && content.id === 'doc-1'+ (content) => content.type === 'email' && content.id === 'doc-1');// doc-1 is unmountable here, so nothing moves: the split keeps showing@@ -369,7 +515,10 @@ describe('layoutManager', () => {type: 'channel',id: 'ch-1',});- expect(docSplit.content()).toMatchObject({ type: 'md', id: 'doc-1' });+ expect(docSplit.content()).toMatchObject({+ type: 'email',+ id: 'doc-1',+ });dispose();});@@ -628,6 +777,7 @@ describe('layoutManager', () => {const handle = manager.replaceAllSplits(target, {referredFrom: 'sidebar',});+ if (!handle) throw new Error('Expected content to open');expect(manager.splits()).toHaveLength(1);expect(manager.splits()[0].id).toBe(keptSplitId);@@ -655,6 +805,7 @@ describe('layoutManager', () => {const handle = manager.replaceAllSplits(target, {referredFrom: 'sidebar',});+ if (!handle) throw new Error('Expected content to open');expect(manager.splits()).toHaveLength(1);expect(manager.splits()[0].id).toBe(keptSplitId);@@ -685,6 +836,7 @@ describe('layoutManager', () => {referredFrom: null,insertIndex: 1,});+ if (!inserted) throw new Error('Expected content to open');expect(manager.splits().map((split) => split.content.id)).toEqual(['left',@@ -1195,6 +1347,7 @@ describe('layoutManager', () => {referredFrom: null,insertIndex: 1,});+ if (!inserted) throw new Error('Expected content to open');expect(manager.splits().map((split) => split.id)).toEqual([controllerId,@@ -1222,6 +1375,7 @@ describe('layoutManager', () => {content: { type: 'md', id: 'between' },referredFrom: null,});+ if (!between) throw new Error('Expected content to open');manager.reconcile([{ type: 'component', id: 'inbox' },@@ -1598,7 +1752,7 @@ describe('layoutManager', () => {createRoot((dispose) => {const { manager, controllerId } = setup();manager.createNewSplit({- content: { type: 'md', id: 'doc-open-elsewhere' },+ content: { type: 'email', id: 'doc-open-elsewhere' },referredFrom: null,});manager.activateSplit(controllerId);@@ -1606,13 +1760,13 @@ describe('layoutManager', () => {const viewerId = manager.viewerOf(controllerId)!;const result = manager.openWithSplit(- { type: 'md', id: 'doc-open-elsewhere' },+ { type: 'email', id: 'doc-open-elsewhere' },{ referredFrom: null, handle: manager.getSplit(controllerId) });expect(manager.splits()).toHaveLength(3);expect(result?.content()).toMatchObject({- type: 'md',+ type: 'email',id: 'doc-open-elsewhere',});expect(manager.activeSplitId()).toBe(controllerId);@@ -1895,6 +2049,7 @@ describe('layoutManager', () => {content: { type: 'component', id: 'composer' },onClose,});+ if (!popover) throw new Error('Expected content to open');popover.close();@@ -1915,6 +2070,7 @@ describe('layoutManager', () => {const popover = manager.createPopoverSplit({content: { type: 'component', id: 'composer' },});+ if (!popover) throw new Error('Expected content to open');popover.close();diff --git a/apps/web/src/components/app/split-layout/tests/layoutUrlSync.test.ts b/apps/web/src/components/app/split-layout/tests/layoutUrlSync.test.tsindex e4f22f8a3b..636c8a04ec 100644--- a/apps/web/src/components/app/split-layout/tests/layoutUrlSync.test.ts+++ b/apps/web/src/components/app/split-layout/tests/layoutUrlSync.test.ts@@ -1,4 +1,5 @@import { agentsRouteId } from '@app/features/agents-view/core/route';+import { createContentInstanceRegistry } from '@core/contentInstanceRegistry';import type { BlockOrchestrator } from '@core/orchestrator';import type { Navigator } from '@solidjs/router';import { batch, createMemo, createRoot, createSignal } from 'solid-js';@@ -41,6 +42,7 @@ beforeAll(() => {function createMockOrchestrator(): BlockOrchestrator {return {+ contentInstances: createContentInstanceRegistry(),isBlockMounted: vi.fn(() => false),createBlockInstance: vi.fn((_type, id, _splitId) => ({node: { type: 'mock-node', id },diff --git a/apps/web/src/components/app/split-layout/tests/splitFocusTracker.test.ts b/apps/web/src/components/app/split-layout/tests/splitFocusTracker.test.tsindex 7ad6c4c125..b981d51c8f 100644--- a/apps/web/src/components/app/split-layout/tests/splitFocusTracker.test.ts+++ b/apps/web/src/components/app/split-layout/tests/splitFocusTracker.test.ts@@ -1,3 +1,4 @@+import { createContentInstanceRegistry } from '@core/contentInstanceRegistry';import type { BlockOrchestrator } from '@core/orchestrator';import { createRoot } from 'solid-js';import {@@ -44,6 +45,7 @@ beforeAll(() => {function createMockOrchestrator(): BlockOrchestrator {return {+ contentInstances: createContentInstanceRegistry(),isBlockMounted: vi.fn(() => false),createBlockInstance: vi.fn((_type, id, _splitId) => ({node: { type: 'mock-node', id },diff --git a/apps/web/src/components/entity-detail/EntityDetailNavigationStack.test.tsx b/apps/web/src/components/entity-detail/EntityDetailNavigationStack.test.tsxnew file mode 100644index 0000000000..df92b1f79d--- /dev/null+++ b/apps/web/src/components/entity-detail/EntityDetailNavigationStack.test.tsx@@ -0,0 +1,70 @@+import { cleanup, render } from '@solidjs/testing-library';+import { afterEach, beforeEach, expect, it, vi } from 'vitest';+import {+ EntityDetailNavigationStack,+ type EntityDetailNavigationStackRootProps,+ type EntityDetailTarget,+ useEntityDetailNavigationStack,+} from './EntityDetailNavigationStack';++const touch = vi.hoisted(() => ({ value: false }));+vi.mock('@core/mobile/isTouchDevice', () => ({+ isTouchDevice: () => touch.value,+}));+vi.mock('@components/app/createPreviewSelectionGuard', () => ({+ createPreviewSelectionGuard: () => () => true,+}));++const target: EntityDetailTarget = { type: 'email', id: 'thread' };+const click = (init: MouseEventInit) => ({+ event: new MouseEvent('click', init),+});++function mount(props: EntityDetailNavigationStackRootProps = {}) {+ let stack!: ReturnType<typeof useEntityDetailNavigationStack>;+ function Capture() {+ stack = useEntityDetailNavigationStack();+ return null;+ }+ const view = render(() => (+ <EntityDetailNavigationStack.Root {...props}>+ <Capture />+ </EntityDetailNavigationStack.Root>+ ));+ return { stack, ...view };+}++beforeEach(() => {+ touch.value = false;+});+afterEach(cleanup);++it('opens inline for plain activation and defers modifier clicks to a split', () => {+ const { stack } = mount();++ expect(stack.shouldNavigate(target)).toBe(true);+ expect(stack.shouldNavigate(target, click({}))).toBe(true);+ expect(stack.shouldNavigate(target, click({ shiftKey: true }))).toBe(false);+ expect(stack.shouldNavigate(target, click({ metaKey: true }))).toBe(false);+ expect(stack.shouldNavigate(target, click({ ctrlKey: true }))).toBe(false);+ expect(stack.navigate(target, click({ altKey: true }))).toBe(false);+ expect(stack.entries).toHaveLength(0);+});++it('never opens inline on touch layouts', () => {+ touch.value = true;+ const { stack } = mount();++ expect(stack.shouldNavigate(target)).toBe(false);+ expect(stack.navigate(target)).toBe(false);+ expect(stack.entries).toHaveLength(0);+});++it('lets a view replace the default policy', () => {+ touch.value = true;+ const { stack } = mount({ shouldNavigate: () => true });++ expect(stack.shouldNavigate(target, click({ shiftKey: true }))).toBe(true);+ expect(stack.navigate(target)).toBe(true);+ expect(stack.entries).toHaveLength(1);+});diff --git a/apps/web/src/components/entity-detail/EntityDetailNavigationStack.tsx b/apps/web/src/components/entity-detail/EntityDetailNavigationStack.tsxindex 9fa1fe2b4d..826565e4e1 100644--- a/apps/web/src/components/entity-detail/EntityDetailNavigationStack.tsx+++ b/apps/web/src/components/entity-detail/EntityDetailNavigationStack.tsx@@ -6,7 +6,9 @@ import {useMaybeNavigationStack,useNavigationStack,} from '@app/components/navigation-stack/NavigationStack';+import { createPreviewSelectionGuard } from '@components/app/createPreviewSelectionGuard';import type { PreviewPanelSelection } from '@components/app/PreviewPanel';+import { isTouchDevice } from '@core/mobile/isTouchDevice';export type EntityDetailTarget = PreviewPanelSelection & {fallbackName?: string;@@ -86,10 +88,32 @@ export type EntityDetailNavigationStackOutletProps = NavigationStackOutletProps<EntityDetailNavigationOptions>;+/**+ * Inline detail is a desktop affordance. Touch layouts open every entity in+ * the split, and a modifier click asks for a split explicitly. A view passes+ * `shouldNavigate` to replace this policy.+ */+function opensInline(options?: EntityDetailNavigationOptions) {+ const event = options?.event;+ return (+ !isTouchDevice() &&+ !(event?.shiftKey || event?.metaKey || event?.ctrlKey || event?.altKey)+ );+}+function Root(props: EntityDetailNavigationStackRootProps) {+ const selectPreview = createPreviewSelectionGuard();return (<NavigationStack.Root<EntityDetailTarget, EntityDetailNavigationOptions>{...props}+ beforeChange={(target) =>+ props.beforeChange?.(target) !== false && selectPreview(target)+ }+ shouldNavigate={(target, options) =>+ props.shouldNavigate+ ? props.shouldNavigate(target, options)+ : opensInline(options)+ }/>);}diff --git a/apps/web/src/components/navigation-stack/NavigationStack.tsx b/apps/web/src/components/navigation-stack/NavigationStack.tsxindex c02e605ef7..bf100a9878 100644--- a/apps/web/src/components/navigation-stack/NavigationStack.tsx+++ b/apps/web/src/components/navigation-stack/NavigationStack.tsx@@ -16,10 +16,12 @@ export type NavigationStackEntry<TData> = {export type NavigationStackState<TData, TNavigateOptions = unknown> = {entries: Store<NavigationStackEntry<TData>[]>;active: () => NavigationStackEntry<TData> | undefined;+ /** Whether `navigate` would open inline; callers with a split path ask first. */+ shouldNavigate: (data: TData, options?: TNavigateOptions) => boolean;navigate: (data: TData, options?: TNavigateOptions) => boolean;- push: (data: TData) => NavigationStackEntry<TData>;- replace: (data: TData) => NavigationStackEntry<TData>;- reset: (data: TData) => NavigationStackEntry<TData>;+ push: (data: TData) => NavigationStackEntry<TData> | undefined;+ replace: (data: TData) => NavigationStackEntry<TData> | undefined;+ reset: (data: TData) => NavigationStackEntry<TData> | undefined;pop: () => void;popTo: (value: string) => void;clear: () => void;@@ -54,6 +56,8 @@ export type NavigationStackRootProps<TNavigateOptions = unknown,> = ParentProps<{defaultValue?: readonly TData[];+ /** Validates the resulting active entry before any state change, including history. */+ beforeChange?: (data: TData | undefined) => boolean;shouldNavigate?: (data: TData, options?: TNavigateOptions) => boolean;onChange?: (entries: readonly NavigationStackEntry<TData>[]) => void;}>;@@ -69,26 +73,32 @@ function Root<TData = unknown, TNavigateOptions = unknown>(data,});const [entries, setEntries] = createStore<NavigationStackEntry<TData>[]>(- props.defaultValue?.map(createEntry) ?? []+ props.defaultValue+ ?.filter((data) => props.beforeChange?.(data) !== false)+ .map(createEntry) ?? []);const active = () => entries.at(-1);const notifyChange = () => props.onChange?.([...entries]);const push = (data: TData) => {+ if (props.beforeChange?.(data) === false) return;const entry = createEntry(data);setEntries(entries.length, entry);notifyChange();return entry;};+ const shouldNavigate = (data: TData, options?: TNavigateOptions) =>+ props.shouldNavigate?.(data, options) !== false;+const navigate = (data: TData, options?: TNavigateOptions) => {- if (props.shouldNavigate?.(data, options) === false) return false;- push(data);- return true;+ if (!shouldNavigate(data, options)) return false;+ return push(data) !== undefined;};const replace = (data: TData) => {if (entries.length === 0) return push(data);+ if (props.beforeChange?.(data) === false) return;const entry = createEntry(data);setEntries(@@ -101,6 +111,7 @@ function Root<TData = unknown, TNavigateOptions = unknown>(};const reset = (data: TData) => {+ if (props.beforeChange?.(data) === false) return;const entry = createEntry(data);setEntries(produce((draft) => {@@ -113,6 +124,7 @@ function Root<TData = unknown, TNavigateOptions = unknown>(const pop = () => {if (entries.length === 0) return;+ if (props.beforeChange?.(entries.at(-2)?.data) === false) return;setEntries(produce((draft) => {draft.pop();@@ -124,6 +136,7 @@ function Root<TData = unknown, TNavigateOptions = unknown>(const popTo = (value: string) => {const index = entries.findIndex((entry) => entry.value === value);if (index < 0 || index === entries.length - 1) return;+ if (props.beforeChange?.(entries[index].data) === false) return;setEntries(produce((draft) => {draft.splice(index + 1);@@ -134,6 +147,7 @@ function Root<TData = unknown, TNavigateOptions = unknown>(const clear = () => {if (entries.length === 0) return;+ if (props.beforeChange?.(undefined) === false) return;setEntries(produce((draft) => {draft.splice(0);@@ -147,10 +161,20 @@ function Root<TData = unknown, TNavigateOptions = unknown>(value={{entries: entries as Store<NavigationStackEntry<unknown>[]>,active: active as () => NavigationStackEntry<unknown> | undefined,+ shouldNavigate: shouldNavigate as (+ data: unknown,+ options?: unknown+ ) => boolean,navigate: navigate as (data: unknown, options?: unknown) => boolean,- push: push as (data: unknown) => NavigationStackEntry<unknown>,- replace: replace as (data: unknown) => NavigationStackEntry<unknown>,- reset: reset as (data: unknown) => NavigationStackEntry<unknown>,+ push: push as (+ data: unknown+ ) => NavigationStackEntry<unknown> | undefined,+ replace: replace as (+ data: unknown+ ) => NavigationStackEntry<unknown> | undefined,+ reset: reset as (+ data: unknown+ ) => NavigationStackEntry<unknown> | undefined,pop,popTo,clear,diff --git a/apps/web/src/features/channels-view/channels-view-context.test.tsx b/apps/web/src/features/channels-view/channels-view-context.test.tsxnew file mode 100644index 0000000000..070724585d--- /dev/null+++ b/apps/web/src/features/channels-view/channels-view-context.test.tsx@@ -0,0 +1,140 @@+import { cleanup, render } from '@solidjs/testing-library';+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';+import {+ type ChannelsViewContext,+ ChannelsViewProvider,+ useChannelsView,+} from './channels-view-context';+import type { ChannelsViewStateOptions } from './types';++const entry = vi.hoisted(() => ({+ state: {} as Record<string, unknown>,+ captors: new Map<string, () => unknown>(),+}));+const touch = vi.hoisted(() => ({ value: false }));+const guard = vi.hoisted(() => ({+ selections: [] as unknown[],+ allow: true,+}));++vi.mock('@core/context/user', () => ({ useUserId: () => () => 'alice' }));+vi.mock('@core/mobile/isTouchDevice', () => ({+ isTouchDevice: () => touch.value,+}));+vi.mock('@components/app/createPreviewSelectionGuard', () => ({+ createPreviewSelectionGuard: () => (selection: unknown) => {+ guard.selections.push(selection);+ return selection === undefined || guard.allow;+ },+}));+vi.mock('@components/app/split-layout/layoutUtils', () => ({+ useSplitPanelOrThrow: () => ({+ handle: {+ currentEntryState: () => entry.state,+ registerEntryStateCaptor: (key: string, capture: () => unknown) => {+ entry.captors.set(key, capture);+ return () => entry.captors.delete(key);+ },+ },+ }),+}));++function mountProvider(initialState?: ChannelsViewStateOptions) {+ let context!: ChannelsViewContext;+ function ReadContext() {+ context = useChannelsView();+ return null;+ }+ const view = render(() => (+ <ChannelsViewProvider initialState={initialState}>+ <ReadContext />+ </ChannelsViewProvider>+ ));+ return { ...view, context };+}++beforeEach(() => {+ localStorage.clear();+ entry.state = {};+ entry.captors.clear();+ touch.value = false;+ guard.selections = [];+ guard.allow = true;+});+afterEach(cleanup);++describe('ChannelsViewProvider preview selection', () => {+ it.each(['entry', 'local', 'explicit'] as const)(+ 'preserves a conflicting %s selection through persistence and remount',+ (source) => {+ const saved = { selectedChannelId: 'c1' };+ const storageKey = 'macro:channels:view-state:v1:alice';+ if (source === 'entry') entry.state = { 'channels.view': saved };+ if (source === 'local') {+ localStorage.setItem(storageKey, JSON.stringify(saved));+ }+ guard.allow = false;+ const first = mountProvider(source === 'explicit' ? saved : undefined);++ expect(first.context.state.selectedChannelId).toBe('c1');+ expect(first.context.previewChannelId()).toBeUndefined();+ // Unrelated preference writes must retain the blocked selection too.+ first.context.setGroupOpen('channels', false);+ expect(JSON.parse(localStorage.getItem(storageKey)!)).toMatchObject(+ saved+ );+ const captured = entry.captors.get('channels.view')?.();+ expect(captured).toMatchObject(saved);+ first.unmount();++ guard.allow = true;+ entry.state = source === 'local' ? {} : { 'channels.view': captured };+ const second = mountProvider();+ expect(second.context.state.selectedChannelId).toBe('c1');+ expect(second.context.previewChannelId()).toBe('c1');+ }+ );++ it('can retry a restored selection after the other view closes', () => {+ entry.state = { 'channels.view': { selectedChannelId: 'c1' } };+ guard.allow = false;+ const { context } = mountProvider();++ guard.allow = true;+ context.setSelectedChannelId('c1');+ expect(context.previewChannelId()).toBe('c1');++ guard.allow = false;+ context.setSelectedChannelId('c2');+ expect(context.state.selectedChannelId).toBe('c1');+ expect(context.previewChannelId()).toBe('c1');++ context.setSelectedChannelId(undefined);+ expect(context.state.selectedChannelId).toBeUndefined();+ expect(context.previewChannelId()).toBeUndefined();+ });++ it('claims the selected channel as an inline preview on desktop', () => {+ guard.allow = false;+ const { context } = mountProvider();++ context.setSelectedChannelId('c1');++ expect(guard.selections.at(-1)).toEqual({ type: 'channel', id: 'c1' });+ expect(context.state.selectedChannelId).toBeUndefined();+ expect(context.previewChannelId()).toBeUndefined();+ });++ it('keeps touch selections out of the preview registry', () => {+ touch.value = true;+ guard.allow = false;+ const { context } = mountProvider();++ context.setSelectedChannelId('c1');++ expect(context.mobileLayout()).toBe(true);+ expect(guard.selections.at(-1)).toBeUndefined();+ expect(context.state.selectedChannelId).toBe('c1');+ expect(context.previewChannelId()).toBeUndefined();+ });+});diff --git a/apps/web/src/features/channels-view/channels-view-context.tsx b/apps/web/src/features/channels-view/channels-view-context.tsxindex 9c7dd875ae..a9eea00a21 100644--- a/apps/web/src/features/channels-view/channels-view-context.tsx+++ b/apps/web/src/features/channels-view/channels-view-context.tsx@@ -1,8 +1,11 @@import { makePersistedState } from '@app/lib/persistence';+import { createPreviewSelectionGuard } from '@components/app/createPreviewSelectionGuard';import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';import { createAssertedContextProvider } from '@core/context/createContext';import { useUserId } from '@core/context/user';+import { isTouchDevice } from '@core/mobile/isTouchDevice';import type { ContextProviderProps } from '@solid-primitives/context';+import { createSignal } from 'solid-js';import { createStore, type Store } from 'solid-js/store';import {CHANNELS_DEFAULT_RAIL_WIDTH,@@ -26,6 +29,10 @@ type ChannelsViewProviderProps = ContextProviderProps & {export type ChannelsViewContext = {state: Store<ChannelsViewState>;+ /** The mobile list opens channels in the split; only desktop renders the inline preview. */+ mobileLayout: () => boolean;+ /** Only admitted selections may render an inline preview. */+ previewChannelId: () => string | undefined;setTab: (tab: ChannelsTab) => void;setMobileTab: (tab: ChannelsQueryScope) => void;setSelectedChannelId: (channelId: string | undefined) => void;@@ -81,12 +88,29 @@ export const [ChannelsViewProvider, useChannelsView] =}));+ const mobileLayout = () => isTouchDevice();+ const selectPreview = createPreviewSelectionGuard();+ const [previewChannelId, setPreviewChannelId] = createSignal<string>();+ const setSelectedChannelId = (id: string | undefined) => {+ // The mobile layout keeps the selection for row highlighting only, so+ // there is no preview to claim.+ const preview =+ id && !mobileLayout() ? { type: 'channel' as const, id } : undefined;+ if (!selectPreview(preview)) return;+ setPreviewChannelId(preview?.id);+ setState('selectedChannelId', id);+ };+ // Keep restored selection in persistence even if another view currently+ // owns its preview. It can be retried on selection or the next mount.+ setSelectedChannelId(state.selectedChannelId);+return {state,+ mobileLayout,+ previewChannelId,setTab: (tab) => setState('tab', tab),setMobileTab: (tab) => setState('mobileTab', tab),- setSelectedChannelId: (channelId) =>- setState('selectedChannelId', channelId),+ setSelectedChannelId,setGroupOpen: (group, open) => setState('expandedGroups', group, open),setSortBy: (group, sort) => setState('sortBy', group, sort),setAsideWidth: (width) =>diff --git a/apps/web/src/features/channels-view/channels-view.tsx b/apps/web/src/features/channels-view/channels-view.tsxindex 26adca517d..b83fa8d1b1 100644--- a/apps/web/src/features/channels-view/channels-view.tsx+++ b/apps/web/src/features/channels-view/channels-view.tsx@@ -5,7 +5,6 @@ import { PreviewPanel } from '@components/app/PreviewPanel';import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';import { SplitPanel } from '@components/app/split-panel';import { StaticMarkdownContext } from '@core/component/LexicalMarkdown/component/core/StaticMarkdown';-import { isTouchDevice } from '@core/mobile/isTouchDevice';import { ListEntityMetadataQueryProvider } from '@entity';import SpinnerIcon from '@phosphor/spinner.svg';import { createMemo, createSignal, onMount, Show, Suspense } from 'solid-js';@@ -28,12 +27,13 @@ export type ChannelsViewProps = {function ChannelsViewRoot() {const panel = useSplitPanelOrThrow();const orchestrator = useGlobalBlockOrchestrator();- const { state, setAsideWidth, setMobileTab } = useChannelsView();+ const { state, mobileLayout, previewChannelId, setAsideWidth, setMobileTab } =+ useChannelsView();const [railSearchOpen, setRailSearchOpen] = createSignal(false);const sources = useChannelsSources((scope) => {- if (isTouchDevice())+ if (mobileLayout())return scope !== 'search' && state.mobileTab === scope;if (railSearchOpen()) return scope === 'search';if (scope === 'search') return false;@@ -51,13 +51,13 @@ function ChannelsViewRoot() {]));const loadedSelectedChannel = createMemo(() =>- resolveSelectedChannel(state.selectedChannelId, loadedChannels())+ resolveSelectedChannel(previewChannelId(), loadedChannels()));const selectedChannelQuery = useChannelByIdQuery(- () => state.selectedChannelId,+ previewChannelId,() =>- !isTouchDevice() &&- state.selectedChannelId !== undefined &&+ !mobileLayout() &&+ previewChannelId() !== undefined &&loadedSelectedChannel() === undefined);const selectedChannel = createMemo(() => {@@ -68,7 +68,7 @@ function ChannelsViewRoot() {}return resolveSelectedChannel(- state.selectedChannelId,+ previewChannelId(),loadedChannels(),selectedChannelQuery.data?.entities);@@ -82,7 +82,7 @@ function ChannelsViewRoot() {<SplitPanel.Root><SplitPanel.Body><Show- when={isTouchDevice()}+ when={mobileLayout()}fallback={<div class="size-full min-h-0 bg-panel"><ViewShell.Rootdiff --git a/apps/web/src/features/drive-view/drive-view.tsx b/apps/web/src/features/drive-view/drive-view.tsxindex 31d304d4bf..cb2bb1686e 100644--- a/apps/web/src/features/drive-view/drive-view.tsx+++ b/apps/web/src/features/drive-view/drive-view.tsx@@ -85,15 +85,6 @@ export type DriveViewProps = {initialClientFilters?: SetPredicatesInput<string>;};-function shouldOpenInline(event?: KeyboardEvent | MouseEvent) {- return !(- event?.shiftKey ||- event?.metaKey ||- event?.ctrlKey ||- event?.altKey- );-}-function favoriteDetailTarget(favorite: Favorite,fallbackName: string@@ -380,7 +371,10 @@ function DriveViewContent(props: DriveViewProps) {const target = favoriteDetailTarget(item, name);if (item.entityType === 'project' && !event.shiftKey)selectFolder(item.entityId);- else if (target && shouldOpenInline(event)) {+ else if (+ target &&+ navigationStack.shouldNavigate(target, { event })+ ) {navigationStack.reset(target);return;} else@@ -586,7 +580,8 @@ function DriveViewContent(props: DriveViewProps) {fallbackName: entity.name,});if (!entityDetailBlockType(target)) return false;- if (!shouldOpenInline(event)) return false;+ if (!navigationStack.shouldNavigate(target, { event }))+ return false;navigationStack.reset(target);return true;}}@@ -604,9 +599,7 @@ function DriveViewContent(props: DriveViewProps) {/** App composition: shared queries, inline details, and upload/create capabilities. */export function DriveView(props: DriveViewProps) {return (- <EntityDetailNavigationStack.Root- shouldNavigate={(_target, options) => shouldOpenInline(options?.event)}- >+ <EntityDetailNavigationStack.Root><DriveViewContent {...props} /></EntityDetailNavigationStack.Root>);diff --git a/apps/web/src/features/email-view/components/EmailList.tsx b/apps/web/src/features/email-view/components/EmailList.tsxindex 1b4e578182..ceceab41d0 100644--- a/apps/web/src/features/email-view/components/EmailList.tsx+++ b/apps/web/src/features/email-view/components/EmailList.tsx@@ -128,14 +128,13 @@ export function EmailList(props: EmailListProps) {if (!newSplit &&metadata?.event?.altKey !== true &&- !panel.handle.isControllerSplit()- ) {- openThread({- id: sourceRow.entity.id,- fallbackName: sourceRow.entity.name,- });+ !panel.handle.isControllerSplit() &&+ openThread(+ { id: sourceRow.entity.id, fallbackName: sourceRow.entity.name },+ { event: metadata?.event }+ )+ )return;- }openEntity(sourceRow.entity, {event: metadata?.event,diff --git a/apps/web/src/features/email-view/email-view-context.tsx b/apps/web/src/features/email-view/email-view-context.tsxindex 5b89b91a68..6fa88f881b 100644--- a/apps/web/src/features/email-view/email-view-context.tsx+++ b/apps/web/src/features/email-view/email-view-context.tsx@@ -1,5 +1,6 @@import {createEntityDetailTarget,+ type EntityDetailNavigationOptions,useEntityDetailNavigationStack,} from '@app/components/entity-detail/EntityDetailNavigationStack';import {@@ -80,7 +81,11 @@ export type EmailViewContext = {) => void) => void;selectedThread: Accessor<EmailThreadTarget | undefined>;- openThread: (thread: EmailThreadTarget) => void;+ /** Returns false when inline detail is unavailable so the caller opens a split instead. */+ openThread: (+ thread: EmailThreadTarget,+ options?: EntityDetailNavigationOptions+ ) => boolean;closeThread: () => void;isSidebarSectionOpen: (id: string) => boolean;setSidebarSectionOpen: (id: string, open: boolean) => void;@@ -187,7 +192,17 @@ export const [EmailViewProvider, useEmailView] = createAssertedContextProvider<};};- const openThread = (thread: EmailThreadTarget) => {+ const openThread = (+ thread: EmailThreadTarget,+ options?: EntityDetailNavigationOptions+ ) => {+ const target = createEntityDetailTarget(+ { type: 'email', id: thread.id },+ thread.fallbackName+ );+ if (!navigationStack.shouldNavigate(target, options)) return false;+ // A refused reset already alerted; there is nothing to fall back to.+ if (!navigationStack.reset(target)) return true;const row = source.items().find((item) => item.kind === 'entity' && item.entity.id === thread.id);@@ -197,12 +212,7 @@ export const [EmailViewProvider, useEmailView] = createAssertedContextProvider<}setState('openThreadId', thread.id);- navigationStack.reset(- createEntityDetailTarget(- { type: 'email', id: thread.id },- thread.fallbackName- )- );+ return true;};const closeThread = () => {@@ -210,9 +220,7 @@ export const [EmailViewProvider, useEmailView] = createAssertedContextProvider<navigationStack.clear();};- if (state.openThreadId) {- openThread({ id: state.openThreadId });- }+ if (state.openThreadId) openThread({ id: state.openThreadId });// A tab is a fresh slice of the mailbox: filters chosen for one tab (Done// on Signal, say) would silently narrow the next, so they reset with it.diff --git a/apps/web/src/features/email-view/email-view.tsx b/apps/web/src/features/email-view/email-view.tsxindex 31929803d9..d2eea6244a 100644--- a/apps/web/src/features/email-view/email-view.tsx+++ b/apps/web/src/features/email-view/email-view.tsx@@ -138,7 +138,6 @@ function EmailMobileLayout(props: ParentProps) {function EmailViewRoot() {const panel = useSplitPanelOrThrow();- const { selectedThread } = useEmailView();const [listElement, setListElement] = createSignal<HTMLDivElement>();onMount(() => panel.handle.setDisplayName('Email'));@@ -161,14 +160,7 @@ function EmailViewRoot() {</EmailDesktopLayout>}>- <Switch>- <Match when={selectedThread()}>- {(thread) => <EmailDetailView thread={thread()} />}- </Match>- <Match when={true}>- <EmailMobileLayout>{list()}</EmailMobileLayout>- </Match>- </Switch>+ <EmailMobileLayout>{list()}</EmailMobileLayout></Show></SplitPanel.Body></SplitPanel.Root>@@ -179,9 +171,7 @@ function EmailViewRoot() {/** Email shares one list across desktop sidebar and mobile pill layouts. */export function EmailView(props: EmailViewProps) {return (- <EntityDetailNavigationStack.Root- shouldNavigate={(_, options) => options?.event?.shiftKey !== true}- >+ <EntityDetailNavigationStack.Root><ListEntityMetadataQueryProvider><EmailViewProvider initialState={props.initialState}><EmailViewBreadcrumbs>diff --git a/apps/web/src/features/inbox-view/inbox-view.tsx b/apps/web/src/features/inbox-view/inbox-view.tsxindex 9d81dd1f2f..1f227d767f 100644--- a/apps/web/src/features/inbox-view/inbox-view.tsx+++ b/apps/web/src/features/inbox-view/inbox-view.tsx@@ -3,6 +3,7 @@ import {ViewBreadcrumbs,ViewShell,} from '@app/components/view-shell';+import { createPreviewSelectionGuard } from '@components/app/createPreviewSelectionGuard';import { useGlobalBlockOrchestrator } from '@components/app/GlobalAppState';import { PreviewPanel } from '@components/app/PreviewPanel';import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';@@ -79,7 +80,12 @@ function InboxViewRoot() {const panel = useSplitPanelOrThrow();const orchestrator = useGlobalBlockOrchestrator();const { state, setTab } = useInboxView();- const [previewEntity, setPreviewEntity] = createSignal<EntityData>();+ const [previewEntity, setPreviewEntityState] = createSignal<EntityData>();+ const selectPreview = createPreviewSelectionGuard();+ const setPreviewEntity = (entity: EntityData | undefined) => {+ if (!selectPreview(entity)) return;+ setPreviewEntityState(entity);+ };let activeTab = state.tab;createEffect(() => {diff --git a/apps/web/src/features/tasks-view/components/TasksSidebar.tsx b/apps/web/src/features/tasks-view/components/TasksSidebar.tsxindex 306412445c..6047f0c6e1 100644--- a/apps/web/src/features/tasks-view/components/TasksSidebar.tsx+++ b/apps/web/src/features/tasks-view/components/TasksSidebar.tsx@@ -96,18 +96,11 @@ function TaskFavorites(props: {fallbackName: string,event: MouseEvent) => {- if (event.shiftKey) {- layout.openWithSplit(favoriteSplitContent(favorite), {- referredFrom: 'sidebar',- preferNewSplit: true,- });+ if (openTask({ id: favorite.entityId, fallbackName }, { event })) return;- return;- }-- openTask({- id: favorite.entityId,- fallbackName,+ layout.openWithSplit(favoriteSplitContent(favorite), {+ referredFrom: 'sidebar',+ preferNewSplit: event.shiftKey,});};diff --git a/apps/web/src/features/tasks-view/components/task-list/TaskList.tsx b/apps/web/src/features/tasks-view/components/task-list/TaskList.tsxindex 1960344d82..b31819e561 100644--- a/apps/web/src/features/tasks-view/components/task-list/TaskList.tsx+++ b/apps/web/src/features/tasks-view/components/task-list/TaskList.tsx@@ -162,16 +162,16 @@ export function TaskList(props: TaskListProps) {const newSplit =metadata?.newSplit === true || metadata?.event?.shiftKey === true;- if (newSplit) {- openEntity(sourceRow.entity, { openInNewSplit: true });-+ if (+ !newSplit &&+ openTask(+ { id: sourceRow.entity.id, fallbackName: sourceRow.entity.name },+ { event: metadata?.event }+ )+ )return;- }- openTask({- id: sourceRow.entity.id,- fallbackName: sourceRow.entity.name,- });+ openEntity(sourceRow.entity, { openInNewSplit: newSplit });}registerListActivationHandler(onActivate);diff --git a/apps/web/src/features/tasks-view/tasks-view-context.tsx b/apps/web/src/features/tasks-view/tasks-view-context.tsxindex 855126b330..90dbbc332c 100644--- a/apps/web/src/features/tasks-view/tasks-view-context.tsx+++ b/apps/web/src/features/tasks-view/tasks-view-context.tsx@@ -1,4 +1,5 @@import {+ type EntityDetailNavigationOptions,entityDetailTarget,useEntityDetailNavigationStack,} from '@app/components/entity-detail/EntityDetailNavigationStack';@@ -71,7 +72,11 @@ export type TasksViewContext = {>) => void) => void;- openTask: (task: TaskDetailTarget) => void;+ /** Returns false when inline detail is unavailable so the caller opens a split instead. */+ openTask: (+ task: TaskDetailTarget,+ options?: EntityDetailNavigationOptions+ ) => boolean;closeTask: () => void;setTab: (tab: TaskTab) => void;setFacets: (facets: TasksViewState['facets']) => void;@@ -175,7 +180,19 @@ export const [TasksViewProvider, useTasksView] = createAssertedContextProvider<};};- const openTask = (task: TaskDetailTarget) => {+ const openTask = (+ task: TaskDetailTarget,+ options?: EntityDetailNavigationOptions+ ) => {+ const target = entityDetailTarget.document({+ id: task.id,+ fileType: 'md',+ subType: { type: 'task' },+ fallbackName: task.fallbackName,+ });+ if (!navigationStack.shouldNavigate(target, options)) return false;+ // A refused reset already alerted; there is nothing to fall back to.+ if (!navigationStack.reset(target)) return true;const row = source.items().find((item) => item.kind === 'entity' && item.entity.id === task.id);@@ -184,14 +201,7 @@ export const [TasksViewProvider, useTasksView] = createAssertedContextProvider<list.selection.setAnchor(row.id);}- navigationStack.reset(- entityDetailTarget.document({- id: task.id,- fileType: 'md',- subType: { type: 'task' },- fallbackName: task.fallbackName,- })- );+ return true;};const closeTask = navigationStack.clear;diff --git a/apps/web/src/features/tasks-view/tasks-view.tsx b/apps/web/src/features/tasks-view/tasks-view.tsxindex 33b61d24a0..9a35864f71 100644--- a/apps/web/src/features/tasks-view/tasks-view.tsx+++ b/apps/web/src/features/tasks-view/tasks-view.tsx@@ -106,9 +106,7 @@ function TasksViewRoot() {/** Production Tasks view. */export function TasksView(props: TasksViewProps) {return (- <EntityDetailNavigationStack.Root- shouldNavigate={(_, options) => options?.event?.shiftKey !== true}- >+ <EntityDetailNavigationStack.Root><ListEntityMetadataQueryProvider><TasksViewProvider initialState={props.initialState}><TasksViewBreadcrumbs>diff --git a/apps/web/src/lib/core/contentInstanceRegistry.ts b/apps/web/src/lib/core/contentInstanceRegistry.tsnew file mode 100644index 0000000000..0f624680b5--- /dev/null+++ b/apps/web/src/lib/core/contentInstanceRegistry.ts@@ -0,0 +1,40 @@+import type { BlockAlias, BlockName } from './block';+import { resolveBlockAlias } from './constant/allBlocks';++export type ContentIdentity = {+ type: BlockName | BlockAlias | 'component';+ id: string;+};+export type ContentOwner = object | string | symbol;++export function sameContentIdentity(a: ContentIdentity, b: ContentIdentity) {+ if (a.type === 'component' || b.type === 'component') return false;+ return (+ a.id === b.id && resolveBlockAlias(a.type) === resolveBlockAlias(b.type)+ );+}++/** Owned by the app orchestrator; sources include selections before their UI mounts. */+export function createContentInstanceRegistry() {+ const sources = new Set<+ () => readonly { owner: ContentOwner; content: ContentIdentity }[]+ >();+ return {+ register(+ source: () => readonly { owner: ContentOwner; content: ContentIdentity }[]+ ) {+ sources.add(source);+ return () => {+ sources.delete(source);+ };+ },+ isOpenElsewhere(content: ContentIdentity, owner?: ContentOwner) {+ return [...sources].some((source) =>+ source().some(+ (entry) =>+ entry.owner !== owner && sameContentIdentity(entry.content, content)+ )+ );+ },+ };+}diff --git a/apps/web/src/lib/core/orchestrator.test.tsx b/apps/web/src/lib/core/orchestrator.test.tsxindex a7d275f728..b7370d383d 100644--- a/apps/web/src/lib/core/orchestrator.test.tsx+++ b/apps/web/src/lib/core/orchestrator.test.tsx@@ -8,7 +8,10 @@ vi.mock('./block', () => ({ValidNestingCombinations: {},}));vi.mock('./constant/allBlocks', () => ({- blocks: { channel: { component: () => <div>Channel content</div> } },+ resolveBlockAlias: (type: string) => type,+ blocks: {+ channel: { component: () => <div>Channel content</div> },+ },}));vi.mock('./internal/BlockLoader', () => ({ BlockLoader: () => null }));vi.mock('./internal/BlockEffectRunner', () => ({diff --git a/apps/web/src/lib/core/orchestrator.tsx b/apps/web/src/lib/core/orchestrator.tsxindex 8f5aa8ed08..831c8558d1 100644--- a/apps/web/src/lib/core/orchestrator.tsx+++ b/apps/web/src/lib/core/orchestrator.tsx@@ -23,6 +23,7 @@ import {import type { BlockMethodsFor } from './blockMethodRegistry';import { LoadingBlock } from './component/LoadingBlock';import { blocks as BLOCK_REGISTRY } from './constant/allBlocks';+import { createContentInstanceRegistry } from './contentInstanceRegistry';import { BlockEffectRunner } from './internal/BlockEffectRunner';import { BlockLoader } from './internal/BlockLoader';import type { Source } from './source';@@ -310,6 +311,7 @@ type CreateBlockInstanceFn = () => BlockInstance;export type BlockOrchestrator = {+ contentInstances: ReturnType<typeof createContentInstanceRegistry>;/** Whether a managed block is currently mounted in any surface. */isBlockMounted: (type: BlockName, id: string) => boolean;/** Get a publicly accessible handle to a block instance */@@ -414,7 +416,7 @@ export function createBlockOrchestrator(): BlockOrchestrator {opts?: CreateBlockOptions): BlockInstance {const key = keyOf(type, id);- let existing = instances.get(key);+ const existing = instances.get(key);if (existing) return existing;const ownedHandle = registerBlock(type, id);@@ -489,6 +491,7 @@ export function createBlockOrchestrator(): BlockOrchestrator {}return {+ contentInstances: createContentInstanceRegistry(),isBlockMounted: (type, id) =>instances.get(keyOf(type, id))?.isMounted() ?? false,getBlockHandle,diff --git a/docs/AGENT_GUIDE/channels.md b/docs/AGENT_GUIDE/channels.mdindex fbd61724f5..2dd5a4f4d1 100644--- a/docs/AGENT_GUIDE/channels.md+++ b/docs/AGENT_GUIDE/channels.md@@ -257,6 +257,10 @@ optional `Favorites` section above the independently paginated `Channels` and`DMs` sections. It appears when the user has channel favorites and only listschannels. Channel favorites open in the channel preview. Shift-clicking afavorite, channel, or DM opens that conversation in a new split instead.+If a restored Chat selection is already open in another view, its preview stays+closed but the saved selection is retained. Close the other view, then select+the conversation again or reopen Chat to restore its preview. Verify that an+unrelated rail preference change while blocked does not erase the saved selection.While reading older history or composing in the preview, incoming notifications(including ones for other channels) must not jump to latest, blank/refetch themessages, or revoke composer focus. To check this, leave an unsent draft in adiff --git a/docs/AGENT_GUIDE/navigation.md b/docs/AGENT_GUIDE/navigation.mdindex 408563d095..7b0f2bd55c 100644--- a/docs/AGENT_GUIDE/navigation.md+++ b/docs/AGENT_GUIDE/navigation.md@@ -333,3 +333,18 @@ polled into Macro about every two seconds; disconnected runtimes must resume firHome does not bind Delete or Backspace to deleting list items. These keys remainavailable to the open editor (for example, clearing a selected spreadsheet range).Use the item menu to delete an item from Home.++### Content already open++Entity content can be open in only one split or inline preview/detail view at a+time. Shell components may have duplicate splits when `allowDuplicate` is enabled.+An Agents conversation route counts as the same entity as its agent or chat block.+Opening an entity already in a split focuses that split when activation is+requested; the sidebar's **Open in new split** also shows a **Content already open** toast.+Selecting an entity owned by another view from a detail view leaves the current+detail and navigation history unchanged and shows a **Content already open**+toast. Close or navigate away+from the owning view before opening it elsewhere. The same rule applies to mouse+selection, keyboard preview navigation, and detail breadcrumbs. Touch layouts+never render inline previews or detail views: a tap opens the entity in the+split, so the toast only appears when the content is genuinely open elsewhere.