Skip to content

Commit 0c5a8cd

Browse files
committed
Merge release/v5-prerelease (stage repair fix)
Brings in #292, which fixes the partial-stage repair bug and cuts redundant downloads. No conflicts; clippy and the policy, in-memory, parity, e2e policy, parser and help suites pass. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01BKsyzefGhAnPkYmXCwq3H3
2 parents 997a6f5 + a7b0d00 commit 0c5a8cd

16 files changed

Lines changed: 1450 additions & 171 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,8 +1232,10 @@ into the new version's section — see docs/releasing.md.
12321232
a server-side archive build and count against quota, are exactly the
12331233
one-at-a-time loop's (71 on a fresh depscan run, where an earlier
12341234
draft of the look-ahead issued 74). What changes is only their timing:
1235-
up to four are in flight at once. `SOCKET_API_CONCURRENCY=1` turns the
1236-
look-ahead off entirely.
1235+
they are requested in one batch at the first planned package (see
1236+
"Fewer downloads in vendored runs"), and up to four archives are in
1237+
flight at once. `SOCKET_API_CONCURRENCY=1` turns the look-ahead off
1238+
entirely.
12371239
- A token revoked *mid-run* now costs the authenticated batch endpoint
12381240
the requests already in flight — up to the in-flight cap instead of
12391241
one — before the run downgrades to the public proxy. Their answers are
@@ -1243,6 +1245,21 @@ into the new version's section — see docs/releasing.md.
12431245

12441246
### Fixed
12451247

1248+
- **`apply` no longer half-applies a patch that creates a file from a
1249+
diff-only cache.** A diff archive has no delta for a file the patch
1250+
creates, but the source check counted a cached diff archive as covering
1251+
the whole patch: `apply --offline` passed it, patched the modified files,
1252+
then failed on the created file's missing blob; online `apply` never
1253+
fetched that blob. Coverage is now per file (a diff covers only files
1254+
with a `beforeHash`), so `apply --offline` reports the patch as having no
1255+
local source up front and changes nothing, online `apply` fetches just
1256+
the created files' blobs, and a default (diff-mode) `repair` downloads
1257+
them too. Such a repair's `--json` envelope carries a second
1258+
`downloaded` (dry-run `verified`) artifact event with `mode: "file"` for
1259+
those blobs.
1260+
- **Hosted `scan` resolves more than 500 patches.** The package-reference
1261+
request is sent in chunks of 500 uuids, the endpoint's limit; a larger
1262+
scan used to fail with a 400.
12461263
- **`rollback` fetches a before-blob that only a store peer variant
12471264
needs.** The before-blob gate now probes every pnpm and vlt store variant
12481265
copy the rollback restores, so an online rollback no longer fails
@@ -1866,6 +1883,15 @@ into the new version's section — see docs/releasing.md.
18661883

18671884
### Changed
18681885

1886+
- **Fewer downloads in vendored runs.** A vendored run now asks the patch
1887+
service for all of its planned packages' download references in one
1888+
request (in chunks of 500) from the first package it reaches, in place
1889+
of one request per package; an outage costs the same retries as before,
1890+
and a package the service reports still building is asked again at its
1891+
turn. A pypi patch the service serves as an sdist (every patch without a
1892+
file qualifier) is refused from its reference, before its bytes are
1893+
downloaded: `auto` still warns `vendor_prebuilt_unavailable` and builds
1894+
the wheel locally, `service` still refuses.
18691895
- **One owner rule for the patch stores.** `list`, `vex`, `scan`'s
18701896
`updates[]`, `rollback` and `remove` now read the
18711897
manifest and the vendor ledger (plus, in `vex`, the hosted records)
@@ -1976,22 +2002,25 @@ into the new version's section — see docs/releasing.md.
19762002
covers the purl (its entry records the record's patch uuid and the
19772003
committed artifact is on disk — a file artifact such as a wheel or
19782004
tarball only while it still hashes to the ledger's `sha256`; `--force`
1979-
keeps the eager fetch), and for every lockfile-only cargo crate the
1980-
registry could fetch and verify (a crates.io `Cargo.lock` entry with a
1981-
checksum, or the pre-vendor resolution the ledger recovers) while the
1982-
patch service is enabled (the cargo backend reads the pristine source
1983-
only once `cargo_service_copy` falls back to the local build). A git,
1984-
path or custom-registry crate is never deferred: it keeps the eager
1985-
ladder's `vendor_fetch_unverifiable` + `package_not_installed` refusal
1986-
and is not vendored from the service's crates.io build, and a committed
2005+
keeps the eager fetch), and for every lockfile-only npm, cargo, golang
2006+
or composer package the registry would fetch and verify (a lock entry
2007+
with an integrity, or the pre-vendor resolution the ledger recovers,
2008+
that none of its fetcher's pre-download refusals applies to) while the
2009+
patch service is enabled (those backends read the pristine source only
2010+
once the service falls back to the local build; pypi and gem keep the
2011+
eager fetch, which their installed-variant probe reads). A git, path,
2012+
local-tarball or custom-registry package is never deferred: it keeps the
2013+
eager ladder's `vendor_fetch_unverifiable` + `package_not_installed`
2014+
refusal and is not vendored from the service's registry build, and a committed
19872015
file artifact that no longer matches its pin keeps the eager ladder's
19882016
outcome too. Visible effects: an idempotent re-run
19892017
makes no registry requests and no longer reports `vendor_fetched_missing`
19902018
for fetches it never needed; with no network (or under `--offline`) the
19912019
re-run of an already-vendored pypi, cargo, go or lockfile-only gem
19922020
project now SUCCEEDS (`already_vendored`, exit 0) instead of failing
1993-
`vendor_fetch_failed` / `package_not_installed`; a cargo crate the service
1994-
serves is never downloaded from the registry. When a deferred fetch does
2021+
`vendor_fetch_failed` / `package_not_installed`; an npm, cargo, golang or
2022+
composer package the service serves is never downloaded from the
2023+
registry. When a deferred fetch does
19952024
happen (a drifted committed copy being rebuilt locally, a service miss),
19962025
its `vendor_fetched_missing` warning is recorded just ahead of that
19972026
package's own event instead of in the up-front fetch pass, and a failed,

‎Cargo.lock‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)