a2a-exposed 0.8.21 → 0.8.23

package/worker/test/migrations.test.ts

@@ -59,6 +59,10 @@ test("fresh database: every migration applies in order; a second run applies not
 	assert.deepEqual(applyMigrations(db), [...FILES].sort(byNumber));
 	for (const t of ["peers", "tasks", "wakes", "wake_budget", "device_requests", "pairing_rate", "settings", "facade_owners", "oauth_clients", "oauth_codes", "mcp_grants", "outbound_peers", "oauth_client_metadata", "oidc_txns", "conversation_owners", "reply_deliveries"]) assert.ok(tables(db).includes(t), t);
 	assert.ok(columns(db, "peers").includes("source"));
+	assert.ok(columns(db, "peers").includes("identity_key"));
+	assert.ok(columns(db, "peers").includes("card_url"));
+	assert.ok(columns(db, "peers").includes("token_enc"));
+	assert.ok(columns(db, "device_requests").includes("identity_key"));
 	assert.ok(columns(db, "device_requests").includes("replaces_label"));
 	assert.ok(columns(db, "device_requests").includes("replaces_hash"));
 	assert.deepEqual(applyMigrations(db), []);
@@ -67,15 +71,15 @@ test("fresh database: every migration applies in order; a second run applies not
 test("database from the 0002 fix (0001-0003 recorded): only 0004 and later apply; pending requests keep working", () => {
 	const db = existingDb([sql("0001_init.sql"), sql("0002_wake_budget.sql"), sql("0003_device_pairing.sql")], ["0001_init.sql", "0002_wake_budget.sql", "0003_device_pairing.sql"]);
 	db.prepare("INSERT INTO device_requests (device_hash, user_code, status, created_ms, expires_ms, interval_s) VALUES ('h', 'WDJB4827', 'pending', 1, 2, 5)").run();
-	assert.deepEqual(applyMigrations(db), ["0004_pairing_replace.sql", "0005_facade_owners.sql", "0006_mcp.sql", "0007_cimd.sql", "0008_oidc_txns.sql", "0009_outbound_seen.sql", "0010_conversation_peer.sql", "0011_conversation_owner.sql", "0012_conversation_peer_owner.sql", "0013_reply_delivery.sql"]);
+	assert.deepEqual(applyMigrations(db), ["0004_pairing_replace.sql", "0005_facade_owners.sql", "0006_mcp.sql", "0007_cimd.sql", "0008_oidc_txns.sql", "0009_outbound_seen.sql", "0010_conversation_peer.sql", "0011_conversation_owner.sql", "0012_conversation_peer_owner.sql", "0013_reply_delivery.sql", "0014_peer_address.sql", "0015_outbound_source.sql"]);
 	assert.equal((db.prepare("SELECT replaces_label FROM device_requests WHERE device_hash = 'h'").get() as any).replaces_label, null);
 });
 
 test("database from v0.2.0 (0001 and 0003 recorded): 0002 applies as a no-op and keeps the data", () => {
 	const db = existingDb([sql("0001_init.sql"), sql("0003_device_pairing.sql")], ["0001_init.sql", "0003_device_pairing.sql"]);
 	db.prepare("INSERT INTO wake_budget (hour, count) VALUES (1, 7)").run();
-	assert.deepEqual(applyMigrations(db), ["0002_wake_budget.sql", "0004_pairing_replace.sql", "0005_facade_owners.sql", "0006_mcp.sql", "0007_cimd.sql", "0008_oidc_txns.sql", "0009_outbound_seen.sql", "0010_conversation_peer.sql", "0011_conversation_owner.sql", "0012_conversation_peer_owner.sql", "0013_reply_delivery.sql"]);
-	assert.deepEqual(recorded(db), ["0001_init.sql", "0003_device_pairing.sql", "0002_wake_budget.sql", "0004_pairing_replace.sql", "0005_facade_owners.sql", "0006_mcp.sql", "0007_cimd.sql", "0008_oidc_txns.sql", "0009_outbound_seen.sql", "0010_conversation_peer.sql", "0011_conversation_owner.sql", "0012_conversation_peer_owner.sql", "0013_reply_delivery.sql"]);
+	assert.deepEqual(applyMigrations(db), ["0002_wake_budget.sql", "0004_pairing_replace.sql", "0005_facade_owners.sql", "0006_mcp.sql", "0007_cimd.sql", "0008_oidc_txns.sql", "0009_outbound_seen.sql", "0010_conversation_peer.sql", "0011_conversation_owner.sql", "0012_conversation_peer_owner.sql", "0013_reply_delivery.sql", "0014_peer_address.sql", "0015_outbound_source.sql"]);
+	assert.deepEqual(recorded(db), ["0001_init.sql", "0003_device_pairing.sql", "0002_wake_budget.sql", "0004_pairing_replace.sql", "0005_facade_owners.sql", "0006_mcp.sql", "0007_cimd.sql", "0008_oidc_txns.sql", "0009_outbound_seen.sql", "0010_conversation_peer.sql", "0011_conversation_owner.sql", "0012_conversation_peer_owner.sql", "0013_reply_delivery.sql", "0014_peer_address.sql", "0015_outbound_source.sql"]);
 	assert.equal((db.prepare("SELECT count FROM wake_budget WHERE hour = 1").get() as any).count, 7);
 });
 
@@ -107,7 +111,7 @@ test("database from an earlier build without wake_budget (0001 and 0003 recorded
 		assert.equal(before.data.error?.code, -32603, JSON.stringify(before.data));
 		assert.equal(wakes.length, 0);
 
-		assert.deepEqual(applyMigrations(db), ["0002_wake_budget.sql", "0004_pairing_replace.sql", "0005_facade_owners.sql", "0006_mcp.sql", "0007_cimd.sql", "0008_oidc_txns.sql", "0009_outbound_seen.sql", "0010_conversation_peer.sql", "0011_conversation_owner.sql", "0012_conversation_peer_owner.sql", "0013_reply_delivery.sql"]);
+		assert.deepEqual(applyMigrations(db), ["0002_wake_budget.sql", "0004_pairing_replace.sql", "0005_facade_owners.sql", "0006_mcp.sql", "0007_cimd.sql", "0008_oidc_txns.sql", "0009_outbound_seen.sql", "0010_conversation_peer.sql", "0011_conversation_owner.sql", "0012_conversation_peer_owner.sql", "0013_reply_delivery.sql", "0014_peer_address.sql", "0015_outbound_source.sql"]);
 		assert.deepEqual(columns(db, "wake_budget"), ["hour", "count"]);
 		assert.deepEqual(applyMigrations(db), []);
 
@@ -169,3 +173,16 @@ test("0012 lets each peer own the same context id and keeps the first row", () =
 	const peers = db.prepare("SELECT peer FROM conversation_owners WHERE context_id = 'ctx-y' ORDER BY peer").all() as { peer: string }[];
 	assert.deepEqual(peers.map((r) => r.peer), ["ada", "bob"]);
 });
+
+test("0014 adds address columns and keeps an existing peer token", () => {
+	const prior = [...FILES].sort(byNumber).filter((f) => f !== "0014_peer_address.sql");
+	const db = existingDb(prior.map(sql), prior);
+	db.prepare("INSERT INTO peers (label, token_hash, created_at, source, user_code, client_name) VALUES ('ada', 'hash', '2026-01-01T00:00:00.000Z', 'pairing', 'WDJB4827', 'Ada')").run();
+	assert.deepEqual(applyMigrations(db), ["0014_peer_address.sql"]);
+	const row = db.prepare("SELECT token_hash, identity_key, card_url, token_enc FROM peers WHERE label = 'ada'").get() as { token_hash: string; identity_key: string | null; card_url: string | null; token_enc: string | null };
+	assert.equal(row.token_hash, "hash");
+	assert.equal(row.identity_key, null);
+	assert.equal(row.card_url, null);
+	assert.equal(row.token_enc, null);
+	assert.ok(columns(db, "device_requests").includes("identity_key"));
+});

package/worker/test/outbound-push.test.ts

@@ -2,6 +2,7 @@
 // A connector send attaches a push config only when the peer card advertises it, and stores the token
 // hash before SendMessage returns. Inbox marks a reply seen only when the stored update is still the
 // snapshot that response returned, on every storage backend this file runs against.
+// Revoking the peer label clears that peer's push hashes. A later push with the old token is 401.
 import { test } from "node:test";
 import assert from "node:assert/strict";
 import { sha256 } from "../src/a2a.ts";
@@ -340,3 +341,192 @@ test("message and artifactUpdate pushes supply inbox text", async () => {
 		assert.equal((history.data as Hist[]).some((r) => r.event === "push" && r.text === c.text && r.state === c.state), true, history.text);
 	}
 });
+
+type OutSnap = {
+	task_id?: string;
+	context_id?: string;
+	peer?: string;
+	task_json?: string | null;
+	updates_json?: string;
+	updates_seen?: number;
+	hash_cleared?: number;
+};
+
+test("revoking a peer rejects its old push token on the self-hosted and hosted paths", async (t) => {
+	const logs: string[] = [];
+	const origLog = console.log;
+	console.log = (...args: unknown[]) => {
+		logs.push(args.map((a) => String(a)).join(" "));
+		origLog(...args);
+	};
+	const pushByHost = new Map<string, string>();
+	const origFetch = globalThis.fetch;
+	globalThis.fetch = (async (input: RequestInfo | URL, init?: RequestInit) => {
+		const url = new URL(reqUrl(input));
+		if (init?.method !== "POST") {
+			return new Response(JSON.stringify(card(`https://${url.host}`, "1.0", true)), { status: 200, headers: { "content-type": "application/json" } });
+		}
+		const body = JSON.parse(String(init.body)) as { params?: { configuration?: { taskPushNotificationConfig?: { token?: string } } } };
+		const token = body.params?.configuration?.taskPushNotificationConfig?.token || "";
+		pushByHost.set(url.host, token);
+		const taskId = url.host.startsWith("bea.") ? "task-bea" : "task-ada";
+		const contextId = url.host.startsWith("bea.") ? "ctx-bea" : "ctx-ada";
+		return new Response(JSON.stringify({ jsonrpc: "2.0", id: "1", result: taskResult(taskId, contextId, "1.0") }), { status: 200, headers: { "content-type": "application/json" } });
+	}) as typeof fetch;
+	t.after(() => {
+		globalThis.fetch = origFetch;
+		console.log = origLog;
+	});
+
+	const secrets: string[] = [];
+	const outputs: string[] = [];
+	const hides = (blob: string, where: string) => {
+		for (const secret of secrets) assert.equal(secret.length > 0 && blob.includes(secret), false, `${where} contains a token`);
+	};
+
+	for (const mode of ["single", "host"] as const) {
+		pushByHost.clear();
+		const db = d1(MIGRATIONS);
+		const publicUrl = "https://owner.example.net";
+		const ctx = mode === "single"
+			? resolveTenant({ DB: db, PUBLIC_URL: publicUrl, OWNER_TOKEN: OWNER, AGENT_NAME: "Owner" } as WorkerBindings)
+			: hostedTenantContext({
+				DB: db, TENANCY: "host", TENANT_SECRETS_KEY: "platform-key", PUBLIC_URL: publicUrl, OWNER_TOKEN: "platform-owner",
+			} as WorkerBindings, {
+				id: "ten_revoke_push", db, publicUrl, ownerTokenHash: await sha256(OWNER), status: "active", config: { AGENT_NAME: "Owner" },
+			});
+		const http = (method: string, path: string, body?: unknown) => owner(ctx, method, path, body);
+		const call = async (method: string, path: string, body?: unknown) => {
+			if (mode === "single") return http(method, path, body);
+			const res = await runOwnerRpc(ctx, ectx as never, {
+				accountId: "acct_owner", method, path, ...(body === undefined ? {} : { body }),
+			});
+			const text = JSON.stringify(res.body);
+			return { status: res.status, data: res.body, text };
+		};
+		const note = (res: { text: string }) => { outputs.push(res.text); return res; };
+
+		const issue = async (label: string) => {
+			const issued = await http("POST", "/owner/peers", { label });
+			assert.equal(issued.status, 200, issued.text);
+			const token = (issued.data as { token?: string }).token || "";
+			assert.match(token, /^a2aow_/);
+			secrets.push(token);
+			return token;
+		};
+		const beaBearer = await issue("bea");
+		const adaBearer = await issue("ada");
+		for (const [alias, bearer] of [["bea", beaBearer], ["ada", adaBearer]] as const) {
+			const synced = note(await call("PUT", `/owner/outbound-peers/${alias}`, { url: `https://${alias}.example.net`, token: bearer }));
+			assert.equal(synced.status, 200, synced.text);
+			assert.equal(JSON.stringify(synced.data).includes(bearer), false);
+		}
+		for (const alias of ["bea", "ada"] as const) {
+			const sent = note(await call("POST", "/owner/mcp/send", { to: alias, text: `hello ${alias}`, contextId: `ctx-${alias}` }));
+			assert.equal(sent.status, 200, sent.text);
+			assert.equal((sent.data as SendBody).isError, false, sent.text);
+			assert.match((sent.data as SendBody).text || "", new RegExp(`task task-${alias}`));
+		}
+		const beaPush = pushByHost.get("bea.example.net") || "";
+		const adaPush = pushByHost.get("ada.example.net") || "";
+		assert.equal(beaPush.length > 0 && adaPush.length > 0 && beaPush !== adaPush, true);
+		secrets.push(beaPush, adaPush);
+		const pendingToken = "pending-push-token";
+		secrets.push(pendingToken);
+		await db.prepare(
+			`INSERT INTO outbound (task_id, context_id, peer, endpoint, protocol, push_token_hash, sent_at, updates_json, updates_seen)
+			 VALUES ('pend.revoked', 'ctx-bea', 'bea', 'https://bea.example.net/', '1.0', ?, '2026-01-01T00:00:00.000Z', '[]', 0)`,
+		).bind(await sha256(pendingToken)).run();
+
+		const missed = note(await call("DELETE", "/owner/peers/nobody"));
+		assert.equal(missed.status, 404, missed.text);
+		const beforeRevoke = await db.prepare("SELECT push_token_hash IS NULL AS cleared FROM outbound WHERE task_id = ?").bind("task-bea").first() as { cleared?: number };
+		assert.equal(Number(beforeRevoke.cleared), 0);
+
+		const revoked = note(await call("DELETE", "/owner/peers/bea"));
+		assert.equal(revoked.status, 200, revoked.text);
+		assert.deepEqual(revoked.data, { revoked: true, label: "bea" });
+		const again = note(await call("DELETE", "/owner/peers/bea"));
+		assert.equal(again.status, 404, again.text);
+
+		const cleared = async (taskId: string) => Number((await db.prepare("SELECT push_token_hash IS NULL AS cleared FROM outbound WHERE task_id = ?").bind(taskId).first() as { cleared?: number }).cleared);
+		assert.equal(await cleared("task-bea"), 1);
+		assert.equal(await cleared("pend.revoked"), 1);
+		assert.equal(await cleared("task-ada"), 0);
+
+		const snap = async (taskId: string) => await db.prepare(
+			`SELECT task_id, context_id, peer, task_json, updates_json, updates_seen, push_token_hash IS NULL AS hash_cleared
+			 FROM outbound WHERE task_id = ?`,
+		).bind(taskId).first() as OutSnap;
+		const histCount = async (contextId: string) => Number((await db.prepare("SELECT COUNT(*) AS n FROM history WHERE context_id = ?").bind(contextId).first() as { n: number }).n);
+		const taskCount = async () => Number((await db.prepare("SELECT COUNT(*) AS n FROM tasks").first() as { n: number }).n);
+		const beaBefore = await snap("task-bea");
+		const beaHist = await histCount("ctx-bea");
+		const tasksBefore = await taskCount();
+		const push = async (token: string, taskId: string, text: string) => {
+			const res = await dispatch(new Request("https://owner.example.net/push", {
+				method: "POST",
+				headers: { "content-type": "application/json", "x-a2a-notification-token": token },
+				body: JSON.stringify({ task: { id: taskId, contextId: "ctx-bea", status: { state: "completed", message: { parts: [{ text }] } } } }),
+			}), ctx, ectx as never);
+			const body = await res.text();
+			outputs.push(body);
+			return { status: res.status, body };
+		};
+		const rejected = await push(beaPush, "task-bea", "revoked reply");
+		assert.equal(rejected.status, 401);
+		assert.equal(rejected.body, '{"error":"unauthorized"}');
+		assert.deepEqual(await snap("task-bea"), beaBefore);
+		assert.equal(await histCount("ctx-bea"), beaHist);
+		assert.equal(await taskCount(), tasksBefore);
+		const wake = await db.prepare("SELECT pending_json FROM wakes WHERE context_id = ?").bind("ctx-bea").first() as { pending_json?: string | null } | null;
+		assert.equal(wake?.pending_json ?? null, null);
+
+		const pending = await push(pendingToken, "task-claimed", "pending reply");
+		assert.equal(pending.status, 401);
+		assert.equal(pending.body, '{"error":"unauthorized"}');
+		assert.equal(await cleared("pend.revoked"), 1);
+		const claimed = await db.prepare("SELECT task_id FROM outbound WHERE task_id = ?").bind("task-claimed").first();
+		assert.equal(claimed, null);
+		assert.equal(await histCount("ctx-bea"), beaHist);
+		assert.deepEqual(await snap("task-bea"), beaBefore);
+
+		const standin = "restored-push-token";
+		secrets.push(standin);
+		await db.prepare("UPDATE outbound SET push_token_hash = ? WHERE task_id = ?").bind(await sha256(standin), "task-bea").run();
+		const restored = await push(standin, "task-bea", "restored reply");
+		assert.equal(restored.status, 401);
+		assert.equal(restored.body, '{"error":"unauthorized"}');
+		const afterRestore = await snap("task-bea");
+		assert.equal(Number(afterRestore.hash_cleared), 0);
+		assert.equal(afterRestore.task_json, beaBefore.task_json);
+		assert.equal(afterRestore.updates_json, beaBefore.updates_json);
+		assert.equal(afterRestore.updates_seen, beaBefore.updates_seen);
+		assert.equal(await histCount("ctx-bea"), beaHist);
+
+		const accepted = await dispatch(new Request("https://owner.example.net/push", {
+			method: "POST",
+			headers: { "content-type": "application/json", "x-a2a-notification-token": adaPush },
+			body: JSON.stringify({ task: { id: "task-ada", contextId: "ctx-ada", status: { state: "completed", message: { parts: [{ text: "ada reply" }] } } } }),
+		}), ctx, ectx as never);
+		const acceptedText = await accepted.text();
+		outputs.push(acceptedText);
+		assert.equal(accepted.status, 200, acceptedText);
+		const adaRow = await snap("task-ada");
+		assert.match(String(adaRow.updates_json), /ada reply/);
+		assert.equal(Number(adaRow.hash_cleared), 0);
+		const adaHist = note(await call("GET", "/owner/history/ctx-ada"));
+		assert.equal((adaHist.data as Hist[]).some((r) => r.event === "push" && r.text === "ada reply"), true, adaHist.text);
+		const beaHistory = note(await call("GET", "/owner/history/ctx-bea"));
+		assert.equal((beaHistory.data as Hist[]).some((r) => r.text === "revoked reply" || r.text === "pending reply" || r.text === "restored reply"), false, beaHistory.text);
+		assert.deepEqual(await snap("task-bea"), afterRestore);
+	}
+
+	hides(outputs.join("\n"), "response");
+	hides(logs.join("\n"), "log");
+	for (const secret of secrets) {
+		const hash = await sha256(secret);
+		assert.equal(outputs.join("\n").includes(hash), false, "response contains a token hash");
+		assert.equal(logs.join("\n").includes(hash), false, "log contains a token hash");
+	}
+});

package/worker/test/reply-delivery.test.ts

@@ -20,15 +20,25 @@ async function fixture(t: Parameters<typeof test>[1] extends (t: infer T) => unk
 	};
 	const byId = new Map<string, TenantContext>();
 	let directPosts = 0;
+	const cards: string[] = [];
+	let missingCard = false;
 	let hold: Promise<void> | null = null;
+	let posted: (() => void) | null = null;
+	let aborted = false;
 	const ns: DoNamespace = {
 		idFromName(name: string) { return name; },
 		get(id: unknown) {
 			return { async fetch(req: Request) {
 				const ctx = byId.get(String(id));
 				if (!ctx) return new Response("missing", { status: 404 });
+				if (req.method === "GET" && new URL(req.url).pathname.startsWith("/.well-known/agent")) {
+					cards.push(new URL(req.url).pathname);
+					if (missingCard) return new Response("missing", { status: 404 });
+				}
 				if (req.method === "POST" && new URL(req.url).pathname === "/") {
 					directPosts++;
+					posted?.();
+					req.signal.addEventListener("abort", () => { aborted = true; }, { once: true });
 					if (hold) await hold;
 				}
 				return dispatch(req, ctx, ectx as never);
@@ -61,10 +71,11 @@ async function fixture(t: Parameters<typeof test>[1] extends (t: infer T) => unk
 		assert.equal(r.status, 200, JSON.stringify(data));
 		return data.result.id as string;
 	};
-	return { a, b, dbA, dbB, owner, sendToBob, get directPosts() { return directPosts; }, blockDirect() {
+	return { a, b, dbA, dbB, owner, sendToBob, cards, missingCard() { missingCard = true; }, get directPosts() { return directPosts; }, get aborted() { return aborted; }, blockDirect() {
 		let release!: () => void;
 		hold = new Promise<void>((resolve) => { release = resolve; });
-		return () => { hold = null; release(); };
+		const started = new Promise<void>((resolve) => { posted = resolve; });
+		return Object.assign(() => { hold = null; posted = null; release(); }, { started });
 	} };
 }
 
@@ -129,8 +140,9 @@ test("stale recovery never overlaps an uncertain delivery and a later retry read
 	const s = await fixture(t as never);
 	const taskId = await s.sendToBob("concurrent question", "ctx-concurrent");
 	const release = s.blockDirect();
+	t.after(release);
 	const first = s.owner(s.b, "acct-bob", "POST", "/owner/mcp/reply", { taskId, text: "one answer" });
-	while (s.directPosts === 0) await new Promise((resolve) => setTimeout(resolve, 0));
+	await release.started;
 	await s.dbB.prepare("UPDATE reply_deliveries SET updated_at = '2000-01-01T00:00:00.000Z'").run();
 	const raced = await s.owner(s.b, "acct-bob", "POST", "/owner/mcp/reply", { taskId, text: "one answer" });
 	assert.equal(raced.status, 200);
@@ -138,11 +150,48 @@ test("stale recovery never overlaps an uncertain delivery and a later retry read
 	assert.match(String((raced.body as any).structuredContent.detail), /uncertain.*not sent again/);
 	assert.equal(s.directPosts, 1, "the overlapping call cannot start a second delivery");
 	release();
-	assert.equal(((await first).body as any).structuredContent.status, "delivered");
+	assert.deepEqual(((await first).body as any).structuredContent, (raced.body as any).structuredContent, "a late success cannot replace the recorded uncertain result");
 	const retry = await s.owner(s.b, "acct-bob", "POST", "/owner/mcp/reply", { taskId, text: "one answer" });
 	assert.equal(retry.status, 200);
-	assert.equal((retry.body as any).structuredContent.status, "delivered");
+	assert.deepEqual((retry.body as any).structuredContent, (raced.body as any).structuredContent);
+	assert.equal(s.directPosts, 1);
+});
+
+test("an identical retry during delivery reports in-flight before the stored completed state", async (t) => {
+	const s = await fixture(t as never);
+	const taskId = await s.sendToBob("retry question", "ctx-in-flight");
+	const release = s.blockDirect();
+	t.after(release);
+	const first = s.owner(s.b, "acct-bob", "POST", "/owner/mcp/reply", { taskId, text: "one answer" });
+	await release.started;
+	const retry = await s.owner(s.b, "acct-bob", "POST", "/owner/mcp/reply", { taskId, text: "one answer" });
+	assert.equal(retry.status, 200);
+	assert.equal((retry.body as any).isError, true);
+	assert.match(String((retry.body as any).text), /already being delivered/);
+	assert.equal(s.directPosts, 1);
+	release();
+	assert.equal(((await first).body as any).structuredContent.status, "delivered");
+});
+
+test("the total delivery deadline returns while a peer ignores cancellation and retries never resend", async (t) => {
+	const s = await fixture(t as never);
+	const taskId = await s.sendToBob("slow question", "ctx-deadline");
+	const release = s.blockDirect();
+	t.after(release);
+	t.mock.timers.enable({ apis: ["setTimeout"] });
+	t.after(() => t.mock.timers.reset());
+	const first = s.owner(s.b, "acct-bob", "POST", "/owner/mcp/reply", { taskId, text: "bounded answer" });
+	await release.started;
+	t.mock.timers.tick(18000);
+	t.mock.timers.reset();
+	const result = await first;
+	assert.equal(result.status, 200);
+	assert.equal((result.body as any).structuredContent.status, "delivery-failed");
+	assert.equal(s.aborted, true, "the deadline reaches the actual peer request signal");
+	const retry = await s.owner(s.b, "acct-bob", "POST", "/owner/mcp/reply", { taskId, text: "bounded answer" });
+	assert.deepEqual((retry.body as any).structuredContent, (result.body as any).structuredContent);
 	assert.equal(s.directPosts, 1);
+	release();
 });
 
 test("a remote token rejection reports HTTP status without losing the stored reply", async (t) => {
@@ -159,3 +208,14 @@ test("a remote token rejection reports HTTP status without losing the stored rep
 	assert.equal(stored.state, "completed");
 	assert.match(stored.status_json, /the answer stays/);
 });
+
+
+test("reply discovers one canonical card and uses the paired base when it is missing", async (t) => {
+	const s = await fixture(t as never);
+	const taskId = await s.sendToBob("no card question", "ctx-one-card");
+	s.missingCard();
+	const result = await s.owner(s.b, "acct-bob", "POST", "/owner/mcp/reply", { taskId, text: "stored answer" });
+	assert.equal((result.body as any).structuredContent.status, "delivered");
+	assert.deepEqual(s.cards, ["/.well-known/agent-card.json"]);
+	assert.equal(s.directPosts, 1);
+});

package/worker/test/wake-target.test.ts

@@ -320,3 +320,13 @@ test("public-https does not request a metadata address, and does post to a check
 	assert.equal(tls.status, null);
 	assert.equal(tls.info, "Error: TLS Handshake Failed.");
 });
+
+
+test("an aborted peer request starts neither DNS lookup nor delivery", async () => {
+	const controller = new AbortController();
+	controller.abort(new Error("delivery deadline"));
+	await assert.rejects(() => fetchCheckedPeer("https://hook.example/rpc", { signal: controller.signal }, {
+		async lookup() { assert.fail("aborted request must not resolve DNS"); },
+		async deliver() { assert.fail("aborted request must not send"); },
+	}), /delivery deadline/);
+});