Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
Seanaye/fix/remove channel perm waterfall (#5805)
Sean Aye7eadc63e2ef2
diff --git a/apps/web/package.json b/apps/web/package.jsonindex a3b3fe411a..f92f68588f 100644--- a/apps/web/package.json+++ b/apps/web/package.json@@ -115,6 +115,7 @@"detect-browser": "^5.3.0","diff": "^9.0.0","dinero.js": "2.0.0-alpha.8",+ "effect": "^4.0.0-rc.111","email-validator": "^2.0.4","emojibase-data": "^17.0.0","emojilib": "^4.0.2",diff --git a/apps/web/src/features/block-agent/CHANNEL_BLOCK_NOTES.md b/apps/web/src/features/block-agent/CHANNEL_BLOCK_NOTES.mdindex 08cca0a23f..0c9c79758a 100644--- a/apps/web/src/features/block-agent/CHANNEL_BLOCK_NOTES.md+++ b/apps/web/src/features/block-agent/CHANNEL_BLOCK_NOTES.md@@ -31,7 +31,7 @@ Everything "block-shaped" lives here, NOT in Channel.tsx:| Orchestrator methods | :354–380 | `createMethodRegistration(blockHandle, { goToLocationFromParams, goToLatest })`. External navigation (mention click, inbox row) lands here. || Handle await | :345–350 | `awaitCondition(() => messagesHandle() !== undefined, 10_000)` — the Messages tab may not have mounted yet; orchestrator methods wait for the child handle via a signal. || Target-message resolution | :308–341 | `resolveTargetMessage`: cache-first (`findTopLevelMessageInChannelMessages`, `findThreadIdInChannelMessages`), falls back to `fetchResolvedChannelMessage` roundtrip. |-| Permissions | :430 | Wraps everything in `<EntityPermissionsGate entityType="channel" entityId={channelId}>`. |+| Initial load gate | `Channel.tsx` | The channel's existing TanStack message query feeds `<EntityLoadGate>` directly, so the content request supplies the loading/access/not-found/gone state without a separate adapter query. Other tabs mount and authorize through their own content queries. || Autofocus | :454 | `autofocus={canAutofocusSplitContent && !navigatedFromJK()}` — split layout + j/k navigation decide, not the component. |### The child-handle pattern (the key adapter↔component contract)diff --git a/apps/web/src/features/block-channel/component/NewChannelBlockAdapter.tsx b/apps/web/src/features/block-channel/component/NewChannelBlockAdapter.tsxindex 711c72d993..010f9cc64a 100644--- a/apps/web/src/features/block-channel/component/NewChannelBlockAdapter.tsx+++ b/apps/web/src/features/block-channel/component/NewChannelBlockAdapter.tsx@@ -46,7 +46,6 @@ import {} from '@components/app/split-layout/layoutUtils';import { useNavigatedFromJK } from '@components/app/useNavigatedFromJK';import { useBlockId } from '@core/block';-import { EntityPermissionsGate } from '@core/component/EntityPermissionsGate';import { ENABLE_CALLS } from '@core/constant/featureFlags';import {useChannel,@@ -280,6 +279,28 @@ export function NewChannelBlockAdapter(props: BlockChannelProps) {const blockHandle = blockHandleSignal.get;const [searchParams, setSearchParams] = useSearchParams();+ const initialTargetMessageParams = (): ChannelTargetMessageParams => {+ const hasPropsTarget =+ props[URL_PARAMS.message] !== undefined ||+ props[URL_PARAMS.thread] !== undefined;+ if (hasPropsTarget) {+ return {+ [URL_PARAMS.message]: props[URL_PARAMS.message],+ [URL_PARAMS.thread]: props[URL_PARAMS.thread],+ };+ }+ const isSingleSplit = globalSplitManager()?.splits().length === 1;+ if (!isSingleSplit) return {};+ return {+ [URL_PARAMS.message]: searchParams[URL_PARAMS.message] as+ | string+ | undefined,+ [URL_PARAMS.thread]: searchParams[URL_PARAMS.thread] as+ | string+ | undefined,+ };+ };+// Decide whether the user asked to auto-join the call (via ?join_call=true// deep link or programmatic open props) before creating signals so we// can land directly on the Call tab without flashing Messages first.@@ -457,28 +478,6 @@ export function NewChannelBlockAdapter(props: BlockChannelProps) {},});- const initialTargetMessageParams = (): ChannelTargetMessageParams => {- const hasPropsTarget =- props[URL_PARAMS.message] !== undefined ||- props[URL_PARAMS.thread] !== undefined;- if (hasPropsTarget) {- return {- [URL_PARAMS.message]: props[URL_PARAMS.message],- [URL_PARAMS.thread]: props[URL_PARAMS.thread],- };- }- const isSingleSplit = globalSplitManager()?.splits().length === 1;- if (!isSingleSplit) return {};- return {- [URL_PARAMS.message]: searchParams[URL_PARAMS.message] as- | string- | undefined,- [URL_PARAMS.thread]: searchParams[URL_PARAMS.thread] as- | string- | undefined,- };- };-const onChannelReady = (handle: ChannelHandle) => {setMessagesHandle(() => handle);};@@ -505,7 +504,7 @@ export function NewChannelBlockAdapter(props: BlockChannelProps) {: undefined;return (- <EntityPermissionsGate entityType="channel" entityId={channelId}>+ <><CallEventSync /><ChannelTabProvider activeTab={activeTab} setActiveTab={setActiveTab}><ChannelCallAutoJoin@@ -556,6 +555,6 @@ export function NewChannelBlockAdapter(props: BlockChannelProps) {<NewTop channelId={channelId} /></div></ChannelTabProvider>- </EntityPermissionsGate>+ </>);}diff --git a/apps/web/src/features/channel/Channel/Channel.tsx b/apps/web/src/features/channel/Channel/Channel.tsxindex 81d8e73d3d..d1d63f4c47 100644--- a/apps/web/src/features/channel/Channel/Channel.tsx+++ b/apps/web/src/features/channel/Channel/Channel.tsx@@ -24,6 +24,10 @@ import { FloatRegions } from '@components/app/mobile/float-regions/float-region-import { SwipableRowProvider } from '@components/app/mobile/SwipableRow';import { useSplitLayout } from '@components/app/split-layout/layout';import { useSplitPanel } from '@components/app/split-layout/layoutUtils';+import {+ EntityLoadGate,+ toEntityLoadError,+} from '@core/component/EntityLoadGate';import { FindBar } from '@core/component/FindBar';import { StaticMarkdownContext } from '@core/component/LexicalMarkdown/component/core/StaticMarkdown';import { toast } from '@core/component/Toast/Toast';@@ -208,6 +212,21 @@ export function Channel(props: ChannelProps) {() => props.channelId,targetMessageController.loadAroundMessageId);+ const isTargetMessageMissing = () =>+ targetMessageController.loadAroundMessageId() !== undefined &&+ isMissingChannelMessageError(messagesQuery.error);+ const messagesLoadResult = {+ data: () => messagesQuery.data,+ // Pagination and background-refresh errors should not replace content that+ // has already loaded. Only initial-loading errors belong to the gate.+ error: () =>+ messagesQuery.isLoadingError && !isTargetMessageMissing()+ ? toEntityLoadError(messagesQuery.error)+ : undefined,+ // Keep the loading view mounted while the missing-target handler switches+ // the query back to the latest page.+ isPending: () => messagesQuery.isPending || isTargetMessageMissing(),+ };createEffect(on(@@ -683,272 +702,278 @@ export function Channel(props: ChannelProps) {);return (- <DebugSuspense name="Channel.root">- <deleteConfirmation.ConfirmationDialog />- <StaticMarkdownContext>- <SearchHighlightTermsProvider value={findBar.getSearchTermsForMessage}>- <MaybeMessageActionDrawerManager>- <ChannelDropZone dragState={dragState}>- <div- class="ph-no-capture relative flex-1 min-h-0 outline-none flex flex-col"- ref={(element) => {- attachMessageListRef(element);- }}- tabIndex={-1}- data-channel-message-list- >- <Show when={findBar.isOpen()}>- <FindBar- class="absolute top-2 right-3 z-10 w-80 max-w-[calc(100%-1.5rem)] touch:top-[calc(var(--mobile-content-inset-top,0)+0.5rem)]"- controller={findBar}- direction="desc"- />- </Show>- <Show when={messages().length > 0}>- <div- class="relative flex-1 min-h-0"- ref={setThreadListContainerEl}- >- <SwipableRowProvider- container={threadListContainerEl}- triggerBehavior="spring-back"+ <EntityLoadGate result={messagesLoadResult}>+ <DebugSuspense name="Channel.root">+ <deleteConfirmation.ConfirmationDialog />+ <StaticMarkdownContext>+ <SearchHighlightTermsProvider+ value={findBar.getSearchTermsForMessage}+ >+ <MaybeMessageActionDrawerManager>+ <ChannelDropZone dragState={dragState}>+ <div+ class="ph-no-capture relative flex-1 min-h-0 outline-none flex flex-col"+ ref={(element) => {+ attachMessageListRef(element);+ }}+ tabIndex={-1}+ data-channel-message-list+ >+ <Show when={findBar.isOpen()}>+ <FindBar+ class="absolute top-2 right-3 z-10 w-80 max-w-[calc(100%-1.5rem)] touch:top-[calc(var(--mobile-content-inset-top,0)+0.5rem)]"+ controller={findBar}+ direction="desc"+ />+ </Show>+ <Show when={messages().length > 0}>+ <div+ class="relative flex-1 min-h-0"+ ref={setThreadListContainerEl}>- <ThreadList- channelId={props.channelId}- keys={() => messageIndex.keys}- initialScrollTarget={threadListInitialScrollTarget()}- initialScrollHandledByTargetElement={- targetMessageController.pendingScrollTargetId() !==- undefined- }- keepMounted={keepMountedTargetThreadIndexes}- fullFrameScrollInsets={threadListScrollInsets}- shift={shift}- prepend={threadPaginator.isPrepending}- onScrollNearTop={threadPaginator.shiftPaginate}- onScrollNearBottom={threadPaginator.prependPaginate}- onNavigationReady={setThreadListNavigation}- onScrollStateChange={setThreadListScrollState}- initialScrollSnapshot={- props.targetMessageId- ? undefined- : props.initialMessagesStateSnapshot?.scroll- }- onScrollSnapshotChange={setThreadListScrollSnapshot}+ <SwipableRowProvider+ container={threadListContainerEl}+ triggerBehavior="spring-back">- {(item) => {- const message = () => messageById().get(item.id);- const state = threadManager.getOrCreateThreadState(- item.id- );- const isNewestThread = () =>- item.id === messageIndex.keys.at(-1);-- return (- <Show when={message()}>- {(m) => (- <ChannelThread- data={m}- channelId={() => props.channelId}- isNewestThread={isNewestThread()}- getMessageActions={getMessageActions}- isFindBarOpen={findBar.isOpen}- targetNavigation={{- targetThreadId:- targetMessageController.activeTargetMessageId,- targetMessageId: () =>- !targetMessageController.pendingTargetReplyId()- ? targetMessageController.pendingScrollTargetId()- : undefined,- targetReplyId: () =>- targetMessageController.pendingScrollTargetId()- ? undefined- : targetMessageController.pendingTargetReplyId(),- activeTargetReplyId:- targetMessageController.activeTargetMessageReplyId,- positionTarget: (- threadRow,- targetElement- ) =>- threadListNavigation()?.scrollToElementInItem(- item.id,+ <ThreadList+ channelId={props.channelId}+ keys={() => messageIndex.keys}+ initialScrollTarget={threadListInitialScrollTarget()}+ initialScrollHandledByTargetElement={+ targetMessageController.pendingScrollTargetId() !==+ undefined+ }+ keepMounted={keepMountedTargetThreadIndexes}+ fullFrameScrollInsets={threadListScrollInsets}+ shift={shift}+ prepend={threadPaginator.isPrepending}+ onScrollNearTop={threadPaginator.shiftPaginate}+ onScrollNearBottom={threadPaginator.prependPaginate}+ onNavigationReady={setThreadListNavigation}+ onScrollStateChange={setThreadListScrollState}+ initialScrollSnapshot={+ props.targetMessageId+ ? undefined+ : props.initialMessagesStateSnapshot?.scroll+ }+ onScrollSnapshotChange={setThreadListScrollSnapshot}+ >+ {(item) => {+ const message = () => messageById().get(item.id);+ const state = threadManager.getOrCreateThreadState(+ item.id+ );+ const isNewestThread = () =>+ item.id === messageIndex.keys.at(-1);++ return (+ <Show when={message()}>+ {(m) => (+ <ChannelThread+ data={m}+ channelId={() => props.channelId}+ isNewestThread={isNewestThread()}+ getMessageActions={getMessageActions}+ isFindBarOpen={findBar.isOpen}+ targetNavigation={{+ targetThreadId:+ targetMessageController.activeTargetMessageId,+ targetMessageId: () =>+ !targetMessageController.pendingTargetReplyId()+ ? targetMessageController.pendingScrollTargetId()+ : undefined,+ targetReplyId: () =>+ targetMessageController.pendingScrollTargetId()+ ? undefined+ : targetMessageController.pendingTargetReplyId(),+ activeTargetReplyId:+ targetMessageController.activeTargetMessageReplyId,+ positionTarget: (threadRow,targetElement- ) ?? false,- onTargetMessageScrolled:- targetMessageController.completePendingScroll,- onTargetReplyScrolled: (replyId) => {- targetMessageController.completePendingReplyScroll(- item.id,- replyId- );- },- onClearTarget: releaseSelectionAndTarget,- }}- unifiedReplyTarget={unifiedInput.replyTarget()}- isExpanded={state.isExpanded}- setIsExpanded={state.setIsExpanded}- isReplying={state.isReplying}- setIsReplying={state.setIsReplying}- replyInputState={state.replyInputState}- setReplyInputState={state.setReplyInputState}- setReplyInputEl={state.setReplyInputEl}- replyInputHandle={state.replyInputHandle}- setReplyInputHandle={- state.setReplyInputHandle- }- replyInputFocusRequest={- state.replyInputFocusRequest- }- listMeta={listMetaByMessageId()[item.id]}- messageEditor={messageEditor}- participants={participants.users}- threadActions={{- onDismissNewMessages:- activityTracker.dismissNewMessages,- }}- isNewMessage={activityTracker.isNewMessage}- selectedMessageId={selection.selectedId}- onSelectMessage={selectMessage}- onClearSelection={clearSelection}- messageListScopeId={messageListScopeId}- />- )}- </Show>- );- }}- </ThreadList>- </SwipableRowProvider>- <Show when={!findBar.isOpen()}>- <ScrollToBottomOverlay- scrollState={threadListScrollState}- onScrollToBottom={handleScrollToBottom}- class="touch:top-[calc(var(--mobile-content-inset-top,0)+1rem)]"- />- </Show>- </div>- </Show>- <DebugSuspense name="Channel.active-call">- <ActiveCallMessage channelId={props.channelId} />- </DebugSuspense>- </div>- <DebugSuspense name="Channel.input">- <FloatRegionOrInline region="accessory">- <ChannelInputContainer- ref={(el) => {- attachInputRef(el);- }}- >- <Switch>- <Match- when={- isUnifiedInputMode() &&- messageEditor.state()?.messageId- }- keyed- >- {(_messageId) => (- <UnifiedEditInput- channelId={props.channelId}- messageEditor={messageEditor}- onNavigateToMessage={(message) =>- goToMessage(- message.thread_id ?? message.id,- message.thread_id ? message.id : undefined- )- }- />- )}- </Match>- <Match- when={- isUnifiedInputMode() &&- unifiedInput.replyTarget()?.threadId- }- keyed- >- {(threadId) => (- <UnifiedReplyInput- channelId={props.channelId}- threadId={threadId}- state={threadManager.getOrCreateThreadState(- threadId- )}- getTargetMessage={() => {- const target = unifiedInput.replyTarget();- if (target?.message) return target.message;- // A restored quote-reply has no resolvable- // message (messageById only indexes thread- // roots) — don't misattribute it to the root.- if (target?.replyId) return undefined;- return messageById().get(threadId);- }}- threadHasReplies={() =>- (messageById().get(threadId)?.thread- .reply_count ?? 0) > 0- }- onNavigateToTarget={() =>- goToMessage(- threadId,- unifiedInput.replyTarget()?.replyId- )- }- onExit={unifiedInput.closeReply}- />- )}- </Match>- <Match when={true}>- <TaskModeChannelInput- autofocus={props.autofocus}- collapsible- input={{- mode: 'channel',- id: `channel-input-${props.channelId}`,- placeholder: inputPlaceholder(),- }}- participants={participants.users}- bots={channelBotMentionUsers}- attachmentTracker={attachmentTracker}- persistenceKey={makeInputValuePersistenceKey({- channelId: props.channelId,- })}- onReady={(handle) => {- dragState.setAttachFilesToChannel(- handle.attachFiles+ ) =>+ threadListNavigation()?.scrollToElementInItem(+ item.id,+ threadRow,+ targetElement+ ) ?? false,+ onTargetMessageScrolled:+ targetMessageController.completePendingScroll,+ onTargetReplyScrolled: (replyId) => {+ targetMessageController.completePendingReplyScroll(+ item.id,+ replyId+ );+ },+ onClearTarget: releaseSelectionAndTarget,+ }}+ unifiedReplyTarget={unifiedInput.replyTarget()}+ isExpanded={state.isExpanded}+ setIsExpanded={state.setIsExpanded}+ isReplying={state.isReplying}+ setIsReplying={state.setIsReplying}+ replyInputState={state.replyInputState}+ setReplyInputState={+ state.setReplyInputState+ }+ setReplyInputEl={state.setReplyInputEl}+ replyInputHandle={state.replyInputHandle}+ setReplyInputHandle={+ state.setReplyInputHandle+ }+ replyInputFocusRequest={+ state.replyInputFocusRequest+ }+ listMeta={listMetaByMessageId()[item.id]}+ messageEditor={messageEditor}+ participants={participants.users}+ threadActions={{+ onDismissNewMessages:+ activityTracker.dismissNewMessages,+ }}+ isNewMessage={activityTracker.isNewMessage}+ selectedMessageId={selection.selectedId}+ onSelectMessage={selectMessage}+ onClearSelection={clearSelection}+ messageListScopeId={messageListScopeId}+ />+ )}+ </Show>);- dragState.setEntityMentionInputHandlers(handle);- setChannelInputHandle(handle);}}- onChange={(snapshot) =>- void setChannelInputSnapshot(snapshot)+ </ThreadList>+ </SwipableRowProvider>+ <Show when={!findBar.isOpen()}>+ <ScrollToBottomOverlay+ scrollState={threadListScrollState}+ onScrollToBottom={handleScrollToBottom}+ class="touch:top-[calc(var(--mobile-content-inset-top,0)+1rem)]"+ />+ </Show>+ </div>+ </Show>+ <DebugSuspense name="Channel.active-call">+ <ActiveCallMessage channelId={props.channelId} />+ </DebugSuspense>+ </div>+ <DebugSuspense name="Channel.input">+ <FloatRegionOrInline region="accessory">+ <ChannelInputContainer+ ref={(el) => {+ attachInputRef(el);+ }}+ >+ <Switch>+ <Match+ when={+ isUnifiedInputMode() &&+ messageEditor.state()?.messageId}- onSend={onSend}- onSendTask={onSendTask}- taskPersistence={makeTaskPersistence({- channelId: props.channelId,- })}- onStartTyping={() =>- typingMutation.mutate({- channelId: props.channelId,- action: 'start',- })+ keyed+ >+ {(_messageId) => (+ <UnifiedEditInput+ channelId={props.channelId}+ messageEditor={messageEditor}+ onNavigateToMessage={(message) =>+ goToMessage(+ message.thread_id ?? message.id,+ message.thread_id ? message.id : undefined+ )+ }+ />+ )}+ </Match>+ <Match+ when={+ isUnifiedInputMode() &&+ unifiedInput.replyTarget()?.threadId}- onStopTyping={() =>- typingMutation.mutate({+ keyed+ >+ {(threadId) => (+ <UnifiedReplyInput+ channelId={props.channelId}+ threadId={threadId}+ state={threadManager.getOrCreateThreadState(+ threadId+ )}+ getTargetMessage={() => {+ const target = unifiedInput.replyTarget();+ if (target?.message) return target.message;+ // A restored quote-reply has no resolvable+ // message (messageById only indexes thread+ // roots) — don't misattribute it to the root.+ if (target?.replyId) return undefined;+ return messageById().get(threadId);+ }}+ threadHasReplies={() =>+ (messageById().get(threadId)?.thread+ .reply_count ?? 0) > 0+ }+ onNavigateToTarget={() =>+ goToMessage(+ threadId,+ unifiedInput.replyTarget()?.replyId+ )+ }+ onExit={unifiedInput.closeReply}+ />+ )}+ </Match>+ <Match when={true}>+ <TaskModeChannelInput+ autofocus={props.autofocus}+ collapsible+ input={{+ mode: 'channel',+ id: `channel-input-${props.channelId}`,+ placeholder: inputPlaceholder(),+ }}+ participants={participants.users}+ bots={channelBotMentionUsers}+ attachmentTracker={attachmentTracker}+ persistenceKey={makeInputValuePersistenceKey({channelId: props.channelId,- action: 'stop',- })- }- />- </Match>- </Switch>- </ChannelInputContainer>- </FloatRegionOrInline>- </DebugSuspense>- </ChannelDropZone>- </MaybeMessageActionDrawerManager>- </SearchHighlightTermsProvider>- </StaticMarkdownContext>- </DebugSuspense>+ })}+ onReady={(handle) => {+ dragState.setAttachFilesToChannel(+ handle.attachFiles+ );+ dragState.setEntityMentionInputHandlers(handle);+ setChannelInputHandle(handle);+ }}+ onChange={(snapshot) =>+ void setChannelInputSnapshot(snapshot)+ }+ onSend={onSend}+ onSendTask={onSendTask}+ taskPersistence={makeTaskPersistence({+ channelId: props.channelId,+ })}+ onStartTyping={() =>+ typingMutation.mutate({+ channelId: props.channelId,+ action: 'start',+ })+ }+ onStopTyping={() =>+ typingMutation.mutate({+ channelId: props.channelId,+ action: 'stop',+ })+ }+ />+ </Match>+ </Switch>+ </ChannelInputContainer>+ </FloatRegionOrInline>+ </DebugSuspense>+ </ChannelDropZone>+ </MaybeMessageActionDrawerManager>+ </SearchHighlightTermsProvider>+ </StaticMarkdownContext>+ </DebugSuspense>+ </EntityLoadGate>);}diff --git a/apps/web/src/features/entity/tests/filter.test.ts b/apps/web/src/features/entity/tests/filter.test.tsindex adf506c8a5..7243fd4c7f 100644--- a/apps/web/src/features/entity/tests/filter.test.ts+++ b/apps/web/src/features/entity/tests/filter.test.ts@@ -86,6 +86,41 @@ describe('unreadFilterFn', () => {});describe('mixed scenarios', () => {+ it('treats an unviewed document mention as an unread channel notification', () => {+ const entity: WithNotification<EntityData> = {+ type: 'channel',+ id: 'channel-1',+ name: 'Channel',+ ownerId: 'owner-1',+ channelType: 'private',+ notifications: () => [+ {+ entity_type: 'channel',+ entity_id: 'channel-1',+ id: 'notification-1',+ created_at: '2025-01-01T00:00:00Z',+ updated_at: '2025-01-01T00:00:00Z',+ viewed_at: null,+ done: false,+ sent: true,+ notification_event_type: 'document_mention',+ notification_metadata: {+ tag: 'document_mention',+ content: {+ channelType: 'private',+ documentName: 'Document',+ messageContent: 'Message',+ messageId: 'message-1',+ owner: 'owner-1',+ },+ },+ },+ ],+ };++ expect(unreadFilterFn(entity)).toBe(true);+ });+it('handles entity with multiple unviewed notifications', () => {const entity: WithNotification<EntityData> = {type: 'channel',diff --git a/apps/web/src/features/entity/utils/notification.ts b/apps/web/src/features/entity/utils/notification.tsindex 073a9c0cbf..c72c1e8691 100644--- a/apps/web/src/features/entity/utils/notification.ts+++ b/apps/web/src/features/entity/utils/notification.ts@@ -21,6 +21,7 @@ const CHANNEL_NOTIFICATION_TYPES = ['channel_mention','channel_message_send','channel_message_reply',+ 'document_mention',] as const;export function notificationIsRead(notification: UnifiedNotification): boolean {diff --git a/apps/web/src/features/notifications/notification-navigation.ts b/apps/web/src/features/notifications/notification-navigation.tsindex d4f9b1e4f4..47cd386e6d 100644--- a/apps/web/src/features/notifications/notification-navigation.ts+++ b/apps/web/src/features/notifications/notification-navigation.ts@@ -110,6 +110,10 @@ export function getChannelNotificationParams(messageId: m.content.messageId,threadId: m.content.threadId,}))+ .with({ tag: 'document_mention' }, (m) => ({+ messageId: m.content.messageId,+ threadId: m.content.threadId ?? undefined,+ })).exhaustive();const params = messageId ? getChannelParams(messageId, threadId) : undefined;@@ -227,40 +231,6 @@ function getSupportedHandler(sourceHandle,}))- .with('document_mention', () => {- const meta = notification.notification_metadata;- if (meta.tag !== 'document_mention') return null;-- // Document mentions are generated by channel messages. For these- // notifications, open the source channel message rather than the- // mentioned document.- return async (lm: SplitManager, newSplit: boolean = false) => {- const content = meta.content;- const messageId = content.messageId;- const threadId = content.threadId ?? undefined;-- if (messageId) {- const orchestrator = lm.getOrchestrator();- await navigateToChannelMessage(- orchestrator,- notification.entity_id,- messageId,- threadId,- {- splitManager: lm,- preferNewSplit: newSplit,- sourceHandle,- }- );- return;- }-- openSplitIfNotOpen(lm, 'channel', notification.entity_id, {- newSplit,- sourceHandle,- });- };- }).with('invite_to_team', () => null).with('call_started',diff --git a/apps/web/src/features/notifications/notification-source.ts b/apps/web/src/features/notifications/notification-source.tsindex f938a35d20..930071d72b 100644--- a/apps/web/src/features/notifications/notification-source.ts+++ b/apps/web/src/features/notifications/notification-source.ts@@ -42,6 +42,7 @@ export const CHANNEL_EVENT_TYPES = ['channel_mention','channel_message_send','channel_message_reply',+ 'document_mention',] as const;export const DOCUMENT_COMMENT_EVENT_TYPES = [diff --git a/apps/web/src/features/notifications/tests/mark-message-notifications.test.tsx b/apps/web/src/features/notifications/tests/mark-message-notifications.test.tsxnew file mode 100644index 0000000000..a3f8da5ae4--- /dev/null+++ b/apps/web/src/features/notifications/tests/mark-message-notifications.test.tsx@@ -0,0 +1,67 @@+import type { NotificationSource } from '@notifications/notification-source';+import type { UnifiedNotification } from '@notifications/types';+import { render, waitFor } from '@solidjs/testing-library';+import { beforeEach, describe, expect, it, vi } from 'vitest';+import { MarkMessageNotifications } from '../components/MarkMessageNotifications';++const mocks = vi.hoisted(() => ({+ notificationSource: undefined as NotificationSource | undefined,+}));++vi.mock('@components/app/GlobalAppState', () => ({+ useGlobalNotificationSource: () => mocks.notificationSource,+}));++function documentMentionNotification(): UnifiedNotification {+ return {+ id: 'notification-1',+ entity_id: 'channel-1',+ entity_type: 'channel',+ created_at: '2026-08-17T00:00:00.000Z',+ done: false,+ notification_event_type: 'document_mention',+ notification_metadata: {+ tag: 'document_mention',+ content: {+ messageId: 'message-1',+ },+ } as UnifiedNotification['notification_metadata'],+ sent: true,+ updated_at: '2026-08-17T00:00:00.000Z',+ viewed_at: null,+ };+}++describe('MarkMessageNotifications', () => {+ const markAsRead = vi.fn<NotificationSource['markAsRead']>();++ beforeEach(() => {+ vi.clearAllMocks();+ markAsRead.mockResolvedValue(undefined);+ const notification = documentMentionNotification();+ mocks.notificationSource = {+ notificationsByEntity: () => ({+ 'channel@channel-1': [notification],+ }),+ markAsRead,+ } as unknown as NotificationSource;+ });++ it('marks a document mention as read when its channel message mounts', async () => {+ render(() => (+ <MarkMessageNotifications messageId="message-1" channelId="channel-1">+ <span>Message</span>+ </MarkMessageNotifications>+ ));++ await waitFor(() => {+ expect(markAsRead).toHaveBeenCalledOnce();+ expect(markAsRead).toHaveBeenCalledWith(+ expect.objectContaining({+ id: 'notification-1',+ notification_event_type: 'document_mention',+ })+ );+ });+ });+});diff --git a/apps/web/src/lib/core/component/EntityLoadGate.test.tsx b/apps/web/src/lib/core/component/EntityLoadGate.test.tsxnew file mode 100644index 0000000000..2f32833e1b--- /dev/null+++ b/apps/web/src/lib/core/component/EntityLoadGate.test.tsx@@ -0,0 +1,159 @@+/**+ * @vitest-environment jsdom+ */++import { ThrownResultError } from '@core/util/result';+import { render } from 'solid-js/web';+import { afterEach, describe, expect, it, vi } from 'vitest';++vi.mock('./AccessErrorViews/Gone', () => ({+ default: () => <div>Gone</div>,+}));+vi.mock('./AccessErrorViews/NotFound', () => ({+ default: () => <div>Not found</div>,+}));+vi.mock('./AccessErrorViews/Unauthorized', () => ({+ default: () => <div>Unauthorized</div>,+}));+vi.mock('./LoadingBlock', () => ({+ LoadingBlock: () => <div>Loading</div>,+}));++import {+ type EntityLoadErrorCode,+ EntityLoadGate,+ type EntityLoadResult,+ toEntityLoadError,+} from './EntityLoadGate';++let dispose: (() => void) | undefined;++function renderGate<Data>(result: EntityLoadResult<Data>): HTMLElement {+ const container = document.createElement('div');+ document.body.appendChild(container);+ const disposeRender = render(+ () => (+ <EntityLoadGate result={result}>+ <div>Loaded</div>+ </EntityLoadGate>+ ),+ container+ );+ dispose = () => {+ disposeRender();+ container.remove();+ };+ return container;+}++afterEach(() => {+ dispose?.();+ dispose = undefined;+});++describe('EntityLoadGate', () => {+ it('renders its child after data loads', () => {+ const container = renderGate({+ data: () => 'channel data',+ error: () => undefined,+ isPending: () => false,+ });++ expect(container.textContent).toBe('Loaded');+ });++ it.each([+ { label: 'zero', data: 0 },+ { label: 'false', data: false },+ { label: 'an empty string', data: '' },+ ])('renders its child when data is $label', ({ data }) => {+ const container = renderGate({+ data: () => data,+ error: () => undefined,+ isPending: () => false,+ });++ expect(container.textContent).toBe('Loaded');+ });++ it('does not mount its child while data is pending', () => {+ let childMounted = false;+ const Child = () => {+ childMounted = true;+ return <div>Loaded</div>;+ };+ const container = document.createElement('div');+ document.body.appendChild(container);+ const disposeRender = render(+ () => (+ <EntityLoadGate+ result={{+ data: () => undefined,+ error: () => undefined,+ isPending: () => true,+ }}+ >+ <Child />+ </EntityLoadGate>+ ),+ container+ );+ dispose = () => {+ disposeRender();+ container.remove();+ };++ expect(childMounted).toBe(false);+ expect(container.textContent).toBe('Loading');+ });++ it('renders loading while data is pending', () => {+ const container = renderGate({+ data: () => undefined,+ error: () => undefined,+ isPending: () => true,+ });++ expect(container.textContent).toBe('Loading');+ });++ it.each<readonly [EntityLoadErrorCode, string]>([+ ['UNAUTHORIZED', 'Unauthorized'],+ ['FORBIDDEN', 'Unauthorized'],+ ['NOT_FOUND', 'Not found'],+ ['GONE', 'Gone'],+ ])('renders the gated view for %s', (code, expected) => {+ const container = renderGate({+ data: () => undefined,+ error: () => code,+ isPending: () => false,+ });++ expect(container.textContent).toBe(expected);+ });++ it('renders an unexpected-error fallback for other failures', () => {+ const container = renderGate({+ data: () => undefined,+ error: () => 'UNEXPECTED',+ isPending: () => false,+ });++ expect(container.textContent).toContain(+ 'Sorry, an unexpected error has occurred.'+ );+ });++ it('normalizes query errors into gate errors', () => {+ expect(+ toEntityLoadError(+ new ThrownResultError([+ { code: 'NOT_FOUND', message: 'entity load failed' },+ ])+ )+ ).toBe('NOT_FOUND');+ expect(toEntityLoadError(new Error('network unavailable'))).toBe(+ 'UNEXPECTED'+ );+ });+});diff --git a/apps/web/src/lib/core/component/EntityLoadGate.tsx b/apps/web/src/lib/core/component/EntityLoadGate.tsxnew file mode 100644index 0000000000..cd97f06f88--- /dev/null+++ b/apps/web/src/lib/core/component/EntityLoadGate.tsx@@ -0,0 +1,85 @@+import { ThrownResultError } from '@core/util/result';+import { type Accessor, type JSX, Match, Suspense, Switch } from 'solid-js';+import Gone from './AccessErrorViews/Gone';+import NotFound from './AccessErrorViews/NotFound';+import Unauthorized from './AccessErrorViews/Unauthorized';+import { LoadingBlock } from './LoadingBlock';++export type EntityLoadErrorCode =+ | 'UNAUTHORIZED'+ | 'FORBIDDEN'+ | 'NOT_FOUND'+ | 'GONE';++export type EntityLoadError = EntityLoadErrorCode | 'UNEXPECTED';++export type EntityLoadResult<Data> = {+ data: Accessor<Data | undefined>;+ error: Accessor<EntityLoadError | undefined>;+ isPending: Accessor<boolean>;+};++type EntityLoadGateProps<Data> = {+ result: EntityLoadResult<Data>;+ children: JSX.Element;+};++const ENTITY_LOAD_ERROR_CODES: ReadonlySet<string> = new Set([+ 'UNAUTHORIZED',+ 'FORBIDDEN',+ 'NOT_FOUND',+ 'GONE',+]);++function isEntityLoadErrorCode(code: string): code is EntityLoadErrorCode {+ return ENTITY_LOAD_ERROR_CODES.has(code);+}++/** Normalizes a query error into the error states supported by the gate. */+export function toEntityLoadError(error: unknown): EntityLoadError | undefined {+ if (error === undefined || error === null) return undefined;+ if (typeof error === 'string' && isEntityLoadErrorCode(error)) return error;+ if (error instanceof ThrownResultError) {+ return (+ error.errors.map(({ code }) => code).find(isEntityLoadErrorCode) ??+ 'UNEXPECTED'+ );+ }+ return 'UNEXPECTED';+}++/** Renders entity content or the appropriate loading and access-error view. */+export function EntityLoadGate<Data>(props: EntityLoadGateProps<Data>) {+ const error = props.result.error;++ return (+ <Suspense fallback={<LoadingBlock />}>+ <Switch+ fallback={+ <div class="flex flex-col items-center justify-center h-full text-lg">+ Sorry, an unexpected error has occurred.+ </div>+ }+ >+ <Match when={error() === 'UNAUTHORIZED' || error() === 'FORBIDDEN'}>+ <Unauthorized />+ </Match>+ <Match when={error() === 'NOT_FOUND'}>+ <NotFound />+ </Match>+ <Match when={error() === 'GONE'}>+ <Gone />+ </Match>+ <Match when={error() === 'UNEXPECTED'}>+ <div class="flex flex-col items-center justify-center h-full text-lg">+ Sorry, an unexpected error has occurred.+ </div>+ </Match>+ <Match when={props.result.isPending()}>+ <LoadingBlock />+ </Match>+ <Match when={props.result.data() !== undefined}>{props.children}</Match>+ </Switch>+ </Suspense>+ );+}diff --git a/apps/web/src/lib/core/component/EntityPermissionsGate.tsx b/apps/web/src/lib/core/component/EntityPermissionsGate.tsxdeleted file mode 100644index f68cacef02..0000000000--- a/apps/web/src/lib/core/component/EntityPermissionsGate.tsx+++ /dev/null@@ -1,64 +0,0 @@-import { ThrownResultError } from '@core/util/result';-import { useEntityPermissions } from '@queries/entity/permissions';-import { hasEntityAccess } from '@queries/entity/permissionUtils';-import { type FlowProps, Match, Show, Suspense, Switch } from 'solid-js';-import Gone from './AccessErrorViews/Gone';-import NotFound from './AccessErrorViews/NotFound';-import Unauthorized from './AccessErrorViews/Unauthorized';-import { LoadingBlock } from './LoadingBlock';--function getErrorCode(error: Error | null): string | null {- if (error instanceof ThrownResultError) {- return error.errors[0]?.code ?? null;- }- return null;-}--function PermissionGateInner(- props: FlowProps<{ entityType: string; entityId: string }>-) {- const query = useEntityPermissions(- () => props.entityType,- () => props.entityId- );-- const errorCode = () => getErrorCode(query.error);-- return (- <Switch- fallback={- <Show- when={query.data && hasEntityAccess(query.data)}- fallback={<Unauthorized />}- >- {props.children}- </Show>- }- >- <Match when={errorCode() === 'UNAUTHORIZED'}>- <Unauthorized />- </Match>- <Match when={errorCode() === 'NOT_FOUND'}>- <NotFound />- </Match>- <Match when={errorCode() === 'GONE'}>- <Gone />- </Match>- <Match when={query.error}>- <div class="flex flex-col items-center justify-center h-full text-lg">- Sorry, an unexpected error has occurred.- </div>- </Match>- </Switch>- );-}--export function EntityPermissionsGate(- props: FlowProps<{ entityType: string; entityId: string }>-) {- return (- <Suspense fallback={<LoadingBlock />}>- <PermissionGateInner {...props} />- </Suspense>- );-}diff --git a/apps/web/src/lib/queries/entity/keys.ts b/apps/web/src/lib/queries/entity/keys.tsdeleted file mode 100644index c24b31bfa9..0000000000--- a/apps/web/src/lib/queries/entity/keys.ts+++ /dev/null@@ -1,7 +0,0 @@-import { createQueryKeys } from '@lukemorales/query-key-factory';--export const entityKeys = createQueryKeys('entity', {- permissions: (entityType: string, entityId: string) => ({- queryKey: [entityType, entityId],- }),-});diff --git a/apps/web/src/lib/queries/entity/permissionUtils.ts b/apps/web/src/lib/queries/entity/permissionUtils.tsdeleted file mode 100644index 307643a4ed..0000000000--- a/apps/web/src/lib/queries/entity/permissionUtils.ts+++ /dev/null@@ -1,62 +0,0 @@-import type {- AccessLevel,- EntityPermission,- EntityPermissionResponse,- ParticipantRole,-} from '@service-storage/generated/schemas';--type AccessResponse = Extract<EntityPermissionResponse, { status: 'access' }>;-type AccessLevelPermission = Extract<- EntityPermission,- { type: 'access_level' }->;-type ChannelRolePermission = Extract<- EntityPermission,- { type: 'channel_role' }->;--export function hasEntityAccess(- response: EntityPermissionResponse-): response is AccessResponse {- return response.status === 'access';-}--function isAccessLevelPermission(- permission: EntityPermission-): permission is AccessLevelPermission {- return permission.type === 'access_level';-}--function isChannelRolePermission(- permission: EntityPermission-): permission is ChannelRolePermission {- return permission.type === 'channel_role';-}--function _getEntityAccessLevel(- response: EntityPermissionResponse-): AccessLevel | null {- if (!hasEntityAccess(response)) {- return null;- }-- if (!isAccessLevelPermission(response.permission)) {- return null;- }-- return response.permission.access_level;-}--function _getEntityChannelRole(- response: EntityPermissionResponse-): ParticipantRole | null {- if (!hasEntityAccess(response)) {- return null;- }-- if (!isChannelRolePermission(response.permission)) {- return null;- }-- return response.permission.role;-}diff --git a/apps/web/src/lib/queries/entity/permissions.ts b/apps/web/src/lib/queries/entity/permissions.tsdeleted file mode 100644index bf8ea2e612..0000000000--- a/apps/web/src/lib/queries/entity/permissions.ts+++ /dev/null@@ -1,42 +0,0 @@-import { catchToResult, type ResultError, throwOnErr } from '@core/util/result';-import { dssFetch } from '@service-storage/client';-import type { EntityPermissionResponse } from '@service-storage/generated/schemas';-import { useQuery } from '@tanstack/solid-query';-import type { Result } from 'neverthrow';-import type { Accessor } from 'solid-js';-import { queryClient } from '../client';-import { entityKeys } from './keys';--function entityPermissionsQueryOptions(entityType: string, entityId: string) {- return {- queryKey: entityKeys.permissions(entityType, entityId).queryKey,- queryFn: async () =>- await throwOnErr(- async () =>- await dssFetch<EntityPermissionResponse>(- `/entity/${entityType}/${entityId}/permissions`- )- ),- };-}--export function useEntityPermissions(- entityType: Accessor<string>,- entityId: Accessor<string>-) {- return useQuery(() =>- entityPermissionsQueryOptions(entityType(), entityId())- );-}--async function _fetchEntityPermissions(- entityType: string,- entityId: string-): Promise<Result<EntityPermissionResponse, ResultError<string>[]>> {- return await catchToResult(- async () =>- await queryClient.ensureQueryData(- entityPermissionsQueryOptions(entityType, entityId)- )- );-}diff --git a/bun.lock b/bun.lockindex 4127130a84..7b8b12e598 100644--- a/bun.lock+++ b/bun.lock@@ -90,6 +90,7 @@"detect-browser": "^5.3.0","diff": "^9.0.0","dinero.js": "2.0.0-alpha.8",+ "effect": "^4.0.0-rc.111","email-validator": "^2.0.4","emojibase-data": "^17.0.0","emojilib": "^4.0.2",@@ -1117,6 +1118,18 @@"@microlabs/otel-cf-workers": ["@microlabs/[email protected]", "", { "dependencies": { "@opentelemetry/core": "^2.0.0", "@opentelemetry/exporter-trace-otlp-http": "^0.200.0", "@opentelemetry/otlp-exporter-base": "^0.200.0", "@opentelemetry/otlp-transformer": "^0.200.0", "@opentelemetry/resources": "^2.0.0", "@opentelemetry/sdk-trace-base": "^2.0.0", "@opentelemetry/semantic-conventions": "^1.33.0" }, "peerDependencies": { "@opentelemetry/api": "~1.9.0" } }, "sha512-7jf4sBNoaZCz2RSayefcvc/CZX0PDVA9aVk44bHpUebLrap+xjzDDw4T03klcYrBl/FdC7NamwvqjUMCtYdBvQ=="],+ "@msgpackr-extract/msgpackr-extract-darwin-arm64": ["@msgpackr-extract/[email protected]", "", { "os": "darwin", "cpu": "arm64" }, "sha512-LCkGo6JDfaBhgST7UpPWgNgLINpcpabaHfyz5OBx75nUYxBsaEPxjnyNjWpeb/xBup/682QnBfRBy2/LvPutZQ=="],++ "@msgpackr-extract/msgpackr-extract-darwin-x64": ["@msgpackr-extract/[email protected]", "", { "os": "darwin", "cpu": "x64" }, "sha512-zExlW9zUJKZH/tOtVMttwjKa4Xm/3KcNjnE3dPN92uCktwavMxpgCA3MoJK/DOnTWsQgo224OaST27/mPNAf+w=="],++ "@msgpackr-extract/msgpackr-extract-linux-arm": ["@msgpackr-extract/[email protected]", "", { "os": "linux", "cpu": "arm" }, "sha512-Tg3yX65f5GbtXLkrYEHE5oibZG9epyYWas7FogTTEJeDEF9JlXJzKgXaNhT3UXlTOeA+AfZpYZYZ0uPj7Cfquw=="],++ "@msgpackr-extract/msgpackr-extract-linux-arm64": ["@msgpackr-extract/[email protected]", "", { "os": "linux", "cpu": "arm64" }, "sha512-dgX0P/9wGPJeHFBG+ZmhgE6bmtMt7NP5CRBGyyktpopdk/mW4POnrpQsSLtKI1dwpc+pPLuXHDh6vvskyQE/sw=="],++ "@msgpackr-extract/msgpackr-extract-linux-x64": ["@msgpackr-extract/[email protected]", "", { "os": "linux", "cpu": "x64" }, "sha512-8TNXMEjJc3QEy7R/x1INhgiU+XakDAFUzBhaz7+Rbrs8NH5UQeHQxxmzsSBJGyV6I1jW79undiQm8tOI+D+8FQ=="],++ "@msgpackr-extract/msgpackr-extract-win32-x64": ["@msgpackr-extract/[email protected]", "", { "os": "win32", "cpu": "x64" }, "sha512-CmCXPQrkbwExx3j946/PtHWHbYJiCRBRDl4BlkRQcJB/YOwQxJRTpoo7aTsortjgoJ1x7opzTSxn7C+ASSLVjQ=="],+"@napi-rs/wasm-runtime": ["@napi-rs/[email protected]", "", { "dependencies": { "@tybys/wasm-util": "^0.10.3" }, "peerDependencies": { "@emnapi/core": "^1.7.1", "@emnapi/runtime": "^1.7.1" } }, "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg=="],"@noble/hashes": ["@noble/[email protected]", "", {}, "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A=="],@@ -2031,6 +2044,8 @@"ee-first": ["[email protected]", "", {}, "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="],+ "effect": ["[email protected]", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "fast-check": "^4.9.0", "msgpackr": "^2.0.5" } }, "sha512-ASd5L58EIR0CUNueZNKKjSsyOCd+2alxOAIaTcHaqkJkPsaYSsw5Cg/cfANk5K4Jr2YsX756xvX11shzqsreWA=="],+"electron-to-chromium": ["[email protected]", "", {}, "sha512-cEto7aeOqBfU1D+c5py5pE+ooscKE75JifxLBdFUZsqAxRS6y7kebtxAZvICszSl05gPjYHDTjY+lXpyGvpJbg=="],"email-validator": ["[email protected]", "", {}, "sha512-gYCwo7kh5S3IDyZPLZf6hSS0MnZT8QmJFqYvbqlDZSbwdZlY6QZWxJ4i/6UhITOJ4XzyI647Bm2MXKCLqnJ4nQ=="],@@ -2115,6 +2130,8 @@"extend": ["[email protected]", "", {}, "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="],+ "fast-check": ["[email protected]", "", { "dependencies": { "pure-rand": "^8.0.0" } }, "sha512-7ms6T7SybUev/PQITciI0yLM2pOSFy5zpG8Ty7tQofcVaQUvrMXp6CBwqF6fThLCLOrfBtuHAtwq6Yu4XPCllg=="],+"fast-deep-equal": ["[email protected]", "", {}, "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="],"fast-diff": ["[email protected]", "", {}, "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw=="],@@ -2647,6 +2664,10 @@"ms": ["[email protected]", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="],+ "msgpackr": ["[email protected]", "", { "optionalDependencies": { "msgpackr-extract": "^3.0.4" } }, "sha512-cef05H/dSYpLpqp3sj/qyZh5vhUYCalnaLO7j1yOmpsR0y/XwLVtK7r5gn+U/F7CTEfMowcGhlUQJDLcLf7jcA=="],++ "msgpackr-extract": ["[email protected]", "", { "dependencies": { "node-gyp-build-optional-packages": "5.2.2" }, "optionalDependencies": { "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.4", "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.4", "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.4", "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.4", "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.4", "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.4" }, "bin": { "download-msgpackr-prebuilds": "bin/download-prebuilds.js" } }, "sha512-4kmO/MdyUIkLIvTPr8VHLil4AtoKIoniWPIEk5+CDy0xnWC84azhSFmuJ7PxZdsYtiP5kEeQsORAVIeMgxT+Hw=="],+"mute-stream": ["[email protected]", "", {}, "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="],"nan": ["[email protected]", "", {}, "sha512-fTsDz99OTq2sVePhGdp4qQhggZFtKr64ZNVyVajRKtMOkJxYekplBh577PiJB12v/D3s2E5cGtOI45LWp6rnLQ=="],@@ -2667,6 +2688,8 @@"node-fetch-h2": ["[email protected]", "", { "dependencies": { "http2-client": "^1.2.5" } }, "sha512-ofRW94Ab0T4AOh5Fk8t0h8OBWrmjb0SSB20xh1H8YnPV9EJ+f5AMoYSUQ2zgJ4Iq2HAK0I2l5/Nequ8YzFS3Hg=="],+ "node-gyp-build-optional-packages": ["[email protected]", "", { "dependencies": { "detect-libc": "^2.0.1" }, "bin": { "node-gyp-build-optional-packages": "bin.js", "node-gyp-build-optional-packages-optional": "optional.js", "node-gyp-build-optional-packages-test": "build-test.js" } }, "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw=="],+"node-readfiles": ["[email protected]", "", { "dependencies": { "es6-promise": "^3.2.1" } }, "sha512-SU00ZarexNlE4Rjdm83vglt5Y9yiQ+XI1XpflWlb7q7UTN1JUItm69xMeiQCTxtTfnzt+83T8Cx+vI2ED++VDA=="],"node-releases": ["[email protected]", "", {}, "sha512-wRNIrw4DmVLKQlbgOMdkMx27Wrpzes2hh5Jtbi2bjPd+4wJstWIqP5A+lscnqbm0xxmT5Bpg8Lec5ItEBwx6BQ=="],@@ -2827,6 +2850,8 @@"punycode.js": ["[email protected]", "", {}, "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA=="],+ "pure-rand": ["[email protected]", "", {}, "sha512-vvuOGgcuPJAirlHvuQw1TrOiw7ptaIXXmIbNuiNOY6lNGJJH49PQ1Kj4nd783nPdQhQdicgOjVI2yI/9BD6/Ng=="],+"qs": ["[email protected]", "", { "dependencies": { "es-define-property": "^1.0.1", "side-channel": "^1.1.1" } }, "sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A=="],"query-selector-shadow-dom": ["[email protected]", "", {}, "sha512-lT5yCqEBgfoMYpf3F2xQRK7zEr1rhIIZuceDK6+xRkJQ4NMbHTwXqk4NkwDwQMNqXgG9r9fyHnzwNVs6zV5KRw=="],diff --git a/nix-support/node_modules-hashes.json b/nix-support/node_modules-hashes.jsonindex a04f4aac97..6d38f0b1d8 100644--- a/nix-support/node_modules-hashes.json+++ b/nix-support/node_modules-hashes.json@@ -1,6 +1,6 @@{"nodeModules": {- "aarch64-darwin": "sha256-1twYQYOzR/LZ6S5zM0eCXyKttn0B66wQoeW4w712o/c=",- "x86_64-linux": "sha256-2SoOzP1lzRlIvwkgJxfl5CxkLB48L36U1X65wMatImU="+ "aarch64-darwin": "sha256-ZFrp1AgZTEZtsLqELRlOLVswbL13Bs/QvCsO+tTlrpU=",+ "x86_64-linux": "sha256-JE+HJpEnW7Hjk+PH360Ca1DNuGNfwQi0GCYecuVOBaM="}-}+}\ No newline at end of file