Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

feat(web): track workspace tabs in pane search params (#6883)

dev-rbef5f9561c58b
diff --git a/apps/web/src/features/channels-view/channels-route.ts b/apps/web/src/features/channels-view/channels-route.ts
index 62365e83a6..5956c4da23 100644
--- a/apps/web/src/features/channels-view/channels-route.ts
+++ b/apps/web/src/features/channels-view/channels-route.ts
@@ -1,5 +1,21 @@
import { createSearchParamsCodec } from '@app/lib/split-router';
import { z } from 'zod';
+import type { ChannelsQueryScope, ChannelsTab } from './types';
+
+export const channelsTabSearch = {
+ namespace: 'channels',
+ schema: z.object({
+ tab: z.enum(['browse', 'recents']),
+ mobileTab: z.enum(['channels', 'direct_messages', 'recents']),
+ }),
+ defaults: {
+ tab: 'browse' as ChannelsTab,
+ mobileTab: 'channels' as ChannelsQueryScope,
+ },
+};
+
+export const channelsTabSearchCodec =
+ createSearchParamsCodec(channelsTabSearch);
export const CHANNEL_DETAIL_SEARCH_NAMESPACE = 'channel-detail';
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.tsx
index a8f49f5762..890b15c6d2 100644
--- a/apps/web/src/features/channels-view/channels-view-context.test.tsx
+++ b/apps/web/src/features/channels-view/channels-view-context.test.tsx
@@ -137,6 +137,58 @@ beforeEach(() => {
afterEach(cleanup);
describe('ChannelsViewProvider route selection', () => {
+ it('takes desktop and mobile tabs from pane search, ahead of saved state', () => {
+ entry.state = { 'channels.view': { tab: 'browse', mobileTab: 'channels' } };
+ const { context } = mountProvider(
+ '/channels?s0.channels.tab=recents&s0.channels.mobileTab=direct_messages'
+ );
+ expect(context.state.tab).toBe('recents');
+ expect(context.state.mobileTab).toBe('direct_messages');
+ });
+
+ it('normalizes invalid URL tabs to defaults without restoring stale tabs', async () => {
+ const { context, location, router } = mountProvider(
+ '/channels?s0.channels.tab=unknown'
+ );
+ await router.settled();
+ expect(context.state.tab).toBe('browse');
+ expect(location.read().search).toBe('');
+ });
+
+ it('writes each tab to pane search and follows browser Back/Forward', async () => {
+ const { context, location, router } = mountProvider();
+ context.setTab('recents');
+ await router.settled();
+ expect(location.read().search).toContain('s0.channels.tab=recents');
+
+ context.setMobileTab('direct_messages');
+ await router.settled();
+ expect(location.read().search).toContain(
+ 's0.channels.mobileTab=direct_messages'
+ );
+ expect(location.back()).toBe(true);
+ await router.settled();
+ expect(context.state.tab).toBe('recents');
+ expect(context.state.mobileTab).toBe('channels');
+ expect(location.forward()).toBe(true);
+ await router.settled();
+ expect(context.state.mobileTab).toBe('direct_messages');
+ });
+
+ it('keeps tab search when entering and leaving inline detail', async () => {
+ const { context, location, router } = mountProvider(
+ '/channels?s0.channels.tab=recents'
+ );
+ context.setSelectedChannel({ type: 'channel', id: 'c1' });
+ await router.settled();
+ expect(location.read().pathname).toBe('/channels/c1');
+ expect(location.read().search).toContain('s0.channels.tab=recents');
+ context.setSelectedChannel(undefined);
+ await router.settled();
+ expect(location.read().pathname).toBe('/channels');
+ expect(location.read().search).toContain('s0.channels.tab=recents');
+ });
+
it('persists collapsed labels per user and restores them', () => {
const storageKey = 'macro:channels:view-state:v1:alice';
const first = mountProvider();
diff --git a/apps/web/src/features/channels-view/channels-view-context.tsx b/apps/web/src/features/channels-view/channels-view-context.tsx
index 4abdca4d5a..b8bdeef8f6 100644
--- a/apps/web/src/features/channels-view/channels-view-context.tsx
+++ b/apps/web/src/features/channels-view/channels-view-context.tsx
@@ -20,6 +20,8 @@ import {
CHANNEL_DETAIL_SEARCH_NAMESPACE,
channelDetailSearch,
channelDetailSearchCodec,
+ channelsTabSearch,
+ channelsTabSearchCodec,
} from './channels-route';
import {
CHANNELS_DEFAULT_RAIL_WIDTH,
@@ -95,6 +97,7 @@ export const [ChannelsViewProvider, useChannelsView] =
const navigate = useNavigate();
const params = useRouteParams(channelDetailRoute);
const [detailSearch] = createSearchParams(channelDetailSearch);
+ const [tabSearch, setTabSearch] = createSearchParams(channelsTabSearch);
const selectPreview = createPreviewSelectionGuard();
const initial = props.initialState ?? {};
const [state, setState] = makePersistedState(
@@ -108,6 +111,16 @@ export const [ChannelsViewProvider, useChannelsView] =
})
);
+ createEffect(
+ on(
+ () => [tabSearch.tab, tabSearch.mobileTab] as const,
+ ([tab, mobileTab]) => {
+ if (state.tab !== tab) setState('tab', tab);
+ if (state.mobileTab !== mobileTab) setState('mobileTab', mobileTab);
+ }
+ )
+ );
+
const mobileLayout = () => isTouchDevice();
const selectedChannel = createMemo<ChannelPreviewSelection | undefined>(
() => {
@@ -148,6 +161,10 @@ export const [ChannelsViewProvider, useChannelsView] =
replace,
search: {
[CHANNEL_DETAIL_SEARCH_NAMESPACE]: routeSearch(channel),
+ [channelsTabSearch.namespace]: channelsTabSearchCodec.serialize({
+ tab: state.tab,
+ mobileTab: state.mobileTab,
+ }),
},
}
);
@@ -156,7 +173,19 @@ export const [ChannelsViewProvider, useChannelsView] =
channel: ChannelPreviewSelection | undefined
) => {
if (!channel) {
- navigate({ route: channelsSplitRoute, params: {} });
+ navigate(
+ { route: channelsSplitRoute, params: {} },
+ {
+ search: {
+ [channelsTabSearch.namespace]: channelsTabSearchCodec.serialize(
+ {
+ tab: state.tab,
+ mobileTab: state.mobileTab,
+ }
+ ),
+ },
+ }
+ );
return true;
}
if (mobileLayout() || !selectPreview.canSelect(channel)) return false;
@@ -171,7 +200,16 @@ export const [ChannelsViewProvider, useChannelsView] =
else
navigate(
{ route: channelsSplitRoute, params: {} },
- { replace: true }
+ {
+ replace: true,
+ search: {
+ [channelsTabSearch.namespace]:
+ channelsTabSearchCodec.serialize({
+ tab: state.tab,
+ mobileTab: state.mobileTab,
+ }),
+ },
+ }
);
}
})
@@ -181,8 +219,16 @@ export const [ChannelsViewProvider, useChannelsView] =
state,
mobileLayout,
selectedChannel,
- setTab: (tab) => setState('tab', tab),
- setMobileTab: (tab) => setState('mobileTab', tab),
+ setTab: (tab) => {
+ if (state.tab === tab) return;
+ setState('tab', tab);
+ setTabSearch({ tab });
+ },
+ setMobileTab: (mobileTab) => {
+ if (state.mobileTab === mobileTab) return;
+ setState('mobileTab', mobileTab);
+ setTabSearch({ mobileTab });
+ },
setSelectedChannel,
setGroupOpen: (group, open) => setState('expandedGroups', group, open),
setLabelOpen: (labelId, open) =>
diff --git a/apps/web/src/features/email-view/email-route.ts b/apps/web/src/features/email-view/email-route.ts
index 59d016d0b6..66013fcfac 100644
--- a/apps/web/src/features/email-view/email-route.ts
+++ b/apps/web/src/features/email-view/email-route.ts
@@ -1,5 +1,24 @@
import { createSearchParamsCodec } from '@app/lib/split-router';
import { z } from 'zod';
+import type { EmailTab } from './types';
+
+export const emailTabSearch = {
+ namespace: 'mail',
+ schema: z.object({
+ tab: z.enum([
+ 'important',
+ 'noise',
+ 'sent',
+ 'calendar',
+ 'drafts',
+ 'shared',
+ 'all',
+ ]),
+ }),
+ defaults: { tab: 'important' as EmailTab },
+};
+
+export const emailTabSearchCodec = createSearchParamsCodec(emailTabSearch);
export const EMAIL_DETAIL_SEARCH_NAMESPACE = 'email-detail';
diff --git a/apps/web/src/features/email-view/email-view-context.tsx b/apps/web/src/features/email-view/email-view-context.tsx
index 2840e0b155..9d0cad64ab 100644
--- a/apps/web/src/features/email-view/email-view-context.tsx
+++ b/apps/web/src/features/email-view/email-view-context.tsx
@@ -10,7 +10,11 @@ import { registerInboxFilterSplit } from '@app/features/next-soup/soup-view/inbo
import { normalizeFacetSelection } from '@app/features/soup';
import { registerListNavigationSource } from '@app/features/soup/collection/list-navigation-source';
import { makePersistedState } from '@app/lib/persistence';
-import { useNavigate, useRouteParams } from '@app/lib/split-router';
+import {
+ createSearchParams,
+ useNavigate,
+ useRouteParams,
+} from '@app/lib/split-router';
import { createPreviewSelectionGuard } from '@components/app/createPreviewSelectionGuard';
import {
useSplitPanelOrThrow,
@@ -36,7 +40,11 @@ import {
type Store,
} from 'solid-js/store';
import { DEFAULT_EMAIL_TAB } from './constants';
-import { emailDetailSearch } from './email-route';
+import {
+ emailDetailSearch,
+ emailTabSearch,
+ emailTabSearchCodec,
+} from './email-route';
import { createEmailViewPersistence } from './persistence';
import {
type EmailDataSource,
@@ -104,6 +112,7 @@ export const [EmailViewProvider, useEmailView] = createAssertedContextProvider<
const panel = useSplitPanelOrThrow();
const navigate = useNavigate();
const routeParams = useRouteParams(emailThreadRoute);
+ const [tabSearch] = createSearchParams(emailTabSearch);
const selectPreview = createPreviewSelectionGuard();
const userId = useUserId();
const tagSets = useTagSets();
@@ -130,6 +139,21 @@ export const [EmailViewProvider, useEmailView] = createAssertedContextProvider<
})
);
+ createEffect(
+ on(
+ () => tabSearch.tab,
+ (tab) => {
+ if (state.tab === tab) return;
+ setState(
+ produce((draft) => {
+ draft.tab = tab;
+ draft.facets = {};
+ })
+ );
+ }
+ )
+ );
+
const source = withSplitPanelOwner(listOwnedSlotName('data-source'), () =>
useEmailDataSource(state, { tagSets, tagSetsReady })
);
@@ -189,7 +213,17 @@ export const [EmailViewProvider, useEmailView] = createAssertedContextProvider<
!(event?.shiftKey || event?.metaKey || event?.ctrlKey || event?.altKey)
);
};
- const closeThread = () => navigate({ route: emailSplitRoute, params: {} });
+ const closeThread = () =>
+ navigate(
+ { route: emailSplitRoute, params: {} },
+ {
+ search: {
+ [emailTabSearch.namespace]: emailTabSearchCodec.serialize({
+ tab: state.tab,
+ }),
+ },
+ }
+ );
const openThread = (
thread: EmailThreadTarget,
options?: EntityDetailNavigationOptions
@@ -201,7 +235,14 @@ export const [EmailViewProvider, useEmailView] = createAssertedContextProvider<
if (!selectPreview.canSelect(selection)) return true;
navigate(
{ route: emailThreadRoute, params: { threadId: thread.id } },
- { search: { [emailDetailSearch.namespace]: {} } }
+ {
+ search: {
+ [emailDetailSearch.namespace]: {},
+ [emailTabSearch.namespace]: emailTabSearchCodec.serialize({
+ tab: state.tab,
+ }),
+ },
+ }
);
return true;
};
@@ -218,10 +259,27 @@ export const [EmailViewProvider, useEmailView] = createAssertedContextProvider<
route: emailThreadRoute,
params: { threadId: previous.id },
},
- { replace: true }
+ {
+ replace: true,
+ search: {
+ [emailTabSearch.namespace]: emailTabSearchCodec.serialize({
+ tab: state.tab,
+ }),
+ },
+ }
);
} else {
- navigate({ route: emailSplitRoute, params: {} }, { replace: true });
+ navigate(
+ { route: emailSplitRoute, params: {} },
+ {
+ replace: true,
+ search: {
+ [emailTabSearch.namespace]: emailTabSearchCodec.serialize({
+ tab: state.tab,
+ }),
+ },
+ }
+ );
}
return;
}
@@ -238,15 +296,17 @@ export const [EmailViewProvider, useEmailView] = createAssertedContextProvider<
// 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.
const setTab = (tab: EmailTab) => {
- closeThread();
- if (state.tab === tab) return;
-
+ if (state.tab === tab) {
+ closeThread();
+ return;
+ }
setState(
produce((draft) => {
draft.tab = tab;
draft.facets = {};
})
);
+ closeThread();
};
const setInboxIds = (ids: string[] | undefined) => {
@@ -262,7 +322,6 @@ export const [EmailViewProvider, useEmailView] = createAssertedContextProvider<
// A tag reaches across every mailbox slice, so choosing one from a narrower
// tab moves to All; as with `setTab`, that move drops the tab's other filters.
const showTags = (tagIds: string[]) => {
- closeThread();
setState(
produce((draft) => {
const movesToAll = tagIds.length > 0 && draft.tab !== 'all';
@@ -273,6 +332,7 @@ export const [EmailViewProvider, useEmailView] = createAssertedContextProvider<
});
})
);
+ closeThread();
};
const isSidebarSectionOpen = (id: string) =>
diff --git a/apps/web/src/features/inbox-view/inbox-tab-search.ts b/apps/web/src/features/inbox-view/inbox-tab-search.ts
new file mode 100644
index 0000000000..fa6770bf2d
--- /dev/null
+++ b/apps/web/src/features/inbox-view/inbox-tab-search.ts
@@ -0,0 +1,11 @@
+import { createSearchParamsCodec } from '@app/lib/split-router';
+import { z } from 'zod';
+import type { InboxTab } from './types';
+
+export const inboxTabSearch = {
+ namespace: 'inbox',
+ schema: z.object({ tab: z.enum(['signal', 'noise', 'reminders']) }),
+ defaults: { tab: 'signal' as InboxTab },
+};
+
+export const inboxTabSearchCodec = createSearchParamsCodec(inboxTabSearch);
diff --git a/apps/web/src/features/inbox-view/inbox-view-context.test.tsx b/apps/web/src/features/inbox-view/inbox-view-context.test.tsx
index 0ec343bdf1..f003a81898 100644
--- a/apps/web/src/features/inbox-view/inbox-view-context.test.tsx
+++ b/apps/web/src/features/inbox-view/inbox-view-context.test.tsx
@@ -195,7 +195,7 @@ beforeEach(() => {
afterEach(cleanup);
describe('InboxViewProvider initialization', () => {
- it('honors all explicit fields instead of restoring the split entry', () => {
+ it('honors explicit fields except the URL-owned tab', () => {
entry.state = { [INBOX_ENTRY_STATE_KEY]: { version: 1, tab: 'signal' } };
const initial: InboxViewStateOptions = {
tab: 'noise',
@@ -204,7 +204,11 @@ describe('InboxViewProvider initialization', () => {
facets: { type: ['email'], read: ['unread'] },
};
- expect(mountProvider(initial).context.state).toEqual(initial);
+ expect(mountProvider(initial).context.state).toEqual({
+ ...initial,
+ tab: 'signal',
+ groupBy: 'date',
+ });
});
it.each([
@@ -212,7 +216,9 @@ describe('InboxViewProvider initialization', () => {
{ tab: 'noise', groupBy: 'date' },
{ tab: 'reminders', groupBy: 'none' },
] as const)('defaults omitted fields for $tab', ({ tab, groupBy }) => {
- expect(mountProvider({ tab }).context.state).toEqual({
+ expect(
+ mountProvider({ tab }, `/inbox?s0.inbox.tab=${tab}`).context.state
+ ).toEqual({
tab,
groupBy,
search: '',
@@ -359,6 +365,53 @@ describe('InboxViewProvider initialization', () => {
});
describe('InboxViewProvider route selection', () => {
+ it('takes the tab from pane search ahead of explicit and restored state', () => {
+ entry.state = { [INBOX_ENTRY_STATE_KEY]: { version: 1, tab: 'signal' } };
+ const { context } = mountProvider(
+ { tab: 'signal' },
+ '/inbox?s0.inbox.tab=noise'
+ );
+ expect(context.state.tab).toBe('noise');
+ });
+
+ it('normalizes invalid URL tabs without restoring an old selection', async () => {
+ const { context, location, router } = mountProvider(
+ undefined,
+ '/inbox?s0.inbox.tab=unknown'
+ );
+ await router.settled();
+ expect(context.state.tab).toBe('signal');
+ expect(location.read().search).toBe('');
+ });
+
+ it('writes the tab to the URL and follows browser Back/Forward', async () => {
+ const { context, location, router } = mountProvider();
+ context.setTab('noise');
+ await router.settled();
+ expect(location.read().search).toBe('?s0.inbox.tab=noise');
+ expect(location.back()).toBe(true);
+ await router.settled();
+ expect(context.state.tab).toBe('signal');
+ expect(location.forward()).toBe(true);
+ await router.settled();
+ expect(context.state.tab).toBe('noise');
+ });
+
+ it('keeps the URL tab when opening and closing a preview', async () => {
+ const { context, location, router } = mountProvider(
+ undefined,
+ '/inbox?s0.inbox.tab=noise'
+ );
+ context.openPreview({ type: 'email', id: 'thread-1' });
+ await router.settled();
+ expect(location.read().pathname).toBe('/inbox/email/thread-1');
+ expect(location.read().search).toContain('s0.inbox.tab=noise');
+ context.closePreview();
+ await router.settled();
+ expect(location.read().pathname).toBe('/inbox');
+ expect(location.read().search).toContain('s0.inbox.tab=noise');
+ });
+
it('rebuilds a heterogeneous channel-message preview from a direct URL', () => {
const { context } = mountProvider(
undefined,
diff --git a/apps/web/src/features/inbox-view/inbox-view-context.tsx b/apps/web/src/features/inbox-view/inbox-view-context.tsx
index 28db8cc6d2..6cd1dcbccd 100644
--- a/apps/web/src/features/inbox-view/inbox-view-context.tsx
+++ b/apps/web/src/features/inbox-view/inbox-view-context.tsx
@@ -26,6 +26,7 @@ import {
inboxPreviewSearchCodec,
inboxPreviewSelection,
} from './inbox-route';
+import { inboxTabSearch, inboxTabSearchCodec } from './inbox-tab-search';
import {
createInboxViewPersistence,
normalizeInboxFacets,
@@ -65,6 +66,7 @@ export const [InboxViewProvider, useInboxView] = createAssertedContextProvider<
const navigate = useNavigate();
const routeParams = useRouteParams(inboxPreviewRoute);
const [previewSearch] = createSearchParams(inboxPreviewSearch);
+ const [tabSearch] = createSearchParams(inboxTabSearch);
const selectPreview = createPreviewSelectionGuard();
const initial = props.initialState ?? {};
const initialTab = initial.tab ?? 'signal';
@@ -83,6 +85,21 @@ export const [InboxViewProvider, useInboxView] = createAssertedContextProvider<
})
);
+ createEffect(
+ on(
+ () => tabSearch.tab,
+ (tab) => {
+ if (state.tab === tab) return;
+ setState(
+ produce((draft) => {
+ draft.tab = tab;
+ draft.groupBy = defaultGroupBy(tab);
+ })
+ );
+ }
+ )
+ );
+
const previewEntity = createMemo<PreviewPanelSelection | undefined>(() => {
const blockType = routeParams.blockType;
const previewId = routeParams.previewId;
@@ -99,11 +116,24 @@ export const [InboxViewProvider, useInboxView] = createAssertedContextProvider<
[INBOX_PREVIEW_SEARCH_NAMESPACE]: inboxPreviewSearchCodec.serialize(
preview.search
),
+ [inboxTabSearch.namespace]: inboxTabSearchCodec.serialize({
+ tab: state.tab,
+ }),
},
}
);
};
- const closePreview = () => navigate({ route: inboxSplitRoute, params: {} });
+ const closePreview = () =>
+ navigate(
+ { route: inboxSplitRoute, params: {} },
+ {
+ search: {
+ [inboxTabSearch.namespace]: inboxTabSearchCodec.serialize({
+ tab: state.tab,
+ }),
+ },
+ }
+ );
const openPreview = (entity: PreviewPanelSelection) => {
if (!selectPreview.canSelect(entity)) return false;
navigatePreview(entity);
@@ -114,20 +144,30 @@ export const [InboxViewProvider, useInboxView] = createAssertedContextProvider<
on(previewEntity, (entity, previous) => {
if (selectPreview(entity)) return;
if (previous) navigatePreview(previous, true);
- else navigate({ route: inboxSplitRoute, params: {} }, { replace: true });
+ else
+ navigate(
+ { route: inboxSplitRoute, params: {} },
+ {
+ replace: true,
+ search: {
+ [inboxTabSearch.namespace]: inboxTabSearchCodec.serialize({
+ tab: state.tab,
+ }),
+ },
+ }
+ );
})
);
const setTab = (tab: InboxTab) => {
if (state.tab === tab) return;
- closePreview();
-
setState(
produce((draft) => {
draft.tab = tab;
draft.groupBy = defaultGroupBy(tab);
})
);
+ closePreview();
};
const setFacets = (facets: FacetSelection) => {
diff --git a/apps/web/src/features/inbox-view/inbox-view.tsx b/apps/web/src/features/inbox-view/inbox-view.tsx
index 4719e86130..9bc77830a1 100644
--- a/apps/web/src/features/inbox-view/inbox-view.tsx
+++ b/apps/web/src/features/inbox-view/inbox-view.tsx
@@ -81,13 +81,12 @@ function HomeReturnBreadcrumb(props: { onReturn: () => void }) {
function InboxViewRoot() {
const panel = useSplitPanelOrThrow();
- const { state, setState, previewEntity, openPreview, closePreview } =
+ const { state, setTab, previewEntity, openPreview, closePreview } =
useInboxView();
createEffect(() => {
if (state.tab !== 'reminders') return;
- setState('tab', 'signal');
- setState('groupBy', 'date');
+ setTab('signal');
});
const newChat = closePreview;
diff --git a/apps/web/src/features/tasks-view/tasks-tab-search.ts b/apps/web/src/features/tasks-view/tasks-tab-search.ts
new file mode 100644
index 0000000000..3eb47167a5
--- /dev/null
+++ b/apps/web/src/features/tasks-view/tasks-tab-search.ts
@@ -0,0 +1,13 @@
+import { createSearchParamsCodec } from '@app/lib/split-router';
+import { z } from 'zod';
+import type { TaskTab } from './types';
+
+export const tasksTabSearch = {
+ namespace: 'tasks',
+ schema: z.object({
+ tab: z.enum(['my-tasks', 'created-by-me', 'team-tasks']),
+ }),
+ defaults: { tab: 'my-tasks' as TaskTab },
+};
+
+export const tasksTabSearchCodec = createSearchParamsCodec(tasksTabSearch);
diff --git a/apps/web/src/features/tasks-view/tasks-view-context.tsx b/apps/web/src/features/tasks-view/tasks-view-context.tsx
index 1e25d5f53b..c6ff0004e5 100644
--- a/apps/web/src/features/tasks-view/tasks-view-context.tsx
+++ b/apps/web/src/features/tasks-view/tasks-view-context.tsx
@@ -8,7 +8,11 @@ import {
import { setSidebarSectionCollapsed } from '@app/components/view-shell';
import { normalizeFacetSelection } from '@app/features/soup';
import { makePersistedState } from '@app/lib/persistence';
-import { useNavigate, useRouteParams } from '@app/lib/split-router';
+import {
+ createSearchParams,
+ useNavigate,
+ useRouteParams,
+} from '@app/lib/split-router';
import { createPreviewSelectionGuard } from '@components/app/createPreviewSelectionGuard';
import {
useSplitPanelOrThrow,
@@ -42,6 +46,7 @@ import {
useTasksDataSource,
} from './queries/use-tasks-query';
import { taskDetailRoute, tasksSplitRoute } from './route';
+import { tasksTabSearch, tasksTabSearchCodec } from './tasks-tab-search';
import type {
TaskDetailTarget,
TaskSortId,
@@ -98,6 +103,7 @@ export const [TasksViewProvider, useTasksView] = createAssertedContextProvider<
const panel = useSplitPanelOrThrow();
const navigate = useNavigate();
const routeParams = useRouteParams(taskDetailRoute);
+ const [tabSearch] = createSearchParams(tasksTabSearch);
const selectPreview = createPreviewSelectionGuard();
const userId = useUserId();
const tagSets = useTagSets();
@@ -130,6 +136,25 @@ export const [TasksViewProvider, useTasksView] = createAssertedContextProvider<
})
);
+ createEffect(
+ on(
+ () => tabSearch.tab,
+ (tab) => {
+ if (state.tab === tab) return;
+ setState(
+ produce((draft) => {
+ draft.tab = tab;
+ draft.groupBy = TASK_DEFAULT_GROUP_BY[tab];
+ draft.facets = normalizeFacetSelection(
+ DEFAULT_TASK_FACET_SELECTION
+ );
+ draft.collapsedGroupIds = [];
+ })
+ );
+ }
+ )
+ );
+
const isGroupExpanded = (groupId: string) =>
!state.collapsedGroupIds.includes(groupId);
const source = withSplitPanelOwner(listOwnedSlotName('data-source'), () =>
@@ -186,14 +211,33 @@ export const [TasksViewProvider, useTasksView] = createAssertedContextProvider<
!(event?.shiftKey || event?.metaKey || event?.ctrlKey || event?.altKey)
);
};
- const closeTask = () => navigate({ route: tasksSplitRoute, params: {} });
+ const closeTask = () =>
+ navigate(
+ { route: tasksSplitRoute, params: {} },
+ {
+ search: {
+ [tasksTabSearch.namespace]: tasksTabSearchCodec.serialize({
+ tab: state.tab,
+ }),
+ },
+ }
+ );
const openTask = (
task: TaskDetailTarget,
options?: EntityDetailNavigationOptions
) => {
if (!opensInline(options)) return false;
if (!selectPreview.canSelect(taskSelection(task.id))) return true;
- navigate({ route: taskDetailRoute, params: { taskId: task.id } });
+ navigate(
+ { route: taskDetailRoute, params: { taskId: task.id } },
+ {
+ search: {
+ [tasksTabSearch.namespace]: tasksTabSearchCodec.serialize({
+ tab: state.tab,
+ }),
+ },
+ }
+ );
return true;
};
@@ -203,10 +247,27 @@ export const [TasksViewProvider, useTasksView] = createAssertedContextProvider<
if (previous) {
navigate(
{ route: taskDetailRoute, params: { taskId: previous.id } },
- { replace: true }
+ {
+ replace: true,
+ search: {
+ [tasksTabSearch.namespace]: tasksTabSearchCodec.serialize({
+ tab: state.tab,
+ }),
+ },
+ }
);
} else {
- navigate({ route: tasksSplitRoute, params: {} }, { replace: true });
+ navigate(
+ { route: tasksSplitRoute, params: {} },
+ {
+ replace: true,
+ search: {
+ [tasksTabSearch.namespace]: tasksTabSearchCodec.serialize({
+ tab: state.tab,
+ }),
+ },
+ }
+ );
}
return;
}
@@ -221,9 +282,10 @@ export const [TasksViewProvider, useTasksView] = createAssertedContextProvider<
);
const setTab = (tab: TaskTab) => {
- closeTask();
- if (state.tab === tab) return;
-
+ if (state.tab === tab) {
+ closeTask();
+ return;
+ }
setState(
produce((draft) => {
draft.tab = tab;
@@ -232,6 +294,7 @@ export const [TasksViewProvider, useTasksView] = createAssertedContextProvider<
draft.collapsedGroupIds = [];
})
);
+ closeTask();
};
const setFacets = (facets: TasksViewState['facets']) => {
diff --git a/docs/AGENT_GUIDE/navigation.md b/docs/AGENT_GUIDE/navigation.md
index a123483fc3..ee35a95924 100644
--- a/docs/AGENT_GUIDE/navigation.md
+++ b/docs/AGENT_GUIDE/navigation.md
@@ -51,7 +51,12 @@ Splits: the app is a tiling window manager. Public variable-length routes use
pane routes remain accepted. Known app-view URLs under `/app/component/` redirect
to their canonical paths above; legacy composers keep their existing paths. Split-specific view state uses positionally
namespaced query parameters such as `s0.drive.sort=created_at`; route identity
-and breadcrumb nesting remain in the path. Desktop panes expose Close when available and omit
+and breadcrumb nesting remain in the path. Home, Email, Tasks, and Channels
+store the selected tab under `sN.inbox.tab`, `sN.mail.tab`, `sN.tasks.tab`,
+and `sN.channels.tab`, respectively. Channels also stores the phone list
+selection as `sN.channels.mobileTab`. Omitted tab keys mean each view's default;
+changing tabs updates the URL, and browser Back/Forward restores the selection
+independently in each pane. Inline detail links preserve these keys. Desktop panes expose Close when available and omit
split-history back/forward buttons. Mobile content panes retain their back button.
The app views are referred to as **workspaces**. Expanded workspace sidebars start