mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-11-12 14:19:00 +01:00
## Thinking Path > - Paperclip lets people manage agent work through the board. > - The board reads task, agent, settings, plugin, and run data from the server. > - A deploy can interrupt those reads after content is already visible. > - Local error branches can replace that content with an error or show raw codes. > - This pull request moves the remaining reads to the shared recovery behavior. > - The query-error guard prevents new local error patterns from returning. ## Linked Issues or Issue Description **What happened?** Loaded lists, settings, task panels, and manual reads could clear their content or show errors during a server restart. Some reads also disabled the shared retry policy. **Expected behavior** Keep loaded content during a temporary failure. Show the shared connection banner. Retry reads after recovery. Replace content after a real access denial or missing resource, with readable copy. **Steps to reproduce** Open a task, settings page, or run log. Return 503 with `tenant_app_unavailable` from the API. Restore the API and check that content refreshes. Repeat with 403 and 404 to check the failure state. Related merged work: Refs #15754, Refs #15772, Refs #17960. This change covers remaining reads and enforcement. Browser persistence and the outage browser suite follow separately. ## What Changed - Repair an existing PostgreSQL deadline fixture at UTC boundaries. A daily cap defers a heartbeat until both its original interval and the next UTC day allow it. Keep the counted run in its seeded day and cover noon, just before midnight and the first second after midnight with explicit clocks and real PostgreSQL. Production scheduling is unchanged. - Integrate the saved list, settings, shell, task, and manual-read recovery changes against current master. Preserve the current task, Inbox, and run-log structure. - Add `useResilientFetch` for component-local reads. Preserve loaded data, cancel stale requests, and retry through the shared connectivity policy. Keep browser and pairing capabilities in memory. - Retain run log chunks across stream changes and catch up after recovery without duplicate chunks or stalled requests. - Keep genuine authorization and missing-resource failures visible. Translate known single-word codes such as `forbidden`. Show known skills and disconnected-app failures before sibling loading states. Keep Retry bound to its failed request. - Make the query-error guard enforce by default and run it in the CI policy job. Document the narrow exceptions and the read recovery contract. - Invalidate pending OAuth discovery when the operator leaves setup or its context changes. Keep reserved-popup cleanup bound to the current attempt. ## Verification - Current read head `09d1db29dea` is merge-ready: all 59 check runs are completed (54 successful, three skipped, two neutral), the legacy Snyk status is successful, and both required `ci / verify` and `ci / e2e` gates pass. Greptile Apex reviewed this exact head at 5/5 with no unresolved threads; the branch has no merge conflicts. The current CI run is `41748339602`. - Current read head `09d1db29dea` includes master `683fa4725e9`. The latest change touches only the existing server deadline test fixture. Application source remains the previously verified `86376fa751e` revision: all 60 affected skills/disconnected-app tests and both application UI typechecks passed, along with token gates and the enforcing query-error guard. Those UI suites were not repeated for this test-only repair. - The fixture repair passes all seven deadline integration cases and the complete server typecheck, including the server test layer. The old assertion deterministically fails at 23:59:06.888 UTC; its one-second-old run also fails the first-second-of-day probe. The corrected fixture passes noon and both midnight probes. The permanent three-case coverage uses seeded 2099 clocks. - Twelve new regressions fail against the previous implementation. Both skills variants and disconnected-app pages show either request's 403 or 429 while the sibling pauses or remains fetching. Permission failures stay visible. Retry stays usable for its failed request and recovers independently. An initial test-fixture query-key typo was corrected before the passing run. The finding is replied to and resolved. Greptile reviewed prior application revision `86376fa751e` at 5/5 with no new actionable findings or unresolved threads. The current test-only head has now received its own Apex 5/5 review with no unresolved threads, and its CI is successful as recorded above. - The preceding OAuth fix passed all 237 setup tests on both application branches. Its ten regressions prove that Back, Cancel, unmount, or context changes retire initial discovery without creating a connection, caching old identities, navigating an abandoned popup, or closing a newer attempt. - Earlier master integration `e992f770339` passed all 309 tests across eight affected Slack, recovery, retry, submission and task files, plus UI typecheck, token gates, enforcing query-error scan and seven guard tests. The integration preserves Slack workspace reconnect and shared recovery, readable execution errors, source-inspection company scoping, and current submission behavior. Newly inherited retained-file recovery controls keep cached data through transient failures and hide it after definitive denial. - The preceding cache head `97c0bc3966f` passed 1,038 focused cache/write/editor/account/task/API tests. All 22 built-UI outage/write/loading cases passed in 4.7 minutes on exact browser head `b7deaaee5da`, with strict checking of all three specs. The latest skills/app rendering fix is covered by its affected component suites; those broader cases were not repeated for this separate read path. - Historical broader UI, CLI and build results and unresolved aggregate server/DB/adapter failures remain in the PR discussion. Interrupted CI runs were audited and recorded separately; they are not counted as passes. Controlled local outages do not prove hosted authentication or a real Cloud restart/deploy. Real hosted acceptance remains required after merge and deployment. Commands for the latest fix: ```sh pnpm --filter @paperclipai/ui exec vitest run src/pages/CompanySkills.test.tsx src/pages/apps/AppNotConnected.test.tsx pnpm --filter @paperclipai/ui typecheck pnpm check:token-gates node scripts/check-query-error-rendering.mjs --enforce --summary ``` ## Risks This migration touches many read surfaces. The main risks are initial loading, request cancellation, retained authorization state, and run-log paging. The tests cover those states. There are no server, schema, dependency, or API contract changes. The follow-up browser suite and hosted deploy acceptance are required before release acceptance. Recovered commits retain their original authors. If squash-merging, preserve `Co-Authored-By: Bender (Fable) <bender@agents.paperclip.ing>` and the Paperclip trailer. ## Model Used OpenAI `gpt-6.1-sol` through Codex, with xhigh reasoning effort, tool use, and code execution. The context window size is not exposed. Saved source commits keep their original authorship. ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have searched GitHub for duplicate or related PRs and linked them above - [x] I have described the issue in-PR following the bug report template - [x] I have not referenced internal/instance-local Paperclip issues or links - [x] My branch name describes the change and contains no internal ticket id - [x] The affected local tests pass; broader limitations are recorded above - [x] I have added or updated tests where applicable - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented risks above - [x] All Paperclip CI gates are green - [x] Greptile is 5/5 with no open P2s, recommendations, or follow-ups - [x] I will address all Greptile and reviewer comments before requesting merge --------- Co-authored-by: devinfoley <139239+devinfoley@users.noreply.github.com> Co-authored-by: Paperclip <noreply@paperclip.ing> Co-authored-by: Bender (Fable) <bender@agents.paperclip.ing> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
332 lines
12 KiB
TypeScript
332 lines
12 KiB
TypeScript
/**
|
|
* The read-resilience contract of `useQuery` for reads that cannot live in the
|
|
* shared React Query cache.
|
|
*
|
|
* Some reads must stay in component memory: a bearer viewer URL, a pairing
|
|
* code preview, an offset-based log page that is appended rather than
|
|
* replaced, or a privileged load that is fenced by a permission epoch. Those
|
|
* used to be hand-rolled `useEffect` fetches, each with its own idea of what a
|
|
* failure means. This hook gives them the same behaviour the shared query
|
|
* components already have:
|
|
*
|
|
* - The last good value is retained through a transient failure, so loaded
|
|
* content stays on screen while the connection banner explains the outage.
|
|
* - Transient errors retry with the app's retry policy
|
|
* (`shouldRetryRequest` / `retryDelayFor` from `lib/query-client`). While the
|
|
* connectivity store reports an outage the fetch pauses instead of polling a
|
|
* down server, and it resumes by itself when the store recovers.
|
|
* - Every error is classified with `classifyError`; a non-transient failure
|
|
* (403, 404, 409, validation, a real 500 after its brief retry) is surfaced
|
|
* as a real `error` for `useQueryView` / `<QueryErrorState>` to render.
|
|
* - A result that arrives after its `key` changed, after the hook was
|
|
* disabled, or after `refetch` superseded it is dropped, so a stale response
|
|
* can never describe the current resource.
|
|
*
|
|
* Nothing here is written to a shared or persisted cache: the value lives in
|
|
* this component's state and dies with it.
|
|
*
|
|
* The result is a `QueryViewSource`, so `useQueryView` and `<QueryView>` read
|
|
* it the same way they read a `useQuery` result; `view` is provided for
|
|
* convenience.
|
|
*/
|
|
|
|
import { useCallback, useEffect, useRef, useState } from "react";
|
|
import { classifyError, type ErrorKind } from "@/api/errors";
|
|
import { useQueryView, type QueryViewSource, type QueryViewState } from "@/components/QueryView";
|
|
import { useConnectivityStore } from "@/lib/connectivity";
|
|
import { retryDelayFor, shouldRetryRequest } from "@/lib/query-client";
|
|
|
|
export interface ResilientFetchOptions<TData> {
|
|
/**
|
|
* Identifies the resource, like a query key. When it changes the previous
|
|
* value is dropped synchronously and any in-flight request is ignored.
|
|
*/
|
|
key: readonly unknown[];
|
|
/** Performs the read. The signal is aborted when the result is no longer wanted. */
|
|
fetcher: (signal: AbortSignal) => Promise<TData>;
|
|
/** `false` keeps the hook idle; the current value is kept. Defaults to `true`. */
|
|
enabled?: boolean;
|
|
/** Fetch again this many milliseconds after each settled attempt while enabled. */
|
|
refetchInterval?: number | false;
|
|
/**
|
|
* Keep the last good value behind a non-transient error (the `useQuery`
|
|
* default). `false` drops it, for values that a real error revokes: a bearer
|
|
* URL after a 403 must not keep its iframe alive.
|
|
*/
|
|
keepDataOnError?: boolean;
|
|
/** Retry policy; defaults to the query client's `shouldRetryRequest`. */
|
|
retry?: (failureCount: number, error: unknown) => boolean;
|
|
/** Retry backoff; defaults to the query client's `retryDelayFor`. */
|
|
retryDelay?: (failureCount: number, error: unknown) => number;
|
|
/**
|
|
* Called once for each successful attempt whose result is still current.
|
|
* For reads that accumulate (an offset-based log page) this is where the
|
|
* page is applied; `data` is only the latest page.
|
|
*/
|
|
onSuccess?: (data: TData) => void;
|
|
}
|
|
|
|
export interface ResilientFetchResult<TData> extends QueryViewSource<TData> {
|
|
/** The classification of `error`, or null when there is none. */
|
|
errorKind: ErrorKind | null;
|
|
isFetching: boolean;
|
|
/** Waiting for the connectivity store to report the server reachable again. */
|
|
isPaused: boolean;
|
|
/** Bumped on every applied success; an effect can key off it. */
|
|
dataUpdatedAt: number;
|
|
/** Fetch again now, superseding any attempt in flight. */
|
|
refetch: () => void;
|
|
/** The view state for this read, from `useQueryView`. */
|
|
view: QueryViewState<TData>;
|
|
}
|
|
|
|
interface FetchState<TData> {
|
|
keyHash: string;
|
|
data: TData | undefined;
|
|
error: unknown;
|
|
status: "pending" | "error" | "success";
|
|
fetchStatus: "fetching" | "paused" | "idle";
|
|
failureReason: unknown;
|
|
dataUpdatedAt: number;
|
|
}
|
|
|
|
function initialState<TData>(keyHash: string): FetchState<TData> {
|
|
return {
|
|
keyHash,
|
|
data: undefined,
|
|
error: null,
|
|
status: "pending",
|
|
fetchStatus: "idle",
|
|
failureReason: undefined,
|
|
dataUpdatedAt: 0,
|
|
};
|
|
}
|
|
|
|
/** A stable hash of a key, like React Query's: object key order does not matter. */
|
|
export function hashFetchKey(key: readonly unknown[]): string {
|
|
return JSON.stringify(key, (_, value) =>
|
|
value && typeof value === "object" && !Array.isArray(value)
|
|
? Object.keys(value as Record<string, unknown>)
|
|
.sort()
|
|
.reduce<Record<string, unknown>>((sorted, name) => {
|
|
sorted[name] = (value as Record<string, unknown>)[name];
|
|
return sorted;
|
|
}, {})
|
|
: value,
|
|
);
|
|
}
|
|
|
|
export function useResilientFetch<TData>(options: ResilientFetchOptions<TData>): ResilientFetchResult<TData> {
|
|
const {
|
|
key,
|
|
enabled = true,
|
|
refetchInterval = false,
|
|
keepDataOnError = true,
|
|
retry = shouldRetryRequest,
|
|
retryDelay = retryDelayFor,
|
|
} = options;
|
|
const keyHash = hashFetchKey(key);
|
|
const store = useConnectivityStore();
|
|
const [state, setState] = useState<FetchState<TData>>(() => initialState<TData>(keyHash));
|
|
|
|
// The latest options, so async completions and timers never see a stale closure.
|
|
const optionsRef = useRef(options);
|
|
optionsRef.current = options;
|
|
const policyRef = useRef({ enabled, refetchInterval, keepDataOnError, retry, retryDelay });
|
|
policyRef.current = { enabled, refetchInterval, keepDataOnError, retry, retryDelay };
|
|
|
|
/** Identifies the attempt whose result may still be applied. */
|
|
const ticketRef = useRef(0);
|
|
const controllerRef = useRef<AbortController | null>(null);
|
|
const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
|
const failureCountRef = useRef(0);
|
|
const mountedRef = useRef(true);
|
|
|
|
const clearTimer = useCallback(() => {
|
|
if (timerRef.current !== null) {
|
|
clearTimeout(timerRef.current);
|
|
timerRef.current = null;
|
|
}
|
|
}, []);
|
|
|
|
/** Forget any attempt in flight and any pending retry or poll. */
|
|
const cancel = useCallback(() => {
|
|
ticketRef.current += 1;
|
|
clearTimer();
|
|
const controller = controllerRef.current;
|
|
controllerRef.current = null;
|
|
controller?.abort();
|
|
if (!mountedRef.current) return;
|
|
setState((current) =>
|
|
current.fetchStatus === "idle" && current.failureReason === undefined
|
|
? current
|
|
: { ...current, fetchStatus: "idle", failureReason: undefined },
|
|
);
|
|
}, [clearTimer]);
|
|
|
|
const beginRef = useRef<() => void>(() => undefined);
|
|
|
|
const schedule = useCallback((delay: number) => {
|
|
clearTimer();
|
|
timerRef.current = setTimeout(() => {
|
|
timerRef.current = null;
|
|
beginRef.current();
|
|
}, delay);
|
|
}, [clearTimer]);
|
|
|
|
const schedulePoll = useCallback(() => {
|
|
const { refetchInterval: interval, enabled: isEnabled } = policyRef.current;
|
|
if (!isEnabled || interval === false || !(interval > 0)) return;
|
|
schedule(interval);
|
|
}, [schedule]);
|
|
|
|
const begin = useCallback(() => {
|
|
clearTimer();
|
|
controllerRef.current?.abort();
|
|
if (!mountedRef.current) return;
|
|
if (store.getSnapshot().status !== "online") {
|
|
// An outage: the store's probe loop decides when the server is back,
|
|
// and `onRecover` resumes this read. Polling a down server helps no one.
|
|
controllerRef.current = null;
|
|
setState((current) => (current.fetchStatus === "paused" ? current : { ...current, fetchStatus: "paused" }));
|
|
return;
|
|
}
|
|
const ticket = ++ticketRef.current;
|
|
const controller = new AbortController();
|
|
controllerRef.current = controller;
|
|
setState((current) => (current.fetchStatus === "fetching" ? current : { ...current, fetchStatus: "fetching" }));
|
|
|
|
let attempt: Promise<TData>;
|
|
try {
|
|
attempt = Promise.resolve(optionsRef.current.fetcher(controller.signal));
|
|
} catch (error) {
|
|
attempt = Promise.reject(error);
|
|
}
|
|
attempt.then(
|
|
(data) => {
|
|
if (ticket !== ticketRef.current || !mountedRef.current) return;
|
|
controllerRef.current = null;
|
|
failureCountRef.current = 0;
|
|
setState((current) => ({
|
|
...current,
|
|
data,
|
|
error: null,
|
|
status: "success",
|
|
fetchStatus: "idle",
|
|
failureReason: undefined,
|
|
dataUpdatedAt: current.dataUpdatedAt + 1,
|
|
}));
|
|
// A component result can be a local no-op or an older in-flight read.
|
|
// Health probes and the socket own app-wide recovery.
|
|
optionsRef.current.onSuccess?.(data);
|
|
schedulePoll();
|
|
},
|
|
(error: unknown) => {
|
|
if (ticket !== ticketRef.current || !mountedRef.current) return;
|
|
controllerRef.current = null;
|
|
const kind = classifyError(error);
|
|
if (kind === "aborted") {
|
|
// Not ours (ours changed the ticket): the caller withdrew the read.
|
|
setState((current) => ({ ...current, fetchStatus: "idle", failureReason: undefined }));
|
|
return;
|
|
}
|
|
store.reportError(error);
|
|
// As in React Query: the count of failures before this one.
|
|
const failureCount = failureCountRef.current;
|
|
failureCountRef.current += 1;
|
|
const policy = policyRef.current;
|
|
if (policy.retry(failureCount, error)) {
|
|
if (store.getSnapshot().status !== "online") {
|
|
setState((current) => ({ ...current, failureReason: error, fetchStatus: "paused" }));
|
|
return;
|
|
}
|
|
setState((current) => ({ ...current, failureReason: error, fetchStatus: "fetching" }));
|
|
schedule(policy.retryDelay(failureCount, error));
|
|
return;
|
|
}
|
|
failureCountRef.current = 0;
|
|
const keepData = policy.keepDataOnError || kind === "transient";
|
|
setState((current) => ({
|
|
...current,
|
|
data: keepData ? current.data : undefined,
|
|
error,
|
|
status: "error",
|
|
fetchStatus: "idle",
|
|
failureReason: undefined,
|
|
}));
|
|
schedulePoll();
|
|
},
|
|
);
|
|
}, [clearTimer, schedule, schedulePoll, store]);
|
|
beginRef.current = begin;
|
|
|
|
// A new key drops the old value at once: a stale response must never
|
|
// describe the new resource, even for one render.
|
|
const current = state.keyHash === keyHash ? state : initialState<TData>(keyHash);
|
|
useEffect(() => {
|
|
setState((previous) => (previous.keyHash === keyHash ? previous : initialState<TData>(keyHash)));
|
|
}, [keyHash]);
|
|
|
|
useEffect(() => {
|
|
if (!enabled) return;
|
|
mountedRef.current = true;
|
|
failureCountRef.current = 0;
|
|
begin();
|
|
return cancel;
|
|
}, [begin, cancel, enabled, keyHash]);
|
|
|
|
useEffect(() => {
|
|
if (controllerRef.current || failureCountRef.current > 0) return;
|
|
clearTimer();
|
|
if (enabled) schedulePoll();
|
|
}, [enabled, refetchInterval, clearTimer, schedulePoll]);
|
|
|
|
// The store recovered from an outage: refetch, as `bindConnectivity` does
|
|
// for every active query.
|
|
useEffect(
|
|
() =>
|
|
store.onRecover(() => {
|
|
if (!policyRef.current.enabled) return;
|
|
failureCountRef.current = 0;
|
|
begin();
|
|
}),
|
|
[begin, store],
|
|
);
|
|
|
|
useEffect(() => {
|
|
mountedRef.current = true;
|
|
return () => {
|
|
mountedRef.current = false;
|
|
ticketRef.current += 1;
|
|
clearTimer();
|
|
controllerRef.current?.abort();
|
|
controllerRef.current = null;
|
|
};
|
|
}, [clearTimer]);
|
|
|
|
const refetch = useCallback(() => {
|
|
failureCountRef.current = 0;
|
|
begin();
|
|
}, [begin]);
|
|
|
|
const source: QueryViewSource<TData> = {
|
|
data: current.data,
|
|
error: current.error,
|
|
status: current.status,
|
|
fetchStatus: current.fetchStatus,
|
|
failureReason: current.failureReason,
|
|
refetch,
|
|
};
|
|
const view = useQueryView(source);
|
|
|
|
return {
|
|
...source,
|
|
errorKind: current.error === null || current.error === undefined ? null : classifyError(current.error),
|
|
isFetching: current.fetchStatus === "fetching",
|
|
isPaused: current.fetchStatus === "paused",
|
|
dataUpdatedAt: current.dataUpdatedAt,
|
|
refetch,
|
|
view,
|
|
};
|
|
}
|