# Main Reaggregation Baseline 2026-04-06

Task: `343c8c57-be11-4097-8fd5-1d30817bc2da`

## Branch Setup

```bash
git fetch origin --prune
git switch -c task/343c8c57-main-reaggregate origin/main
```

The re-aggregated branch is rooted at `origin/main` and keeps existing untracked local files untouched.

## Inventory Summary

Diff reviewed:

```bash
git diff --stat origin/main..task/f5c70db0-baseline-profiles
```

Selected changes imported from `task/f5c70db0-baseline-profiles`:

- `flake.nix`, `nix/ci/flake.nix`: canonical-profile eval/build guards, `single-node-quickstart`, `baremetal-iso-e2e`, and `portable-control-plane-regressions`
- `nix/single-node/*`: one-command single-node quickstart profile and VM launcher
- `nix/iso/ultracloud-iso.nix`, `nix/nodes/baremetal-qemu/*`, `nix/test-cluster/verify-baremetal-iso.sh`: canonical ISO bootstrap path for QEMU-as-bare-metal validation
- `nix/images/netboot-all-in-one.nix`, `nix/nodes/vm-cluster/common-disko.nix`, `nix/modules/default.nix`: support fixes needed by canonical helper images and optional services
- `.github/workflows/nix.yml`: portable regression coverage that matches the re-aggregated local validation surface
- `README.md`, `docs/*`, `nix/test-cluster/README.md`: public documentation for the supported quickstart, portable regression lane, and ISO bootstrap proof

Intentionally excluded from the new baseline:

- `.github/workflows/kvm-publishable-selfhosted.yml`
- runner-label pinning and manual remote checkout changes aimed at constrained Forgejo runners
- `plans/baselines/kvm-publishable-lane-2026-04-05.md`
- historical `plans/baselines/logs/*.meta` capture files

## Policy

- Keep local and branch-independent validation paths in-tree: `single-node-quickstart`, `baremetal-iso`, `baremetal-iso-e2e`, and `portable-control-plane-regressions`
- Keep helper images evaluable when they back those canonical paths
- Treat `netboot-all-in-one` and `netboot-control-plane` as companion images of supported profiles; keep `netboot-worker` helper-only but still covered by the canonical profile guards
- Do not carry runner-specific workflow tuning into the baseline branch unless it is required for local QEMU/KVM or flake evaluation