From 5fdde71944e97efbf4f4db5941ab0210e759c688 Mon Sep 17 00:00:00 2001 From: Willie Chalmers III Date: Sun, 11 Oct 2026 12:07:48 -0700 Subject: [PATCH] fix(cli): handle paginated Worker deployment recovery envelope Isolate the reviewed deployment reader correction on the published v0.1.8 source baseline so recovery acceptance is independent of new cache transports. Keep generic pagination and the complete-deployment requirement unchanged. Static Ruff, Python syntax, diff and exact-function boundary checks passed. No tests were added or manually run, and real hosted recovery remains pending. No release version is assigned by this source change. Co-authored-by: Codex --- docs/rollout.md | 19 +++++++++++++++++++ studio/websites.py | 26 ++++++++++++++++++++------ 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/docs/rollout.md b/docs/rollout.md index aeb86b4..99681a9 100644 --- a/docs/rollout.md +++ b/docs/rollout.md @@ -188,3 +188,22 @@ on Node 24.20.0, together with four Swift tests, actionlint, runtime assembly an fix. Hosted workflow execution, real signing, private package delivery and provider promotion remain external acceptance gates; no push or release was performed for these changes. + +## Worker recovery deployment envelope correction + +Recovery capture run 38165763297 stopped before producing a recovery record: +the deployment reader expected a direct `deployments` object, while the +Cloudflare transport preserves `result` and `result_info` when pagination +metadata is present. The [official list deployments response](https://developers.cloudflare.com/api/resources/workers/subresources/scripts/subresources/deployments/methods/list/) +has exactly that envelope. The endpoint reader now accepts the transport's +envelope as well as direct results, rejects ambiguous or malformed envelopes +and rollout rows, and still requires one active version at 100%. Generic +transport and custom-domain pagination are unchanged. + +This correction is isolated on the published v0.1.8 source baseline; a candidate +release version has not been assigned. It is unreleased source. Static checks +are separate from recovery acceptance; no tests were added or manually run, +and no provider request, release, +tag or consumer pin change was performed for this correction. The failed +capture remains retained evidence; a future authorized hosted capture must +prove recovery against the real complete deployment. diff --git a/studio/websites.py b/studio/websites.py index d7423f4..a4d53d0 100644 --- a/studio/websites.py +++ b/studio/websites.py @@ -122,19 +122,33 @@ def _api_mutate(api, method, path, data, headers=None): def _deployment_version(api, account, worker): payload = _api_get(api, f'/accounts/{account}/workers/scripts/{worker}/deployments') + # The transport retains result_info for paginated callers. This endpoint's + # result is itself an object, rather than the lists returned by those APIs. + if isinstance(payload, dict) and ('result' in payload or 'result_info' in payload): + if ('deployments' in payload or not isinstance(payload.get('result'), dict) + or not isinstance(payload.get('result_info'), dict)): + raise ValueError('Cloudflare deployment response envelope is malformed') + payload = payload['result'] deployments = payload.get('deployments') if isinstance(payload, dict) else None if not isinstance(deployments, list) or not deployments or not isinstance(deployments[0], dict): raise ValueError('Cloudflare has no complete Worker deployment to recover') versions = deployments[0].get('versions') - if not isinstance(versions, list): + if not isinstance(versions, list) or not versions: raise ValueError('Cloudflare deployment version state is malformed') - active = [v for v in versions if isinstance(v, dict) and v.get('percentage', 0) > 0] + for row in versions: + if not isinstance(row, dict): + raise ValueError('Cloudflare deployment version state is malformed') + percentage = row.get('percentage') + if (isinstance(percentage, bool) or not isinstance(percentage, (int, float)) + or not 0 <= percentage <= 100): + raise ValueError('Cloudflare deployment percentage is malformed') + version = row.get('version_id') + if not isinstance(version, str) or not re.fullmatch(r'[A-Fa-f0-9-]{16,64}', version): + raise ValueError('Cloudflare deployment has an invalid version identity') + active = [v for v in versions if v['percentage'] > 0] if len(active) != 1 or active[0].get('percentage') != 100: raise ValueError('Workers recovery requires one complete 100% deployment') - version = active[0].get('version_id') - if not isinstance(version, str) or not re.fullmatch(r'[A-Fa-f0-9-]{16,64}', version): - raise ValueError('Cloudflare deployment has an invalid version identity') - return version + return active[0]['version_id'] def _version_artifact_digest(api, account, worker, version):