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(email): preserve expanded invitations across access refreshes (#8182)

gbirman432c2b9e4e61
diff --git a/apps/web/AGENTS.md b/apps/web/AGENTS.md
index 6b9440ab1a..6ee525c1bb 100644
--- a/apps/web/AGENTS.md
+++ b/apps/web/AGENTS.md
@@ -83,6 +83,9 @@ Then trigger the interaction and read `window.__inst.log`. `'1,2,3' → '' → '
move between inboxes).
- Shared server-state queries and mutations live in `src/lib/queries`; keep
feature-specific query orchestration with its owning feature.
+- Preserve loaded block content on initial access confirmation when its loader
+ supplies no permissions; reload only on a later confirmed permission change.
+ Apply shared access in place only after a successful permissionless load.
- Reactive GraphQL reads use `createLiveQuery` for a document and
`useSoupAstItemsQuery` (backed by `createSoupLiveQuery`) for Soup lists; see
[choosing a reactive read](docs/graphql-normalized-cache-plan.md#choosing-a-reactive-read).
diff --git a/apps/web/src/features/access-requests/queries/access-updates.test.tsx b/apps/web/src/features/access-requests/queries/access-updates.test.tsx
index a44be5d776..b598d60a5a 100644
--- a/apps/web/src/features/access-requests/queries/access-updates.test.tsx
+++ b/apps/web/src/features/access-requests/queries/access-updates.test.tsx
@@ -1,4 +1,5 @@
import { cleanup, render } from '@solidjs/testing-library';
+import { createSignal } from 'solid-js';
import { createStore } from 'solid-js/store';
import { afterEach, expect, it, vi } from 'vitest';
import type { AccessLevel } from '../core/types';
@@ -35,9 +36,9 @@ it('ignores initial cache and failures, but propagates confirmed removal and a l
expect(apply).not.toHaveBeenCalled();
expect(access!()).toBeUndefined();
update('isFetchedAfterMount', true);
- expect(apply).toHaveBeenLastCalledWith('edit');
+ expect(apply).toHaveBeenLastCalledWith('edit', undefined);
update('data', 'accessLevel', null);
- expect(apply).toHaveBeenLastCalledWith(null);
+ expect(apply).toHaveBeenLastCalledWith(null, 'edit');
expect(access!()).toBeNull();
const calls = apply.mock.calls.length;
update('isSuccess', false);
@@ -45,5 +46,36 @@ it('ignores initial cache and failures, but propagates confirmed removal and a l
expect(apply).toHaveBeenCalledTimes(calls);
update('data', 'accessLevel', 'view');
update('isSuccess', true);
- expect(apply).toHaveBeenLastCalledWith('view');
+ expect(apply).toHaveBeenLastCalledWith('view', null);
+});
+
+it('reports the previous confirmation for refreshes and resets it for a new entity', () => {
+ const [state, update] = createStore({
+ isSuccess: true,
+ isFetchedAfterMount: true,
+ data: { accessLevel: 'owner' as AccessLevel | null },
+ });
+ snapshot = state;
+ const [entityId, setEntityId] = createSignal('first');
+ const apply = vi.fn();
+ function Host() {
+ useSharedAccessUpdates(
+ () => ({ entityType: 'document', entityId: entityId() }),
+ apply
+ );
+ return null;
+ }
+ render(() => <Host />);
+ expect(apply).toHaveBeenLastCalledWith('owner', undefined);
+ update('isSuccess', false);
+ expect(apply).toHaveBeenCalledTimes(1);
+ update('isSuccess', true);
+ expect(apply).toHaveBeenCalledTimes(2);
+ expect(apply).toHaveBeenLastCalledWith('owner', 'owner');
+
+ setEntityId('second');
+ expect(apply).toHaveBeenCalledTimes(3);
+ expect(apply).toHaveBeenLastCalledWith('owner', undefined);
+ update('data', 'accessLevel', 'view');
+ expect(apply).toHaveBeenLastCalledWith('view', 'owner');
});
diff --git a/apps/web/src/features/access-requests/queries/access-updates.ts b/apps/web/src/features/access-requests/queries/access-updates.ts
index 73b87cd01a..ee6b65e522 100644
--- a/apps/web/src/features/access-requests/queries/access-updates.ts
+++ b/apps/web/src/features/access-requests/queries/access-updates.ts
@@ -3,10 +3,16 @@ import { useAccessRequestState } from '@queries/access-requests/requests';
import { type Accessor, createEffect, createMemo, on } from 'solid-js';
import type { AccessLevel, ShareEntity } from '../core/types';
-/** Bridges refreshed server access to a host's existing permission adapter. */
+/**
+ * Bridges refreshed server access to a host's existing permission adapter.
+ * The previous level is undefined until this entity has confirmed access.
+ */
export function useSharedAccessUpdates(
entity: Accessor<ShareEntity | undefined>,
- apply: (level: AccessLevel | null) => void
+ apply: (
+ level: AccessLevel | null,
+ previous: AccessLevel | null | undefined
+ ) => void
) {
const authenticated = useIsAuthenticated();
const state = useAccessRequestState(entity, () => !!authenticated());
@@ -22,12 +28,13 @@ export function useSharedAccessUpdates(
return previous?.key === key ? previous : undefined;
});
createEffect(
- on(
- () => confirmed()?.level,
- (level) => {
- if (level !== undefined) apply(level);
- }
- )
+ on(confirmed, (current, previous) => {
+ if (current)
+ apply(
+ current.level,
+ previous?.key === current.key ? previous.level : undefined
+ );
+ })
);
return () => confirmed()?.level;
}
diff --git a/apps/web/src/lib/core/internal/BlockLoader.test.tsx b/apps/web/src/lib/core/internal/BlockLoader.test.tsx
index 9b0188f0b9..7541da438e 100644
--- a/apps/web/src/lib/core/internal/BlockLoader.test.tsx
+++ b/apps/web/src/lib/core/internal/BlockLoader.test.tsx
@@ -1,8 +1,8 @@
import type { AccessLevel } from '@service-storage/generated/schemas/accessLevel';
-import { cleanup, render } from '@solidjs/testing-library';
-import { ok } from 'neverthrow';
-import { createSignal } from 'solid-js';
-import { afterEach, expect, it, vi } from 'vitest';
+import { cleanup, fireEvent, render } from '@solidjs/testing-library';
+import { err, ok } from 'neverthrow';
+import { createEffect, createSignal, on, Show } from 'solid-js';
+import { afterEach, beforeEach, expect, it, vi } from 'vitest';
vi.mock('@core/block', () => ({
createBlockSignal<T>() {
@@ -22,12 +22,16 @@ let notifyAccess: (level: AccessLevel | null) => void;
vi.mock('@app/features/access-requests/access-requests', () => ({
useSharedAccessUpdates: (
_entity: unknown,
- apply: (level: AccessLevel | null) => void
+ apply: (
+ level: AccessLevel | null,
+ previous: AccessLevel | null | undefined
+ ) => void
) => {
const [level, setLevel] = createSignal<AccessLevel | null>();
notifyAccess = (next) => {
+ const previous = level();
setLevel(next);
- apply(next);
+ apply(next, previous);
};
return level;
},
@@ -36,11 +40,277 @@ vi.mock('@app/features/access-requests/access-requests', () => ({
import {
blockErrorSignal,
blockLoadRetrySignal,
+ blockSyncSourceSignal,
blockUserAccessSignal,
} from '../signal/load';
import { BlockLoader, blockDataSignal } from './BlockLoader';
afterEach(cleanup);
+beforeEach(() => {
+ blockDataSignal.set(undefined);
+ blockErrorSignal.set(undefined);
+ blockLoadRetrySignal.set(undefined);
+ blockUserAccessSignal.set(undefined);
+ blockSyncSourceSignal.set(undefined);
+});
+
+it('preserves an open email disclosure on initial and unchanged access confirmations, but reloads on a later change', async () => {
+ const loaded = Promise.withResolvers<void>();
+ const reloaded = Promise.withResolvers<void>();
+ const load = vi.fn(async () => ok({ id: 'email' }));
+ const view = render(() => {
+ createEffect(
+ on(blockDataSignal.get, (data) => {
+ if (data) {
+ if (load.mock.calls.length === 1) loaded.resolve();
+ else reloaded.resolve();
+ }
+ })
+ );
+ return (
+ <>
+ <BlockLoader
+ id="01a1460f-3198-7650-9b32-a43b49108e47"
+ source={{ type: 'dss', id: '01a1460f-3198-7650-9b32-a43b49108e47' }}
+ definition={{
+ name: 'email',
+ description: 'Email',
+ accepted: {},
+ component: () => null,
+ load,
+ }}
+ />
+ <Show when={blockDataSignal.get()}>
+ <details>
+ <summary>View original email</summary>
+ Original email
+ </details>
+ </Show>
+ </>
+ );
+ });
+ await loaded.promise;
+ const disclosure = view.container.querySelector('details')!;
+ fireEvent.click(view.getByText('View original email'));
+ expect(disclosure.open).toBe(true);
+ const data = blockDataSignal.get();
+
+ notifyAccess('owner');
+ expect(blockUserAccessSignal.get()).toBe('owner');
+ expect(blockDataSignal.get()).toBe(data);
+ expect(view.container.querySelector('details')).toBe(disclosure);
+ expect(disclosure.open).toBe(true);
+ notifyAccess('owner');
+ expect(load).toHaveBeenCalledTimes(1);
+ expect(disclosure.isConnected).toBe(true);
+ expect(disclosure.open).toBe(true);
+
+ notifyAccess('view');
+ expect(blockDataSignal.get()).toBeUndefined();
+ await reloaded.promise;
+ expect(load).toHaveBeenCalledTimes(2);
+ expect(blockUserAccessSignal.get()).toBe('view');
+});
+
+it('retains access confirmed before a lightweight loader finishes', async () => {
+ const pending = Promise.withResolvers<{ id: string }>();
+ const loaded = Promise.withResolvers<void>();
+ const load = vi.fn(async () => ok(await pending.promise));
+ render(() => {
+ createEffect(
+ on(blockDataSignal.get, (data) => {
+ if (data) loaded.resolve();
+ })
+ );
+ return (
+ <BlockLoader
+ id="01a1460f-3198-7650-9b32-a43b49108e47"
+ source={{ type: 'dss', id: '01a1460f-3198-7650-9b32-a43b49108e47' }}
+ definition={{
+ name: 'email',
+ description: 'Email',
+ accepted: {},
+ component: () => null,
+ load,
+ }}
+ />
+ );
+ });
+ notifyAccess('owner');
+ pending.resolve({ id: 'email' });
+ await loaded.promise;
+ expect(blockUserAccessSignal.get()).toBe('owner');
+ notifyAccess('owner');
+ expect(load).toHaveBeenCalledTimes(1);
+ expect(blockDataSignal.get()).toMatchObject({ id: 'email' });
+});
+
+it('keeps document permissions unavailable until its pending load finishes', async () => {
+ const pending = Promise.withResolvers<void>();
+ const loaded = Promise.withResolvers<void>();
+ const load = vi.fn(async () => {
+ await pending.promise;
+ return ok({ userAccessLevel: 'owner' as const });
+ });
+ render(() => {
+ createEffect(
+ on(blockDataSignal.get, (data) => {
+ if (data) loaded.resolve();
+ })
+ );
+ return (
+ <BlockLoader
+ id="01a140ad-06d5-7791-8b68-bc128654bbba"
+ source={{ type: 'dss', id: '01a140ad-06d5-7791-8b68-bc128654bbba' }}
+ definition={{
+ name: 'write',
+ description: 'Document',
+ accepted: {},
+ component: () => null,
+ load,
+ }}
+ />
+ );
+ });
+
+ notifyAccess('owner');
+ expect(blockDataSignal.get()).toBeUndefined();
+ expect(blockUserAccessSignal.get()).toBeUndefined();
+ pending.resolve();
+ await loaded.promise;
+ expect(blockUserAccessSignal.get()).toBe('owner');
+ notifyAccess('owner');
+ expect(load).toHaveBeenCalledTimes(1);
+});
+
+it.each(['MISSING', 'GONE', 'INVALID'] as const)(
+ 'keeps document permissions unavailable after a %s load failure',
+ async (code) => {
+ const failed = Promise.withResolvers<void>();
+ const load = vi.fn(async () => err([{ code, message: 'Load failed' }]));
+ render(() => {
+ createEffect(
+ on(blockErrorSignal.get, (error) => {
+ if (error === code) failed.resolve();
+ })
+ );
+ return (
+ <BlockLoader
+ id="01a140ad-06d5-7791-8b68-bc128654bbba"
+ source={{ type: 'dss', id: '01a140ad-06d5-7791-8b68-bc128654bbba' }}
+ definition={{
+ name: 'write',
+ description: 'Document',
+ accepted: {},
+ component: () => null,
+ load,
+ }}
+ />
+ );
+ });
+ await failed.promise;
+
+ notifyAccess('owner');
+ expect(blockDataSignal.get()).toBeUndefined();
+ expect(blockUserAccessSignal.get()).toBeUndefined();
+ expect(blockErrorSignal.get()).toBe(code);
+ expect(load).toHaveBeenCalledTimes(1);
+ }
+);
+
+it.each(['view', undefined] as const)(
+ 'reloads a loader-provided %s permission when the first confirmation differs',
+ async (userAccessLevel) => {
+ const loaded = Promise.withResolvers<void>();
+ const reloaded = Promise.withResolvers<void>();
+ const cleanupSource = vi.fn();
+ const load = vi
+ .fn()
+ .mockResolvedValueOnce(
+ ok({ userAccessLevel, syncSource: { cleanup: cleanupSource } })
+ )
+ .mockResolvedValue(ok({ userAccessLevel: 'owner' }));
+ render(() => {
+ createEffect(
+ on(blockDataSignal.get, (data) => {
+ if (data) {
+ if (load.mock.calls.length === 1) loaded.resolve();
+ else reloaded.resolve();
+ }
+ })
+ );
+ return (
+ <BlockLoader
+ id="01a140ad-06d5-7791-8b68-bc128654bbba"
+ source={{ type: 'dss', id: '01a140ad-06d5-7791-8b68-bc128654bbba' }}
+ definition={{
+ name: 'md',
+ description: 'Document',
+ accepted: {},
+ component: () => null,
+ load,
+ }}
+ />
+ );
+ });
+ await loaded.promise;
+ notifyAccess('owner');
+ expect(cleanupSource).toHaveBeenCalledTimes(1);
+ expect(blockDataSignal.get()).toBeUndefined();
+ await reloaded.promise;
+ expect(load).toHaveBeenCalledTimes(2);
+ expect(blockUserAccessSignal.get()).toBe('owner');
+ }
+);
+
+it('reconciles a stale permission-bearing load on a later unchanged confirmation', async () => {
+ const pending = Promise.withResolvers<void>();
+ const loaded = Promise.withResolvers<void>();
+ const reloaded = Promise.withResolvers<void>();
+ const cleanupSource = vi.fn();
+ const load = vi
+ .fn()
+ .mockImplementationOnce(async () => {
+ await pending.promise;
+ return ok({
+ userAccessLevel: 'edit',
+ syncSource: { cleanup: cleanupSource },
+ });
+ })
+ .mockResolvedValue(ok({ userAccessLevel: 'view' }));
+ render(() => {
+ createEffect(
+ on(blockDataSignal.get, (data) => {
+ if (data) {
+ if (load.mock.calls.length === 1) loaded.resolve();
+ else reloaded.resolve();
+ }
+ })
+ );
+ return (
+ <BlockLoader
+ id="01a140ad-06d5-7791-8b68-bc128654bbba"
+ source={{ type: 'dss', id: '01a140ad-06d5-7791-8b68-bc128654bbba' }}
+ definition={{
+ name: 'md',
+ description: 'Document',
+ accepted: {},
+ component: () => null,
+ load,
+ }}
+ />
+ );
+ });
+ notifyAccess('view');
+ pending.resolve();
+ await loaded.promise;
+ notifyAccess('view');
+ expect(cleanupSource).toHaveBeenCalledTimes(1);
+ expect(blockDataSignal.get()).toBeUndefined();
+ await reloaded.promise;
+ expect(load).toHaveBeenCalledTimes(2);
+ expect(blockUserAccessSignal.get()).toBe('view');
+});
it('drops a revoked open document, cleans its source, and loads fresh credentials after regrant', async () => {
const cleanupSource = vi.fn();
diff --git a/apps/web/src/lib/core/internal/BlockLoader.tsx b/apps/web/src/lib/core/internal/BlockLoader.tsx
index ca445df700..e22ca158a1 100644
--- a/apps/web/src/lib/core/internal/BlockLoader.tsx
+++ b/apps/web/src/lib/core/internal/BlockLoader.tsx
@@ -70,18 +70,31 @@ export function BlockLoader<
const analytics = useAnalytics();
const currentSharedAccess = useSharedAccessUpdates(
() => shareEntity(blockNameToItemType(props.definition.name), props.id),
- (level) => {
+ (level, previous) => {
+ const data = blockDataSignal.get();
+ const hasLoadedPermissions =
+ data != null && typeof data === 'object' && 'userAccessLevel' in data;
+ // Lightweight loaders (e.g. email) supply no permissions. Their initial
+ // fallback is not a confirmed access change that requires a remount.
+ const accessChanged = hasLoadedPermissions
+ ? blockUserAccessSignal.get() !== level
+ : previous !== undefined && previous !== level;
if (level === null) {
clearLoadedDocument();
setError('UNAUTHORIZED');
} else if (
- (blockDataSignal.get() != null &&
- blockUserAccessSignal.get() !== level) ||
+ (data != null && accessChanged) ||
blockErrorSignal.get() === 'UNAUTHORIZED'
) {
clearLoadedDocument();
setError(undefined);
blockLoadRetrySignal.set((count) => (count ?? 0) + 1);
+ } else if (
+ data != null &&
+ !hasLoadedPermissions &&
+ !blockErrorSignal.get()
+ ) {
+ setUserAccess(level);
}
}
);
@@ -207,7 +220,9 @@ Check that the load function does not return a preload source when the intent is
setFile(() => (data && 'dssFile' in data ? data.dssFile : undefined));
setText((text) => (data && 'text' in data ? data.text : text));
setUserAccess<UserAccessLevel>(() =>
- data && 'userAccessLevel' in data ? data.userAccessLevel : 'view'
+ data && 'userAccessLevel' in data
+ ? data.userAccessLevel
+ : (untrack(currentSharedAccess) ?? 'view')
);
setDocumentMetadata(() => {
if (data && 'projectMetadata' in data) {
diff --git a/docs/agent-guide/calendar.md b/docs/agent-guide/calendar.md
index e4605b910e..e12f48b088 100644
--- a/docs/agent-guide/calendar.md
+++ b/docs/agent-guide/calendar.md
@@ -942,7 +942,8 @@ vertical scrolling without clipping the lower sections.
In `/app/component/mail`, open an invitation message; the same card appears in
`/app/email/:threadId`. Saved details appear below the sender without waiting for calendar
sync. Expand guests and descriptions with their explicit controls. `View original email`
-is an accessible disclosure that starts closed; attachments remain below it.
+is an accessible disclosure that starts closed and stays open across unchanged
+permission refreshes and window refocus on desktop and mobile; attachments remain below it.
ICS attachments show a calendar icon in the attachment pill and file headers on
desktop and mobile, including when the email uses `application/ics` or a
parameterized `text/calendar` MIME type. Opening the attachment still shows the