a2a-exposed 0.8.2 → 0.8.4

package/lib/deploy.mjs

@@ -103,10 +103,13 @@ function syncTemplate(dir) {
 	fs.cpSync(src, dir, { recursive: true, force: true, filter: (p) => !skip.has(path.basename(p)) });
 }
 
-function run(cmd, args, { cwd, env, capture = false, allowFail = false } = {}) {
-	const r = spawnSync(cmd, args, { cwd, env: env || process.env, stdio: ["ignore", capture ? "pipe" : "inherit", "inherit"], encoding: "utf8" });
+function run(cmd, args, { cwd, env, capture = false, captureStderr = false, allowFail = false } = {}) {
+	const r = spawnSync(cmd, args, { cwd, env: env || process.env, stdio: ["ignore", capture ? "pipe" : "inherit", capture && captureStderr ? "pipe" : "inherit"], encoding: "utf8" });
 	if (r.error) die(`${cmd}: ${r.error.message}`);
-	if (r.status !== 0 && !allowFail) die(`${cmd} ${args[0] || ""} ${args[1] || ""} failed (exit ${r.status})`);
+	if (r.status !== 0 && !allowFail) {
+		if (captureStderr && r.stderr) process.stderr.write(r.stderr.endsWith("\n") ? r.stderr : r.stderr + "\n");
+		die(`${cmd} ${args[0] || ""} ${args[1] || ""} failed (exit ${r.status})`);
+	}
 	return r;
 }
 
@@ -298,26 +301,61 @@ async function verifyDeployedCard(base) {
 	console.error(`warning: agent card not reachable yet at ${base} (${r.lastError || "no answer"}); ${C.get("A2A_HOSTNAME") ? "a new custom domain" : "a new workers.dev deployment or subdomain"} can take a few minutes. Check again with: ${CLI} status`);
 }
 
+/** Drop cf's non-interactive confirm line. The migrations still apply; the question is answered yes. */
+export function migrationStderr(text) {
+	return String(text || "").split(/\r?\n/).filter((line) => {
+		const t = line.trim();
+		if (!t) return false;
+		if (/Using fallback value in non-interactive context/i.test(t)) return false;
+		if (/^\? About to apply \d+ migration/.test(t)) return false;
+		if (/may not be available to serve requests during the migration, continue\?/.test(t)) return false;
+		return true;
+	}).join("\n");
+}
+
 /** Apply D1 migrations quietly: cf prints a bare JSON array (often `[]`) when stdout is not a TTY. */
 function applyMigrations(dir, env) {
 	step("applying D1 migrations");
-	const r = runCf(dir, ["d1", "migrations", "apply", C.get("A2A_D1_ID"), "--dir", "migrations"], { env, capture: true });
+	const r = runCf(dir, ["d1", "migrations", "apply", C.get("A2A_D1_ID"), "--dir", "migrations"], { env, capture: true, captureStderr: true, allowFail: true });
+	const err = migrationStderr(r.stderr);
+	if (err) console.error(err);
+	if (r.status !== 0) die(`cf d1 migrations failed (exit ${r.status})`);
 	let applied = null;
 	try { applied = JSON.parse(r.stdout); } catch { /* not JSON: show as is */ }
 	if (Array.isArray(applied)) console.error(applied.length ? `    applied: ${applied.map((m) => m.name || m.id || JSON.stringify(m)).join(", ")}` : "    (none pending)");
 	else if (r.stdout.trim()) console.error(r.stdout.trim());
 }
 
+/** cf deploy sometimes names a Wrangler file. This project configures the Worker in cloudflare.config.ts. */
+export function withoutWranglerConfigMention(text) {
+	return String(text || "").split(/\n/).filter((line) => !/Wrangler config file|Wrangler file/i.test(line)).join("\n");
+}
+
 /** Run a command, streaming its output to stderr while collecting it. */
 function runTee(cmd, args, { cwd, env }) {
 	return new Promise((resolve, reject) => {
 		const ch = spawn(cmd, args, { cwd, env, stdio: ["ignore", "pipe", "pipe"] });
-		let out = "";
-		const on = (d) => { process.stderr.write(d); out += d; };
-		ch.stdout.on("data", on);
-		ch.stderr.on("data", on);
+		let out = "", pending = "";
+		const take = (d) => {
+			pending += d;
+			const lines = pending.split("\n");
+			pending = lines.pop();
+			for (const line of lines) {
+				if (withoutWranglerConfigMention(line) !== line) continue;
+				process.stderr.write(line + "\n");
+				out += line + "\n";
+			}
+		};
+		ch.stdout.on("data", take);
+		ch.stderr.on("data", take);
 		ch.on("error", reject);
-		ch.on("close", (code) => resolve({ status: code ?? 1, out }));
+		ch.on("close", (code) => {
+			if (pending && withoutWranglerConfigMention(pending) === pending) {
+				process.stderr.write(pending);
+				out += pending;
+			}
+			resolve({ status: code ?? 1, out });
+		});
 	});
 }
 
@@ -421,6 +459,7 @@ export async function init(o) {
 	applyMigrations(dir, env);
 
 	let ownerToken = C.fileConfig().A2A_OWNER_TOKEN;
+	const rotated = !!(ownerToken && o["rotate-owner-token"]);
 	if (!ownerToken || o["rotate-owner-token"]) ownerToken = randomToken(32);
 	C.saveConfig({ A2A_OWNER_TOKEN: ownerToken, A2A_BASE_URL: publicBase() || undefined });
 
@@ -432,6 +471,7 @@ export async function init(o) {
 	console.log(base);
 	reportSwitch(switched);
 	proxyNote(secrets);
+	if (rotated) console.error(`owner token replaced. Update A2A_OWNER_TOKEN wherever this inbox is called, then run \`${CLI} peers sync\` so uploaded peers stay readable.`);
 	console.error(`config saved to ${C.CONFIG_FILE} (chmod 600). Next: ${CLI} status (shows the next setup step)`);
 	printStar();
 }
@@ -594,7 +634,16 @@ export async function wake(sub, o) {
 	if (sub === "unset") {
 		const dir = workerDir(o), name = workerName();
 		const env = cfEnv();
-		for (const k of WAKE_SECRETS) runCf(dir, ["workers", "secrets", "delete", k, "--worker", name, "--force"], { env, allowFail: true });
+		const problems = [];
+		for (const k of WAKE_SECRETS) {
+			const r = runCf(dir, ["workers", "secrets", "delete", k, "--worker", name, "--force"], { env, allowFail: true, capture: true, captureStderr: true });
+			if (r.status === 0) continue;
+			const err = `${r.stderr || ""}\n${r.stdout || ""}`;
+			if (/404|not found|does not exist|could not be found/i.test(err)) continue; // already unset
+			const line = (err.match(/\[\d+\][^\n]*/) || [err.trim().split("\n").filter(Boolean).pop() || "cf failed"])[0];
+			problems.push(`${k}: ${line.slice(0, 300)}`);
+		}
+		if (problems.length) die(`could not remove wake secrets:\n  ${problems.join("\n  ")}`);
 		return console.error("wake secrets removed (wake is now a no-op; use polling)");
 	}
 	die("usage: wake set|unset|test|preview|fingerprint");

package/lib/main.mjs

@@ -53,7 +53,8 @@ https://github.com/telegraphic-dev/a2a-exposed/blob/main/docs/getting-started.md
                                                Plugin manifests leave MCP unset: the URL differs per deploy.
                                                When GET /owner/mcp reports enabled and the agent card is reachable,
                                                \`status\` prints \`claude mcp add --transport http a2a-exposed <url>/mcp\`
-                                --rotate-owner-token  on init, replace the owner token; other settings come from config.env
+                                --rotate-owner-token  on init, replace the owner token; other settings come from config.env.
+                                               Then update A2A_OWNER_TOKEN wherever this inbox is called, and run \`peers sync\`
                                 --upstream URL  proxy / expose mode: a public façade for an agent that already
                                                speaks A2A (JSON-RPC) on a private network. URL is its endpoint on
                                                a Cloudflare Tunnel hostname behind Access (never a Tailnet/LAN

package/lib/tunnel.mjs

@@ -428,8 +428,11 @@ export async function remove(o, { quiet = false } = {}) {
 	// 2. DNS before Access, so the hostname never resolves without its Access app
 	await attempt("DNS record", "A2A_TUNNEL_DNS_ID", () => cfCall(dir, ["dns", "records", "delete", C.get("A2A_TUNNEL_DNS_ID"), "-z", C.get("A2A_TUNNEL_ZONE_ID"), "--force"], { allowNotFound: true }));
 	await attempt("tunnel", "A2A_TUNNEL_ID", () => {
-		cfCall(dir, ["tunnels", "connections", "cleanup", C.get("A2A_TUNNEL_ID")], { allowNotFound: true });
-		cfCall(dir, ["tunnels", "delete", C.get("A2A_TUNNEL_ID"), "--force"], { allowNotFound: true });
+		const id = C.get("A2A_TUNNEL_ID");
+		// Already deleted (a previous rm stopped on the confirm prompt, or it was removed by hand): clear the saved id.
+		if (!cfCall(dir, ["tunnels", "get", id], { allowNotFound: true })) return;
+		cfCall(dir, ["tunnels", "connections", "cleanup", id, "--force"], { allowNotFound: true });
+		cfCall(dir, ["tunnels", "delete", id, "--force"], { allowNotFound: true });
 	});
 	await attempt("Access application (and its policy)", "A2A_TUNNEL_ACCESS_APP_ID", () => cfCall(dir, ["zero-trust", "access", "applications", "delete", C.get("A2A_TUNNEL_ACCESS_APP_ID"), "--force"], { allowNotFound: true }));
 	await attempt("Access service token", "A2A_TUNNEL_ACCESS_TOKEN_ID", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "a2a-exposed",
-	"version": "0.8.2",
+	"version": "0.8.4",
 	"description": "Give any AI agent a public A2A (Agent2Agent) endpoint: Cloudflare Worker inbox + wake webhook or scheduled inbox checks",
 	"type": "module",
 	"bin": {

package/worker/cloudflare.config.ts

@@ -11,7 +11,7 @@ const v = (k: string) => (e[k] ?? "").trim();
 const name = v("A2A_WORKER_NAME") || "a2a-exposed";
 const hostname = v("A2A_HOSTNAME"); // e.g. agent.example.com (on a zone in your account)
 // No hostname: serve on <name>.<account subdomain>.workers.dev instead of a custom domain (and the other way round:
-// with a hostname, the workers.dev route is switched off).
+// with a hostname, the workers.dev route is switched off). Preview URLs follow that same switch.
 const workersDev = !hostname;
 const wdSubdomain = v("A2A_WORKERS_DEV_SUBDOMAIN"); // the account's workers.dev subdomain, once known
 // Public base URL for the agent card, derived only from where the Worker is served (no override: a local webhook,
@@ -112,6 +112,7 @@ export default defineConfig((ctx) => ({
 		...(hosted ? { exports: { TenantStore: exports.durableObject({ storage: "sqlite" }) } } : {}),
 		...(hostname ? { domains: [hostname] } : {}),
 		workersDev,
+		previewUrls: workersDev,
 		// Optional persisted Workers Logs (A2A_WORKERS_LOGS=1, `init|deploy --workers-logs`): the JSON event lines plus
 		// invocation logs with CPU time. Query strings are redacted, so one-time setup links never reach the logs.
 		...(v("A2A_WORKERS_LOGS") === "1" ? { observability: { enabled: true, redactQueryString: true, logs: { enabled: true, invocationLogs: true } } } : {}),

package/worker/src/index.ts

@@ -1312,7 +1312,7 @@ async function tokenEndpoint(req: Request, ctx: TenantContext): Promise<Response
 	if (now >= r.expires_ms) return oauthError("expired_token", "the device_code expired; start again");
 	if (r.status === "denied") {
 		await ctx.DB.prepare("DELETE FROM device_requests WHERE device_hash = ?").bind(hash).run();
-		return oauthError("access_denied", "the inbox owner denied this request");
+		return oauthError("access_denied", "the agent owner denied this request");
 	}
 	if (r.status === "pending") {
 		// RFC 8628 §3.5: polling faster than the interval -> slow_down, and the interval grows by 5 s for good
@@ -1321,7 +1321,7 @@ async function tokenEndpoint(req: Request, ctx: TenantContext): Promise<Response
 			return oauthError("slow_down", `polling too fast; wait at least ${r.interval_s + 5} seconds between requests`);
 		}
 		await ctx.DB.prepare("UPDATE device_requests SET last_poll_ms = ? WHERE device_hash = ?").bind(now, hash).run();
-		return oauthError("authorization_pending", "waiting for the inbox owner to approve");
+		return oauthError("authorization_pending", "waiting for the agent owner to approve");
 	}
 	// approved: single use. Only the request that flips the row gets the token; the row is then deleted.
 	const claimed = await ctx.DB.prepare("UPDATE device_requests SET status = 'redeemed' WHERE device_hash = ? AND status = 'approved'").bind(hash).run();
@@ -2029,7 +2029,7 @@ async function authorizePage(req: Request, ctx: TenantContext, url: URL, head =
 		return show(403, { kind: "error", text: "This form expired or came from another site. Start connecting again from your MCP client." });
 	if (form.decision === "deny") {
 		log("mcp_authorization_denied", { ip, clientName: c.client!.client_name });
-		return redirectWith(ctx, c.redirect!, { error: "access_denied", error_description: "the inbox owner denied access", state: c.params.state });
+		return redirectWith(ctx, c.redirect!, { error: "access_denied", error_description: "the agent owner denied access", state: c.params.state });
 	}
 	if (form.decision === "oidc") {
 		const started = await O.startOidc(ctx, {

package/worker/src/version.ts

@@ -1,2 +1,2 @@
 /** Inbox build. Keep this equal to `version` in cli/package.json. */
-export const VERSION = "0.8.2";
+export const VERSION = "0.8.4";

package/worker/test/mcp.test.ts

@@ -231,7 +231,7 @@ test("authorization: consent page, CSP allows the redirect origin, password requ
 	c = await s.consent(q, "", "deny");
 	assert.equal(c.post.status, 302);
 	const den = new URL(c.post.headers.get("location")!);
-	assert.deepEqual([den.origin + den.pathname, den.searchParams.get("error"), den.searchParams.get("state"), den.searchParams.get("iss")], [CLAUDE_CB, "access_denied", "xyz", BASE]);
+	assert.deepEqual([den.origin + den.pathname, den.searchParams.get("error"), den.searchParams.get("error_description"), den.searchParams.get("state"), den.searchParams.get("iss")], [CLAUDE_CB, "access_denied", "the agent owner denied access", "xyz", BASE]);
 	// CSRF: a POST without the cookie is refused
 	const forged = await s.call("POST", "/oauth/authorize", { form: { ...q, csrf: "x".repeat(24), password: PASSWORD, decision: "approve" }, headers: { origin: BASE } });
 	assert.equal(forged.status, 403);

package/worker/test/pairing.test.ts

@@ -271,7 +271,7 @@ test("human approval: pending, slow_down, page approve with the password, single
 	assert.match(w.pairing.instructions, /never approve on your own[\s\S]*give them this link/);
 
 	let p = await s.poll(d.device_code);
-	assert.deepEqual([p.status, p.data.error], [400, "authorization_pending"]);
+	assert.deepEqual([p.status, p.data.error, p.data.error_description], [400, "authorization_pending", "waiting for the agent owner to approve"]);
 	p = await s.poll(d.device_code);
 	assert.deepEqual([p.status, p.data.error], [400, "slow_down"], "polled again at once");
 	assert.match(p.data.error_description, /at least 10 seconds/);
@@ -390,7 +390,8 @@ test("human mode: the owner token approves and denies; the device poll returns t
 	assert.equal(denied.data.decision, "denied");
 	const denyRow = s.DB.db.prepare("SELECT decided_by FROM device_requests WHERE user_code = ?").get(deny.user_code.replace("-", "")) as { decided_by: string };
 	assert.equal(denyRow.decided_by, "owner");
-	assert.equal((await s.poll(deny.device_code)).data.error, "access_denied");
+	const deniedPoll = await s.poll(deny.device_code);
+	assert.deepEqual([deniedPoll.data.error, deniedPoll.data.error_description], ["access_denied", "the agent owner denied this request"]);
 });
 
 test("a pairing label comes from the client name, a second one is suffixed, and inbox from uses it", async (t) => {