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.

refactor(web): colocate split routes with feature entries (#6862)

dev-rbc188df79e033
diff --git a/apps/web/src/components/app/split-layout/componentRegistry.tsx b/apps/web/src/components/app/split-layout/componentRegistry.tsx
index eef36b1148..1343c022c5 100644
--- a/apps/web/src/components/app/split-layout/componentRegistry.tsx
+++ b/apps/web/src/components/app/split-layout/componentRegistry.tsx
@@ -1,9 +1,27 @@
+import { ActivityRouteView } from '@app/features/activity/route';
import { parseAgentsRoute } from '@app/features/agents-view/core/route';
+import { AgentsRouteView } from '@app/features/agents-view/route';
import { useSpreadsheetAccess } from '@app/features/block-spreadsheet/primitives/use-spreadsheet-access';
import type { EventEditorInitialValues } from '@app/features/calendar/components/composer/event-form-model';
import type { CalendarEvent } from '@app/features/calendar/types';
+import { ChannelsRouteView } from '@app/features/channels-view/route';
+import { CompaniesRouteView } from '@app/features/companies/route';
+import { DriveRouteView } from '@app/features/drive-view/route';
import { EmailCompose } from '@app/features/email-compose/email-compose';
+import { MailRouteView } from '@app/features/email-view/route';
+import { GettingStartedRouteView } from '@app/features/getting-started/route';
+import { HomeRouteView } from '@app/features/home/route';
+import { InboxRouteView } from '@app/features/inbox-view/route';
+import {
+ CallsRouteView,
+ FoldersRouteView,
+ RecentRouteView,
+ SearchRouteView,
+} from '@app/features/next-soup/route';
import { ReminderEditorSplit } from '@app/features/reminders/ReminderEditorSplit';
+import { RemindersRouteView } from '@app/features/reminders/route';
+import { SettingsRouteView } from '@app/features/settings/route';
+import { TasksRouteView } from '@app/features/tasks-view/route';
import { EventComposerSplit } from '@block-calendar/components/EventComposerSplit';
import { ChannelCompose } from '@block-channel/component/Compose';
import { ComposeSkill } from '@block-md/component/ComposeSkill';
@@ -12,12 +30,11 @@ import { LoadingBlock } from '@core/component/LoadingBlock';
import { DEV_MODE_ENV, LOCAL_ONLY } from '@core/constant/featureFlags';
import type { ViewId } from '@core/types/view';
import { type JSXElement, lazy, Show } from 'solid-js';
-import * as views from './split-router/app-views';
import {
RedirectSplit,
usePageViewTracking,
withAuth,
-} from './split-router/app-views';
+} from './split-router/app-route-shell';
type ComponentParams = Record<string, unknown>;
@@ -107,27 +124,21 @@ registerComponent('unified-list', () => (
// Compatibility factories for restored content and hosts outside a route outlet.
// App views themselves are composed by the application route layer.
-registerComponent('home', (params) => <views.HomeView {...params} />);
-registerComponent('getting-started', (params) => (
- <views.GettingStartedView {...params} />
-));
-registerComponent('inbox', (params) => <views.InboxRouteView {...params} />);
-registerComponent('recent', (params) => <views.RecentView {...params} />);
-registerComponent('activity', (params) => <views.ActivityView {...params} />);
-registerComponent('reminders', (params) => <views.RemindersView {...params} />);
-registerComponent('agents', (params) => <views.AgentsRouteView {...params} />);
-registerComponent('mail', (params) => <views.MailView {...params} />);
-registerComponent('documents', (params) => (
- <views.DriveRouteView {...params} />
-));
-registerComponent('tasks', (params) => <views.TasksRouteView {...params} />);
-registerComponent('channels', (params) => (
- <views.ChannelsRouteView {...params} />
-));
-registerComponent('calls', (params) => <views.CallsView {...params} />);
-registerComponent('companies', (params) => <views.CompaniesView {...params} />);
-registerComponent('folders', (params) => <views.FoldersView {...params} />);
-registerComponent('search', (params) => <views.SearchView {...params} />);
+registerComponent('home', () => <HomeRouteView />);
+registerComponent('getting-started', () => <GettingStartedRouteView />);
+registerComponent('inbox', () => <InboxRouteView />);
+registerComponent('recent', () => <RecentRouteView />);
+registerComponent('activity', () => <ActivityRouteView />);
+registerComponent('reminders', () => <RemindersRouteView />);
+registerComponent('agents', () => <AgentsRouteView />);
+registerComponent('mail', () => <MailRouteView />);
+registerComponent('documents', () => <DriveRouteView />);
+registerComponent('tasks', () => <TasksRouteView />);
+registerComponent('channels', () => <ChannelsRouteView />);
+registerComponent('calls', () => <CallsRouteView />);
+registerComponent('companies', () => <CompaniesRouteView />);
+registerComponent('folders', () => <FoldersRouteView />);
+registerComponent('search', () => <SearchRouteView />);
registerComponent('firehose', () => (
<RedirectSplit to={{ type: 'component', id: 'activity' }} />
));
@@ -199,7 +210,7 @@ registerComponent(
'import-linear',
lazy(() => import('@app/features/integrations/import-linear/ImportLinear'))
);
-registerComponent('settings', () => <views.SettingsView />);
+registerComponent('settings', () => <SettingsRouteView />);
if (LOCAL_ONLY) {
registerComponent(
diff --git a/apps/web/src/components/app/split-layout/split-router/app-middleware.ts b/apps/web/src/components/app/split-layout/split-router/app-middleware.ts
index 8a8931fa11..50afcbeca8 100644
--- a/apps/web/src/components/app/split-layout/split-router/app-middleware.ts
+++ b/apps/web/src/components/app/split-layout/split-router/app-middleware.ts
@@ -68,7 +68,7 @@ export function createAppSplitRouterMiddleware(options: {
return redirect(`/mail/${encodeURIComponent(content.id)}`);
}
if (content.type === 'channel') {
- return redirect(`/channels/channel/${encodeURIComponent(content.id)}`);
+ return redirect(`/channels/${encodeURIComponent(content.id)}`);
}
if (type === 'task') {
return redirect(`/tasks/${encodeURIComponent(content.id)}`);
diff --git a/apps/web/src/components/app/split-layout/split-router/app-route-shell.tsx b/apps/web/src/components/app/split-layout/split-router/app-route-shell.tsx
new file mode 100644
index 0000000000..943ceb47a8
--- /dev/null
+++ b/apps/web/src/components/app/split-layout/split-router/app-route-shell.tsx
@@ -0,0 +1,96 @@
+import { useAnalytics } from '@app/lib/analytics/analytics-context';
+import { useFeatureFlag } from '@app/lib/analytics/posthog';
+import { useIsAuthenticated } from '@core/auth';
+import { LoadingBlock } from '@core/component/LoadingBlock';
+import { enableNewAppViews } from '@core/constant/featureFlags';
+import { isTouchDevice } from '@core/mobile/isTouchDevice';
+import {
+ type Component,
+ createRenderEffect,
+ createSignal,
+ type JSX,
+ onCleanup,
+ onMount,
+ Show,
+} from 'solid-js';
+import type { SplitContent } from '../layoutManager';
+import { useSplitPanelOrThrow } from '../layoutUtils';
+
+export function usePageViewTracking(pageTitle: string) {
+ const analytics = useAnalytics();
+ onMount(() => {
+ analytics.pageView(pageTitle);
+ analytics.track('open_view', { viewId: pageTitle });
+ });
+}
+
+export function withAuth<P extends object>(View: Component<P>): Component<P> {
+ return (props) => {
+ const authenticated = useIsAuthenticated();
+ return (
+ <Show when={authenticated()} fallback={<LoadingBlock />}>
+ <View {...props} />
+ </Show>
+ );
+ };
+}
+
+export function RedirectSplit(props: { to: SplitContent }) {
+ const panel = useSplitPanelOrThrow();
+ onMount(() => panel.handle.replace({ next: props.to }));
+ return null;
+}
+
+/** App-only feature gating and shell metadata; feature views stay route-agnostic. */
+export function NewAppView(props: {
+ id: string;
+ children: JSX.Element;
+ fallback: JSX.Element;
+ desktopOnly?: boolean;
+ composableOnTouch?: boolean;
+ detailRequested?: () => boolean;
+ detailFallback?: JSX.Element;
+ detailDesktopOnly?: boolean;
+}) {
+ usePageViewTracking(props.id);
+ const panel = useSplitPanelOrThrow();
+ const flag = useFeatureFlag(enableNewAppViews);
+ const [timedOut, setTimedOut] = createSignal(false);
+ const timer = setTimeout(() => setTimedOut(true), 5_000);
+ onCleanup(() => clearTimeout(timer));
+ const ready = () => !flag().loading || timedOut();
+ const enabled = () => ready() && flag().enabled;
+ const detailUnsupported = () =>
+ Boolean(
+ props.detailRequested?.() && props.detailDesktopOnly && isTouchDevice()
+ );
+ const surfaceSupported = () => !props.desktopOnly || !isTouchDevice();
+ const renderModern = () =>
+ enabled() && surfaceSupported() && !detailUnsupported();
+ const fallback = () => {
+ if (!props.detailRequested?.()) return props.fallback;
+ const detail = props.detailFallback;
+ return detail === undefined ? props.fallback : detail;
+ };
+ createRenderEffect(() => {
+ if (!ready()) return;
+ panel.handle.updateMeta?.({
+ splitPanelLayout:
+ renderModern() && (!isTouchDevice() || props.composableOnTouch)
+ ? 'composable'
+ : 'legacy',
+ });
+ });
+ return (
+ <Show
+ when={
+ ready() || (props.desktopOnly && isTouchDevice()) || detailUnsupported()
+ }
+ fallback={<LoadingBlock />}
+ >
+ <Show when={renderModern()} fallback={fallback()}>
+ {props.children}
+ </Show>
+ </Show>
+ );
+}
diff --git a/apps/web/src/components/app/split-layout/split-router/app-routes.ts b/apps/web/src/components/app/split-layout/split-router/app-routes.ts
index 530611bd5d..5d8c12da33 100644
--- a/apps/web/src/components/app/split-layout/split-router/app-routes.ts
+++ b/apps/web/src/components/app/split-layout/split-router/app-routes.ts
@@ -1,264 +1,29 @@
+import { activityRoute } from '@app/features/activity/route';
import {
- DRIVE_DOCUMENT_TYPES,
- driveDocumentBlockType,
-} from '@app/features/drive-view/primitives/drive-route-schema';
-import { inboxPreviewRouteParams } from '@app/features/inbox-view/inbox-route-schema';
+ agentChatsRoute,
+ agentsRoute,
+ agentsViewRoute,
+ codersRoute,
+} from '@app/features/agents-view/route';
+import { channelsSplitRoute } from '@app/features/channels-view/route';
+import { companiesRoute } from '@app/features/companies/route';
+import { driveSplitRoute } from '@app/features/drive-view/route';
+import { emailSplitRoute } from '@app/features/email-view/route';
+import { gettingStartedRoute } from '@app/features/getting-started/route';
+import { homeRoute } from '@app/features/home/route';
+import { inboxSplitRoute } from '@app/features/inbox-view/route';
import {
- defineRoute,
- defineRoutes,
- routeParams,
- type SplitRouterEntry,
-} from '@app/lib/split-router';
-import { URL_PARAMS as MARKDOWN_URL_PARAMS } from '@block-md/constants';
-import { URL_PARAMS as PDF_URL_PARAMS } from '@block-pdf/constants';
-import {
- settingsSlugToTab,
- settingsTabToSlug,
-} from '@core/constant/settingsTabsConfig';
-import { type Component, createComponent, lazy } from 'solid-js';
-import { z } from 'zod';
-import type { AppRouteViewId } from './app-views';
+ callsRoute,
+ foldersRoute,
+ recentRoute,
+ searchRoute,
+} from '@app/features/next-soup/route';
+import { remindersRoute } from '@app/features/reminders/route';
+import { settingsRoute } from '@app/features/settings/route';
+import { tasksSplitRoute } from '@app/features/tasks-view/route';
+import { defineRoutes } from '@app/lib/split-router';
import { handleLegacySplitPath, legacySplitRoute } from './legacy-route';
-const AppRouteRenderer = lazy(async () => ({
- default: (await import('./app-views')).AppRouteRenderer,
-}));
-
-/** Stable route bindings share one lazy application-view module boundary. */
-function appView(view: AppRouteViewId): Component {
- return () => createComponent(AppRouteRenderer, { view });
-}
-
-function viewDefinition<const TId extends string>(
- id: TId,
- view: AppRouteViewId,
- externalSearch: string[] = []
-) {
- return defineRoute({
- id: `view-${id}`,
- path: id,
- component: appView(view),
- search: '*' as const,
- externalSearch,
- claim: () => ({ namespace: 'component', id }),
- });
-}
-
-const driveDocumentParams = z.object({
- documentType: z.enum(DRIVE_DOCUMENT_TYPES),
- documentId: z.string().min(1),
-});
-export const driveRootDocumentRoute = defineRoute({
- id: 'drive-document',
- path: ':documentType/:documentId',
- params: driveDocumentParams,
- component: appView('drive-detail'),
- claim: ({ documentType, documentId }) => ({
- namespace: 'block',
- id: `${driveDocumentBlockType(documentType)}:${documentId}`,
- }),
-});
-export const driveFolderDocumentRoute = defineRoute({
- id: 'drive-folder-document',
- path: ':documentType/:documentId',
- params: driveDocumentParams,
- component: appView('drive-detail'),
- claim: ({ documentType, documentId }) => ({
- namespace: 'block',
- id: `${driveDocumentBlockType(documentType)}:${documentId}`,
- }),
-});
-export const driveTabDocumentRoute = defineRoute({
- id: 'drive-tab-document',
- path: ':documentType/:documentId',
- params: driveDocumentParams,
- component: appView('drive-detail'),
- claim: ({ documentType, documentId }) => ({
- namespace: 'block',
- id: `${driveDocumentBlockType(documentType)}:${documentId}`,
- }),
-});
-export const driveFolderRoute = defineRoute({
- id: 'drive-folder',
- path: 'folder/:folderId?',
- params: z
- .object({ folderId: z.string().min(1).optional() })
- .transform(({ folderId }) => ({ view: 'folder' as const, folderId })),
- children: [driveFolderDocumentRoute],
-});
-export const driveTabRoute = defineRoute({
- id: 'drive-tab',
- path: ':tab',
- aliases: ['tab/:tab'],
- params: z.object({ tab: z.enum(['recent', 'shared']) }),
- children: [driveTabDocumentRoute],
-});
-export const driveSplitRoute = defineRoute({
- id: 'drive',
- path: 'drive',
- aliases: ['drive/owned', 'drive/tab/owned'],
- params: z.object({}),
- component: appView('drive'),
- search: ['drive'],
- externalSearch: (entry: Readonly<SplitRouterEntry>) => {
- const type = routeParams<{ documentType?: string }>(
- entry.location.route
- ).documentType;
- if (
- type === 'md' ||
- type === 'task' ||
- type === 'snippet' ||
- type === 'skill'
- ) {
- return Object.values(MARKDOWN_URL_PARAMS);
- }
- return type === 'pdf' ? Object.values(PDF_URL_PARAMS) : [];
- },
- children: [driveFolderRoute, driveTabRoute, driveRootDocumentRoute],
-});
-
-export const settingsRoute = defineRoute({
- id: 'settings',
- path: 'settings/:tab?',
- params: z.object({
- tab: z
- .string()
- .refine((tab) => settingsSlugToTab(tab) !== undefined)
- .default(settingsTabToSlug('Account')),
- }),
- component: appView('settings'),
- claim: () => ({ namespace: 'component', id: 'settings' }),
- externalSearch: ['pair', 'createAgent'],
-});
-
-export const agentsRoute = defineRoute({
- id: 'agents',
- path: 'agents/:id',
- params: z.object({ id: z.string() }),
- component: appView('agents'),
- remountKey: ({ id }) => id,
- claim: ({ id }) => ({ namespace: 'agent', id }),
-});
-export const codersRoute = defineRoute({
- id: 'coders',
- path: 'coders/:id',
- params: z.object({ id: z.string() }),
- component: appView('agents'),
- remountKey: ({ id }) => id,
- claim: ({ id }) => ({ namespace: 'agent', id }),
-});
-export const agentChatsRoute = defineRoute({
- id: 'agent-chats',
- path: 'agents/chat/:id',
- aliases: ['agent-chats/:id'],
- params: z.object({ id: z.string() }),
- component: appView('agents'),
- remountKey: ({ id }) => id,
- claim: ({ id }) => ({ namespace: 'chat', id }),
-});
-
-export const homeRoute = viewDefinition('home', 'home');
-export const gettingStartedRoute = viewDefinition(
- 'getting-started',
- 'getting-started'
-);
-
-export const inboxPreviewRoute = defineRoute({
- id: 'inbox-preview',
- path: ':blockType/:previewId',
- params: inboxPreviewRouteParams,
- component: appView('inbox-detail'),
- remountKey: ({ blockType, previewId }) => `${blockType}:${previewId}`,
- claim: ({ blockType, previewId }) => ({
- namespace: 'block',
- id: `${blockType}:${previewId}`,
- }),
-});
-export const inboxSplitRoute = defineRoute({
- id: 'view-inbox',
- path: 'inbox',
- params: z.object({}),
- component: appView('inbox'),
- search: '*' as const,
- children: [inboxPreviewRoute],
-});
-
-export const recentRoute = viewDefinition('recent', 'recent');
-export const activityRoute = viewDefinition('activity', 'activity');
-export const remindersRoute = viewDefinition('reminders', 'reminders');
-export const agentsViewRoute = viewDefinition('agents', 'agents', [
- 'createAgent',
-]);
-
-export const emailThreadRoute = defineRoute({
- id: 'mail-thread',
- path: ':threadId',
- params: z.object({ threadId: z.string().min(1) }),
- component: appView('mail-detail'),
- externalSearch: ['email_message_id'],
- remountKey: ({ threadId }) => threadId,
- claim: ({ threadId }) => ({
- namespace: 'block',
- id: `email:${threadId}`,
- }),
-});
-export const emailSplitRoute = defineRoute({
- id: 'view-mail',
- path: 'mail',
- params: z.object({}),
- component: appView('mail'),
- search: '*' as const,
- children: [emailThreadRoute],
-});
-
-export const taskDetailRoute = defineRoute({
- id: 'tasks-task',
- path: ':taskId',
- params: z.object({ taskId: z.string().min(1) }),
- component: appView('tasks-detail'),
- remountKey: ({ taskId }) => taskId,
- claim: ({ taskId }) => ({
- namespace: 'block',
- id: `md:${taskId}`,
- }),
-});
-export const tasksSplitRoute = defineRoute({
- id: 'view-tasks',
- path: 'tasks',
- params: z.object({}),
- component: appView('tasks'),
- search: '*' as const,
- children: [taskDetailRoute],
-});
-
-export const channelDetailRoute = defineRoute({
- id: 'channels-channel',
- path: 'channel/:channelId',
- params: z.object({ channelId: z.string().min(1) }),
- component: appView('channels-detail'),
- externalSearch: ['channel_message_id', 'channel_thread_id'],
- remountKey: ({ channelId }) => channelId,
- claim: ({ channelId }) => ({
- namespace: 'block',
- id: `channel:${channelId}`,
- }),
-});
-export const channelsSplitRoute = defineRoute({
- id: 'view-channels',
- path: 'channels',
- params: z.object({}),
- component: appView('channels'),
- search: '*' as const,
- children: [channelDetailRoute],
-});
-
-export const callsRoute = viewDefinition('calls', 'calls');
-export const companiesRoute = viewDefinition('companies', 'companies', [
- 'crmView',
-]);
-export const foldersRoute = viewDefinition('folders', 'folders');
-export const searchRoute = viewDefinition('search', 'search');
-
export const appSplitRoutes = defineRoutes({
definitions: [
driveSplitRoute,
diff --git a/apps/web/src/components/app/split-layout/split-router/app-views.tsx b/apps/web/src/components/app/split-layout/split-router/app-views.tsx
deleted file mode 100644
index 626c4ac1af..0000000000
--- a/apps/web/src/components/app/split-layout/split-router/app-views.tsx
+++ /dev/null
@@ -1,653 +0,0 @@
-import { openEntityInSplit } from '@app/features/activity/open-entity-in-split';
-import { useActivityFeedFlag } from '@app/features/activity/use-activity-feed-flag';
-import { parseAgentsRoute } from '@app/features/agents-view/core/route';
-import { AgentsView } from '@app/features/agents-view/views/AgentsView';
-import { channelDetailSearch } from '@app/features/channels-view/channels-route';
-import {
- ChannelDetailRouteView,
- ChannelsView,
-} from '@app/features/channels-view/channels-view';
-import { DriveDetailView } from '@app/features/drive-view/components/DriveDetailView';
-import {
- DriveView,
- type DriveViewProps,
-} from '@app/features/drive-view/drive-view';
-import { URL_PARAMS as EMAIL_URL_PARAMS } from '@app/features/email-thread/core/location';
-import { EmailDetailRouteView } from '@app/features/email-view/components/EmailDetailView';
-import { emailDetailSearch } from '@app/features/email-view/email-route';
-import { EmailView } from '@app/features/email-view/email-view';
-import { GettingStarted } from '@app/features/getting-started';
-import { Home } from '@app/features/home';
-import {
- inboxPreviewLegacyTarget,
- inboxPreviewSearch,
-} from '@app/features/inbox-view/inbox-route';
-import {
- InboxDetailRouteView,
- InboxView,
-} from '@app/features/inbox-view/inbox-view';
-import { queryStateFrom } from '@app/features/next-soup/filters/filter-store';
-import type { SetPredicatesInput } from '@app/features/next-soup/filters/filter-store/predicates-store';
-import { mergeQuery } from '@app/features/next-soup/filters/filter-store/query-store';
-import type { Query } from '@app/features/next-soup/filters/filter-store/types';
-import { getViewPreset } from '@app/features/next-soup/sidebar/soup-filter-presets';
-import { useRecentViewFlag } from '@app/features/next-soup/use-recent-view-flag';
-import { McpConnections } from '@app/features/settings/McpConnections';
-import { SettingsPanelComponentWrapper } from '@app/features/settings/Settings';
-import { TasksDetailRouteView } from '@app/features/tasks-view/components/TasksDetailView';
-import { TasksView } from '@app/features/tasks-view/tasks-view';
-import { useAnalytics } from '@app/lib/analytics/analytics-context';
-import { useFeatureFlag, usePosthog } from '@app/lib/analytics/posthog';
-import { createSearchParams, useRouteParams } from '@app/lib/split-router';
-import { URL_PARAMS as CHANNEL_URL_PARAMS } from '@block-channel/constants';
-import {
- CRM_VIEW_URL_PARAM,
- decodeCrmViewParam,
-} from '@companies/crm/saved-views';
-import { useIsAuthenticated } from '@core/auth';
-import { LoadingBlock } from '@core/component/LoadingBlock';
-import {
- enableChatV3Agents,
- enableCrm,
- enableNewAppViews,
- enableReminders,
- isFeatureEnabled,
-} from '@core/constant/featureFlags';
-import { useUserContext } from '@core/context/user';
-import { isTouchDevice } from '@core/mobile/isTouchDevice';
-import { useAutomationEntities } from '@queries/agent-schedule/entities';
-import {
- type Component,
- createRenderEffect,
- createSignal,
- type JSX,
- lazy,
- onCleanup,
- onMount,
- Show,
-} from 'solid-js';
-import type { SplitContent } from '../layoutManager';
-import { useSplitPanelOrThrow } from '../layoutUtils';
-import {
- channelDetailRoute,
- emailThreadRoute,
- inboxPreviewRoute,
- taskDetailRoute,
-} from './app-routes';
-
-// Legacy fallbacks are loaded only when a view actually needs them.
-const SoupView = lazy(async () => ({
- default: (await import('@app/features/next-soup/soup-view/soup-view'))
- .SoupView,
-}));
-
-export function usePageViewTracking(pageTitle: string) {
- const analytics = useAnalytics();
- onMount(() => {
- analytics.pageView(pageTitle);
- analytics.track('open_view', { viewId: pageTitle });
- });
-}
-
-export function withAuth<P extends object>(View: Component<P>): Component<P> {
- return (props) => {
- const authenticated = useIsAuthenticated();
- return (
- <Show when={authenticated()} fallback={<LoadingBlock />}>
- <View {...props} />
- </Show>
- );
- };
-}
-
-export function RedirectSplit(props: { to: SplitContent }) {
- const panel = useSplitPanelOrThrow();
- onMount(() => panel.handle.replace({ next: props.to }));
- return null;
-}
-
-/** App-only feature gating and shell metadata; feature views stay route-agnostic. */
-function NewAppView(props: {
- id: string;
- children: JSX.Element;
- fallback: JSX.Element;
- desktopOnly?: boolean;
- composableOnTouch?: boolean;
- detailRequested?: () => boolean;
- detailFallback?: JSX.Element;
- detailDesktopOnly?: boolean;
-}) {
- usePageViewTracking(props.id);
- const panel = useSplitPanelOrThrow();
- const flag = useFeatureFlag(enableNewAppViews);
- const [timedOut, setTimedOut] = createSignal(false);
- const timer = setTimeout(() => setTimedOut(true), 5_000);
- onCleanup(() => clearTimeout(timer));
- const ready = () => !flag().loading || timedOut();
- const enabled = () => ready() && flag().enabled;
- const detailUnsupported = () =>
- Boolean(
- props.detailRequested?.() && props.detailDesktopOnly && isTouchDevice()
- );
- const surfaceSupported = () => !props.desktopOnly || !isTouchDevice();
- const renderModern = () =>
- enabled() && surfaceSupported() && !detailUnsupported();
- const fallback = () => {
- if (!props.detailRequested?.()) return props.fallback;
- // JSX props are getters: evaluate the chosen fallback only once.
- const detail = props.detailFallback;
- return detail === undefined ? props.fallback : detail;
- };
- createRenderEffect(() => {
- if (!ready()) return;
- panel.handle.updateMeta?.({
- splitPanelLayout:
- renderModern() && (!isTouchDevice() || props.composableOnTouch)
- ? 'composable'
- : 'legacy',
- });
- });
- return (
- <Show
- when={
- ready() || (props.desktopOnly && isTouchDevice()) || detailUnsupported()
- }
- fallback={<LoadingBlock />}
- >
- <Show when={renderModern()} fallback={fallback()}>
- {props.children}
- </Show>
- </Show>
- );
-}
-
-export const HomeView = withAuth(() => {
- usePageViewTracking('home');
- return <Home />;
-});
-export const GettingStartedView = withAuth(() => {
- usePageViewTracking('getting-started');
- return <GettingStarted />;
-});
-
-function LegacyInboxView() {
- const preset = getViewPreset('inbox');
- return (
- <SoupView
- viewName={isTouchDevice() ? 'Notifications' : 'Home'}
- initialFilters={preset?.filters}
- initialClientFilters={preset?.clientFilters}
- initialGroupBy={preset?.groupBy}
- disableLocalSearch
- />
- );
-}
-function InboxLegacyRouteView() {
- const params = useRouteParams(inboxPreviewRoute);
- const [search] = createSearchParams(inboxPreviewSearch);
- const detailRequested = () =>
- typeof params.blockType === 'string' &&
- typeof params.previewId === 'string';
-
- return (
- <Show when={detailRequested()} fallback={<LegacyInboxView />}>
- <RedirectSplit
- to={inboxPreviewLegacyTarget(params, search) as SplitContent}
- />
- </Show>
- );
-}
-
-export const InboxRouteView = withAuth(() => {
- const params = useRouteParams(inboxPreviewRoute);
- const detailRequested = () =>
- typeof params.blockType === 'string' &&
- typeof params.previewId === 'string';
-
- return (
- <NewAppView
- id="inbox"
- composableOnTouch
- detailDesktopOnly
- detailRequested={detailRequested}
- detailFallback={<InboxLegacyRouteView />}
- fallback={<LegacyInboxView />}
- >
- <InboxView />
- </NewAppView>
- );
-});
-
-function TrackedRecentView() {
- usePageViewTracking('recent');
- const preset = getViewPreset('recent');
- return (
- <SoupView
- viewName="Recent"
- initialFilters={preset?.filters}
- initialClientFilters={preset?.clientFilters}
- initialClientSort={['touched_at']}
- disableLocalSearch
- />
- );
-}
-export const RecentView = withAuth(() => {
- const enabled = useRecentViewFlag();
- const posthog = usePosthog();
- return (
- <Show
- when={enabled()}
- fallback={
- <Show when={posthog.flagsLoaded()}>
- <RedirectSplit to={{ type: 'component', id: 'inbox' }} />
- </Show>
- }
- >
- <TrackedRecentView />
- </Show>
- );
-});
-
-const MyActivityView = lazy(async () => ({
- default: (await import('@app/features/activity/views/my-activity-view'))
- .MyActivityView,
-}));
-function TrackedActivityView() {
- usePageViewTracking('activity');
- return <MyActivityView onOpen={openEntityInSplit} />;
-}
-export const ActivityView = withAuth(() => {
- const enabled = useActivityFeedFlag();
- const posthog = usePosthog();
- return (
- <Show
- when={enabled()}
- fallback={
- <Show when={posthog.flagsLoaded()}>
- <RedirectSplit to={{ type: 'component', id: 'inbox' }} />
- </Show>
- }
- >
- <TrackedActivityView />
- </Show>
- );
-});
-
-export const RemindersView = withAuth(() => {
- if (!isFeatureEnabled(enableReminders))
- return <RedirectSplit to={{ type: 'component', id: 'inbox' }} />;
- usePageViewTracking('reminders');
- const preset = getViewPreset('reminders');
- return (
- <SoupView
- viewName="Reminders"
- initialFilters={preset?.filters}
- initialClientFilters={preset?.clientFilters}
- initialGroupBy={preset?.groupBy}
- disableLocalSearch
- />
- );
-});
-
-function LegacyAgentsView() {
- const user = useUserContext();
- const preset = getViewPreset('agents', undefined, {
- userId: user.userId(),
- isTeamAdmin: false,
- });
- const entities = useAutomationEntities();
- return (
- <SoupView
- viewName="Agents"
- initialFilters={preset?.filters}
- initialClientFilters={preset?.clientFilters}
- initialGroupBy={preset?.groupBy}
- additionalEntities={entities}
- />
- );
-}
-export const AgentsRouteView = withAuth((params: Record<string, unknown>) => {
- const panel = useSplitPanelOrThrow();
- const route = parseAgentsRoute(
- typeof params.agentsRoute === 'string'
- ? params.agentsRoute
- : panel.handle.content().id
- );
- usePageViewTracking('agents');
- const flag = useFeatureFlag(enableChatV3Agents);
- const enabled = () => flag().enabled && !isTouchDevice();
- const connectionsRequested = () => {
- const content = panel.handle.content();
- return (
- content.type === 'component' &&
- content.params?.agentPage === 'connections'
- );
- };
- createRenderEffect(() => {
- if (!flag().loading)
- panel.handle.updateMeta?.({
- splitPanelLayout: enabled() ? 'composable' : 'legacy',
- });
- });
- return (
- <Show when={!flag().loading} fallback={<LoadingBlock />}>
- <Show
- when={enabled()}
- fallback={
- <Show
- when={connectionsRequested()}
- fallback={
- route ? (
- <RedirectSplit
- to={{
- type:
- route.conversation.type === 'agent_session'
- ? 'agent'
- : 'chat',
- id: route.conversation.id,
- }}
- />
- ) : (
- <LegacyAgentsView />
- )
- }
- >
- <McpConnections />
- </Show>
- }
- >
- <AgentsView initialRoute={route} />
- </Show>
- </Show>
- );
-});
-
-function LegacyMailView() {
- const preset = getViewPreset('mail');
- return (
- <SoupView
- viewName="Email"
- initialFilters={preset?.filters}
- initialClientFilters={preset?.clientFilters}
- initialGroupBy={preset?.groupBy}
- />
- );
-}
-function MailLegacyRouteView() {
- const params = useRouteParams(emailThreadRoute);
- const [search] = createSearchParams(emailDetailSearch);
- const legacyThread = (id: string): SplitContent => {
- const params: Record<string, string> = {};
- if (search.messageId) params[EMAIL_URL_PARAMS.messageId] = search.messageId;
- return { type: 'email', id, params };
- };
-
- return (
- <Show when={params.threadId} fallback={<LegacyMailView />}>
- {(threadId) => <RedirectSplit to={legacyThread(threadId())} />}
- </Show>
- );
-}
-
-export const MailView = withAuth(() => {
- const params = useRouteParams(emailThreadRoute);
- const detailRequested = () => typeof params.threadId === 'string';
-
- return (
- <NewAppView
- id="mail"
- detailDesktopOnly
- detailRequested={detailRequested}
- detailFallback={<MailLegacyRouteView />}
- fallback={<LegacyMailView />}
- >
- <EmailView />
- </NewAppView>
- );
-});
-
-export const DriveRouteView = withAuth(
- (
- props: DriveViewProps & {
- initialFilters?: Query;
- initialClientFilters?: SetPredicatesInput<string>;
- }
- ) => {
- const user = useUserContext();
- const preset = getViewPreset('documents', undefined, {
- userId: user.userId(),
- isTeamAdmin: false,
- });
- const initialFilters =
- preset?.filters && props.initialFilters
- ? mergeQuery(queryStateFrom(preset.filters), props.initialFilters)
- : (props.initialFilters ?? preset?.filters);
- const initialClientFilters =
- preset?.clientFilters && props.initialClientFilters
- ? {
- and: [
- ...new Set([
- ...(preset.clientFilters.and ?? []),
- ...(props.initialClientFilters.and ?? []),
- ]),
- ],
- or: [
- ...new Set([
- ...(preset.clientFilters.or ?? []),
- ...(props.initialClientFilters.or ?? []),
- ]),
- ],
- }
- : (props.initialClientFilters ?? preset?.clientFilters);
- return (
- <NewAppView
- id="documents"
- composableOnTouch
- fallback={
- <SoupView
- viewName="Files"
- initialFilters={initialFilters}
- initialClientFilters={initialClientFilters}
- initialGroupBy={preset?.groupBy}
- />
- }
- >
- <DriveView initialFacets={props.initialFacets} />
- </NewAppView>
- );
- }
-);
-
-function LegacyTasksView() {
- const user = useUserContext();
- const preset = getViewPreset('tasks', undefined, {
- userId: user.userId(),
- isTeamAdmin: false,
- });
- return (
- <SoupView
- viewName="Tasks"
- initialFilters={preset?.filters}
- initialClientFilters={preset?.clientFilters}
- initialGroupBy={preset?.groupBy}
- />
- );
-}
-function TasksLegacyRouteView() {
- const params = useRouteParams(taskDetailRoute);
- return (
- <Show when={params.taskId} fallback={<LegacyTasksView />}>
- {(taskId) => <RedirectSplit to={{ type: 'task', id: taskId() }} />}
- </Show>
- );
-}
-
-export const TasksRouteView = withAuth(() => {
- const params = useRouteParams(taskDetailRoute);
- const detailRequested = () => typeof params.taskId === 'string';
-
- return (
- <NewAppView
- id="tasks"
- composableOnTouch
- detailDesktopOnly
- detailRequested={detailRequested}
- detailFallback={<TasksLegacyRouteView />}
- fallback={<LegacyTasksView />}
- >
- <TasksView />
- </NewAppView>
- );
-});
-
-function LegacyChannelsView() {
- const preset = getViewPreset('channels');
- return (
- <SoupView
- viewName="Channels"
- initialFilters={preset?.filters}
- initialClientFilters={preset?.clientFilters}
- initialGroupBy={preset?.groupBy}
- />
- );
-}
-function ChannelsLegacyRouteView() {
- const params = useRouteParams(channelDetailRoute);
- const [search] = createSearchParams(channelDetailSearch);
- const legacyChannel = (id: string): SplitContent => {
- const params: Record<string, string> = {};
- if (search.messageId) params[CHANNEL_URL_PARAMS.message] = search.messageId;
- if (search.threadId) params[CHANNEL_URL_PARAMS.thread] = search.threadId;
- return { type: 'channel', id, params };
- };
-
- return (
- <Show when={params.channelId} fallback={<LegacyChannelsView />}>
- {(channelId) => <RedirectSplit to={legacyChannel(channelId())} />}
- </Show>
- );
-}
-
-export const ChannelsRouteView = withAuth(() => {
- const params = useRouteParams(channelDetailRoute);
- const detailRequested = () => typeof params.channelId === 'string';
-
- return (
- <NewAppView
- id="channels"
- detailDesktopOnly
- detailRequested={detailRequested}
- detailFallback={<ChannelsLegacyRouteView />}
- fallback={<LegacyChannelsView />}
- >
- <ChannelsView />
- </NewAppView>
- );
-});
-
-export const CallsView = withAuth(() => {
- usePageViewTracking('calls');
- const preset = getViewPreset('calls');
- return (
- <SoupView
- viewName="Calls"
- initialFilters={preset?.filters}
- initialClientFilters={preset?.clientFilters}
- initialGroupBy={preset?.groupBy}
- />
- );
-});
-export const CompaniesView = withAuth(() => {
- if (!isFeatureEnabled(enableCrm))
- return <RedirectSplit to={{ type: 'component', id: 'inbox' }} />;
- usePageViewTracking('companies');
- const panel = useSplitPanelOrThrow();
- createRenderEffect(() =>
- panel.handle.updateMeta?.({
- splitPanelLayout: isTouchDevice() ? 'legacy' : 'composable',
- })
- );
- const preset = getViewPreset('companies');
- const crmView = new URLSearchParams(window.location.search).get(
- CRM_VIEW_URL_PARAM
- );
- return (
- <SoupView
- viewName="Customers"
- initialFilters={preset?.filters}
- initialClientFilters={preset?.clientFilters}
- initialGroupBy={preset?.groupBy}
- initialCrmView={crmView ? decodeCrmViewParam(crmView) : undefined}
- />
- );
-});
-export const FoldersView = withAuth(() => {
- usePageViewTracking('folders');
- const user = useUserContext();
- const preset = getViewPreset('folders', undefined, {
- userId: user.userId(),
- isTeamAdmin: false,
- });
- return (
- <SoupView
- viewName="Folders"
- initialFilters={preset?.filters}
- initialClientFilters={preset?.clientFilters}
- initialGroupBy={preset?.groupBy}
- />
- );
-});
-export const SearchView = withAuth(
- (props: {
- initialQuery?: string;
- initialFilters?: Query;
- initialClientFilters?: SetPredicatesInput<string>;
- }) => {
- usePageViewTracking('search');
- const preset = getViewPreset('search');
- return (
- <SoupView
- viewName="Search"
- initialFilters={props.initialFilters ?? preset?.filters}
- initialClientFilters={
- props.initialClientFilters ?? preset?.clientFilters
- }
- initialSearchText={props.initialQuery}
- />
- );
- }
-);
-export const SettingsView = SettingsPanelComponentWrapper;
-
-const appRouteViews = {
- home: HomeView,
- 'getting-started': GettingStartedView,
- inbox: InboxRouteView,
- 'inbox-detail': InboxDetailRouteView,
- recent: RecentView,
- activity: ActivityView,
- reminders: RemindersView,
- agents: AgentsRouteView,
- mail: MailView,
- 'mail-detail': EmailDetailRouteView,
- drive: DriveRouteView,
- 'drive-detail': DriveDetailView,
- tasks: TasksRouteView,
- 'tasks-detail': TasksDetailRouteView,
- channels: ChannelsRouteView,
- 'channels-detail': ChannelDetailRouteView,
- calls: CallsView,
- companies: CompaniesView,
- folders: FoldersView,
- search: SearchView,
- settings: SettingsView,
-} as const;
-
-export type AppRouteViewId = keyof typeof appRouteViews;
-
-/** Shared lazy boundary target for every application route component. */
-export function AppRouteRenderer(props: { view: AppRouteViewId }) {
- const View = appRouteViews[props.view] as Component<Record<string, unknown>>;
- const content = useSplitPanelOrThrow().handle.content();
- return <View {...(content.type === 'component' ? content.params : {})} />;
-}
diff --git a/apps/web/src/components/app/split-layout/tests/activity-registration.test.tsx b/apps/web/src/components/app/split-layout/tests/activity-registration.test.tsx
index d9a6a36138..e69e00eab9 100644
--- a/apps/web/src/components/app/split-layout/tests/activity-registration.test.tsx
+++ b/apps/web/src/components/app/split-layout/tests/activity-registration.test.tsx
@@ -41,7 +41,6 @@ vi.mock('@app/features/activity/open-entity-in-split', () => ({
// Quarantine unrelated registered views and their module-load side effects.
// Route/preview codecs otherwise pull the full block-definition graph into this test.
-vi.mock('../split-router/app-routes', () => ({}));
vi.mock('@app/features/inbox-view/inbox-route', () => ({}));
vi.mock('@app/features/agents-view/views/AgentsView', () => ({}));
vi.mock('@app/features/channels-view/channels-view', () => ({
diff --git a/apps/web/src/components/app/split-layout/tests/app-route-isolation.test.ts b/apps/web/src/components/app/split-layout/tests/app-route-isolation.test.ts
index e387a5708e..6f3ce02eb4 100644
--- a/apps/web/src/components/app/split-layout/tests/app-route-isolation.test.ts
+++ b/apps/web/src/components/app/split-layout/tests/app-route-isolation.test.ts
@@ -16,12 +16,48 @@ vi.mock('@service-connection/websocket', () => ({
createConnectionWebsocketEffect: vi.fn(),
}));
-vi.mock('../split-router/app-views', () => {
- throw new Error('Route declarations must not eagerly load application views');
+vi.mock('@app/features/activity/views/my-activity-view', () => {
+ throw new Error('Route declarations must not eagerly load activity views');
+});
+vi.mock('@app/features/agents-view/views/AgentsView', () => {
+ throw new Error('Route declarations must not eagerly load agent views');
+});
+vi.mock('@app/features/channels-view/channels-view', () => {
+ throw new Error('Route declarations must not eagerly load channel views');
+});
+vi.mock('@app/features/drive-view/drive-view', () => {
+ throw new Error('Route declarations must not eagerly load Drive views');
});
vi.mock('@app/features/drive-view/components/DriveDetailView', () => {
throw new Error('Route declarations must not eagerly load document views');
});
+vi.mock('@app/features/email-view/email-view', () => {
+ throw new Error('Route declarations must not eagerly load email views');
+});
+vi.mock('@app/features/email-view/components/EmailDetailView', () => {
+ throw new Error('Route declarations must not eagerly load email details');
+});
+vi.mock('@app/features/getting-started', () => {
+ throw new Error('Route declarations must not eagerly load onboarding views');
+});
+vi.mock('@app/features/home', () => {
+ throw new Error('Route declarations must not eagerly load home views');
+});
+vi.mock('@app/features/inbox-view/inbox-view', () => {
+ throw new Error('Route declarations must not eagerly load inbox views');
+});
+vi.mock('@app/features/next-soup/soup-view/soup-view', () => {
+ throw new Error('Route declarations must not eagerly load Soup views');
+});
+vi.mock('@app/features/settings/Settings', () => {
+ throw new Error('Route declarations must not eagerly load settings views');
+});
+vi.mock('@app/features/tasks-view/tasks-view', () => {
+ throw new Error('Route declarations must not eagerly load task views');
+});
+vi.mock('@app/features/tasks-view/components/TasksDetailView', () => {
+ throw new Error('Route declarations must not eagerly load task details');
+});
describe('application route import isolation', () => {
it('builds and decodes routes without initializing view modules', () => {
@@ -31,8 +67,12 @@ describe('application route import isolation', () => {
['tasks'],
['settings', 'account'],
['drive', 'md', 'doc'],
+ ['channels', 'channel-id'],
]) {
expect(decodeRoute(routes, path)).toBeDefined();
}
+ expect(decodeRoute(routes, ['channels', 'channel', 'channel-id'])).toBe(
+ undefined
+ );
});
});
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.ts
index 42007ab02f..769df6c73f 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,11 +1,17 @@
import { agentsRouteId } from '@app/features/agents-view/core/route';
import { driveDestination } from '@app/features/drive-view/drive-route-navigation';
+import { driveSplitRoute } from '@app/features/drive-view/route';
+import {
+ emailSplitRoute,
+ emailThreadRoute,
+} from '@app/features/email-view/route';
import {
getListNavigationSource,
listNavigationSourceId,
registerListNavigationSource,
withListNavigationSource,
} from '@app/features/soup/collection/list-navigation-source';
+import { taskDetailRoute } from '@app/features/tasks-view/route';
import { createMemorySplitRouterLocation } from '@app/lib/split-router/integrations/memory';
import { createSplitRouter } from '@app/lib/split-router/router';
import { createRoutesManifest } from '@app/lib/split-router/routes';
@@ -25,13 +31,7 @@ import {
} from '../layoutUtils';
import { createMobileSwipeLayout } from '../mobile/createMobileSwipeLayout';
import { createAppSplitRouterMiddleware } from '../split-router/app-middleware';
-import {
- appSplitRoutes,
- driveSplitRoute,
- emailSplitRoute,
- emailThreadRoute,
- taskDetailRoute,
-} from '../split-router/app-routes';
+import { appSplitRoutes } from '../split-router/app-routes';
import { createAppSplitRouterLayout } from '../splitRouterLayout';
vi.mock('@core/component/Toast/Toast', () => ({
@@ -896,7 +896,7 @@ describe('layoutManager', () => {
it('normalizes legacy search per detail pane without overriding canonical values', async () => {
const { manager, location, router, dispose } = ingressRouter(
- '/mail/one/~/channels/channel/c1/~/mail/two/~/mail' +
+ '/mail/one/~/channels/c1/~/mail/two/~/mail' +
'?email_message_id=legacy&channel_message_id=first&channel_message_id=last' +
'&channel_thread_id=thread&s0.email-detail.messageId=explicit' +
'&s0.email-detail.extra=keep&s2.email-detail.messageId=&referral_code=code#focus'
diff --git a/apps/web/src/features/activity/route.tsx b/apps/web/src/features/activity/route.tsx
new file mode 100644
index 0000000000..d2fc99a6f8
--- /dev/null
+++ b/apps/web/src/features/activity/route.tsx
@@ -0,0 +1,44 @@
+import { usePosthog } from '@app/lib/analytics/posthog';
+import { defineRoute } from '@app/lib/split-router';
+import {
+ RedirectSplit,
+ usePageViewTracking,
+ withAuth,
+} from '@components/app/split-layout/split-router/app-route-shell';
+import { lazy, Show } from 'solid-js';
+import { openEntityInSplit } from './open-entity-in-split';
+import { useActivityFeedFlag } from './use-activity-feed-flag';
+
+const MyActivityView = lazy(async () => ({
+ default: (await import('./views/my-activity-view')).MyActivityView,
+}));
+
+function TrackedActivityView() {
+ usePageViewTracking('activity');
+ return <MyActivityView onOpen={openEntityInSplit} />;
+}
+
+export const ActivityRouteView = withAuth(() => {
+ const enabled = useActivityFeedFlag();
+ const posthog = usePosthog();
+ return (
+ <Show
+ when={enabled()}
+ fallback={
+ <Show when={posthog.flagsLoaded()}>
+ <RedirectSplit to={{ type: 'component', id: 'inbox' }} />
+ </Show>
+ }
+ >
+ <TrackedActivityView />
+ </Show>
+ );
+});
+
+export const activityRoute = defineRoute({
+ id: 'view-activity',
+ path: 'activity',
+ component: ActivityRouteView,
+ search: '*' as const,
+ claim: () => ({ namespace: 'component', id: 'activity' }),
+});
diff --git a/apps/web/src/features/agents-view/route.tsx b/apps/web/src/features/agents-view/route.tsx
new file mode 100644
index 0000000000..6adc72fb6d
--- /dev/null
+++ b/apps/web/src/features/agents-view/route.tsx
@@ -0,0 +1,142 @@
+import { useFeatureFlag } from '@app/lib/analytics/posthog';
+import { defineRoute } from '@app/lib/split-router';
+import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
+import {
+ RedirectSplit,
+ usePageViewTracking,
+ withAuth,
+} from '@components/app/split-layout/split-router/app-route-shell';
+import { LoadingBlock } from '@core/component/LoadingBlock';
+import { enableChatV3Agents } from '@core/constant/featureFlags';
+import { useUserContext } from '@core/context/user';
+import { isTouchDevice } from '@core/mobile/isTouchDevice';
+import { useAutomationEntities } from '@queries/agent-schedule/entities';
+import { createRenderEffect, lazy, Show } from 'solid-js';
+import { z } from 'zod';
+import { getViewPreset } from '../next-soup/sidebar/soup-filter-presets';
+import { parseAgentsRoute } from './core/route';
+
+const SoupView = lazy(async () => ({
+ default: (await import('../next-soup/soup-view/soup-view')).SoupView,
+}));
+const AgentsView = lazy(async () => ({
+ default: (await import('./views/AgentsView')).AgentsView,
+}));
+const McpConnections = lazy(async () => ({
+ default: (await import('../settings/McpConnections')).McpConnections,
+}));
+
+function LegacyAgentsView() {
+ const user = useUserContext();
+ const preset = getViewPreset('agents', undefined, {
+ userId: user.userId(),
+ isTeamAdmin: false,
+ });
+ const entities = useAutomationEntities();
+ return (
+ <SoupView
+ viewName="Agents"
+ initialFilters={preset?.filters}
+ initialClientFilters={preset?.clientFilters}
+ initialGroupBy={preset?.groupBy}
+ additionalEntities={entities}
+ />
+ );
+}
+
+export const AgentsRouteView = withAuth(() => {
+ const panel = useSplitPanelOrThrow();
+ const route = () => {
+ const content = panel.handle.content();
+ const requested =
+ content.type === 'component' &&
+ typeof content.params?.agentsRoute === 'string'
+ ? content.params.agentsRoute
+ : content.id;
+ return parseAgentsRoute(requested);
+ };
+ usePageViewTracking('agents');
+ const flag = useFeatureFlag(enableChatV3Agents);
+ const enabled = () => flag().enabled && !isTouchDevice();
+ const connectionsRequested = () => {
+ const content = panel.handle.content();
+ return (
+ content.type === 'component' &&
+ content.params?.agentPage === 'connections'
+ );
+ };
+ createRenderEffect(() => {
+ if (!flag().loading)
+ panel.handle.updateMeta?.({
+ splitPanelLayout: enabled() ? 'composable' : 'legacy',
+ });
+ });
+ return (
+ <Show when={!flag().loading} fallback={<LoadingBlock />}>
+ <Show
+ when={enabled()}
+ fallback={
+ <Show
+ when={connectionsRequested()}
+ fallback={
+ <Show when={route()} fallback={<LegacyAgentsView />}>
+ {(current) => (
+ <RedirectSplit
+ to={{
+ type:
+ current().conversation.type === 'agent_session'
+ ? 'agent'
+ : 'chat',
+ id: current().conversation.id,
+ }}
+ />
+ )}
+ </Show>
+ }
+ >
+ <McpConnections />
+ </Show>
+ }
+ >
+ <AgentsView initialRoute={route()} />
+ </Show>
+ </Show>
+ );
+});
+
+export const agentsRoute = defineRoute({
+ id: 'agents',
+ path: 'agents/:id',
+ params: z.object({ id: z.string() }),
+ component: AgentsRouteView,
+ remountKey: ({ id }) => id,
+ claim: ({ id }) => ({ namespace: 'agent', id }),
+});
+
+export const codersRoute = defineRoute({
+ id: 'coders',
+ path: 'coders/:id',
+ params: z.object({ id: z.string() }),
+ component: AgentsRouteView,
+ remountKey: ({ id }) => id,
+ claim: ({ id }) => ({ namespace: 'agent', id }),
+});
+
+export const agentChatsRoute = defineRoute({
+ id: 'agent-chats',
+ path: 'agents/chat/:id',
+ aliases: ['agent-chats/:id'],
+ params: z.object({ id: z.string() }),
+ component: AgentsRouteView,
+ remountKey: ({ id }) => id,
+ claim: ({ id }) => ({ namespace: 'chat', id }),
+});
+
+export const agentsViewRoute = defineRoute({
+ id: 'view-agents',
+ path: 'agents',
+ component: AgentsRouteView,
+ search: '*' as const,
+ externalSearch: ['createAgent'],
+ claim: () => ({ namespace: 'component', id: 'agents' }),
+});
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 2dc5630364..a8f49f5762 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
@@ -155,7 +155,7 @@ describe('ChannelsViewProvider route selection', () => {
});
it('derives accepted selection from a direct detail route', () => {
const { context } = mountProvider(
- '/channels/channel/c1?s0.channel-detail.messageId=m1&s0.channel-detail.threadId=t1'
+ '/channels/c1?s0.channel-detail.messageId=m1&s0.channel-detail.threadId=t1'
);
expect(context.selectedChannel()).toEqual({
@@ -178,7 +178,7 @@ describe('ChannelsViewProvider route selection', () => {
).toBe(true);
await router.settled();
expect(location.read()).toMatchObject({
- pathname: '/channels/channel/c1',
+ pathname: '/channels/c1',
search: '?s0.channel-detail.messageId=m1&s0.channel-detail.threadId=t1',
});
expect(context.selectedChannel()?.id).toBe('c1');
@@ -190,24 +190,20 @@ describe('ChannelsViewProvider route selection', () => {
});
it('keeps the accepted route when compatibility preflight refuses a request', async () => {
- const { context, location, router } = mountProvider(
- '/channels/channel/current'
- );
+ const { context, location, router } = mountProvider('/channels/current');
guard.allow = false;
expect(context.setSelectedChannel({ type: 'channel', id: 'blocked' })).toBe(
false
);
await router.settled();
- expect(location.read().pathname).toBe('/channels/channel/current');
+ expect(location.read().pathname).toBe('/channels/current');
expect(context.selectedChannel()?.id).toBe('current');
});
it('replaces a directly loaded incompatible preview with the list route', async () => {
guard.allow = false;
- const { context, location, router } = mountProvider(
- '/channels/channel/blocked'
- );
+ const { context, location, router } = mountProvider('/channels/blocked');
await router.settled();
expect(location.read().pathname).toBe('/channels');
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 6b2c792703..4abdca4d5a 100644
--- a/apps/web/src/features/channels-view/channels-view-context.tsx
+++ b/apps/web/src/features/channels-view/channels-view-context.tsx
@@ -10,10 +10,6 @@ import {
} from '@app/lib/split-router';
import { createPreviewSelectionGuard } from '@components/app/createPreviewSelectionGuard';
import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
-import {
- channelDetailRoute,
- channelsSplitRoute,
-} from '@components/app/split-layout/split-router/app-routes';
import { createAssertedContextProvider } from '@core/context/createContext';
import { useUserId } from '@core/context/user';
import { isTouchDevice } from '@core/mobile/isTouchDevice';
@@ -31,6 +27,7 @@ import {
clampChannelsRailWidth,
} from './constants';
import { createChannelsViewPersistence } from './persistence';
+import { channelDetailRoute, channelsSplitRoute } from './route';
import type {
ChannelListSort,
ChannelsGroup,
diff --git a/apps/web/src/features/channels-view/route.tsx b/apps/web/src/features/channels-view/route.tsx
new file mode 100644
index 0000000000..4fe2ba6bba
--- /dev/null
+++ b/apps/web/src/features/channels-view/route.tsx
@@ -0,0 +1,93 @@
+import {
+ createSearchParams,
+ defineRoute,
+ useParams,
+} from '@app/lib/split-router';
+import { URL_PARAMS as CHANNEL_URL_PARAMS } from '@block-channel/constants';
+import type { SplitContent } from '@components/app/split-layout/layoutManager';
+import {
+ NewAppView,
+ RedirectSplit,
+ withAuth,
+} from '@components/app/split-layout/split-router/app-route-shell';
+import { lazy, Show } from 'solid-js';
+import { z } from 'zod';
+import { getViewPreset } from '../next-soup/sidebar/soup-filter-presets';
+import { channelDetailSearch } from './channels-route';
+
+const SoupView = lazy(async () => ({
+ default: (await import('../next-soup/soup-view/soup-view')).SoupView,
+}));
+const ChannelsView = lazy(async () => ({
+ default: (await import('./channels-view')).ChannelsView,
+}));
+const ChannelDetailRouteView = lazy(async () => ({
+ default: (await import('./channels-view')).ChannelDetailRouteView,
+}));
+
+function LegacyChannelsView() {
+ const preset = getViewPreset('channels');
+ return (
+ <SoupView
+ viewName="Channels"
+ initialFilters={preset?.filters}
+ initialClientFilters={preset?.clientFilters}
+ initialGroupBy={preset?.groupBy}
+ />
+ );
+}
+
+function ChannelsLegacyRouteView() {
+ const params = useParams<{ channelId?: string }>();
+ const [search] = createSearchParams(channelDetailSearch);
+ const legacyChannel = (id: string): SplitContent => {
+ const params: Record<string, string> = {};
+ if (search.messageId) params[CHANNEL_URL_PARAMS.message] = search.messageId;
+ if (search.threadId) params[CHANNEL_URL_PARAMS.thread] = search.threadId;
+ return { type: 'channel', id, params };
+ };
+
+ return (
+ <Show when={params.channelId} fallback={<LegacyChannelsView />}>
+ {(channelId) => <RedirectSplit to={legacyChannel(channelId())} />}
+ </Show>
+ );
+}
+
+export const ChannelsRouteView = withAuth(() => {
+ const params = useParams<{ channelId?: string }>();
+ const detailRequested = () => typeof params.channelId === 'string';
+
+ return (
+ <NewAppView
+ id="channels"
+ detailDesktopOnly
+ detailRequested={detailRequested}
+ detailFallback={<ChannelsLegacyRouteView />}
+ fallback={<LegacyChannelsView />}
+ >
+ <ChannelsView />
+ </NewAppView>
+ );
+});
+
+export const channelDetailRoute = defineRoute({
+ id: 'channels-channel',
+ path: ':channelId',
+ params: z.object({ channelId: z.string().min(1) }),
+ component: ChannelDetailRouteView,
+ externalSearch: ['channel_message_id', 'channel_thread_id'],
+ remountKey: ({ channelId }) => channelId,
+ claim: ({ channelId }) => ({
+ namespace: 'block',
+ id: `channel:${channelId}`,
+ }),
+});
+
+export const channelsSplitRoute = defineRoute({
+ id: 'view-channels',
+ path: 'channels',
+ component: ChannelsRouteView,
+ search: '*' as const,
+ children: [channelDetailRoute],
+});
diff --git a/apps/web/src/features/companies/route.tsx b/apps/web/src/features/companies/route.tsx
new file mode 100644
index 0000000000..cf3134396b
--- /dev/null
+++ b/apps/web/src/features/companies/route.tsx
@@ -0,0 +1,53 @@
+import { defineRoute } from '@app/lib/split-router';
+import {
+ CRM_VIEW_URL_PARAM,
+ decodeCrmViewParam,
+} from '@companies/crm/saved-views';
+import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
+import {
+ RedirectSplit,
+ usePageViewTracking,
+ withAuth,
+} from '@components/app/split-layout/split-router/app-route-shell';
+import { enableCrm, isFeatureEnabled } from '@core/constant/featureFlags';
+import { isTouchDevice } from '@core/mobile/isTouchDevice';
+import { createRenderEffect, lazy } from 'solid-js';
+import { getViewPreset } from '../next-soup/sidebar/soup-filter-presets';
+
+const SoupView = lazy(async () => ({
+ default: (await import('../next-soup/soup-view/soup-view')).SoupView,
+}));
+
+export const CompaniesRouteView = withAuth(() => {
+ if (!isFeatureEnabled(enableCrm))
+ return <RedirectSplit to={{ type: 'component', id: 'inbox' }} />;
+ usePageViewTracking('companies');
+ const panel = useSplitPanelOrThrow();
+ createRenderEffect(() =>
+ panel.handle.updateMeta?.({
+ splitPanelLayout: isTouchDevice() ? 'legacy' : 'composable',
+ })
+ );
+ const preset = getViewPreset('companies');
+ const crmView = new URLSearchParams(window.location.search).get(
+ CRM_VIEW_URL_PARAM
+ );
+ return (
+ <SoupView
+ viewName="Customers"
+ initialFilters={preset?.filters}
+ initialClientFilters={preset?.clientFilters}
+ initialGroupBy={preset?.groupBy}
+ initialCrmView={crmView ? decodeCrmViewParam(crmView) : undefined}
+ />
+ );
+});
+
+export const companiesRoute = defineRoute({
+ id: 'view-companies',
+ path: 'companies',
+ component: CompaniesRouteView,
+ search: '*' as const,
+ externalSearch: ['crmView'],
+ claim: () => ({ namespace: 'component', id: 'companies' }),
+});
diff --git a/apps/web/src/features/drive-view/drive-route-navigation.ts b/apps/web/src/features/drive-view/drive-route-navigation.ts
index 660d5bdff2..f01805bfbc 100644
--- a/apps/web/src/features/drive-view/drive-route-navigation.ts
+++ b/apps/web/src/features/drive-view/drive-route-navigation.ts
@@ -1,3 +1,6 @@
+import { match } from 'ts-pattern';
+import type { DriveLocation } from './core/types';
+import type { DriveDocumentRoute } from './primitives/drive-route';
import {
driveFolderDocumentRoute,
driveFolderRoute,
@@ -5,10 +8,7 @@ import {
driveSplitRoute,
driveTabDocumentRoute,
driveTabRoute,
-} from '@components/app/split-layout/split-router/app-routes';
-import { match } from 'ts-pattern';
-import type { DriveLocation } from './core/types';
-import type { DriveDocumentRoute } from './primitives/drive-route';
+} from './route';
/** Maps Drive domain selection to a route, including its folder/tab params. */
export function driveDestination(
diff --git a/apps/web/src/features/drive-view/route.tsx b/apps/web/src/features/drive-view/route.tsx
new file mode 100644
index 0000000000..a6ad0b4d9f
--- /dev/null
+++ b/apps/web/src/features/drive-view/route.tsx
@@ -0,0 +1,172 @@
+import {
+ defineRoute,
+ routeParams,
+ type SplitRouterEntry,
+} from '@app/lib/split-router';
+import { URL_PARAMS as MARKDOWN_URL_PARAMS } from '@block-md/constants';
+import { URL_PARAMS as PDF_URL_PARAMS } from '@block-pdf/constants';
+import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
+import {
+ NewAppView,
+ withAuth,
+} from '@components/app/split-layout/split-router/app-route-shell';
+import { useUserContext } from '@core/context/user';
+import { lazy } from 'solid-js';
+import { z } from 'zod';
+import { queryStateFrom } from '../next-soup/filters/filter-store';
+import type { SetPredicatesInput } from '../next-soup/filters/filter-store/predicates-store';
+import { mergeQuery } from '../next-soup/filters/filter-store/query-store';
+import type { Query } from '../next-soup/filters/filter-store/types';
+import { getViewPreset } from '../next-soup/sidebar/soup-filter-presets';
+import type { DriveViewProps } from './drive-view';
+import {
+ DRIVE_DOCUMENT_TYPES,
+ driveDocumentBlockType,
+} from './primitives/drive-route-schema';
+
+const SoupView = lazy(async () => ({
+ default: (await import('../next-soup/soup-view/soup-view')).SoupView,
+}));
+const DriveView = lazy(async () => ({
+ default: (await import('./drive-view')).DriveView,
+}));
+const DriveDetailView = lazy(async () => ({
+ default: (await import('./components/DriveDetailView')).DriveDetailView,
+}));
+
+type DriveRouteViewProps = DriveViewProps & {
+ initialFilters?: Query;
+ initialClientFilters?: SetPredicatesInput<string>;
+};
+
+export const DriveRouteView = withAuth(() => {
+ const panel = useSplitPanelOrThrow();
+ const props = (): DriveRouteViewProps => {
+ const content = panel.handle.content();
+ return content.type === 'component'
+ ? ((content.params ?? {}) as DriveRouteViewProps)
+ : {};
+ };
+ const user = useUserContext();
+ const preset = getViewPreset('documents', undefined, {
+ userId: user.userId(),
+ isTeamAdmin: false,
+ });
+ const initialFilters = () => {
+ const requested = props().initialFilters;
+ return preset?.filters && requested
+ ? mergeQuery(queryStateFrom(preset.filters), requested)
+ : (requested ?? preset?.filters);
+ };
+ const initialClientFilters = () =>
+ preset?.clientFilters && props().initialClientFilters
+ ? {
+ and: [
+ ...new Set([
+ ...(preset.clientFilters.and ?? []),
+ ...(props().initialClientFilters?.and ?? []),
+ ]),
+ ],
+ or: [
+ ...new Set([
+ ...(preset.clientFilters.or ?? []),
+ ...(props().initialClientFilters?.or ?? []),
+ ]),
+ ],
+ }
+ : (props().initialClientFilters ?? preset?.clientFilters);
+ return (
+ <NewAppView
+ id="documents"
+ composableOnTouch
+ fallback={
+ <SoupView
+ viewName="Files"
+ initialFilters={initialFilters()}
+ initialClientFilters={initialClientFilters()}
+ initialGroupBy={preset?.groupBy}
+ />
+ }
+ >
+ <DriveView initialFacets={props().initialFacets} />
+ </NewAppView>
+ );
+});
+
+const driveDocumentParams = z.object({
+ documentType: z.enum(DRIVE_DOCUMENT_TYPES),
+ documentId: z.string().min(1),
+});
+
+export const driveRootDocumentRoute = defineRoute({
+ id: 'drive-document',
+ path: ':documentType/:documentId',
+ params: driveDocumentParams,
+ component: DriveDetailView,
+ claim: ({ documentType, documentId }) => ({
+ namespace: 'block',
+ id: `${driveDocumentBlockType(documentType)}:${documentId}`,
+ }),
+});
+
+export const driveFolderDocumentRoute = defineRoute({
+ id: 'drive-folder-document',
+ path: ':documentType/:documentId',
+ params: driveDocumentParams,
+ component: DriveDetailView,
+ claim: ({ documentType, documentId }) => ({
+ namespace: 'block',
+ id: `${driveDocumentBlockType(documentType)}:${documentId}`,
+ }),
+});
+
+export const driveTabDocumentRoute = defineRoute({
+ id: 'drive-tab-document',
+ path: ':documentType/:documentId',
+ params: driveDocumentParams,
+ component: DriveDetailView,
+ claim: ({ documentType, documentId }) => ({
+ namespace: 'block',
+ id: `${driveDocumentBlockType(documentType)}:${documentId}`,
+ }),
+});
+
+export const driveFolderRoute = defineRoute({
+ id: 'drive-folder',
+ path: 'folder/:folderId?',
+ params: z
+ .object({ folderId: z.string().min(1).optional() })
+ .transform(({ folderId }) => ({ view: 'folder' as const, folderId })),
+ children: [driveFolderDocumentRoute],
+});
+
+export const driveTabRoute = defineRoute({
+ id: 'drive-tab',
+ path: ':tab',
+ aliases: ['tab/:tab'],
+ params: z.object({ tab: z.enum(['recent', 'shared']) }),
+ children: [driveTabDocumentRoute],
+});
+
+export const driveSplitRoute = defineRoute({
+ id: 'drive',
+ path: 'drive',
+ aliases: ['drive/owned', 'drive/tab/owned'],
+ component: DriveRouteView,
+ search: ['drive'],
+ externalSearch: (entry: Readonly<SplitRouterEntry>) => {
+ const type = routeParams<{ documentType?: string }>(
+ entry.location.route
+ ).documentType;
+ if (
+ type === 'md' ||
+ type === 'task' ||
+ type === 'snippet' ||
+ type === 'skill'
+ ) {
+ return Object.values(MARKDOWN_URL_PARAMS);
+ }
+ return type === 'pdf' ? Object.values(PDF_URL_PARAMS) : [];
+ },
+ children: [driveFolderRoute, driveTabRoute, driveRootDocumentRoute],
+});
diff --git a/apps/web/src/features/email-view/components/EmailDetailView.tsx b/apps/web/src/features/email-view/components/EmailDetailView.tsx
index 6d43096ef9..dc9020314b 100644
--- a/apps/web/src/features/email-view/components/EmailDetailView.tsx
+++ b/apps/web/src/features/email-view/components/EmailDetailView.tsx
@@ -14,7 +14,6 @@ import {
useCanAutofocusSplitContent,
useSplitPanelOrThrow,
} from '@components/app/split-layout/layoutUtils';
-import { emailThreadRoute } from '@components/app/split-layout/split-router/app-routes';
import { EntityIcon } from '@core/component/EntityIcon';
import { toEntityLoadError } from '@core/component/EntityLoadGate';
import {
@@ -31,6 +30,7 @@ import { representativeThreadMessage } from '@queries/email/thread-subject';
import { createEffect, createMemo, createSignal, Show } from 'solid-js';
import { emailDetailSearch } from '../email-route';
import { useEmailView } from '../email-view-context';
+import { emailThreadRoute } from '../route';
import type { EmailThreadTarget } from '../types';
import { useEmailDetailListNavigation } from '../use-email-detail-list-navigation';
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 3aaa037e93..2840e0b155 100644
--- a/apps/web/src/features/email-view/email-view-context.tsx
+++ b/apps/web/src/features/email-view/email-view-context.tsx
@@ -16,10 +16,6 @@ import {
useSplitPanelOrThrow,
withSplitPanelOwner,
} from '@components/app/split-layout/layoutUtils';
-import {
- emailSplitRoute,
- emailThreadRoute,
-} from '@components/app/split-layout/split-router/app-routes';
import { createAssertedContextProvider } from '@core/context/createContext';
import { useUserId } from '@core/context/user';
import { isTouchDevice } from '@core/mobile/isTouchDevice';
@@ -47,6 +43,7 @@ import {
type EmailDataSourceItem,
useEmailDataSource,
} from './queries/use-email-query';
+import { emailSplitRoute, emailThreadRoute } from './route';
import type {
EmailTab,
EmailThreadTarget,
diff --git a/apps/web/src/features/email-view/route.tsx b/apps/web/src/features/email-view/route.tsx
new file mode 100644
index 0000000000..61e6d0fb54
--- /dev/null
+++ b/apps/web/src/features/email-view/route.tsx
@@ -0,0 +1,92 @@
+import {
+ createSearchParams,
+ defineRoute,
+ useParams,
+} from '@app/lib/split-router';
+import type { SplitContent } from '@components/app/split-layout/layoutManager';
+import {
+ NewAppView,
+ RedirectSplit,
+ withAuth,
+} from '@components/app/split-layout/split-router/app-route-shell';
+import { lazy, Show } from 'solid-js';
+import { z } from 'zod';
+import { URL_PARAMS as EMAIL_URL_PARAMS } from '../email-thread/core/location';
+import { getViewPreset } from '../next-soup/sidebar/soup-filter-presets';
+import { emailDetailSearch } from './email-route';
+
+const SoupView = lazy(async () => ({
+ default: (await import('../next-soup/soup-view/soup-view')).SoupView,
+}));
+const EmailView = lazy(async () => ({
+ default: (await import('./email-view')).EmailView,
+}));
+const EmailDetailRouteView = lazy(async () => ({
+ default: (await import('./components/EmailDetailView')).EmailDetailRouteView,
+}));
+
+function LegacyMailView() {
+ const preset = getViewPreset('mail');
+ return (
+ <SoupView
+ viewName="Email"
+ initialFilters={preset?.filters}
+ initialClientFilters={preset?.clientFilters}
+ initialGroupBy={preset?.groupBy}
+ />
+ );
+}
+
+function MailLegacyRouteView() {
+ const params = useParams<{ threadId?: string }>();
+ const [search] = createSearchParams(emailDetailSearch);
+ const legacyThread = (id: string): SplitContent => {
+ const params: Record<string, string> = {};
+ if (search.messageId) params[EMAIL_URL_PARAMS.messageId] = search.messageId;
+ return { type: 'email', id, params };
+ };
+
+ return (
+ <Show when={params.threadId} fallback={<LegacyMailView />}>
+ {(threadId) => <RedirectSplit to={legacyThread(threadId())} />}
+ </Show>
+ );
+}
+
+export const MailRouteView = withAuth(() => {
+ const params = useParams<{ threadId?: string }>();
+ const detailRequested = () => typeof params.threadId === 'string';
+
+ return (
+ <NewAppView
+ id="mail"
+ detailDesktopOnly
+ detailRequested={detailRequested}
+ detailFallback={<MailLegacyRouteView />}
+ fallback={<LegacyMailView />}
+ >
+ <EmailView />
+ </NewAppView>
+ );
+});
+
+export const emailThreadRoute = defineRoute({
+ id: 'mail-thread',
+ path: ':threadId',
+ params: z.object({ threadId: z.string().min(1) }),
+ component: EmailDetailRouteView,
+ externalSearch: ['email_message_id'],
+ remountKey: ({ threadId }) => threadId,
+ claim: ({ threadId }) => ({
+ namespace: 'block',
+ id: `email:${threadId}`,
+ }),
+});
+
+export const emailSplitRoute = defineRoute({
+ id: 'view-mail',
+ path: 'mail',
+ component: MailRouteView,
+ search: '*' as const,
+ children: [emailThreadRoute],
+});
diff --git a/apps/web/src/features/getting-started/route.tsx b/apps/web/src/features/getting-started/route.tsx
new file mode 100644
index 0000000000..8e57ba5897
--- /dev/null
+++ b/apps/web/src/features/getting-started/route.tsx
@@ -0,0 +1,23 @@
+import { defineRoute } from '@app/lib/split-router';
+import {
+ usePageViewTracking,
+ withAuth,
+} from '@components/app/split-layout/split-router/app-route-shell';
+import { lazy } from 'solid-js';
+
+const GettingStarted = lazy(async () => ({
+ default: (await import('.')).GettingStarted,
+}));
+
+export const GettingStartedRouteView = withAuth(() => {
+ usePageViewTracking('getting-started');
+ return <GettingStarted />;
+});
+
+export const gettingStartedRoute = defineRoute({
+ id: 'view-getting-started',
+ path: 'getting-started',
+ component: GettingStartedRouteView,
+ search: '*' as const,
+ claim: () => ({ namespace: 'component', id: 'getting-started' }),
+});
diff --git a/apps/web/src/features/home/route.tsx b/apps/web/src/features/home/route.tsx
new file mode 100644
index 0000000000..bf0faf1775
--- /dev/null
+++ b/apps/web/src/features/home/route.tsx
@@ -0,0 +1,23 @@
+import { defineRoute } from '@app/lib/split-router';
+import {
+ usePageViewTracking,
+ withAuth,
+} from '@components/app/split-layout/split-router/app-route-shell';
+import { lazy } from 'solid-js';
+
+const Home = lazy(async () => ({
+ default: (await import('.')).Home,
+}));
+
+export const HomeRouteView = withAuth(() => {
+ usePageViewTracking('home');
+ return <Home />;
+});
+
+export const homeRoute = defineRoute({
+ id: 'view-home',
+ path: 'home',
+ component: HomeRouteView,
+ search: '*' as const,
+ claim: () => ({ namespace: 'component', id: 'home' }),
+});
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 c74f657795..28db8cc6d2 100644
--- a/apps/web/src/features/inbox-view/inbox-view-context.tsx
+++ b/apps/web/src/features/inbox-view/inbox-view-context.tsx
@@ -8,10 +8,6 @@ import {
import { createPreviewSelectionGuard } from '@components/app/createPreviewSelectionGuard';
import type { PreviewPanelSelection } from '@components/app/previewTarget';
import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
-import {
- inboxPreviewRoute,
- inboxSplitRoute,
-} from '@components/app/split-layout/split-router/app-routes';
import { createAssertedContextProvider } from '@core/context/createContext';
import { useUserId } from '@core/context/user';
import type { ContextProviderProps } from '@solid-primitives/context';
@@ -34,6 +30,7 @@ import {
createInboxViewPersistence,
normalizeInboxFacets,
} from './persistence';
+import { inboxPreviewRoute, inboxSplitRoute } from './route';
import type {
InboxGroupBy,
InboxTab,
diff --git a/apps/web/src/features/inbox-view/route.tsx b/apps/web/src/features/inbox-view/route.tsx
new file mode 100644
index 0000000000..1064345241
--- /dev/null
+++ b/apps/web/src/features/inbox-view/route.tsx
@@ -0,0 +1,98 @@
+import {
+ createSearchParams,
+ defineRoute,
+ useParams,
+} from '@app/lib/split-router';
+import type { SplitContent } from '@components/app/split-layout/layoutManager';
+import {
+ NewAppView,
+ RedirectSplit,
+ withAuth,
+} from '@components/app/split-layout/split-router/app-route-shell';
+import { isTouchDevice } from '@core/mobile/isTouchDevice';
+import { lazy, Show } from 'solid-js';
+import { getViewPreset } from '../next-soup/sidebar/soup-filter-presets';
+import { inboxPreviewLegacyTarget, inboxPreviewSearch } from './inbox-route';
+import {
+ type InboxPreviewRouteParams,
+ inboxPreviewRouteParams,
+} from './inbox-route-schema';
+
+const SoupView = lazy(async () => ({
+ default: (await import('../next-soup/soup-view/soup-view')).SoupView,
+}));
+const InboxView = lazy(async () => ({
+ default: (await import('./inbox-view')).InboxView,
+}));
+const InboxDetailRouteView = lazy(async () => ({
+ default: (await import('./inbox-view')).InboxDetailRouteView,
+}));
+
+function LegacyInboxView() {
+ const preset = getViewPreset('inbox');
+ return (
+ <SoupView
+ viewName={isTouchDevice() ? 'Notifications' : 'Home'}
+ initialFilters={preset?.filters}
+ initialClientFilters={preset?.clientFilters}
+ initialGroupBy={preset?.groupBy}
+ disableLocalSearch
+ />
+ );
+}
+
+function InboxLegacyRouteView() {
+ const params = useParams<Partial<InboxPreviewRouteParams>>();
+ const [search] = createSearchParams(inboxPreviewSearch);
+ const legacyTarget = () => {
+ const { blockType, previewId } = params;
+ if (!blockType || !previewId) return;
+ return inboxPreviewLegacyTarget({ blockType, previewId }, search);
+ };
+
+ return (
+ <Show when={legacyTarget()} fallback={<LegacyInboxView />}>
+ {(target) => <RedirectSplit to={target() as SplitContent} />}
+ </Show>
+ );
+}
+
+export const InboxRouteView = withAuth(() => {
+ const params = useParams<Partial<InboxPreviewRouteParams>>();
+ const detailRequested = () =>
+ typeof params.blockType === 'string' &&
+ typeof params.previewId === 'string';
+
+ return (
+ <NewAppView
+ id="inbox"
+ composableOnTouch
+ detailDesktopOnly
+ detailRequested={detailRequested}
+ detailFallback={<InboxLegacyRouteView />}
+ fallback={<LegacyInboxView />}
+ >
+ <InboxView />
+ </NewAppView>
+ );
+});
+
+export const inboxPreviewRoute = defineRoute({
+ id: 'inbox-preview',
+ path: ':blockType/:previewId',
+ params: inboxPreviewRouteParams,
+ component: InboxDetailRouteView,
+ remountKey: ({ blockType, previewId }) => `${blockType}:${previewId}`,
+ claim: ({ blockType, previewId }) => ({
+ namespace: 'block',
+ id: `${blockType}:${previewId}`,
+ }),
+});
+
+export const inboxSplitRoute = defineRoute({
+ id: 'view-inbox',
+ path: 'inbox',
+ component: InboxRouteView,
+ search: '*' as const,
+ children: [inboxPreviewRoute],
+});
diff --git a/apps/web/src/features/next-soup/route.tsx b/apps/web/src/features/next-soup/route.tsx
new file mode 100644
index 0000000000..c1932d01f6
--- /dev/null
+++ b/apps/web/src/features/next-soup/route.tsx
@@ -0,0 +1,139 @@
+import { usePosthog } from '@app/lib/analytics/posthog';
+import { defineRoute } from '@app/lib/split-router';
+import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
+import {
+ RedirectSplit,
+ usePageViewTracking,
+ withAuth,
+} from '@components/app/split-layout/split-router/app-route-shell';
+import { useUserContext } from '@core/context/user';
+import { lazy, Show } from 'solid-js';
+import type { SetPredicatesInput } from './filters/filter-store/predicates-store';
+import type { Query } from './filters/filter-store/types';
+import { getViewPreset } from './sidebar/soup-filter-presets';
+import { useRecentViewFlag } from './use-recent-view-flag';
+
+const SoupView = lazy(async () => ({
+ default: (await import('./soup-view/soup-view')).SoupView,
+}));
+
+function TrackedRecentView() {
+ usePageViewTracking('recent');
+ const preset = getViewPreset('recent');
+ return (
+ <SoupView
+ viewName="Recent"
+ initialFilters={preset?.filters}
+ initialClientFilters={preset?.clientFilters}
+ initialClientSort={['touched_at']}
+ disableLocalSearch
+ />
+ );
+}
+
+export const RecentRouteView = withAuth(() => {
+ const enabled = useRecentViewFlag();
+ const posthog = usePosthog();
+ return (
+ <Show
+ when={enabled()}
+ fallback={
+ <Show when={posthog.flagsLoaded()}>
+ <RedirectSplit to={{ type: 'component', id: 'inbox' }} />
+ </Show>
+ }
+ >
+ <TrackedRecentView />
+ </Show>
+ );
+});
+
+export const CallsRouteView = withAuth(() => {
+ usePageViewTracking('calls');
+ const preset = getViewPreset('calls');
+ return (
+ <SoupView
+ viewName="Calls"
+ initialFilters={preset?.filters}
+ initialClientFilters={preset?.clientFilters}
+ initialGroupBy={preset?.groupBy}
+ />
+ );
+});
+
+export const FoldersRouteView = withAuth(() => {
+ usePageViewTracking('folders');
+ const user = useUserContext();
+ const preset = getViewPreset('folders', undefined, {
+ userId: user.userId(),
+ isTeamAdmin: false,
+ });
+ return (
+ <SoupView
+ viewName="Folders"
+ initialFilters={preset?.filters}
+ initialClientFilters={preset?.clientFilters}
+ initialGroupBy={preset?.groupBy}
+ />
+ );
+});
+
+type SearchRouteViewParams = {
+ initialQuery?: string;
+ initialFilters?: Query;
+ initialClientFilters?: SetPredicatesInput<string>;
+};
+
+export const SearchRouteView = withAuth(() => {
+ const panel = useSplitPanelOrThrow();
+ const params = (): SearchRouteViewParams => {
+ const content = panel.handle.content();
+ return content.type === 'component'
+ ? ((content.params ?? {}) as SearchRouteViewParams)
+ : {};
+ };
+ usePageViewTracking('search');
+ const preset = getViewPreset('search');
+ return (
+ <SoupView
+ viewName="Search"
+ initialFilters={params().initialFilters ?? preset?.filters}
+ initialClientFilters={
+ params().initialClientFilters ?? preset?.clientFilters
+ }
+ initialSearchText={params().initialQuery}
+ />
+ );
+});
+
+export const recentRoute = defineRoute({
+ id: 'view-recent',
+ path: 'recent',
+ component: RecentRouteView,
+ search: '*' as const,
+ claim: () => ({ namespace: 'component', id: 'recent' }),
+});
+
+export const callsRoute = defineRoute({
+ id: 'view-calls',
+ path: 'calls',
+ component: CallsRouteView,
+ search: '*' as const,
+ claim: () => ({ namespace: 'component', id: 'calls' }),
+});
+
+export const foldersRoute = defineRoute({
+ id: 'view-folders',
+ path: 'folders',
+ component: FoldersRouteView,
+ search: '*' as const,
+ claim: () => ({ namespace: 'component', id: 'folders' }),
+});
+
+export const searchRoute = defineRoute({
+ id: 'view-search',
+ path: 'search',
+ component: SearchRouteView,
+ search: '*' as const,
+ claim: () => ({ namespace: 'component', id: 'search' }),
+});
diff --git a/apps/web/src/features/reminders/route.tsx b/apps/web/src/features/reminders/route.tsx
new file mode 100644
index 0000000000..c2ac02659d
--- /dev/null
+++ b/apps/web/src/features/reminders/route.tsx
@@ -0,0 +1,37 @@
+import { defineRoute } from '@app/lib/split-router';
+import {
+ RedirectSplit,
+ usePageViewTracking,
+ withAuth,
+} from '@components/app/split-layout/split-router/app-route-shell';
+import { enableReminders, isFeatureEnabled } from '@core/constant/featureFlags';
+import { lazy } from 'solid-js';
+import { getViewPreset } from '../next-soup/sidebar/soup-filter-presets';
+
+const SoupView = lazy(async () => ({
+ default: (await import('../next-soup/soup-view/soup-view')).SoupView,
+}));
+
+export const RemindersRouteView = withAuth(() => {
+ if (!isFeatureEnabled(enableReminders))
+ return <RedirectSplit to={{ type: 'component', id: 'inbox' }} />;
+ usePageViewTracking('reminders');
+ const preset = getViewPreset('reminders');
+ return (
+ <SoupView
+ viewName="Reminders"
+ initialFilters={preset?.filters}
+ initialClientFilters={preset?.clientFilters}
+ initialGroupBy={preset?.groupBy}
+ disableLocalSearch
+ />
+ );
+});
+
+export const remindersRoute = defineRoute({
+ id: 'view-reminders',
+ path: 'reminders',
+ component: RemindersRouteView,
+ search: '*' as const,
+ claim: () => ({ namespace: 'component', id: 'reminders' }),
+});
diff --git a/apps/web/src/features/settings/route.tsx b/apps/web/src/features/settings/route.tsx
new file mode 100644
index 0000000000..e3642dd90e
--- /dev/null
+++ b/apps/web/src/features/settings/route.tsx
@@ -0,0 +1,25 @@
+import { defineRoute } from '@app/lib/split-router';
+import {
+ settingsSlugToTab,
+ settingsTabToSlug,
+} from '@core/constant/settingsTabsConfig';
+import { lazy } from 'solid-js';
+import { z } from 'zod';
+
+export const SettingsRouteView = lazy(async () => ({
+ default: (await import('./Settings')).SettingsPanelComponentWrapper,
+}));
+
+export const settingsRoute = defineRoute({
+ id: 'settings',
+ path: 'settings/:tab?',
+ params: z.object({
+ tab: z
+ .string()
+ .refine((tab) => settingsSlugToTab(tab) !== undefined)
+ .default(settingsTabToSlug('Account')),
+ }),
+ component: SettingsRouteView,
+ claim: () => ({ namespace: 'component', id: 'settings' }),
+ externalSearch: ['pair', 'createAgent'],
+});
diff --git a/apps/web/src/features/tasks-view/components/TasksDetailView.tsx b/apps/web/src/features/tasks-view/components/TasksDetailView.tsx
index 1a4a4549ee..7dca6671e7 100644
--- a/apps/web/src/features/tasks-view/components/TasksDetailView.tsx
+++ b/apps/web/src/features/tasks-view/components/TasksDetailView.tsx
@@ -7,13 +7,13 @@ import { useRouteParams } from '@app/lib/split-router';
import { MarkdownDetailBreadcrumbItem } from '@block-md/component/MarkdownDetailBreadcrumbItem';
import { SidePanel } from '@components/app/side-panel';
import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
-import { taskDetailRoute } from '@components/app/split-layout/split-router/app-routes';
import { toast } from '@core/component/Toast/Toast';
import {
ShareDialogContext,
ShareTrigger,
} from '@core/component/TopBar/ShareButton';
import { createSignal } from 'solid-js';
+import { taskDetailRoute } from '../route';
import { useTasksView } from '../tasks-view-context';
import type { TaskDetailTarget } from '../types';
import { TaskDetail } from './TaskDetail';
diff --git a/apps/web/src/features/tasks-view/route.tsx b/apps/web/src/features/tasks-view/route.tsx
new file mode 100644
index 0000000000..498dcb7fee
--- /dev/null
+++ b/apps/web/src/features/tasks-view/route.tsx
@@ -0,0 +1,83 @@
+import { defineRoute, useParams } from '@app/lib/split-router';
+import {
+ NewAppView,
+ RedirectSplit,
+ withAuth,
+} from '@components/app/split-layout/split-router/app-route-shell';
+import { useUserContext } from '@core/context/user';
+import { lazy, Show } from 'solid-js';
+import { z } from 'zod';
+import { getViewPreset } from '../next-soup/sidebar/soup-filter-presets';
+
+const SoupView = lazy(async () => ({
+ default: (await import('../next-soup/soup-view/soup-view')).SoupView,
+}));
+const TasksView = lazy(async () => ({
+ default: (await import('./tasks-view')).TasksView,
+}));
+const TasksDetailRouteView = lazy(async () => ({
+ default: (await import('./components/TasksDetailView')).TasksDetailRouteView,
+}));
+
+function LegacyTasksView() {
+ const user = useUserContext();
+ const preset = getViewPreset('tasks', undefined, {
+ userId: user.userId(),
+ isTeamAdmin: false,
+ });
+ return (
+ <SoupView
+ viewName="Tasks"
+ initialFilters={preset?.filters}
+ initialClientFilters={preset?.clientFilters}
+ initialGroupBy={preset?.groupBy}
+ />
+ );
+}
+
+function TasksLegacyRouteView() {
+ const params = useParams<{ taskId?: string }>();
+ return (
+ <Show when={params.taskId} fallback={<LegacyTasksView />}>
+ {(taskId) => <RedirectSplit to={{ type: 'task', id: taskId() }} />}
+ </Show>
+ );
+}
+
+export const TasksRouteView = withAuth(() => {
+ const params = useParams<{ taskId?: string }>();
+ const detailRequested = () => typeof params.taskId === 'string';
+
+ return (
+ <NewAppView
+ id="tasks"
+ composableOnTouch
+ detailDesktopOnly
+ detailRequested={detailRequested}
+ detailFallback={<TasksLegacyRouteView />}
+ fallback={<LegacyTasksView />}
+ >
+ <TasksView />
+ </NewAppView>
+ );
+});
+
+export const taskDetailRoute = defineRoute({
+ id: 'tasks-task',
+ path: ':taskId',
+ params: z.object({ taskId: z.string().min(1) }),
+ component: TasksDetailRouteView,
+ remountKey: ({ taskId }) => taskId,
+ claim: ({ taskId }) => ({
+ namespace: 'block',
+ id: `md:${taskId}`,
+ }),
+});
+
+export const tasksSplitRoute = defineRoute({
+ id: 'view-tasks',
+ path: 'tasks',
+ component: TasksRouteView,
+ search: '*' as const,
+ children: [taskDetailRoute],
+});
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 d2de9ef216..1e25d5f53b 100644
--- a/apps/web/src/features/tasks-view/tasks-view-context.tsx
+++ b/apps/web/src/features/tasks-view/tasks-view-context.tsx
@@ -14,10 +14,6 @@ import {
useSplitPanelOrThrow,
withSplitPanelOwner,
} from '@components/app/split-layout/layoutUtils';
-import {
- taskDetailRoute,
- tasksSplitRoute,
-} from '@components/app/split-layout/split-router/app-routes';
import { createAssertedContextProvider } from '@core/context/createContext';
import { useUserId } from '@core/context/user';
import { isTouchDevice } from '@core/mobile/isTouchDevice';
@@ -45,6 +41,7 @@ import {
type TasksDataSourceItem,
useTasksDataSource,
} from './queries/use-tasks-query';
+import { taskDetailRoute, tasksSplitRoute } from './route';
import type {
TaskDetailTarget,
TaskSortId,
diff --git a/apps/web/src/lib/core/constant/settingsSplitUrl.test.ts b/apps/web/src/lib/core/constant/settingsSplitUrl.test.ts
index 4eddac6f99..a88d991c70 100644
--- a/apps/web/src/lib/core/constant/settingsSplitUrl.test.ts
+++ b/apps/web/src/lib/core/constant/settingsSplitUrl.test.ts
@@ -6,11 +6,6 @@ import {
stripSettingsSplitFromUrl,
} from './settingsSplitUrl';
-// Route-only helpers do not need to initialize the application views.
-vi.mock('@components/app/split-layout/split-router/app-views', () => ({
- withLaunchParams: () => () => null,
-}));
-
// Legacy split decoding only needs alias resolution to exist.
vi.mock('@core/constant/allBlocks', () => ({
isBlockAlias: vi.fn(() => false),
diff --git a/apps/web/src/lib/split-router/routes.ts b/apps/web/src/lib/split-router/routes.ts
index 7e2fcb47fd..630a7a2226 100644
--- a/apps/web/src/lib/split-router/routes.ts
+++ b/apps/web/src/lib/split-router/routes.ts
@@ -5,6 +5,7 @@ import type {
DefinedSplitRoute,
DefinedSplitRoutes,
InferSplitRouteParams,
+ InferSplitRoutePathParams,
SplitRouteClaim,
SplitRouteDefinition,
SplitRouteMatch,
@@ -38,18 +39,124 @@ type RouteParamCallbacks<TParams> = {
remountKey?: (params: TParams) => string | number | undefined;
};
-export function defineRoute<
- const TParamsSchema extends StandardSchemaV1,
- const TDefinition extends SplitRouteDefinitionConstraint,
->(
- definition: TDefinition & { params: TParamsSchema } & RouteParamCallbacks<
- StandardSchemaV1.InferOutput<TParamsSchema>
- >
-): DefinedSplitRoute<
- TDefinition & { params: TParamsSchema } & RouteParamCallbacks<
- StandardSchemaV1.InferOutput<TParamsSchema>
- >
+type KeysOfUnion<T> = T extends unknown ? keyof T : never;
+type RequiredKeys<T> = {
+ [K in keyof T]-?: {} extends Pick<T, K> ? never : K;
+}[keyof T];
+
+// Schemas may narrow or coerce raw string values. The declaration boundary
+// therefore compares parameter names and requiredness, not value domains.
+type CompatibleSchemaInputs<TPathParams, TSchemaInput> =
+ TSchemaInput extends unknown
+ ? Exclude<keyof TPathParams, keyof TSchemaInput> extends never
+ ? Exclude<
+ RequiredKeys<TPathParams>,
+ RequiredKeys<TSchemaInput>
+ > extends never
+ ? Exclude<
+ RequiredKeys<TSchemaInput>,
+ RequiredKeys<TPathParams>
+ > extends never
+ ? TSchemaInput
+ : never
+ : never
+ : never
+ : never;
+
+type InvalidSchemaPathParams<TPathParams, TSchemaInput> =
+ TPathParams extends unknown
+ ? [CompatibleSchemaInputs<TPathParams, TSchemaInput>] extends [never]
+ ? TPathParams
+ : never
+ : never;
+
+type RouteParamsSchemaIssue<
+ TPath extends string,
+ TAliases extends readonly string[] | undefined,
+ TSchema extends StandardSchemaV1,
+> =
+ InferSplitRoutePathParams<TPath, TAliases> extends infer TPathParams
+ ? InvalidSchemaPathParams<
+ TPathParams,
+ StandardSchemaV1.InferInput<TSchema>
+ > extends infer TInvalidPathParams
+ ? [TInvalidPathParams] extends [never]
+ ? never
+ : {
+ path: TPath;
+ aliases: TAliases;
+ pathParams: TPathParams;
+ schemaInput: StandardSchemaV1.InferInput<TSchema>;
+ missingSchemaKeys: Exclude<
+ KeysOfUnion<TPathParams>,
+ KeysOfUnion<StandardSchemaV1.InferInput<TSchema>>
+ >;
+ incompatiblePathParams: TInvalidPathParams;
+ }
+ : never
+ : never;
+
+type RouteParamsSchemaConstraint<
+ TPath extends string,
+ TAliases extends readonly string[] | undefined,
+ TSchema extends StandardSchemaV1,
+> = [RouteParamsSchemaIssue<TPath, TAliases, TSchema>] extends [never]
+ ? unknown
+ : {
+ readonly 'ERROR: params schema keys and optionality must match path and aliases': RouteParamsSchemaIssue<
+ TPath,
+ TAliases,
+ TSchema
+ >;
+ };
+
+type DefinitionAliases<TDefinition> = TDefinition extends {
+ aliases: infer TAliases extends readonly string[];
+}
+ ? TAliases
+ : undefined;
+
+type SplitRouteDefinitionRemainder = Omit<
+ SplitRouteDefinitionConstraint,
+ 'path' | 'params'
>;
+
+type RouteDefinitionParamsSchemaIssues<TDefinition> =
+ | (TDefinition extends {
+ id: infer TId;
+ path: infer TPath extends string;
+ params: infer TSchema extends StandardSchemaV1;
+ }
+ ? RouteParamsSchemaIssue<
+ TPath,
+ DefinitionAliases<TDefinition>,
+ TSchema
+ > extends infer TIssue
+ ? [TIssue] extends [never]
+ ? never
+ : TIssue & { routeId: TId }
+ : never
+ : never)
+ | (TDefinition extends {
+ children: infer TChildren extends readonly unknown[];
+ }
+ ? RouteDefinitionsParamsSchemaIssues<TChildren>
+ : never);
+
+type RouteDefinitionsParamsSchemaIssues<
+ TDefinitions extends readonly unknown[],
+> = TDefinitions[number] extends infer TDefinition
+ ? RouteDefinitionParamsSchemaIssues<TDefinition>
+ : never;
+
+type RouteDefinitionsParamsSchemaConstraint<
+ TDefinitions extends readonly unknown[],
+> = [RouteDefinitionsParamsSchemaIssues<TDefinitions>] extends [never]
+ ? unknown
+ : {
+ readonly 'ERROR: route params schema keys and optionality must match paths and aliases': RouteDefinitionsParamsSchemaIssues<TDefinitions>;
+ };
+
export function defineRoute<
const TPath extends string,
const TAliases extends readonly string[] | undefined,
@@ -87,6 +194,25 @@ export function defineRoute<
params?: undefined;
} & RouteParamCallbacks<InferSplitRouteParams<{ path: TPath }>>
>;
+export function defineRoute<
+ const TPath extends string,
+ const TParamsSchema extends StandardSchemaV1,
+ const TDefinition extends SplitRouteDefinitionRemainder,
+>(
+ definition: TDefinition & {
+ path: TPath;
+ params: TParamsSchema;
+ } & RouteParamsSchemaConstraint<
+ NoInfer<TPath>,
+ DefinitionAliases<NoInfer<TDefinition>>,
+ NoInfer<TParamsSchema>
+ > &
+ RouteParamCallbacks<StandardSchemaV1.InferOutput<TParamsSchema>>
+): DefinedSplitRoute<
+ TDefinition & { path: TPath; params: TParamsSchema } & RouteParamCallbacks<
+ StandardSchemaV1.InferOutput<TParamsSchema>
+ >
+>;
export function defineRoute(
definition: SplitRouteDefinitionConstraint
): unknown {
@@ -101,7 +227,8 @@ export function defineRoutes<
},
>(
routes: TRoutes &
- (NoInfer<TRoutes> extends SplitRoutes ? unknown : SplitRoutes)
+ (NoInfer<TRoutes> extends SplitRoutes ? unknown : SplitRoutes) &
+ RouteDefinitionsParamsSchemaConstraint<NoInfer<TRoutes>['definitions']>
): DefinedSplitRoutes<TRoutes> {
return routes as DefinedSplitRoutes<TRoutes>;
}
diff --git a/apps/web/src/lib/split-router/tests/routes-manifest.test.ts b/apps/web/src/lib/split-router/tests/routes-manifest.test.ts
index db1b254190..81389a9f34 100644
--- a/apps/web/src/lib/split-router/tests/routes-manifest.test.ts
+++ b/apps/web/src/lib/split-router/tests/routes-manifest.test.ts
@@ -240,7 +240,17 @@ describe('split routes manifests', () => {
id: 'item',
path: 'item/:invalid',
aliases: ['item/:value', ':prefix/:value'],
- params: z.object({ value: z.string() }).transform(validate),
+ params: z
+ .union([
+ z.object({ invalid: z.string() }).refine(() => false),
+ z.object({ value: z.string() }),
+ z.object({ prefix: z.string(), value: z.string() }),
+ ])
+ .transform((params) =>
+ 'value' in params
+ ? validate({ value: params.value })
+ : { value: params.invalid }
+ ),
}),
],
});
diff --git a/apps/web/src/lib/split-router/tests/routes.test.ts b/apps/web/src/lib/split-router/tests/routes.test.ts
index 410bab2bc9..5c015a58dd 100644
--- a/apps/web/src/lib/split-router/tests/routes.test.ts
+++ b/apps/web/src/lib/split-router/tests/routes.test.ts
@@ -114,6 +114,47 @@ function assertInvalidRouteDeclarations() {
// @ts-expect-error Route parameter schemas must produce objects.
definitions: [defineRoute({ id: 'bad', path: 'bad', params: z.string() })],
});
+ // @ts-expect-error Schema keys must match the path parameter keys.
+ defineRoute({
+ id: 'mismatched-key',
+ path: 'issue/:issueId',
+ params: z.object({ id: z.string() }),
+ });
+ // @ts-expect-error Schema keys must cover every alias parameter key.
+ defineRoute({
+ id: 'mismatched-alias-key',
+ path: 'issue/:issueId',
+ aliases: ['issues/:legacyId'],
+ params: z.object({ issueId: z.string() }),
+ });
+ // @ts-expect-error Optional path parameters require optional schema input.
+ defineRoute({
+ id: 'mismatched-optionality',
+ path: 'issue/:issueId?',
+ params: z.object({ issueId: z.string() }),
+ });
+ // @ts-expect-error Schemas cannot require input that the path never provides.
+ defineRoute({
+ id: 'extra-required-input',
+ path: 'issue/:issueId',
+ params: z.object({ issueId: z.string(), revision: z.string() }),
+ });
+ // @ts-expect-error Nested declarations receive the same schema validation.
+ defineRoutes({
+ definitions: [
+ {
+ id: 'parent',
+ path: 'parent',
+ children: [
+ {
+ id: 'mismatched-child',
+ path: ':childId',
+ params: z.object({ id: z.string() }),
+ },
+ ],
+ },
+ ],
+ });
}
describe('typed route trees', () => {
diff --git a/apps/web/src/lib/split-router/types.ts b/apps/web/src/lib/split-router/types.ts
index 71df385cdf..e60945084b 100644
--- a/apps/web/src/lib/split-router/types.ts
+++ b/apps/web/src/lib/split-router/types.ts
@@ -189,6 +189,14 @@ type PathParams<TPath extends string> = TPath extends unknown
: PathSegmentParams<TPath>
: never;
+/** Raw parameters produced by a route's canonical path and aliases. */
+export type InferSplitRoutePathParams<
+ TPath extends string,
+ TAliases extends readonly string[] | undefined = undefined,
+> = PathParams<
+ TPath | (TAliases extends readonly string[] ? TAliases[number] : never)
+>;
+
type Simplify<T> = { [K in keyof T]: T[K] };
type RequiredParamKeys<T> = {
[K in keyof T]-?: {} extends Pick<T, K> ? never : K;
@@ -233,11 +241,11 @@ export type InferSplitRouteParams<TRoute> = TRoute extends {
: TRoute extends { path: infer TPath extends string }
? MergeRouteParams<
{},
- PathParams<
- | TPath
- | (TRoute extends { aliases: infer TAliases }
- ? Extract<TAliases, readonly string[]>[number]
- : never)
+ InferSplitRoutePathParams<
+ TPath,
+ TRoute extends { aliases: infer TAliases }
+ ? Extract<TAliases, readonly string[]>
+ : undefined
>
>
: SplitRouteParams;
diff --git a/docs/AGENT_GUIDE/navigation.md b/docs/AGENT_GUIDE/navigation.md
index 6a7410e7cd..9a78b6e3b3 100644
--- a/docs/AGENT_GUIDE/navigation.md
+++ b/docs/AGENT_GUIDE/navigation.md
@@ -13,7 +13,7 @@
| `/app/mail` | Email client |
| `/app/mail/<uuid>` | Email with a thread opened inline; a targeted message uses `sN.email-detail.messageId` |
| `/app/channels` | Channels list |
-| `/app/channels/channel/<uuid>` | Channels with a conversation opened inline; message/thread targets use `sN.channel-detail.*` |
+| `/app/channels/<uuid>` | Channels with a conversation opened inline; message/thread targets use `sN.channel-detail.*` |
| `/app/drive` | Files (Drive defaults to My Files) |
| `/app/drive/<recent-or-shared>` | A Drive tab (`/app/drive/tab/<...>` remains a compatibility alias) |
| `/app/drive/folder/<uuid>` | A Drive folder; breadcrumbs resolve from current accessible folder data |