Aetherlight AL2b-2b: retirement lives on SubjectState; grants keyed by SubjectId

SubjectState.retired is the one stored statement; is_retired reads it. The
Retire arm sets it; affordance_grants is keyed by SubjectId. Controllers still
compiled; removed in the next commit.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
soul 2026-11-20 01:11:45 +01:00
commit c79f9b5671
3 changed files with 47 additions and 54 deletions

View file

@ -3322,23 +3322,22 @@ pub(super) fn resolve_patch(
})
.collect();
// `Retire` and the affordance grant operations read and write these
// candidates. `retired` seeds from the committed `ControllerAssignment`,
// which the resolver otherwise never reads: a declared subject is always
// candidates. `retired` seeds from the committed subject rows: a declared subject is always
// fresh and unretired, so drafts start out of the set. `affordance_holdings`
// seeds from committed `affordance_grants` and is extended below for a
// subject this same patch declares.
let mut retired: BTreeSet<Key<SubjectId>> = state
.controller_assignments
.subjects
.keys()
.filter(|scope| super::is_retired(state, scope.subject_id))
.map(|scope| Key::Existing(scope.subject_id))
.filter(|subject_id| super::is_retired(state, **subject_id))
.map(|subject_id| Key::Existing(*subject_id))
.collect();
let mut affordance_holdings: BTreeMap<Key<SubjectId>, BTreeSet<Key<AffordanceId>>> = state
.affordance_grants
.iter()
.map(|(scope, granted)| {
.map(|(subject_id, granted)| {
(
Key::Existing(scope.subject_id),
Key::Existing(*subject_id),
granted.iter().map(|id| Key::Existing(*id)).collect(),
)
})
@ -5096,6 +5095,7 @@ pub(super) fn resolve_patch(
label: input.label.clone(),
kind: input.kind,
import_key: input.import_key.clone(),
retired: false,
},
controller,
affordances: granted,