Skip to content

Commit 9e77ca1

Browse files
committed
test(desktop): drive focus-policy tests from production query options
The focusRefetchPolicy tests built QueryObservers from synthetic options, so a hook that dropped its staleTime or refetchOnWindowFocus wiring kept green tests. Each gated family now exports its focus-refetch policy object, spreads it into the production useQuery call, and the tests consume that same object — drift in production options now changes the observed refetch behavior and fails the test. Signed-off-by: Will Pfleger <[email protected]>
1 parent d264cca commit 9e77ca1

22 files changed

Lines changed: 209 additions & 157 deletions

‎desktop/src/features/agents/focusRefetchPolicy.test.mjs‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ import {
88
} from "@tanstack/react-query";
99

1010
import {
11-
AGENTS_FOCUS_STALE_TIME_MS,
12-
MANAGED_AGENT_LOG_FOCUS_STALE_TIME_MS,
11+
agentsFocusRefetchPolicy,
12+
managedAgentLogFocusRefetchPolicy,
1313
} from "./hooks.ts";
1414

1515
afterEach(() => {
1616
focusManager.setFocused(undefined);
1717
});
1818

19-
async function focusRefetchCount({ ageMs, staleTime }) {
19+
async function focusRefetchCount({ ageMs, policy }) {
2020
focusManager.setFocused(false);
2121
const queryClient = new QueryClient({
2222
defaultOptions: { queries: { retry: false } },
2323
});
2424
queryClient.mount();
2525

26-
const queryKey = ["focus-refetch-policy", staleTime, ageMs];
26+
const queryKey = ["focus-refetch-policy", policy.staleTime, ageMs];
2727
queryClient.setQueryData(queryKey, "cached", {
2828
updatedAt: Date.now() - ageMs,
2929
});
@@ -35,8 +35,7 @@ async function focusRefetchCount({ ageMs, staleTime }) {
3535
return "refetched";
3636
},
3737
refetchOnMount: false,
38-
refetchOnWindowFocus: true,
39-
staleTime,
38+
...policy,
4039
});
4140
const unsubscribe = observer.subscribe(() => {});
4241

@@ -51,8 +50,8 @@ async function focusRefetchCount({ ageMs, staleTime }) {
5150
test("agents: skips fresh focus refetch", async () => {
5251
assert.equal(
5352
await focusRefetchCount({
54-
ageMs: AGENTS_FOCUS_STALE_TIME_MS - 1_000,
55-
staleTime: AGENTS_FOCUS_STALE_TIME_MS,
53+
ageMs: agentsFocusRefetchPolicy.staleTime - 1_000,
54+
policy: agentsFocusRefetchPolicy,
5655
}),
5756
0,
5857
);
@@ -61,8 +60,8 @@ test("agents: skips fresh focus refetch", async () => {
6160
test("agents: refetches genuinely stale data on focus", async () => {
6261
assert.equal(
6362
await focusRefetchCount({
64-
ageMs: AGENTS_FOCUS_STALE_TIME_MS + 1,
65-
staleTime: AGENTS_FOCUS_STALE_TIME_MS,
63+
ageMs: agentsFocusRefetchPolicy.staleTime + 1,
64+
policy: agentsFocusRefetchPolicy,
6665
}),
6766
1,
6867
);
@@ -71,8 +70,8 @@ test("agents: refetches genuinely stale data on focus", async () => {
7170
test("managed-agent-log: skips focus refetch when data is fresher than one poll tick", async () => {
7271
assert.equal(
7372
await focusRefetchCount({
74-
ageMs: MANAGED_AGENT_LOG_FOCUS_STALE_TIME_MS - 1_000,
75-
staleTime: MANAGED_AGENT_LOG_FOCUS_STALE_TIME_MS,
73+
ageMs: managedAgentLogFocusRefetchPolicy.staleTime - 1_000,
74+
policy: managedAgentLogFocusRefetchPolicy,
7675
}),
7776
0,
7877
);
@@ -81,8 +80,8 @@ test("managed-agent-log: skips focus refetch when data is fresher than one poll
8180
test("managed-agent-log: refetches on focus when data is older than one poll tick", async () => {
8281
assert.equal(
8382
await focusRefetchCount({
84-
ageMs: MANAGED_AGENT_LOG_FOCUS_STALE_TIME_MS + 1,
85-
staleTime: MANAGED_AGENT_LOG_FOCUS_STALE_TIME_MS,
83+
ageMs: managedAgentLogFocusRefetchPolicy.staleTime + 1,
84+
policy: managedAgentLogFocusRefetchPolicy,
8685
}),
8786
1,
8887
);

‎desktop/src/features/agents/hooks.ts‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,18 @@ export const AGENTS_FOCUS_STALE_TIME_MS = 5 * 60_000;
108108
*/
109109
export const MANAGED_AGENT_LOG_FOCUS_STALE_TIME_MS = 30_000;
110110

111+
/** Focus-refetch policy for relay-agent and managed-agent queries; consumed by focusRefetchPolicy.test.mjs. */
112+
export const agentsFocusRefetchPolicy = {
113+
staleTime: AGENTS_FOCUS_STALE_TIME_MS,
114+
refetchOnWindowFocus: true,
115+
} as const;
116+
117+
/** Focus-refetch policy for the managed-agent-log query; consumed by focusRefetchPolicy.test.mjs. */
118+
export const managedAgentLogFocusRefetchPolicy = {
119+
staleTime: MANAGED_AGENT_LOG_FOCUS_STALE_TIME_MS,
120+
refetchOnWindowFocus: true,
121+
} as const;
122+
111123
export const relayAgentsQueryKey = ["relay-agents"] as const;
112124
export const managedAgentsQueryKey = ["managed-agents"] as const;
113125
export const personasQueryKey = ["personas"] as const;
@@ -329,7 +341,6 @@ export function useRelayAgentsQuery(options?: { enabled?: boolean }) {
329341
return useQuery({
330342
queryKey: relayAgentsQueryKey,
331343
queryFn: listRelayAgents,
332-
staleTime: AGENTS_FOCUS_STALE_TIME_MS,
333344
// Relay agent profiles (kind:10100) are near-static and the backing
334345
// `list_relay_agents` command is an unfiltered relay query for the whole
335346
// profile set — mounted on ~13 always-live surfaces (channel screen,
@@ -339,8 +350,8 @@ export function useRelayAgentsQuery(options?: { enabled?: boolean }) {
339350
// reconcile (kinds PERSONA/TEAM/MANAGED_AGENT), never for kind:10100. So we
340351
// keep polling but at a relaxed cadence and pause it while backgrounded.
341352
refetchInterval,
342-
refetchOnWindowFocus: true,
343353
enabled: options?.enabled,
354+
...agentsFocusRefetchPolicy,
344355
});
345356
}
346357

@@ -350,7 +361,6 @@ export function useManagedAgentsQuery(options?: { enabled?: boolean }) {
350361
enabled: options?.enabled ?? true,
351362
queryKey: managedAgentsQueryKey,
352363
queryFn: listManagedAgents,
353-
staleTime: AGENTS_FOCUS_STALE_TIME_MS,
354364
refetchInterval: (query) => {
355365
if (!appFocused) return false;
356366
const agents = query.state.data as ManagedAgent[] | undefined;
@@ -363,7 +373,7 @@ export function useManagedAgentsQuery(options?: { enabled?: boolean }) {
363373
? 5_000
364374
: false;
365375
},
366-
refetchOnWindowFocus: true,
376+
...agentsFocusRefetchPolicy,
367377
});
368378
}
369379

@@ -828,9 +838,8 @@ export function useManagedAgentLogQuery(
828838
queryFn: () => getManagedAgentLog(pubkey as string, lineCount),
829839
enabled: pubkey !== null,
830840
retry: false,
831-
staleTime: MANAGED_AGENT_LOG_FOCUS_STALE_TIME_MS,
832841
refetchInterval,
833-
refetchOnWindowFocus: true,
842+
...managedAgentLogFocusRefetchPolicy,
834843
});
835844
}
836845

@@ -843,9 +852,8 @@ export function useAgentConfigSurface(pubkey: string | null) {
843852
queryKey: agentConfigSurfaceQueryKey(pubkey ?? ""),
844853
queryFn: () => getAgentConfigSurface(pubkey ?? ""),
845854
enabled: !!pubkey,
846-
staleTime: AGENTS_FOCUS_STALE_TIME_MS,
847855
refetchInterval,
848-
refetchOnWindowFocus: true,
856+
...agentsFocusRefetchPolicy,
849857
});
850858
}
851859

‎desktop/src/features/agents/lib/focusRefetchPolicy.test.mjs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ import {
77
QueryObserver,
88
} from "@tanstack/react-query";
99

10-
import { PERSONA_CATALOG_FOCUS_STALE_TIME_MS } from "./usePersonaCatalogRelay.ts";
10+
import { personaCatalogFocusRefetchPolicy } from "./usePersonaCatalogRelay.ts";
1111

1212
afterEach(() => {
1313
focusManager.setFocused(undefined);
1414
});
1515

16-
async function focusRefetchCount({ ageMs, staleTime }) {
16+
async function focusRefetchCount({ ageMs, policy }) {
1717
focusManager.setFocused(false);
1818
const queryClient = new QueryClient({
1919
defaultOptions: { queries: { retry: false } },
2020
});
2121
queryClient.mount();
2222

23-
const queryKey = ["focus-refetch-policy", staleTime, ageMs];
23+
const queryKey = ["focus-refetch-policy", policy.staleTime, ageMs];
2424
queryClient.setQueryData(queryKey, "cached", {
2525
updatedAt: Date.now() - ageMs,
2626
});
@@ -32,8 +32,7 @@ async function focusRefetchCount({ ageMs, staleTime }) {
3232
return "refetched";
3333
},
3434
refetchOnMount: false,
35-
refetchOnWindowFocus: true,
36-
staleTime,
35+
...policy,
3736
});
3837
const unsubscribe = observer.subscribe(() => {});
3938

@@ -48,8 +47,8 @@ async function focusRefetchCount({ ageMs, staleTime }) {
4847
test("persona-catalog: skips fresh focus refetch", async () => {
4948
assert.equal(
5049
await focusRefetchCount({
51-
ageMs: PERSONA_CATALOG_FOCUS_STALE_TIME_MS - 1_000,
52-
staleTime: PERSONA_CATALOG_FOCUS_STALE_TIME_MS,
50+
ageMs: personaCatalogFocusRefetchPolicy.staleTime - 1_000,
51+
policy: personaCatalogFocusRefetchPolicy,
5352
}),
5453
0,
5554
);
@@ -58,8 +57,8 @@ test("persona-catalog: skips fresh focus refetch", async () => {
5857
test("persona-catalog: refetches genuinely stale data on focus", async () => {
5958
assert.equal(
6059
await focusRefetchCount({
61-
ageMs: PERSONA_CATALOG_FOCUS_STALE_TIME_MS + 1,
62-
staleTime: PERSONA_CATALOG_FOCUS_STALE_TIME_MS,
60+
ageMs: personaCatalogFocusRefetchPolicy.staleTime + 1,
61+
policy: personaCatalogFocusRefetchPolicy,
6362
}),
6463
1,
6564
);

‎desktop/src/features/agents/lib/usePersonaCatalogRelay.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ export const PERSONA_CATALOG_REFETCH_INTERVAL_MS = 120_000;
2121
* The live subscription (invalidateQueries) is the primary freshness path. */
2222
export const PERSONA_CATALOG_FOCUS_STALE_TIME_MS = 5 * 60_000;
2323

24+
/** Focus-refetch policy for the persona catalog query; consumed by focusRefetchPolicy.test.mjs. */
25+
export const personaCatalogFocusRefetchPolicy = {
26+
staleTime: PERSONA_CATALOG_FOCUS_STALE_TIME_MS,
27+
refetchOnWindowFocus: true,
28+
} as const;
29+
2430
export function personaCatalogQueryKey(communityId: string | null) {
2531
return ["persona-catalog", communityId] as const;
2632
}
@@ -33,9 +39,8 @@ export function usePersonaCatalogQuery(communityId: string | null) {
3339
enabled: communityId !== null,
3440
queryKey: personaCatalogQueryKey(communityId),
3541
queryFn: fetchPersonaCatalogPublications,
36-
staleTime: PERSONA_CATALOG_FOCUS_STALE_TIME_MS,
3742
refetchInterval,
38-
refetchOnWindowFocus: true,
43+
...personaCatalogFocusRefetchPolicy,
3944
});
4045
}
4146

‎desktop/src/features/channel-templates/focusRefetchPolicy.test.mjs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ import {
77
QueryObserver,
88
} from "@tanstack/react-query";
99

10-
import { CHANNEL_TEMPLATES_FOCUS_STALE_TIME_MS } from "./hooks.ts";
10+
import { channelTemplatesFocusRefetchPolicy } from "./hooks.ts";
1111

1212
afterEach(() => {
1313
focusManager.setFocused(undefined);
1414
});
1515

16-
async function focusRefetchCount({ ageMs, staleTime }) {
16+
async function focusRefetchCount({ ageMs, policy }) {
1717
focusManager.setFocused(false);
1818
const queryClient = new QueryClient({
1919
defaultOptions: { queries: { retry: false } },
2020
});
2121
queryClient.mount();
2222

23-
const queryKey = ["focus-refetch-policy", staleTime, ageMs];
23+
const queryKey = ["focus-refetch-policy", policy.staleTime, ageMs];
2424
queryClient.setQueryData(queryKey, "cached", {
2525
updatedAt: Date.now() - ageMs,
2626
});
@@ -32,8 +32,7 @@ async function focusRefetchCount({ ageMs, staleTime }) {
3232
return "refetched";
3333
},
3434
refetchOnMount: false,
35-
refetchOnWindowFocus: true,
36-
staleTime,
35+
...policy,
3736
});
3837
const unsubscribe = observer.subscribe(() => {});
3938

@@ -48,8 +47,8 @@ async function focusRefetchCount({ ageMs, staleTime }) {
4847
test("channel-templates: skips fresh focus refetch", async () => {
4948
assert.equal(
5049
await focusRefetchCount({
51-
ageMs: CHANNEL_TEMPLATES_FOCUS_STALE_TIME_MS - 1_000,
52-
staleTime: CHANNEL_TEMPLATES_FOCUS_STALE_TIME_MS,
50+
ageMs: channelTemplatesFocusRefetchPolicy.staleTime - 1_000,
51+
policy: channelTemplatesFocusRefetchPolicy,
5352
}),
5453
0,
5554
);
@@ -58,8 +57,8 @@ test("channel-templates: skips fresh focus refetch", async () => {
5857
test("channel-templates: refetches genuinely stale data on focus", async () => {
5958
assert.equal(
6059
await focusRefetchCount({
61-
ageMs: CHANNEL_TEMPLATES_FOCUS_STALE_TIME_MS + 1,
62-
staleTime: CHANNEL_TEMPLATES_FOCUS_STALE_TIME_MS,
60+
ageMs: channelTemplatesFocusRefetchPolicy.staleTime + 1,
61+
policy: channelTemplatesFocusRefetchPolicy,
6362
}),
6463
1,
6564
);

‎desktop/src/features/channel-templates/hooks.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ export const CHANNEL_TEMPLATES_REFETCH_INTERVAL_MS = 30_000;
2121
* Templates change rarely; mutations cover all writes with push-invalidation. */
2222
export const CHANNEL_TEMPLATES_FOCUS_STALE_TIME_MS = 5 * 60_000;
2323

24+
/** Focus-refetch policy for the channel templates query; consumed by focusRefetchPolicy.test.mjs. */
25+
export const channelTemplatesFocusRefetchPolicy = {
26+
staleTime: CHANNEL_TEMPLATES_FOCUS_STALE_TIME_MS,
27+
refetchOnWindowFocus: true,
28+
} as const;
29+
2430
export const channelTemplatesQueryKey = ["channel-templates"] as const;
2531

2632
export function useChannelTemplatesQuery() {
@@ -31,9 +37,8 @@ export function useChannelTemplatesQuery() {
3137
return useQuery({
3238
queryKey: channelTemplatesQueryKey,
3339
queryFn: listChannelTemplates,
34-
staleTime: CHANNEL_TEMPLATES_FOCUS_STALE_TIME_MS,
3540
refetchInterval,
36-
refetchOnWindowFocus: true,
41+
...channelTemplatesFocusRefetchPolicy,
3742
});
3843
}
3944

‎desktop/src/features/channels/hooks.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ export const channelsQueryKey = ["channels"] as const;
4646
export const CHANNELS_REFETCH_INTERVAL_MS = 60_000;
4747
/** Suppresses the expensive focus refetch until the channel list is old. */
4848
export const CHANNELS_FOCUS_STALE_TIME_MS = 5 * 60_000;
49+
50+
/** Focus-refetch policy for the channels query; consumed by focusRefetchPolicy.test.mjs. */
51+
export const channelsFocusRefetchPolicy = {
52+
staleTime: CHANNELS_FOCUS_STALE_TIME_MS,
53+
refetchOnWindowFocus: true,
54+
} as const;
4955
/**
5056
* Query-cache key for the channels payload hash. Stored alongside the channel
5157
* list so its lifecycle is tied to the channel cache — a community switch that
@@ -281,9 +287,8 @@ export function useChannelsQuery(options?: { enabled?: boolean }) {
281287
}
282288
: undefined,
283289
initialDataUpdatedAt: 0,
284-
staleTime: CHANNELS_FOCUS_STALE_TIME_MS,
285290
refetchInterval,
286-
refetchOnWindowFocus: true,
291+
...channelsFocusRefetchPolicy,
287292
});
288293
}
289294

‎desktop/src/features/custom-emoji/focusRefetchPolicy.test.mjs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ import {
77
QueryObserver,
88
} from "@tanstack/react-query";
99

10-
import { CUSTOM_EMOJI_FOCUS_STALE_TIME_MS } from "./hooks.ts";
10+
import { customEmojiFocusRefetchPolicy } from "./hooks.ts";
1111

1212
afterEach(() => {
1313
focusManager.setFocused(undefined);
1414
});
1515

16-
async function focusRefetchCount({ ageMs, staleTime }) {
16+
async function focusRefetchCount({ ageMs, policy }) {
1717
focusManager.setFocused(false);
1818
const queryClient = new QueryClient({
1919
defaultOptions: { queries: { retry: false } },
2020
});
2121
queryClient.mount();
2222

23-
const queryKey = ["focus-refetch-policy", staleTime, ageMs];
23+
const queryKey = ["focus-refetch-policy", policy.staleTime, ageMs];
2424
queryClient.setQueryData(queryKey, "cached", {
2525
updatedAt: Date.now() - ageMs,
2626
});
@@ -32,8 +32,7 @@ async function focusRefetchCount({ ageMs, staleTime }) {
3232
return "refetched";
3333
},
3434
refetchOnMount: false,
35-
refetchOnWindowFocus: true,
36-
staleTime,
35+
...policy,
3736
});
3837
const unsubscribe = observer.subscribe(() => {});
3938

@@ -48,8 +47,8 @@ async function focusRefetchCount({ ageMs, staleTime }) {
4847
test("custom-emoji: skips fresh focus refetch", async () => {
4948
assert.equal(
5049
await focusRefetchCount({
51-
ageMs: CUSTOM_EMOJI_FOCUS_STALE_TIME_MS - 1_000,
52-
staleTime: CUSTOM_EMOJI_FOCUS_STALE_TIME_MS,
50+
ageMs: customEmojiFocusRefetchPolicy.staleTime - 1_000,
51+
policy: customEmojiFocusRefetchPolicy,
5352
}),
5453
0,
5554
);
@@ -58,8 +57,8 @@ test("custom-emoji: skips fresh focus refetch", async () => {
5857
test("custom-emoji: refetches genuinely stale data on focus", async () => {
5958
assert.equal(
6059
await focusRefetchCount({
61-
ageMs: CUSTOM_EMOJI_FOCUS_STALE_TIME_MS + 1,
62-
staleTime: CUSTOM_EMOJI_FOCUS_STALE_TIME_MS,
60+
ageMs: customEmojiFocusRefetchPolicy.staleTime + 1,
61+
policy: customEmojiFocusRefetchPolicy,
6362
}),
6463
1,
6564
);

0 commit comments

Comments
 (0)