@fedify/fedify 2.3.5-dev.1755 → 2.3.6

package/dist/{builder-De3ym5P9.mjs → builder-CW-9AJCO.mjs}

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-Bb3DoPyg.mjs";
+import { n as version, t as name } from "./deno-KC-uf6Un.mjs";
 import { t as ActivityListenerSet } from "./activity-listener-tztVvlNb.mjs";
 import { getLogger } from "@logtape/logtape";
 import { Router, RouterError, assertPath } from "@fedify/uri-template";
@@ -80,7 +80,7 @@ var FederationBuilderImpl = class {
 	* specified.
 	*/
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-BZdewTD9.mjs");
+		const { FederationImpl } = await import("./middleware-Be2z0t5f.mjs");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();

package/dist/{circuit-breaker-DLS_n1x5.mjs → circuit-breaker-D1fxthDI.mjs}

@@ -4,10 +4,11 @@ globalThis.addEventListener = () => {};
 import { getLogger } from "@logtape/logtape";
 //#region src/federation/circuit-breaker.ts
 const MAX_CUSTOM_FAILURE_HISTORY = 100;
-const LEGACY_SWEEP_MARKER = ["__fedify_meta", "circuit_breaker_state_ttl_sweep_v1"];
+const LEGACY_SWEEP_MARKER = ["__fedify_meta", "circuit_breaker_state_ttl_sweep_v2"];
 const LEGACY_SWEEP_DELETING_MARKER = { __fedifyDeletingCircuitBreakerLegacyState: true };
 const CIRCUIT_BREAKER_STATE_VERSION = 1;
 const LEGACY_SWEEP_LOCK_TTL = Temporal.Duration.from({ minutes: 5 });
+const LEGACY_SWEEP_RENEW_INTERVAL = Temporal.Duration.from({ minutes: 1 });
 const LEGACY_SWEEP_RETRY_WINDOW = Temporal.Duration.from({ hours: 168 });
 const LEGACY_SWEEP_WAIT_INTERVAL = 10;
 const LEGACY_SWEEP_CAS_ATTEMPTS = 3;
@@ -222,12 +223,20 @@ var CircuitBreaker = class {
 	}
 	async #sweepLegacyStatesImpl() {
 		const markerKey = this.#legacySweepMarkerKey();
-		const marker = await this.#acquireLegacySweep(markerKey);
-		if (marker === "done") return;
+		const acquired = await this.#acquireLegacySweep(markerKey);
+		if (acquired === "done") return;
+		let marker = acquired;
+		let leaseRenewedAt = this.#now();
 		try {
 			for await (const { key, value } of this.#kv.list(this.#prefix)) {
 				if (key.length !== this.#prefix.length + 1) continue;
 				await this.#migrateLegacyState(key, value);
+				if (Temporal.Instant.compare(this.#now(), leaseRenewedAt.add(LEGACY_SWEEP_RENEW_INTERVAL)) >= 0) {
+					const renewed = await this.#renewLegacySweep(markerKey, marker);
+					if (renewed == null) return;
+					marker = renewed;
+					leaseRenewedAt = this.#now();
+				}
 			}
 		} catch (error) {
 			await this.#deleteIfUnchanged(markerKey, marker);
@@ -236,6 +245,14 @@ var CircuitBreaker = class {
 		const finishedMarker = this.#finishLegacySweepMarker(marker);
 		if (await this.#kv.cas(markerKey, marker, finishedMarker)) this.#rememberLegacySweepMarker(finishedMarker);
 	}
+	async #renewLegacySweep(markerKey, marker) {
+		const renewed = {
+			state: "sweeping",
+			started: this.#now().toString(),
+			retryUntil: getLegacySweepRetryUntil(marker) ?? this.#now().add(LEGACY_SWEEP_RETRY_WINDOW).toString()
+		};
+		if (await this.#kv.cas(markerKey, marker, renewed, { ttl: LEGACY_SWEEP_LOCK_TTL })) return renewed;
+	}
 	#finishLegacySweepMarker(marker) {
 		const retryUntil = getLegacySweepRetryUntil(marker);
 		if (retryUntil != null && Temporal.Instant.compare(this.#now(), Temporal.Instant.from(retryUntil)) < 0) return {
@@ -245,7 +262,10 @@ var CircuitBreaker = class {
 		return { state: "final" };
 	}
 	async #migrateLegacyState(key, value) {
-		if (isCurrentCircuitBreakerState(value)) return;
+		if (isCurrentCircuitBreakerState(value)) {
+			await this.#kv.cas(key, value, value, this.#setOptions());
+			return;
+		}
 		const state = parseCircuitBreakerKvState(value);
 		if (state != null) {
 			await this.#kv.cas(key, value, markCircuitBreakerState(state), this.#setOptions());
@@ -382,7 +402,7 @@ function normalizeCircuitBreakerOptions(options) {
 	} else {
 		failure = options.failure;
 		pruneFailures = (timestamps) => timestamps.slice(-MAX_CUSTOM_FAILURE_HISTORY);
-		stateTtl = configuredStateTtl;
+		stateTtl = configuredStateTtl ?? recoveryDelay.add(heldActivityTtl);
 	}
 	return {
 		failure,

package/dist/{circuit-breaker-test-utils-BVnv3T76.mjs → circuit-breaker-test-utils-CAdwjgMi.mjs}

@@ -7,7 +7,7 @@ function markCircuitBreakerLegacySweepDone(kv) {
 		"_fedify",
 		"circuit",
 		"__fedify_meta",
-		"circuit_breaker_state_ttl_sweep_v1"
+		"circuit_breaker_state_ttl_sweep_v2"
 	], { state: "final" });
 }
 //#endregion

package/dist/compat/mod.d.cts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { jt as ActivityTransformer, n as Context } from "../context-Bjswu3eC.cjs";
+import { jt as ActivityTransformer, n as Context } from "../context-BpmLyiPx.cjs";
 import { Activity } from "@fedify/vocab";
 
 //#region src/compat/transformers.d.ts

package/dist/compat/mod.d.ts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { jt as ActivityTransformer, n as Context } from "../context-COxc_O-c.js";
+import { jt as ActivityTransformer, n as Context } from "../context-BxVVO5Ro.js";
 import { Activity } from "@fedify/vocab";
 
 //#region src/compat/transformers.d.ts

package/dist/compat/outgoing-jsonld.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-XEgZAlrj.mjs";
-import { n as normalizeAttachmentArrays, r as normalizeOutgoingActivityJsonLd, t as isPreloadedContextAttachmentSafe } from "../outgoing-jsonld-L_DbOaFe.mjs";
+import { n as normalizeAttachmentArrays, r as normalizeOutgoingActivityJsonLd, t as isPreloadedContextAttachmentSafe } from "../outgoing-jsonld-OFoubetZ.mjs";
 import { Create, Document, Note, PUBLIC_COLLECTION } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 //#region src/compat/outgoing-jsonld.test.ts

package/dist/compat/public-audience.test.mjs

@@ -3,8 +3,8 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import { t as assertNotEquals } from "../assert_not_equals-DkVK8oqV.mjs";
-import { t as normalizePublicAudience } from "../public-audience-Cvbr2Gzt.mjs";
-import { Create, Note, PUBLIC_COLLECTION } from "@fedify/vocab";
+import { t as normalizePublicAudience } from "../public-audience-DZJAUUi8.mjs";
+import { Create, Follow, Note, PUBLIC_COLLECTION } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 import { getDocumentLoader, preloadedContexts } from "@fedify/vocab-runtime";
 //#region src/compat/public-audience.test.ts
@@ -45,6 +45,15 @@ test("normalizePublicAudience() normalises activities serialized by @fedify/voca
 	const nestedObject = normalized.object;
 	assertEquals(nestedObject.to, PUBLIC_URI);
 });
+test("normalizePublicAudience() normalises a public relay Follow object", async () => {
+	const compact = await new Follow({
+		id: new URL("https://example.com/activities/follow-relay"),
+		actor: new URL("https://example.com/alice"),
+		object: PUBLIC_COLLECTION
+	}).toJsonLd({ format: "compact" });
+	assertEquals(compact.object, "as:Public");
+	assertEquals((await normalizePublicAudience(compact, getDocumentLoader())).object, PUBLIC_URI);
+});
 test("normalizePublicAudience() is a no-op without the CURIE", async () => {
 	const input = {
 		"@context": AS_CONTEXT,

package/dist/compat/transformers.test.mjs

@@ -5,7 +5,7 @@ import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-DBC5X09g.mjs";
 import { t as assert } from "../assert-OguE97r2.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { b as autoIdAssigner, n as FederationImpl, y as actorDehydrator } from "../middleware-HRbD2E7D.mjs";
+import { b as autoIdAssigner, n as FederationImpl, y as actorDehydrator } from "../middleware-3L9f9ZTw.mjs";
 import { Follow, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 //#region src/compat/transformers.test.ts

package/dist/{context-Bjswu3eC.d.cts → context-BpmLyiPx.d.cts}

@@ -92,8 +92,9 @@ type CircuitBreakerOptions = CircuitBreakerFailurePolicy & {
   *
   * When omitted, Fedify derives this from `failureWindow`, `recoveryDelay`, and
   * `heldActivityTtl` for the default numeric failure policy.  Custom `failure`
-  * callbacks do not have an inspectable time window, so custom policies do not
-  * expire their stored state unless this option is provided.
+  * callbacks do not have an inspectable time window, so their state expires
+  * after `recoveryDelay` plus `heldActivityTtl` unless this option overrides
+  * it.
   */
   readonly stateTtl?: Temporal.Duration | Temporal.DurationLike;
   /**

package/dist/{context-COxc_O-c.d.ts → context-BxVVO5Ro.d.ts}

@@ -95,8 +95,9 @@ type CircuitBreakerOptions = CircuitBreakerFailurePolicy & {
   *
   * When omitted, Fedify derives this from `failureWindow`, `recoveryDelay`, and
   * `heldActivityTtl` for the default numeric failure policy.  Custom `failure`
-  * callbacks do not have an inspectable time window, so custom policies do not
-  * expire their stored state unless this option is provided.
+  * callbacks do not have an inspectable time window, so their state expires
+  * after `recoveryDelay` plus `heldActivityTtl` unless this option overrides
+  * it.
   */
   readonly stateTtl?: Temporal.Duration | Temporal.DurationLike;
   /**

package/dist/{deno-Bb3DoPyg.mjs → deno-KC-uf6Un.mjs}

@@ -3,6 +3,6 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.3.5-dev.1755+9b03b9cc";
+var version = "2.3.6";
 //#endregion
 export { version as n, name as t };

package/dist/{docloader-B9iBabXZ.mjs → docloader-BHS1yt22.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { o as validateCryptoKey } from "./key-C2zsXBK1.mjs";
-import { n as doubleKnock } from "./http-DjON0zte.mjs";
+import { o as validateCryptoKey } from "./key-Cbkqgt-G.mjs";
+import { n as doubleKnock } from "./http-BcbYkefs.mjs";
 import { getLogger } from "@logtape/logtape";
 import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, validatePublicUrl } from "@fedify/vocab-runtime";
 import { curry } from "es-toolkit";
@@ -26,6 +26,17 @@ const logger = getLogger([
 function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, maxRedirection, userAgent, specDeterminer, tracerProvider } = {}) {
 	validateCryptoKey(identity.privateKey);
 	async function load(url, options) {
+		await validateUrl(url);
+		return getRemoteDocument(url, await doubleKnock(createActivityPubRequest(url, { userAgent }), identity, {
+			maxRedirection,
+			specDeterminer,
+			log: curry(logRequest)(logger),
+			tracerProvider,
+			signal: options?.signal,
+			validateRedirect: validateUrl
+		}), load);
+	}
+	async function validateUrl(url) {
 		if (!allowPrivateAddress) try {
 			await validatePublicUrl(url);
 		} catch (error) {
@@ -35,13 +46,6 @@ function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, maxRedi
 			});
 			throw error;
 		}
-		return getRemoteDocument(url, await doubleKnock(createActivityPubRequest(url, { userAgent }), identity, {
-			maxRedirection,
-			specDeterminer,
-			log: curry(logRequest)(logger),
-			tracerProvider,
-			signal: options?.signal
-		}), load);
 	}
 	return load;
 }

package/dist/federation/builder.test.mjs

@@ -5,7 +5,7 @@ import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import { r as assertExists } from "../std__assert-BBjXFNOb.mjs";
 import { t as assertThrows } from "../assert_throws-BOkhLGYc.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { r as createFederationBuilder } from "../builder-De3ym5P9.mjs";
+import { r as createFederationBuilder } from "../builder-CW-9AJCO.mjs";
 import { DisallowedOperatorError, DisallowedVarSpecModifierError, DuplicateRouteVariableError, RouteTemplateOptionsNotMatchedError, RouterError } from "@fedify/uri-template";
 import { Activity, Note, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";

package/dist/federation/circuit-breaker.test.mjs

@@ -5,8 +5,8 @@ import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import "../std__assert-BBjXFNOb.mjs";
 import { t as assertThrows } from "../assert_throws-BOkhLGYc.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { n as normalizeCircuitBreakerOptions, r as parseCircuitBreakerKvState, t as CircuitBreaker } from "../circuit-breaker-DLS_n1x5.mjs";
-import { t as markCircuitBreakerLegacySweepDone } from "../circuit-breaker-test-utils-BVnv3T76.mjs";
+import { n as normalizeCircuitBreakerOptions, r as parseCircuitBreakerKvState, t as CircuitBreaker } from "../circuit-breaker-D1fxthDI.mjs";
+import { t as markCircuitBreakerLegacySweepDone } from "../circuit-breaker-test-utils-CAdwjgMi.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/circuit-breaker.test.ts
 var AlwaysConflictingKvStore = class extends MemoryKvStore {
@@ -51,7 +51,7 @@ var CountingSweepKvStore = class extends MemoryKvStore {
 	casCalls = [];
 	deletedKeys = [];
 	get(key) {
-		if (key.length === 4 && key[0] === "_fedify" && key[1] === "circuit" && key[2] === "__fedify_meta" && key[3] === "circuit_breaker_state_ttl_sweep_v1") this.markerGetCalls++;
+		if (key.length === 4 && key[0] === "_fedify" && key[1] === "circuit" && key[2] === "__fedify_meta" && key[3] === "circuit_breaker_state_ttl_sweep_v2") this.markerGetCalls++;
 		return super.get(key);
 	}
 	cas(key, expectedValue, newValue, options) {
@@ -73,7 +73,7 @@ var CountingSweepKvStore = class extends MemoryKvStore {
 var ConflictingSweepMarkerKvStore = class extends CountingSweepKvStore {
 	attempts = 0;
 	cas(key, expectedValue, newValue, options) {
-		if (key.length === 4 && key[0] === "_fedify" && key[1] === "circuit" && key[2] === "__fedify_meta" && key[3] === "circuit_breaker_state_ttl_sweep_v1") {
+		if (key.length === 4 && key[0] === "_fedify" && key[1] === "circuit" && key[2] === "__fedify_meta" && key[3] === "circuit_breaker_state_ttl_sweep_v2") {
 			this.attempts++;
 			if (this.attempts > 3) throw new Error("legacy sweep did not stop retrying CAS misses");
 			return Promise.resolve(false);
@@ -81,6 +81,23 @@ var ConflictingSweepMarkerKvStore = class extends CountingSweepKvStore {
 		return super.cas(key, expectedValue, newValue, options);
 	}
 };
+var ClockAdvancingSweepKvStore = class extends CountingSweepKvStore {
+	clock = Temporal.Instant.from("2026-05-25T00:00:00Z");
+	cas(key, expectedValue, newValue, options) {
+		if (key.length === 3) this.clock = this.clock.add({ seconds: 30 });
+		return super.cas(key, expectedValue, newValue, options);
+	}
+};
+var RenewalLostSweepKvStore = class extends ClockAdvancingSweepKvStore {
+	markerCasAttempts = 0;
+	cas(key, expectedValue, newValue, options) {
+		if (key.length === 4 && key[3] === "circuit_breaker_state_ttl_sweep_v2") {
+			this.markerCasAttempts++;
+			if (this.markerCasAttempts > 1) return Promise.resolve(false);
+		}
+		return super.cas(key, expectedValue, newValue, options);
+	}
+};
 var MarkerChangedDuringListKvStore = class extends CountingSweepKvStore {
 	async *list(prefix) {
 		yield* super.list(prefix);
@@ -88,7 +105,7 @@ var MarkerChangedDuringListKvStore = class extends CountingSweepKvStore {
 			"_fedify",
 			"circuit",
 			"__fedify_meta",
-			"circuit_breaker_state_ttl_sweep_v1"
+			"circuit_breaker_state_ttl_sweep_v2"
 		], { state: "final" });
 	}
 };
@@ -176,6 +193,18 @@ test("normalizeCircuitBreakerOptions() accepts callback failure policy", () => {
 	assertEquals(options.failure([Temporal.Instant.from("2026-05-25T00:00:00Z")]), false);
 	assertEquals(options.failure([Temporal.Instant.from("2026-05-25T00:00:00Z"), Temporal.Instant.from("2026-05-25T00:01:00Z")]), true);
 	assertEquals(options.pruneFailures(failures, base.add({ minutes: 105 })).map((t) => t.toString()), failures.slice(-100).map((t) => t.toString()));
+	assertEquals(options.stateTtl?.total("millisecond"), Temporal.Duration.from({
+		days: 7,
+		minutes: 30
+	}).total("millisecond"));
+	assertEquals(normalizeCircuitBreakerOptions({
+		failure: (timestamps) => timestamps.length >= 2,
+		recoveryDelay: { hours: 1 },
+		heldActivityTtl: { days: 2 }
+	}).stateTtl?.total("millisecond"), Temporal.Duration.from({
+		days: 2,
+		hours: 1
+	}).total("millisecond"));
 });
 test("parseCircuitBreakerKvState() validates stored shape", () => {
 	assertEquals(parseCircuitBreakerKvState({
@@ -561,7 +590,7 @@ test("CircuitBreaker writes stored states with a TTL without CAS", async () => {
 		hours: 1
 	}) });
 });
-test("CircuitBreaker preserves custom failure history by default", async () => {
+test("CircuitBreaker writes custom-policy states with a derived TTL", async () => {
 	const kv = new CountingCasKvStore();
 	await markCircuitBreakerLegacySweepDone(kv);
 	await new CircuitBreaker({
@@ -570,7 +599,10 @@ test("CircuitBreaker preserves custom failure history by default", async () => {
 		now: () => Temporal.Instant.from("2026-05-25T00:00:00Z"),
 		options: { failure: (timestamps) => timestamps.length >= 2 }
 	}).recordFailure("remote.example");
-	assertEquals(kv.options.at(-1), void 0);
+	assertEquals(kv.options.at(-1)?.ttl?.total("millisecond"), Temporal.Duration.from({
+		days: 7,
+		minutes: 30
+	}).total("millisecond"));
 });
 test("CircuitBreaker accepts an explicit TTL with custom failure policies", async () => {
 	const kv = new CountingCasKvStore();
@@ -586,7 +618,7 @@ test("CircuitBreaker accepts an explicit TTL with custom failure policies", asyn
 	}).recordFailure("remote.example");
 	assertEquals(kv.options.at(-1), { ttl: Temporal.Duration.from({ days: 14 }) });
 });
-test("CircuitBreaker skips legacy sweep when custom policies have no TTL", async () => {
+test("CircuitBreaker sweeps legacy states for custom failure policies", async () => {
 	const kv = new CountingSweepKvStore();
 	await kv.set([
 		"_fedify",
@@ -604,15 +636,146 @@ test("CircuitBreaker skips legacy sweep when custom policies have no TTL", async
 	});
 	await circuit.recordFailure("remote.example");
 	await circuit.pendingSweep;
-	assertEquals(kv.listCalls, 0);
+	assertEquals(kv.listCalls, 1);
 	assertEquals(await kv.get([
 		"_fedify",
 		"circuit",
 		"stale.example"
 	]), {
 		state: "closed",
-		failures: ["2026-05-25T00:00:00Z"]
+		failures: ["2026-05-25T00:00:00Z"],
+		__fedifyCircuitBreakerStateVersion: 1
+	});
+	assertEquals(kv.casCalls.find(({ key }) => key.at(-1) === "stale.example")?.options?.ttl?.total("millisecond"), Temporal.Duration.from({
+		days: 7,
+		minutes: 30
+	}).total("millisecond"));
+});
+test("CircuitBreaker stamps a TTL on versioned states during sweeps", async () => {
+	const kv = new CountingSweepKvStore();
+	await kv.set([
+		"_fedify",
+		"circuit",
+		"lingering.example"
+	], {
+		state: "closed",
+		failures: ["2026-05-25T00:00:00Z"],
+		__fedifyCircuitBreakerStateVersion: 1
+	});
+	const circuit = new CircuitBreaker({
+		kv,
+		prefix: ["_fedify", "circuit"],
+		now: () => Temporal.Instant.from("2026-05-25T00:00:00Z"),
+		options: { failure: (timestamps) => timestamps.length >= 2 }
+	});
+	await circuit.recordFailure("remote.example");
+	await circuit.pendingSweep;
+	assertEquals(await kv.get([
+		"_fedify",
+		"circuit",
+		"lingering.example"
+	]), {
+		state: "closed",
+		failures: ["2026-05-25T00:00:00Z"],
+		__fedifyCircuitBreakerStateVersion: 1
+	});
+	assertEquals(kv.casCalls.find(({ key }) => key.at(-1) === "lingering.example")?.options?.ttl?.total("millisecond"), Temporal.Duration.from({
+		days: 7,
+		minutes: 30
+	}).total("millisecond"));
+});
+test("CircuitBreaker re-sweeps despite a completed v1 sweep marker", async () => {
+	const kv = new CountingSweepKvStore();
+	await kv.set([
+		"_fedify",
+		"circuit",
+		"__fedify_meta",
+		"circuit_breaker_state_ttl_sweep_v1"
+	], { state: "final" });
+	await kv.set([
+		"_fedify",
+		"circuit",
+		"lingering.example"
+	], {
+		state: "closed",
+		failures: ["2026-05-25T00:00:00Z"],
+		__fedifyCircuitBreakerStateVersion: 1
+	});
+	const circuit = new CircuitBreaker({
+		kv,
+		prefix: ["_fedify", "circuit"],
+		now: () => Temporal.Instant.from("2026-05-25T00:00:00Z"),
+		options: { failure: (timestamps) => timestamps.length >= 2 }
+	});
+	await circuit.recordFailure("remote.example");
+	await circuit.pendingSweep;
+	assertEquals(kv.listCalls, 1);
+	assertEquals(kv.casCalls.find(({ key }) => key.at(-1) === "lingering.example")?.options?.ttl?.total("millisecond"), Temporal.Duration.from({
+		days: 7,
+		minutes: 30
+	}).total("millisecond"));
+});
+test("CircuitBreaker renews the sweep marker lease during long sweeps", async () => {
+	const kv = new ClockAdvancingSweepKvStore();
+	for (let i = 0; i < 5; i++) await kv.set([
+		"_fedify",
+		"circuit",
+		`host-${i}.example`
+	], {
+		state: "closed",
+		failures: ["2026-05-25T00:00:00Z"],
+		__fedifyCircuitBreakerStateVersion: 1
+	});
+	const circuit = new CircuitBreaker({
+		kv,
+		prefix: ["_fedify", "circuit"],
+		now: () => kv.clock,
+		options: { failure: (timestamps) => timestamps.length >= 2 }
+	});
+	await circuit.getState("remote.example");
+	await circuit.pendingSweep;
+	assertEquals(kv.casCalls.filter(({ key }) => key.at(-1) === "circuit_breaker_state_ttl_sweep_v2").length, 4);
+	assertEquals(await kv.get([
+		"_fedify",
+		"circuit",
+		"__fedify_meta",
+		"circuit_breaker_state_ttl_sweep_v2"
+	]), {
+		state: "done",
+		retryUntil: "2026-06-01T00:00:00Z"
 	});
+	assertEquals(kv.casCalls.find(({ key }) => key.at(-1) === "host-4.example")?.options?.ttl?.total("millisecond"), Temporal.Duration.from({
+		days: 7,
+		minutes: 30
+	}).total("millisecond"));
+});
+test("CircuitBreaker abandons the sweep when the marker lease is lost", async () => {
+	const kv = new RenewalLostSweepKvStore();
+	for (let i = 0; i < 5; i++) await kv.set([
+		"_fedify",
+		"circuit",
+		`host-${i}.example`
+	], {
+		state: "closed",
+		failures: ["2026-05-25T00:00:00Z"],
+		__fedifyCircuitBreakerStateVersion: 1
+	});
+	const circuit = new CircuitBreaker({
+		kv,
+		prefix: ["_fedify", "circuit"],
+		now: () => kv.clock,
+		options: { failure: (timestamps) => timestamps.length >= 2 }
+	});
+	await circuit.getState("remote.example");
+	await circuit.pendingSweep;
+	assertEquals(kv.markerCasAttempts, 2);
+	assertEquals(kv.casCalls.filter(({ key }) => key.at(-1) === "host-4.example").length, 0);
+	assertEquals((await kv.get([
+		"_fedify",
+		"circuit",
+		"__fedify_meta",
+		"circuit_breaker_state_ttl_sweep_v2"
+	]))?.state, "sweeping");
 });
 test("CircuitBreaker migrates legacy states without TTL once", async () => {
 	const kv = new CountingSweepKvStore();
@@ -720,7 +883,7 @@ test("CircuitBreaker migrates legacy states without TTL once", async () => {
 		"_fedify",
 		"circuit",
 		"__fedify_meta",
-		"circuit_breaker_state_ttl_sweep_v1"
+		"circuit_breaker_state_ttl_sweep_v2"
 	]), {
 		state: "done",
 		retryUntil: "2026-06-01T00:00:00Z"
@@ -764,7 +927,7 @@ test("CircuitBreaker migrates legacy states without TTL once", async () => {
 		"_fedify",
 		"circuit",
 		"__fedify_meta",
-		"circuit_breaker_state_ttl_sweep_v1"
+		"circuit_breaker_state_ttl_sweep_v2"
 	]), { state: "final" });
 });
 test("CircuitBreaker does not sweep state changed after listing", async () => {
@@ -800,7 +963,7 @@ test("CircuitBreaker skips legacy sweep already running elsewhere", async () =>
 		"_fedify",
 		"circuit",
 		"__fedify_meta",
-		"circuit_breaker_state_ttl_sweep_v1"
+		"circuit_breaker_state_ttl_sweep_v2"
 	], {
 		state: "sweeping",
 		started: "2026-05-25T00:00:00Z",
@@ -841,7 +1004,7 @@ test("CircuitBreaker does not overwrite a changed legacy sweep marker", async ()
 		"_fedify",
 		"circuit",
 		"__fedify_meta",
-		"circuit_breaker_state_ttl_sweep_v1"
+		"circuit_breaker_state_ttl_sweep_v2"
 	]), { state: "final" });
 });
 test("CircuitBreaker bounds legacy sweep CAS retries", async () => {
@@ -863,7 +1026,7 @@ test("CircuitBreaker retries expired legacy sweep markers", async () => {
 		"_fedify",
 		"circuit",
 		"__fedify_meta",
-		"circuit_breaker_state_ttl_sweep_v1"
+		"circuit_breaker_state_ttl_sweep_v2"
 	], {
 		state: "sweeping",
 		started: "2026-05-25T00:00:00Z",
@@ -899,7 +1062,7 @@ test("CircuitBreaker retries expired legacy sweep markers", async () => {
 		"_fedify",
 		"circuit",
 		"__fedify_meta",
-		"circuit_breaker_state_ttl_sweep_v1"
+		"circuit_breaker_state_ttl_sweep_v2"
 	]), {
 		state: "done",
 		retryUntil: "2026-06-01T00:00:00Z"
@@ -911,7 +1074,7 @@ test("CircuitBreaker caches completed legacy sweep markers", async () => {
 		"_fedify",
 		"circuit",
 		"__fedify_meta",
-		"circuit_breaker_state_ttl_sweep_v1"
+		"circuit_breaker_state_ttl_sweep_v2"
 	], {
 		state: "done",
 		retryUntil: "2026-06-01T00:00:00Z"
@@ -952,7 +1115,7 @@ test("CircuitBreaker retries malformed legacy sweep markers", async () => {
 		"_fedify",
 		"circuit",
 		"__fedify_meta",
-		"circuit_breaker_state_ttl_sweep_v1"
+		"circuit_breaker_state_ttl_sweep_v2"
 	], {
 		state: "done",
 		retryUntil: "not an instant"
@@ -991,7 +1154,7 @@ test("CircuitBreaker retries malformed legacy sweep markers", async () => {
 		"_fedify",
 		"circuit",
 		"__fedify_meta",
-		"circuit_breaker_state_ttl_sweep_v1"
+		"circuit_breaker_state_ttl_sweep_v2"
 	]), {
 		state: "done",
 		retryUntil: "2026-06-01T00:00:00Z"
@@ -1011,13 +1174,13 @@ test("CircuitBreaker retries legacy sweep after transient failures", async () =>
 		"_fedify",
 		"circuit",
 		"__fedify_meta",
-		"circuit_breaker_state_ttl_sweep_v1"
+		"circuit_breaker_state_ttl_sweep_v2"
 	]), void 0);
 	assertEquals(kv.deletedKeys, [[
 		"_fedify",
 		"circuit",
 		"__fedify_meta",
-		"circuit_breaker_state_ttl_sweep_v1"
+		"circuit_breaker_state_ttl_sweep_v2"
 	]]);
 	assertEquals(await circuit.getState("remote.example"), {
 		state: "closed",

package/dist/federation/handler.test.mjs

@@ -8,11 +8,11 @@ import { n as assertGreaterOrEqual, t as assertRejects } from "../assert_rejects
 import { t as assertInstanceOf } from "../assert_instance_of-DBC5X09g.mjs";
 import { t as assert } from "../assert-OguE97r2.mjs";
 import { r as parseAcceptSignature } from "../accept-CPkZzmGN.mjs";
-import { s as signRequest } from "../http-DjON0zte.mjs";
+import { s as signRequest } from "../http-BcbYkefs.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, s as rsaPublicKey2 } from "../keys-DGu1NFwu.mjs";
-import { a as compactJsonLd, p as signJsonLd } from "../ld-CB6S9oHd.mjs";
+import { a as compactJsonLd, p as signJsonLd } from "../ld-c-9mCB36.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { c as handleActor, d as handleInbox, f as handleObject, h as respondWithObjectIfAcceptable, l as handleCollection, m as respondWithObject, o as createFederation, p as handleOutbox, u as handleCustomCollection } from "../middleware-HRbD2E7D.mjs";
+import { c as handleActor, d as handleInbox, f as handleObject, h as respondWithObjectIfAcceptable, l as handleCollection, m as respondWithObject, o as createFederation, p as handleOutbox, u as handleCustomCollection } from "../middleware-3L9f9ZTw.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-tztVvlNb.mjs";
 import { Activity, Create, Note, Person, Tombstone } from "@fedify/vocab";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/idempotency.test.mjs

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import "../std__assert-BBjXFNOb.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-DGu1NFwu.mjs";
-import { r as signObject } from "../proof-CCC9itsd.mjs";
+import { r as signObject } from "../proof-D_6qtBdQ.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { o as createFederation } from "../middleware-HRbD2E7D.mjs";
+import { o as createFederation } from "../middleware-3L9f9ZTw.mjs";
 import { Create, Follow, Person } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 //#region src/federation/idempotency.test.ts

package/dist/federation/metrics.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import "../std__assert-BBjXFNOb.mjs";
 import { t as assertRejects } from "../assert_rejects-DN60FHPX.mjs";
-import { _ as recordKeyLookup, a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, m as recordDocumentFetch, p as recordDocumentCache, r as getFederationMetrics, t as classifyFetchError, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "../metrics-DbryxSc6.mjs";
+import { _ as recordKeyLookup, a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, m as recordDocumentFetch, p as recordDocumentCache, r as getFederationMetrics, t as classifyFetchError, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "../metrics-D8s1eKfJ.mjs";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 import { FetchError } from "@fedify/vocab-runtime";
 import { DataPointType, MeterProvider, MetricReader } from "@opentelemetry/sdk-metrics";