Diffusion: keep a pin's own changes when moving it 7a14bdaeb857

    /// The pin names changes the upstream does not hold: not followed.

    Unknown,

    /// Taking the upstream's state with the pin's own extra changes would

    /// conflict.

    Conflicts,

/// Where a consumer's pin `old` moves when the upstream reaches `new`,

/// worked out in the upstream (§4.3).

#[derive(Clone, Debug, PartialEq, Eq)]

pub enum Plan {

    /// To these heads, which add this many changes.

    To(Vec<ChangeHash>, usize),

    /// Nothing to add.

    UpToDate,

    /// The pin names changes the upstream does not hold (rewritten, or

    /// from elsewhere): not followed.

    Unknown,

    /// Taking `new` with the pin's own extra changes would conflict.

    Conflicts,

}

/// The pin `old` moved to the upstream's `new`. When the pin has changes

/// `new` lacks (say, from an upstream proposal not landed yet), they are

/// kept: changes that do not touch each other combine, so the move is to

/// both, never dropping what the consumer already relies on.

pub async fn plan(app: &Shared, upstream: &RepoName, old: Vec<ChangeHash>, new: Vec<ChangeHash>) -> Result<Plan, crate::repos::RepoError> {

            let Ok(o) = cache.summary(r, &old) else { return Ok(Plan::Unknown) };

            let n = cache.summary(r, &new)?;

            if o.changes.iter().all(|c| n.changes.contains(c)) {

                let added = n.changes.len() - o.changes.len();

                return Ok(if added == 0 { Plan::UpToDate } else { Plan::To(new, added) });

            }

            let mut both = new.clone();

            both.extend(old.iter().copied());

            let heads = r.load_state(&both)?.heads();

            let b = cache.summary(r, &heads)?;

            if b.conflicted && !o.conflicted {

                return Ok(Plan::Conflicts);

            let added = b.changes.len() - o.changes.len();

            Ok(if added == 0 { Plan::UpToDate } else { Plan::To(heads, added) })

    if repo != upstream_id {

        return Ok(Bumped::NoPin);

    }

    let new_heads = match plan(app, &uname, old.clone(), new_heads.clone()).await? {

        Plan::To(heads, _) => heads,

        Plan::UpToDate => return Ok(Bumped::UpToDate),

        Plan::Unknown => return Ok(Bumped::Unknown),

        Plan::Conflicts => return Ok(Bumped::Conflicts),

    };

            Ok(other) => tracing::info!("diffusion: {}/{} {path}: no bump ({other:?})", consumer.owner, consumer.name),

    // A state lacking changes the pin has (as when the consumer pinned an

    // upstream proposal not landed yet) is combined with the pin, never

    // dropping what it relies on.

    let combined = oxygenhub::diffusion::bump(&h.app, &game_row, "main", "deps/api", &api_row, only_v3).await.unwrap();

    let oxygenhub::diffusion::Bumped::Moved { heads: ch, .. } = combined else { panic!("{combined:?}") };

    game.fetch("origin").unwrap();

    let st = game.load_state(&ch).unwrap().materialize();

    let pin = match &st.files["deps/api"].content {

        oxy_core::state::FileContent::Opaque { blobs } => oxy_core::subrepo::Pin::decode(&game.read_blob(&blobs[0]).unwrap()).unwrap(),

        other => panic!("{other:?}"),

    };

    let oxy_core::subrepo::Pin::Oxy { heads: pinned, .. } = pin else { panic!() };

    let all = api.load_state(&pinned).unwrap();

    // The game's main still pins v1 alone; combined with v3, it is both.

    assert!(all.contains(&v3) && all.len() == 2, "v1 and v3, {} changes", all.len());

- **Architecture** (OxygenFlow spec §11.2–§11.3, oxygenflow#36): a runner reports each image's architecture on its claims (`image_archs`), kept in `flow_images`; a job is offered only to a runner whose architecture matches its sandbox's `arch`, else its image's as known; unknown matches, as before. The queue says which architecture a waiting job asks for. **Images by hash** (oxygenflow#39, Jetstream): `flow rootfs push HASH` sends a rootfs image as the FastCDC chunks the hub lacks (`POST /flow/images/missing`, `PUT /flow/images/chunks/{hash}`, by a token that may write repositories) and then its manifest (`PUT /flow/images/{hash}`), which the hub accepts only when every chunk is held and they make an image with that hash; chunks are kept zstd-compressed under `<data>/images`, shared by every image, and `jet_images` lists what is held. Runners and accounts fetch with `GET /flow/images/{hash}` and `GET /flow/images/chunks/{hash}`. A runner whose claims say `fetches_images` is offered jobs whose image only the hub holds, and fetches it before its preflight. Each claim also carries the runner's `facts` (OxygenFlow spec §11.1, oxygenflow#40): free disk, load, speed score and class, kernel; the hub keeps the latest on the runner, shows them on Admin › Runners and in `GET /runners`. A job's finish carries the most disk and memory it took (`peak_disk_mib`, `peak_memory_mib`, oxygenflow#41); a new job's `need_disk_mib` is the most its last five runs of the same repository and name took, plus a quarter and 64 MiB, and it is offered only to a runner whose claim reports at least that much free disk; the waiting reason says so. **Ranking** (oxygenflow#42): a job that another free runner which polled in the last 10 s would do better (it holds the job's image while the claimant would fetch it, or has a higher speed class) is held from the claimant for up to 15 s, then any runner that fits takes it; each job records why it ran where it did (`placed`: "holds the image, idle, speed 100 (class 3)", with "after N s held for a better runner" when it was), shown on the run page, in the API and by `oh run view`. A run whose jobs pin an image held by neither the hub nor a runner sets a failing `pipeline/images` check on its state (#137), naming the images and how to send them (`flow rootfs push`), so a proposal pinning a new image shows it before it lands; a later run of the state turns it to passed once every image is held. A placement pass every 15 seconds works out why each ready queued job no runner can take waits, from what each online runner offered at its last claim (scope, tier, architecture, image held, labels, memory and CPUs, a recent decline), and shows it on the job (API `waiting`, `oh run view` and `oh run watch`, its panel open on the run page) and in its check's summary, so a proposal says why its check is stuck (#28). **Diffusion** (#148, `docs/diffusion.md`): a push that moves a repository's default bookmark, or the bookmark its work lands on (the most common target of its proposals landed in the last 90 days), records each Oxygen subrepo pin in the new state (`diffusion_pins`: consumer, bookmark, path, the upstream's Oxygen repository id, the pinned heads); a hub that had no index fills it at start. `GET /repos/{owner}/{name}/consumers` lists the consumers the caller may read, each with its pin and how many changes of this repository's default bookmark it lacks (`behind`, null when the pin names changes this repository does not hold), and the overview shows them as Used by. A consumer follows a subrepo's upstream as its `.oxymodules` entry says (`follow = off | green | any`, `land = propose | auto`, `target` naming the bookmark to bump, `watch` listing paths whose upstream changes are flagged), else as its repository setting says (Settings › Diffusion, or `PUT /repos/{owner}/{name}/diffusion {"follow": ...}` by its owners and admins; migration 0058), else as `[diffusion] follow` in hub.toml says (default `off`). A **bump** moves a consumer's pin at a path to a newer upstream state: one change on the target bookmark's heads that replaces only the pin (oxy-core `build_pin_change`), signed with the hub's key, on the bookmark `diffusion/<path>`, which the hub owns and rebuilds on the target each time (a forced update). When the pin has changes the upstream's state lacks (say, from an upstream proposal not landed yet), the bump moves to both, so a consumer never loses changes it relies on; it is skipped when that combination would conflict, when the pin names changes the upstream does not hold, when the pin already holds the state, or when the bump bookmark already moves it there, and the hub logs why. A bump is **proposed** once per bump bookmark, by the hub's `diffusion` account (made on first use, never able to sign in), into the target, labelled `dependencies`, its body the upstream changes the pin lacks (newest first, linking to the upstream's change pages); a later bump edits the same open proposal. It is triggered when a push moves the upstream's default bookmark (for consumers following `any`) or when a run of that bookmark passes (for `green`). Diffusion never lands a proposal. Turning Diffusion on for a consumer (the setting or the API) catches it up at once: it is bumped to each upstream's newest state whose default-bookmark run passed, or to its newest state when it follows every move. **Images page** (#146): Admin › Runners › Images lists every rootfs image a runner holds, the hub keeps, or a job ran on in the last 90 days (from each job's sandbox), newest use first: its size and architecture, where it is (the hub, each runner holding it, each runner fetching it from the swarm now), the repositories whose jobs used it, and who sent it; an image held nowhere is marked. **The swarm** (#144, oxygenflow docs/jetstream.md §8.1): a runner in an image swarm reports its peer address, its site and the BLAKE3 of its TLS certificate with each claim (`swarm`; without a certificate it is not in the swarm), kept in memory and shown on Admin › Runners. `POST /flow/swarm/announce {image, state}` (by a runner; `fetching`, `done` or `stopped`) returns the online runners in its site that hold the image or announced fetching it in the last 45 seconds, each with its certificate's fingerprint, which the fetcher pins its TLS connection to, and a ticket signed with the hub key (JSON naming the runner, its site and an expiry 15 minutes on, hex, then the signature) that peers check against `/.well-known/oxyhub-key` before serving chunks; a runner that has not reported an address is told to add `[runner.swarm]` (409).