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.

fix(web): gate the inbox notified_at sort behind a PostHog flag (#6158)

gbirman20ffa3636415
diff --git a/apps/web/src/features/inbox-view/queries/inbox-query.ts b/apps/web/src/features/inbox-view/queries/inbox-query.ts
index ff217ced58..cbd17603af 100644
--- a/apps/web/src/features/inbox-view/queries/inbox-query.ts
+++ b/apps/web/src/features/inbox-view/queries/inbox-query.ts
@@ -18,6 +18,7 @@ import type { InboxTab } from '../types';
export type InboxQueryCapabilities = {
calendar: boolean;
foreignEntities: boolean;
+ notifiedSort: boolean;
reminders: boolean;
snippets: boolean;
};
@@ -167,8 +168,11 @@ export type InboxViewContext = {
* on a week-old task is today's news. The server sort is also a filter (rows
* without a notification are absent), which is what those tabs mean anyway.
*/
-export const inboxTabOrdersByNotification = (tab: InboxTab): boolean =>
- tab === 'signal' || tab === 'noise';
+export const inboxTabOrdersByNotification = (
+ context: Pick<InboxViewContext, 'tab' | 'capabilities'>
+): boolean =>
+ context.capabilities.notifiedSort &&
+ (context.tab === 'signal' || context.tab === 'noise');
/** Builds the heterogeneous Soup AST for the composable Inbox view. */
export function buildInboxQuery(
@@ -200,7 +204,7 @@ export function buildInboxQuery(
params: {
expand: true,
limit: 100,
- sort_method: inboxTabOrdersByNotification(context.tab)
+ sort_method: inboxTabOrdersByNotification(context)
? 'notified_at'
: 'updated_at',
sort_direction: context.tab === 'reminders' ? 'asc' : 'desc',
diff --git a/apps/web/src/features/inbox-view/queries/inbox-results.test.ts b/apps/web/src/features/inbox-view/queries/inbox-results.test.ts
index 7ad8d25292..155c9e2e01 100644
--- a/apps/web/src/features/inbox-view/queries/inbox-results.test.ts
+++ b/apps/web/src/features/inbox-view/queries/inbox-results.test.ts
@@ -38,18 +38,26 @@ const freshEmail = {
sortTs: '2026-09-02T16:00:00Z',
} as unknown as WithNotification<EntityData>;
+const capabilities = {
+ calendar: false,
+ foreignEntities: false,
+ notifiedSort: true,
+ reminders: false,
+ snippets: false,
+};
+
const context = {
facets: {},
facetContext: { notificationSource: undefined as never },
- capabilities: {
- calendar: false,
- foreignEntities: false,
- reminders: false,
- snippets: false,
- },
+ capabilities,
userId: 'macro|[email protected]',
};
+const withoutNotifiedSort = {
+ ...context,
+ capabilities: { ...capabilities, notifiedSort: false },
+};
+
describe('inbox sort method per tab', () => {
it('orders the notification tabs by latest notification', () => {
for (const tab of ['signal', 'noise'] as const) {
@@ -66,16 +74,25 @@ describe('inbox sort method per tab', () => {
);
}
});
+
+ it('keeps recency ordering everywhere while the notified sort is off', () => {
+ for (const tab of ['signal', 'noise', 'all', 'reminders'] as const) {
+ expect(
+ buildInboxQuery({ ...withoutNotifiedSort, tab }).params.sort_method
+ ).toBe('updated_at');
+ }
+ });
});
describe('inbox date buckets', () => {
it('buckets a notified row by its notification on the notification tabs', () => {
- expect(inboxGroupTimestamp(staleTaskFreshComment, 'signal')).toBe(
+ const signal = { tab: 'signal' as const, capabilities };
+ expect(inboxGroupTimestamp(staleTaskFreshComment, signal)).toBe(
'2026-09-02T17:00:00Z'
);
const groups = groupInboxEntitiesByDate(
[freshEmail, staleTaskFreshComment],
- 'signal',
+ signal,
now
);
expect(groups).toHaveLength(1);
@@ -83,15 +100,35 @@ describe('inbox date buckets', () => {
});
it('falls back to content recency without a stamp and on the other tabs', () => {
- expect(inboxGroupTimestamp(freshEmail, 'signal')).toBe(
- '2026-09-02T16:00:00Z'
+ expect(
+ inboxGroupTimestamp(freshEmail, { tab: 'signal', capabilities })
+ ).toBe('2026-09-02T16:00:00Z');
+ const all = { tab: 'all' as const, capabilities };
+ expect(inboxGroupTimestamp(staleTaskFreshComment, all)).toBe(
+ '2026-08-31T19:00:00Z'
+ );
+ const groups = groupInboxEntitiesByDate(
+ [freshEmail, staleTaskFreshComment],
+ all,
+ now
);
- expect(inboxGroupTimestamp(staleTaskFreshComment, 'all')).toBe(
+ expect(groups.map((group) => group.label)).toEqual([
+ 'Today',
+ 'Last 7 days',
+ ]);
+ });
+
+ it('buckets by content recency while the notified sort is off', () => {
+ const signal = {
+ tab: 'signal' as const,
+ capabilities: withoutNotifiedSort.capabilities,
+ };
+ expect(inboxGroupTimestamp(staleTaskFreshComment, signal)).toBe(
'2026-08-31T19:00:00Z'
);
const groups = groupInboxEntitiesByDate(
[freshEmail, staleTaskFreshComment],
- 'all',
+ signal,
now
);
expect(groups.map((group) => group.label)).toEqual([
diff --git a/apps/web/src/features/inbox-view/queries/inbox-results.ts b/apps/web/src/features/inbox-view/queries/inbox-results.ts
index 31ca64bb33..70f901035a 100644
--- a/apps/web/src/features/inbox-view/queries/inbox-results.ts
+++ b/apps/web/src/features/inbox-view/queries/inbox-results.ts
@@ -4,8 +4,12 @@ import {
type SoupGroup,
} from '@app/features/soup/collection';
import type { EntityData, WithNotification } from '@entity';
-import type { InboxTab } from '../types';
-import { inboxTabOrdersByNotification } from './inbox-query';
+import {
+ type InboxViewContext,
+ inboxTabOrdersByNotification,
+} from './inbox-query';
+
+type InboxOrderContext = Pick<InboxViewContext, 'tab' | 'capabilities'>;
export const inboxSortTimestamp = (entity: EntityData) =>
entity.sortTs ?? entity.updatedAt ?? entity.createdAt;
@@ -16,19 +20,22 @@ export const inboxSortTimestamp = (entity: EntityData) =>
* arrive in; rows without a stamp (websocket inserts) and the other tabs fall
* back to content recency.
*/
-export const inboxGroupTimestamp = (entity: EntityData, tab: InboxTab) =>
- (inboxTabOrdersByNotification(tab) ? entity.notifiedAt : undefined) ??
+export const inboxGroupTimestamp = (
+ entity: EntityData,
+ context: InboxOrderContext
+) =>
+ (inboxTabOrdersByNotification(context) ? entity.notifiedAt : undefined) ??
inboxSortTimestamp(entity);
export function groupInboxEntitiesByDate(
entities: WithNotification<EntityData>[],
- tab: InboxTab,
+ context: InboxOrderContext,
now = new Date()
): SoupGroup<WithNotification<EntityData>>[] {
return groupSoupEntities(entities, {
getGroupId: (entity) =>
- dateBucket(inboxGroupTimestamp(entity, tab), now).key,
+ dateBucket(inboxGroupTimestamp(entity, context), now).key,
getGroupLabel: (_groupId, firstEntity) =>
- dateBucket(inboxGroupTimestamp(firstEntity, tab), now).label,
+ dateBucket(inboxGroupTimestamp(firstEntity, context), now).label,
});
}
diff --git a/apps/web/src/features/inbox-view/queries/use-inbox-query.ts b/apps/web/src/features/inbox-view/queries/use-inbox-query.ts
index 7e1574f4f9..d43c2d33fa 100644
--- a/apps/web/src/features/inbox-view/queries/use-inbox-query.ts
+++ b/apps/web/src/features/inbox-view/queries/use-inbox-query.ts
@@ -13,6 +13,8 @@ import { useFeatureFlag } from '@app/lib/analytics/posthog';
import { useGlobalNotificationSource } from '@components/app/GlobalAppState';
import {
ENABLE_CALENDAR_UI,
+ ENABLE_INBOX_NOTIFIED_SORT_FLAG,
+ ENABLE_INBOX_NOTIFIED_SORT_OVERRIDE,
ENABLE_REMINDERS,
ENABLE_SNIPPETS,
ENABLE_SUPPORTED_SOUP_FOREIGN_ENTITIES_FLAG,
@@ -108,12 +110,16 @@ export function useInboxDataSource(
ENABLE_SUPPORTED_SOUP_FOREIGN_ENTITIES_FLAG,
{ enabledOverride: ENABLE_SUPPORTED_SOUP_FOREIGN_ENTITIES_OVERRIDE }
);
+ const notifiedSort = useFeatureFlag(ENABLE_INBOX_NOTIFIED_SORT_FLAG, {
+ enabledOverride: ENABLE_INBOX_NOTIFIED_SORT_OVERRIDE,
+ });
const facetContext = (): InboxFacetContext => ({ notificationSource });
const capabilities = (): InboxQueryCapabilities => ({
calendar: ENABLE_CALENDAR_UI(),
foreignEntities: foreignEntities().enabled,
+ notifiedSort: notifiedSort().enabled,
reminders: ENABLE_REMINDERS(),
snippets: ENABLE_SNIPPETS(),
});
@@ -248,7 +254,7 @@ export function useInboxDataSource(
let result: InboxDataSourceItem[];
if (state.groupBy === 'date' && !search.isSearching()) {
result = buildGroupedSoupRows(
- groupInboxEntitiesByDate(entities().items, state.tab)
+ groupInboxEntitiesByDate(entities().items, viewContext())
);
} else {
result = buildFlatSoupRows(entities().items);
diff --git a/apps/web/src/features/next-soup/soup-view/soup-view-context.tsx b/apps/web/src/features/next-soup/soup-view/soup-view-context.tsx
index c71578ef92..6d192bcc5f 100644
--- a/apps/web/src/features/next-soup/soup-view/soup-view-context.tsx
+++ b/apps/web/src/features/next-soup/soup-view/soup-view-context.tsx
@@ -52,6 +52,8 @@ import { useEntryState } from '@components/app/split-layout/entry-state';
import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';
import {
ENABLE_FEATURED_SEARCH_RESULTS,
+ ENABLE_INBOX_NOTIFIED_SORT_FLAG,
+ ENABLE_INBOX_NOTIFIED_SORT_OVERRIDE,
ENABLE_REMINDERS,
ENABLE_SUPPORTED_SOUP_FOREIGN_ENTITIES_FLAG,
ENABLE_SUPPORTED_SOUP_FOREIGN_ENTITIES_OVERRIDE,
@@ -668,6 +670,9 @@ export const SoupViewContextProvider: FlowComponent<
const notificationSource = useGlobalNotificationSource();
const userId = useUserId();
const isTeamAdmin = useIsTeamAdmin();
+ const notifiedSortFF = useFeatureFlag(ENABLE_INBOX_NOTIFIED_SORT_FLAG, {
+ enabledOverride: ENABLE_INBOX_NOTIFIED_SORT_OVERRIDE,
+ });
// Sits below `activeTab`/`userId` because the page direction comes from the
// active tab's preset, which some views resolve against user context.
@@ -681,6 +686,13 @@ export const SoupViewContextProvider: FlowComponent<
: undefined;
});
+ const presetSortMethod = () => {
+ const method = activePreset()?.sortMethod;
+ return method === 'notified_at' && !notifiedSortFF().enabled
+ ? 'updated_at'
+ : method;
+ };
+
const soupParams = createMemo(() => {
const sortId = soup.sort.active()[0]?.id ?? 'updated_at';
@@ -695,13 +707,12 @@ export const SoupViewContextProvider: FlowComponent<
// user's own touches — not to the sort method state, so the preset owns
// them. Omitted when absent so the server default (desc) applies and
// the query keys of every existing view stay byte-identical.
- const preset = activePreset();
- const sortDirection = preset?.sortDirection;
+ const sortDirection = activePreset()?.sortDirection;
return {
// Mail views use a smaller page size
limit: view === 'mail' ? 30 : 100,
- sort_method: preset?.sortMethod ?? sortMethod,
+ sort_method: presetSortMethod() ?? sortMethod,
...(sortDirection ? { sort_direction: sortDirection } : {}),
};
});
@@ -712,7 +723,7 @@ export const SoupViewContextProvider: FlowComponent<
// inbox's All and Reminders tabs stay on update recency even when a row
// carries a notification stamp from a Signal page or a live delivery.
const clientSort = createMemo((): SortConfig<SoupEntity>[] =>
- activePreset()?.sortMethod === 'notified_at'
+ presetSortMethod() === 'notified_at'
? [SORT_CONFIGS.notified_at]
: soup.sort.active()
);
diff --git a/apps/web/src/lib/core/constant/featureFlags.ts b/apps/web/src/lib/core/constant/featureFlags.ts
index 3209cbe482..748e18d313 100644
--- a/apps/web/src/lib/core/constant/featureFlags.ts
+++ b/apps/web/src/lib/core/constant/featureFlags.ts
@@ -522,6 +522,11 @@ export const ENABLE_SUPPORTED_SOUP_FOREIGN_ENTITIES_OVERRIDE = DEV_MODE_ENV
? true
: undefined;
+export const ENABLE_INBOX_NOTIFIED_SORT_FLAG = 'enable-inbox-notified-sort';
+export const ENABLE_INBOX_NOTIFIED_SORT_OVERRIDE =
+ getFeatureFlagOverride('ENABLE_INBOX_NOTIFIED_SORT') ??
+ (DEV_MODE_ENV ? true : undefined);
+
export const ENABLE_GRAPHQL_SOUP_FLAG = 'enable-graphql-soup';
export const ENABLE_GRAPHQL_SOUP_OVERRIDE = getFeatureFlagOverride(
'ENABLE_GRAPHQL_SOUP'
diff --git a/docs/AGENT_GUIDE/surfaces.md b/docs/AGENT_GUIDE/surfaces.md
index d6583df2ba..80bda0ad6b 100644
--- a/docs/AGENT_GUIDE/surfaces.md
+++ b/docs/AGENT_GUIDE/surfaces.md
@@ -5,9 +5,10 @@
Unified triage list (emails, channel messages, task assignments, doc mentions, agent
results). Filter radios: `Signal` (default, AI-filtered "needs attention") / `Noise` / `All`
/ `Reminders`; plus `Filter` menu and `Preview` toggle (split list + preview pane; the empty
-preview shows "No content selected"). `Signal` and `Noise` order rows (and their date
-headers) by when you were last notified about the item, so a fresh comment on an old task
-sits under "Today". `All` and `Reminders` order by recency. Keyboard: `j`/`k` move, `space` preview, `enter` open, `e` mark done.
+preview shows "No content selected"). With the `enable-inbox-notified-sort` flag on, `Signal`
+and `Noise` order rows (and their date headers) by when you were last notified about the
+item, so a fresh comment on an old task sits under "Today"; with it off they order by
+recency like `All` and `Reminders`. Keyboard: `j`/`k` move, `space` preview, `enter` open, `e` mark done.
Rows are buttons named `<channel> <sender>:<snippet> <time>`.
## Email — `/app/component/mail`