merge: restore resource profile ABI v3 history

[schickling-assistant]

Problem

main was replaced by c2f3facca88e6cbd3c5f1024b0849c20cd66336f, whose parent is the stale 9bcda7894b476b230f06686dc92c6bb321135dd4. That preserved the retired-root/root-count fix but dropped former main at 9d766557dd89a4d964339e69e8b1da0ecdd7440e, including descriptor ABI v3. ABI v3 profile modules were consequently rejected as though ABI v2 were current.

Goal

Make main descend from both histories: retain retired-root topology semantics from c2f3fac and restore ABI v3, runtime facts, semantic invalidations, and the other former-main changes from 9d76655.

Decisions

• Use a two-parent merge commit rather than replaying commits, so ancestry records both exact former heads.
• Resolve Resource Profile implementation conflicts toward the ABI v3/facts implementation while retaining the newer session-driver, delivery-readiness, graph, and retired-state behavior from current main.
• Keep the existing focused regressions for ABI v3 WASM loading and retired-root validation/catalog topology.

Verification

• nix develop -c cargo test -p agent-spec --features wasm-resolver --test profile_wasm — 25 passed, including valid_v3_descriptor_executes_and_resolve_only_module_stays_passive.
• nix develop -c cargo test --test validate --test catalog_graph — 58 passed, including retired-root root-slot and topology cases.
• nix develop -c cargo test --features wasm-resolver --test resource_profile_supervisor_e2e --test resync — 6 passed.
• nix develop -c cargo test -p st2-resource-protocol — 9 passed.
• Merge commit parents are exactly c2f3facca88e6cbd3c5f1024b0849c20cd66336f and 9d766557dd89a4d964339e69e8b1da0ecdd7440e.

Complexity

No new abstraction; this reconciles two already-reviewed histories and their tests.

Concerns

PR #404 overlaps the Resource Profile files and will need to rebase on the restored history.

Friction & bottlenecks

One transient Nix source-cache lookup failed and succeeded on retry; no persistent bottleneck observed.

Follow-ups

• Rebase PR Add atomic Resource demand observations #404 after this restoration lands.

References

• Former main: 9d766557dd89a4d964339e69e8b1da0ecdd7440e
• Current main/root fix: c2f3facca88e6cbd3c5f1024b0849c20cd66336f
• Related: Add atomic Resource demand observations #404

Posted on behalf of @schickling

field	value
agent_identity	dev3.direct.omp.5wtg9j4p
session	dev3.5wtg9j4p
agent_persona	generalist
agent_supervisor	unavailable
agent_tool	OMP
agent_tool_version	18.0.11
agent_runtime	OMP 18.0.11
tooling_profile	dotfiles@2161b9c