From cc434b9de2b5f44ff3be994a641f495a1dda022e Mon Sep 17 00:00:00 2001 From: maria Date: Sat, 5 Sep 2026 14:40:49 -0400 Subject: [PATCH 1/3] fix(shared): validate cloudflared with the version subcommand (#9880) (cherry picked from commit 2c301fd0c4fc58c1612be47c3856fa4ad547429d) --- packages/shared/src/relayClient.test.ts | 5 ++++- packages/shared/src/relayClient.ts | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/shared/src/relayClient.test.ts b/packages/shared/src/relayClient.test.ts index df39ef0b1..7c4fa0df4 100644 --- a/packages/shared/src/relayClient.test.ts +++ b/packages/shared/src/relayClient.test.ts @@ -57,7 +57,10 @@ const makeSpawnerLayer = (commands: Array) => ChildProcessSpawner.make((command) => Effect.sync(() => { commands.push(ChildProcess.isStandardCommand(command) ? command.command : "piped-command"); - return makeHandle(); + // The pinned Windows executable rejects --version but accepts the version subcommand. + return makeHandle( + ChildProcess.isStandardCommand(command) && command.args.includes("--version") ? 1 : 0, + ); }), ), ); diff --git a/packages/shared/src/relayClient.ts b/packages/shared/src/relayClient.ts index f1f44f789..7968f7516 100644 --- a/packages/shared/src/relayClient.ts +++ b/packages/shared/src/relayClient.ts @@ -421,7 +421,7 @@ export const makeCloudflaredRelayClient = Effect.fn("cloudflared.make")(function .pipe(wrapInstallFailure("write_failed", "Could not make the relay client executable.")); } yield* report("validating"); - yield* runCommand(executablePath, ["--version"]).pipe( + yield* runCommand(executablePath, ["version"]).pipe( wrapInstallFailure("validation_failed", "The downloaded relay client binary did not run."), ); From 176817a0dfc7e770d68ca71f34541ea6ada8f231 Mon Sep 17 00:00:00 2001 From: Trevor Walker Date: Sat, 5 Sep 2026 19:48:11 -0600 Subject: [PATCH 2/3] docs(upstream): record relay validation fix --- .agents/upstream-review.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.agents/upstream-review.md b/.agents/upstream-review.md index 5ba4d4963..d7bf8cc84 100644 --- a/.agents/upstream-review.md +++ b/.agents/upstream-review.md @@ -15,6 +15,19 @@ Two standing sections outlive any single batch and must be read on every review: ## Review batches +## 2026-09-05 — relay client validation (A4, partial) + +The maintainer approved A4 against upstream `f12d39359f0f76a64ff2d77959c5baf821df15be`. +Adopted #9880 (`2c301fd0c4fc58c1612be47c3856fa4ad547429d`) as `f6eb6d547a` +on `upstream/2026-09-05-cloudflared-validation`, awaiting merge. Validate the +downloaded cloudflared executable with `version`; the pinned Windows binary +rejects `--version`. Clean port affecting relay setup on server/desktop and the +clients connecting through it, independent of provider. Other modes are unchanged. +Focused relay tests, shared-package typecheck, lint, and formatting pass. + +The cursor is unchanged for this partial selection. Deferred/watch results +are recorded with #268; no register or watch row changes in this PR. + ## 2026-09-02 — `9b2d04317c68233782e0630464ac86d77d0686f3..beae2147a9487ec47ac992319f2216914b4cb62d` The maintainer's standing instruction for this batch was to stop escalating From 6b2d84532e62c0a19acc9a1da8acf5b8024a9df4 Mon Sep 17 00:00:00 2001 From: Trevor Walker Date: Sat, 5 Sep 2026 20:33:09 -0600 Subject: [PATCH 3/3] docs(upstream): consolidate batch records in PR #279 --- .agents/upstream-review.md | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.agents/upstream-review.md b/.agents/upstream-review.md index d7bf8cc84..5ba4d4963 100644 --- a/.agents/upstream-review.md +++ b/.agents/upstream-review.md @@ -15,19 +15,6 @@ Two standing sections outlive any single batch and must be read on every review: ## Review batches -## 2026-09-05 — relay client validation (A4, partial) - -The maintainer approved A4 against upstream `f12d39359f0f76a64ff2d77959c5baf821df15be`. -Adopted #9880 (`2c301fd0c4fc58c1612be47c3856fa4ad547429d`) as `f6eb6d547a` -on `upstream/2026-09-05-cloudflared-validation`, awaiting merge. Validate the -downloaded cloudflared executable with `version`; the pinned Windows binary -rejects `--version`. Clean port affecting relay setup on server/desktop and the -clients connecting through it, independent of provider. Other modes are unchanged. -Focused relay tests, shared-package typecheck, lint, and formatting pass. - -The cursor is unchanged for this partial selection. Deferred/watch results -are recorded with #268; no register or watch row changes in this PR. - ## 2026-09-02 — `9b2d04317c68233782e0630464ac86d77d0686f3..beae2147a9487ec47ac992319f2216914b4cb62d` The maintainer's standing instruction for this batch was to stop escalating