A desktop coding agent with free access to frontier models.
TypeScript
fix(collector): spool retries stay within the retry cap when the clock goes back
ogsamratbe20890ed1d3
diff --git a/apps/server/src/workspace-collector.test.ts b/apps/server/src/workspace-collector.test.tsindex 2f1cbe3d..de13b6d8 100644--- a/apps/server/src/workspace-collector.test.ts+++ b/apps/server/src/workspace-collector.test.ts@@ -1078,6 +1078,32 @@ describe("workspace collector upload deadline and spool drain", () => {expect(await collector.spoolStatus()).toEqual({ entries: 1, bytes: 1_024 });});+ test("an entry dated in the future (the clock went back) waits one backoff, not until then", async () => {+ const stateDir = await drainState();+ await spoolEntry(stateDir, 1, 256, { attempts: 2, last_attempt_at: new Date(Date.now() + 30 * 24 * 60 * 60_000).toISOString() });+ let calls = 0;+ const collector = new WorkspaceCollector({+ stateDir,+ upload: async () => {+ calls += 1;+ return new Response(null, { status: calls === 1 ? 503 : 201 });+ },+ retryBaseMs: 20,+ retryMaxMs: 80,+ });+ // Due at once: the first try fails and records a sane last attempt.+ expect(await collector.drainSpool()).toEqual({ delivered: 0, pending: 1 });+ const deadline = Date.now() + 2_000;+ while ((await collector.spoolStatus()).entries > 0 && Date.now() < deadline) {+ await new Promise((resolvePromise) => setTimeout(resolvePromise, 20));+ }+ expect(await collector.spoolStatus()).toEqual({ entries: 0, bytes: 0 });+ // Retried on the capped schedule: a handful of calls, no 1 ms loop.+ expect(calls).toBeGreaterThanOrEqual(1);+ expect(calls).toBeLessThanOrEqual(4);+ await collector.stop();+ });+test("a drain asked for while one runs picks up the entries spooled meanwhile", async () => {const stateDir = await drainState();await spoolEntry(stateDir, 1, 512);diff --git a/apps/server/src/workspace-collector.ts b/apps/server/src/workspace-collector.tsindex 6f1a94f9..b7b985ce 100644--- a/apps/server/src/workspace-collector.ts+++ b/apps/server/src/workspace-collector.ts@@ -4726,7 +4726,10 @@ export class WorkspaceCollector {private scheduleRetry(delayMs?: number): void {if (!this.spoolDir || this.stopped || this.retryTimer) return;- const delay = delayMs ?? this.jitteredBackoffMs();+ // Never past the retry cap: a delay computed from a spool entry dated in+ // the future (the clock went back) must not park the spool for days, or+ // overflow setTimeout into a 1 ms loop.+ const delay = Math.min(this.retryMaxMs, Math.max(0, delayMs ?? this.jitteredBackoffMs()));this.retryTimer = setTimeout(() => {this.retryTimer = null;void this.drainSpool().catch(() => undefined);@@ -4750,7 +4753,10 @@ export class WorkspaceCollector {*/private spoolEntryDueAt(entry: SpoolMeta): number {const last = entry.last_attempt_at ? Date.parse(entry.last_attempt_at) : Number.NaN;- return Number.isFinite(last) ? last + this.backoffMs(entry.attempts - 1) : 0;+ if (!Number.isFinite(last)) return 0;+ // A last attempt after now means the clock went back: due at once, and+ // the attempt then records a sane time.+ return last > Date.now() ? 0 : last + this.backoffMs(entry.attempts - 1);}/**