carlos / platform Public

merge: catch up with main (#151 route aliases) — aliases inherit multi-upstream entries

Main had moved well past #151 by the time this branch caught up: the merge
takes in route aliases (#151/#164), delegated wildcards (#168), woodstar docs
(#169), the unit-economics work (#171) and the account-default-resolution
seam. Seven files conflicted; all but two were additive-on-both-sides.

Resolutions that needed judgment rather than side-picking:

- internal/status/snapshot.go — both sides added a field to Probes AND to
  BoxMetrics at the same offsets (ours Upstreams, theirs Aliases). Both are
  kept, and CollectBox's "attach Metrics only when something is known" guard
  now ORs both new tables (len(aliasReadings) > 0 || len(p.Upstreams) > 0).
  Taking either side alone would have silently dropped the other's block from
  status/boxes/<label>.json for a box that knew only that one thing.

- instances_cli.go — main replaced apiAccount with resolvedAccount ("the seam
  every API-mode verb reaches through", apimode.go) across every instances
  verb. `instances set-upstreams` was written on this branch before that seam
  existed, so the mechanical resolution would have left it the ONLY instances
  verb still defaulting -account to "ops" and skipping default-account
  resolution: a user omitting -account would get create/list/delete resolving
  correctly and set-upstreams 404ing against an "ops" account they don't
  have. Converted it to -account "" + resolvedAccount to match its siblings.

- apimode.go — ours collapsed putJSON into sendJSON; main added #160's
  consoleMoved handling to the then-inline putJSON body. Ours wins: the
  auto-merged sendJSON already carries the consoleMoved branch, so the
  collapse keeps main's behavior with one copy instead of two.

- internal/host/agent.go — the edge ready hook gained both sides' wiring
  (setUpstreamSource for the probe table, then main's usage meter).

- internal/edge/edge_test.go, internal/status/status_test.go — both sides
  appended whole test funcs at adjacent offsets and git interleaved them.
  Neither side deletes a base line, so both files were rebuilt from the merge
  base with each side's additions applied at their own offsets rather than
  hand-splicing the interleaved hunks.

edge.go's Reload merged clean, and the ordering the branch needs holds:
alias wiring, then probers.Sync, then upstreams.Store. Aliases copy the
primary's upstream entry, whose proxy for a probed route is multiProxy
closed over the proberSet pointer and resolving Live(primaryHost) per
request — so an alias of a multi-upstream route inherits failover, and Sync
running after the entries are built is correct (it updates the set's
contents, never the table). TestAliasSharesUpstreamEntry is byte-identical
to main's and passes unchanged (-race -count=2).

Gate: build, vet, GOOS=darwin build, gofmt and all 27 test packages clean.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>