Skip to content

Commit b4dff15

Browse files
committed
fix(composer): retry retained expired catalogs without losing skew guard
1 parent 9d6ba4e commit b4dff15

1 file changed

Lines changed: 16 additions & 5 deletions

File tree

‎packages/client-runtime/src/providerSkills.ts‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ interface ProviderWorkspaceSnapshotRefreshState {
144144
readonly requestedAt: number | null;
145145
/** A failed scan is not retried before this time. */
146146
readonly retryNotBefore: number | null;
147-
/** Scans in a row that ended without a complete snapshot. */
147+
/** Failed scans within the current request TTL. */
148148
readonly failedAttempts: number;
149149
readonly hadSnapshot: boolean;
150150
}
@@ -183,8 +183,10 @@ function planProviderWorkspaceSnapshotRefresh(
183183
const state = {
184184
requestedAt,
185185
retryNotBefore,
186-
// A complete snapshot ends the run of failures.
187-
failedAttempts: hasSnapshot ? 0 : previous.failedAttempts,
186+
failedAttempts:
187+
lost || (requestedAt !== null && now - requestedAt >= PROVIDER_WORKSPACE_SNAPSHOT_TTL_MS)
188+
? 0
189+
: previous.failedAttempts,
188190
hadSnapshot: hasSnapshot,
189191
};
190192
const refresh =
@@ -305,9 +307,18 @@ export function createProviderWorkspaceSnapshotRefreshAtomFamily(input: {
305307
{ environmentId, input: { instanceId, cwd } },
306308
{ reportFailure: false },
307309
).then((result) => {
310+
const refreshedProvider =
311+
result._tag === "Success" ? findProvider(result.value.providers) : undefined;
312+
const snapshot =
313+
refreshedProvider && resolveProviderWorkspaceSnapshot(refreshedProvider, cwd);
314+
// A new server timestamp proves progress even when the client clock is ahead.
315+
// @effect-diagnostics-next-line globalDate:off
316+
const completedAt = Date.now();
308317
const refreshed =
309-
result._tag === "Success" &&
310-
hasCompleteProviderWorkspaceSnapshot(findProvider(result.value.providers), cwd);
318+
hasCompleteProviderWorkspaceSnapshot(refreshedProvider, cwd) &&
319+
(hasCurrentProviderWorkspaceSnapshot(refreshedProvider, cwd, completedAt) ||
320+
snapshot?.checkedAt !==
321+
(provider && resolveProviderWorkspaceSnapshot(provider, cwd))?.checkedAt);
311322
if (!refreshed) retryLater();
312323
}, retryLater);
313324
return plan.state;

0 commit comments

Comments
 (0)