Address review feedback on smoke test suite

 -  Extract parseRecipient helper in backdoor.ts to reduce duplication
 -  Extract pollHarnessInbox helper in orchestrator.ts to reduce
    duplication and centralize inbox polling
 -  Make poll() catch transient errors and retry instead of aborting,
    include last error message on timeout
 -  Fix workflow name reference in mastodon.env comment
 -  Pin Deno Docker image to 2.7.1 to match mise.toml

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: sij411

test/smoke/harness/backdoor.ts

@@ -9,6 +9,19 @@ function json(data: unknown, status = 200): Response {
   });
 }
 
+// Build recipient manually — Mastodon's WebFinger requires HTTPS but our
+// harness only has HTTP.  Parse the handle (user@domain) to construct the
+// actor URI and inbox URL directly.
+function parseRecipient(
+  handle: string,
+): { id: URL; inboxId: URL; actorId: URL } {
+  const [user, domain] = handle.split("@");
+  const inboxId = new URL(`http://${domain}/users/${user}/inbox`);
+  // Mastodon generates https:// actor URIs; use that as the canonical id
+  const actorId = new URL(`https://${domain}/users/${user}`);
+  return { id: actorId, inboxId, actorId };
+}
+
 export async function handleBackdoor(
   request: Request,
   federation: Federation<void>,
@@ -43,14 +56,7 @@ export async function handleBackdoor(
       undefined as void,
     );
 
-    // Build the recipient manually — Mastodon's WebFinger requires HTTPS
-    // but we only have HTTP.  Parse the handle (user@domain) to construct
-    // the actor URI and inbox URL directly.
-    const [user, domain] = to.split("@");
-    const inboxUrl = new URL(`http://${domain}/users/${user}/inbox`);
-    // Mastodon generates https:// actor URIs; use that as the canonical id
-    const actorId = new URL(`https://${domain}/users/${user}`);
-    const recipient = { id: actorId, inboxId: inboxUrl };
+    const { actorId, ...recipient } = parseRecipient(to);
 
     const noteId = crypto.randomUUID();
     const note = new Note({
@@ -92,10 +98,7 @@ export async function handleBackdoor(
       undefined as void,
     );
 
-    const [user, domain] = target.split("@");
-    const inboxUrl = new URL(`http://${domain}/users/${user}/inbox`);
-    const actorId = new URL(`https://${domain}/users/${user}`);
-    const recipient = { id: actorId, inboxId: inboxUrl };
+    const { actorId, ...recipient } = parseRecipient(target);
 
     const follow = new Follow({
       id: new URL(
@@ -128,10 +131,7 @@ export async function handleBackdoor(
       undefined as void,
     );
 
-    const [user, domain] = target.split("@");
-    const inboxUrl = new URL(`http://${domain}/users/${user}/inbox`);
-    const actorId = new URL(`https://${domain}/users/${user}`);
-    const recipient = { id: actorId, inboxId: inboxUrl };
+    const { actorId, ...recipient } = parseRecipient(target);
 
     const undo = new Undo({
       id: new URL(

test/smoke/mastodon/docker-compose.yml

@@ -29,7 +29,7 @@ services:
   # Fedify test harness — runs inside the Docker network so Mastodon's
   # Resolv::DNS can resolve "fedify-harness" natively via Docker DNS.
   fedify-harness:
-    image: denoland/deno:latest
+    image: denoland/deno:2.7.1
     working_dir: /workspace
     volumes:
       - ../../../:/workspace

test/smoke/mastodon/mastodon.env

@@ -1,6 +1,6 @@
 # Mastodon configuration for smoke tests.
 # SECRET_KEY_BASE, OTP_SECRET, VAPID_*, and ACTIVE_RECORD_ENCRYPTION_*
-# are appended by CI (see .github/workflows/smoke.yml).
+# are appended by CI (see .github/workflows/smoke-mastodon.yml).
 
 LOCAL_DOMAIN=mastodon:3000
 ALTERNATE_DOMAINS=localhost:3000

test/smoke/orchestrator.ts

@@ -36,12 +36,30 @@ async function poll<T>(
   fn: () => Promise<T | null>,
 ): Promise<T> {
   const deadline = Date.now() + POLL_TIMEOUT_MS;
+  let lastError: unknown = null;
   while (Date.now() < deadline) {
-    const result = await fn();
-    if (result !== null) return result;
+    try {
+      const result = await fn();
+      if (result !== null) return result;
+    } catch (err) {
+      lastError = err;
+    }
     await new Promise((r) => setTimeout(r, POLL_INTERVAL_MS));
   }
-  throw new Error(`Timed out waiting for: ${label}`);
+  const suffix = lastError instanceof Error
+    ? ` (last error: ${lastError.message})`
+    : "";
+  throw new Error(`Timed out waiting for: ${label}${suffix}`);
+}
+
+function pollHarnessInbox(
+  activityType: string,
+): Promise<{ type: string; id: string }> {
+  return poll(`${activityType} in harness inbox`, async () => {
+    const res = await fetch(`${HARNESS_URL}/_test/inbox`);
+    const items = await res.json() as { type: string; id: string }[];
+    return items.find((a) => a.type === activityType) ?? null;
+  });
 }
 
 async function serverGet(path: string): Promise<unknown> {
@@ -179,11 +197,7 @@ async function testFollowMastodonToFedify(): Promise<void> {
   await assertNotFollowing(accountId, "following");
   await serverPost(`/api/v1/accounts/${accountId}/follow`);
 
-  await poll("Follow in harness inbox", async () => {
-    const res = await fetch(`${HARNESS_URL}/_test/inbox`);
-    const items = await res.json() as { type: string; id: string }[];
-    return items.find((a) => a.type === "Follow") ?? null;
-  });
+  await pollHarnessInbox("Follow");
 
   await poll("follow accepted", async () => {
     const rels = await serverGet(
@@ -216,11 +230,7 @@ async function testFollowFedifyToMastodon(): Promise<void> {
     return rel?.followed_by ? rel : null;
   });
 
-  await poll("Accept in harness inbox", async () => {
-    const res = await fetch(`${HARNESS_URL}/_test/inbox`);
-    const items = await res.json() as { type: string; id: string }[];
-    return items.find((a) => a.type === "Accept") ?? null;
-  });
+  await pollHarnessInbox("Accept");
 }
 
 // ---------------------------------------------------------------------------
@@ -260,11 +270,7 @@ async function testReply(): Promise<void> {
     status: replyContent,
   });
 
-  await poll("Create in harness inbox", async () => {
-    const res = await fetch(`${HARNESS_URL}/_test/inbox`);
-    const items = await res.json() as { type: string; id: string }[];
-    return items.find((a) => a.type === "Create") ?? null;
-  });
+  await pollHarnessInbox("Create");
 }
 
 // ---------------------------------------------------------------------------
@@ -277,11 +283,7 @@ async function testUnfollowMastodonFromFedify(): Promise<void> {
   const accountId = await lookupFedifyAccount();
   await serverPost(`/api/v1/accounts/${accountId}/unfollow`);
 
-  await poll("Undo in harness inbox", async () => {
-    const res = await fetch(`${HARNESS_URL}/_test/inbox`);
-    const items = await res.json() as { type: string; id: string }[];
-    return items.find((a) => a.type === "Undo") ?? null;
-  });
+  await pollHarnessInbox("Undo");
 
   await poll("unfollow confirmed", async () => {
     const rels = await serverGet(