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(harnesses): stop polling harnesses after the session is rejected (#8409)

teo28d98f1102c4
diff --git a/apps/web/src/lib/queries/harnesses/harnesses.test.tsx b/apps/web/src/lib/queries/harnesses/harnesses.test.tsx
new file mode 100644
index 0000000000..20de1d217f
--- /dev/null
+++ b/apps/web/src/lib/queries/harnesses/harnesses.test.tsx
@@ -0,0 +1,74 @@
+import { render } from '@solidjs/testing-library';
+import { QueryClient, QueryClientProvider } from '@tanstack/solid-query';
+import { err, ok } from 'neverthrow';
+import { afterEach, beforeEach, expect, it, vi } from 'vitest';
+import { useHarnessesQuery } from './harnesses';
+
+const mocks = vi.hoisted(() => ({
+ getHarnesses: vi.fn(),
+}));
+
+vi.mock('@service-storage/client', () => ({
+ storageServiceClient: { getHarnesses: mocks.getHarnesses },
+}));
+vi.mock('@queries/client', () => ({ queryClient: {} }));
+vi.mock('@queries/agents/agents', () => ({ invalidateAgents: vi.fn() }));
+
+let queryClient: QueryClient;
+let unmount: (() => void) | undefined;
+
+function mountHarnesses() {
+ function Probe() {
+ useHarnessesQuery();
+ return null;
+ }
+ unmount = render(() => (
+ <QueryClientProvider client={queryClient}>
+ <Probe />
+ </QueryClientProvider>
+ )).unmount;
+}
+
+beforeEach(() => {
+ vi.useFakeTimers();
+ queryClient = new QueryClient({
+ defaultOptions: { queries: { retry: false } },
+ });
+ mocks.getHarnesses.mockReset();
+});
+
+afterEach(() => {
+ unmount?.();
+ unmount = undefined;
+ queryClient.clear();
+ vi.useRealTimers();
+});
+
+it('stops polling after a 401 and resumes once a fetch succeeds again', async () => {
+ mocks.getHarnesses.mockResolvedValue(
+ err([{ code: 'UNAUTHORIZED', message: 'Unauthorized' }])
+ );
+ mountHarnesses();
+ await vi.advanceTimersByTimeAsync(0);
+ expect(mocks.getHarnesses).toHaveBeenCalledOnce();
+
+ await vi.advanceTimersByTimeAsync(60_000);
+ expect(mocks.getHarnesses).toHaveBeenCalledOnce();
+
+ // Login invalidates every query.
+ mocks.getHarnesses.mockResolvedValue(ok([]));
+ await queryClient.invalidateQueries();
+ expect(mocks.getHarnesses).toHaveBeenCalledTimes(2);
+ await vi.advanceTimersByTimeAsync(15_000);
+ expect(mocks.getHarnesses).toHaveBeenCalledTimes(3);
+});
+
+it('keeps polling through errors that are not a dead session', async () => {
+ mocks.getHarnesses.mockResolvedValue(
+ err([{ code: 'NETWORK_ERROR', message: 'offline' }])
+ );
+ mountHarnesses();
+ await vi.advanceTimersByTimeAsync(0);
+ await vi.advanceTimersByTimeAsync(30_000);
+ expect(mocks.getHarnesses).toHaveBeenCalledTimes(3);
+});
diff --git a/apps/web/src/lib/queries/harnesses/harnesses.ts b/apps/web/src/lib/queries/harnesses/harnesses.ts
index 028d89ab43..0bd0d64eed 100644
--- a/apps/web/src/lib/queries/harnesses/harnesses.ts
+++ b/apps/web/src/lib/queries/harnesses/harnesses.ts
@@ -1,4 +1,4 @@
-import { throwOnErr } from '@core/util/result';
+import { thrownResultErrorHasCode, throwOnErr } from '@core/util/result';
import { invalidateAgents } from '@queries/agents/agents';
import { queryClient } from '@queries/client';
import {
@@ -25,7 +25,12 @@ const harnessesQueryOptions = queryOptions({
queryKey: harnessKeys.list.queryKey,
queryFn: async (): Promise<Harness[]> =>
await throwOnErr(() => storageServiceClient.getHarnesses()),
- refetchInterval: 15_000,
+ // A dead session answers every poll with a 401, so wait for the next
+ // successful fetch (login invalidates every query) before polling again.
+ refetchInterval: (query) =>
+ thrownResultErrorHasCode(query.state.error, 'UNAUTHORIZED')
+ ? false
+ : 15_000,
});
/**