jpmschweitzer/settled-reach
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(simulation): address PR #75 review — vision components, triangle validation, FNV-1a, KG gating

Browse Source 
1. CRITICAL: spawn_template_npcs now inserts NpcVisionState, NpcMemory,
   PlayerAwareness on template-spawned NPCs — matches spawn_npc() pattern
   from PR #66. Without these, template NPCs were invisible to vision and
   awareness systems.

2. WARNING: generate_intra_template_triangles now calls validate_triangle_def
   before generating TriangleState — mirrors cross-template path. Updates
   test TriangleDefs and logistics-hub.yaml to pass all three quality checks
   (conflict viability, relationship coherence, interest divergence).

3. WARNING: state_hash in compute_observer_snapshot now uses FNV-1a instead
   of DefaultHasher — consistent with D-010 principle 4 and the pattern in
   TemplateId/TriangleId. Updates golden file for new hash value.

4. WARNING: TriangleCrisisEventWire.role_assignments now filtered against
   observer KnowledgeGraph — unknown NPCs redacted from wire event per
   D-010 principle 2 (information boundaries).

5. WARNING: ActiveTemplateInstances::insert now despawns previous instance
   entities before overwriting — prevents orphaned ECS entities.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
jpmschweitzer
2026-02-27 19:02:43 +01:00
co-authored by Claude Opus 4.6
parent 88fc6c30dc
commit dd00a9cd9e
6 changed files with 108 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/content/template.rs
+49 -11
View File
@@ -682,6 +682,16 @@ pub fn generate_intra_template_triangles(
let role_to_npc: BTreeMap<RoleId, StableId> = npc_roles.into_iter().collect();
for def in defs {
// Validate triangle definition before generating TriangleState (#109).
// Mirrors the cross-template path in generate_cross_template_triangles.
if let Err(e) = validate_triangle_def(def) {
result.warnings.push(format!(
"Triangle {:?}: skipped — validation failed: {}",
def.triangle_id, e
));
continue;
}
let mut role_assignments = BTreeMap::new();
let mut assigned_npcs = BTreeSet::new();
let mut assignment_ok = true;
@@ -1363,7 +1373,11 @@ mod tests {
],
conflict_type: ConflictType::LoyaltyConflict,
interest_axes: [NpcAxis::Want, NpcAxis::Secret, NpcAxis::Relationships],
relationship_constraints: vec![],
relationship_constraints: vec![RelationshipConstraint {
with_role: RoleId::new("waitstaff"),
kind: crate::npc::RelationshipKind::Colleague,
required_trust: TrustRange { min: 0, max: 5 },
}],
},
TriangleDef {
triangle_id: TriangleId::from_seed_and_roles(
@@ -1381,7 +1395,11 @@ mod tests {
],
conflict_type: ConflictType::ResourceCompetition,
interest_axes: [NpcAxis::Want, NpcAxis::Tolerance, NpcAxis::Contentment],
relationship_constraints: vec![],
relationship_constraints: vec![RelationshipConstraint {
with_role: RoleId::new("bouncer"),
kind: crate::npc::RelationshipKind::Colleague,
required_trust: TrustRange { min: 0, max: 3 },
}],
},
];
@@ -1423,8 +1441,12 @@ mod tests {
RoleId::new("missing_role"), // no NPC has this role
],
conflict_type: ConflictType::SecretExposure,
interest_axes: [NpcAxis::Secret, NpcAxis::Secret, NpcAxis::Secret],
relationship_constraints: vec![],
interest_axes: [NpcAxis::Want, NpcAxis::Secret, NpcAxis::Tolerance],
relationship_constraints: vec![RelationshipConstraint {
with_role: RoleId::new("bouncer"),
kind: crate::npc::RelationshipKind::Colleague,
required_trust: TrustRange { min: 0, max: 5 },
}],
},
TriangleDef {
triangle_id: TriangleId(101),
@@ -1434,8 +1456,12 @@ mod tests {
RoleId::new("also_missing"),
],
conflict_type: ConflictType::LatentTension,
interest_axes: [NpcAxis::Contentment, NpcAxis::Contentment, NpcAxis::Tolerance],
relationship_constraints: vec![],
interest_axes: [NpcAxis::Want, NpcAxis::Contentment, NpcAxis::Tolerance],
relationship_constraints: vec![RelationshipConstraint {
with_role: RoleId::new("bouncer"),
kind: crate::npc::RelationshipKind::Rival,
required_trust: TrustRange { min: -5, max: 0 },
}],
},
];
@@ -1475,8 +1501,12 @@ mod tests {
RoleId::new("regular"),
],
conflict_type: ConflictType::ResourceCompetition,
interest_axes: [NpcAxis::Want, NpcAxis::Want, NpcAxis::Want],
relationship_constraints: vec![],
interest_axes: [NpcAxis::Want, NpcAxis::Secret, NpcAxis::Tolerance],
relationship_constraints: vec![RelationshipConstraint {
with_role: RoleId::new("bouncer"),
kind: crate::npc::RelationshipKind::Colleague,
required_trust: TrustRange { min: 0, max: 5 },
}],
}];
// Should succeed with 1 triangle but log an error about < 2
@@ -1498,7 +1528,11 @@ mod tests {
],
conflict_type: ConflictType::LoyaltyConflict,
interest_axes: [NpcAxis::Want, NpcAxis::Secret, NpcAxis::Relationships],
relationship_constraints: vec![],
relationship_constraints: vec![RelationshipConstraint {
with_role: RoleId::new("b"),
kind: crate::npc::RelationshipKind::Colleague,
required_trust: TrustRange { min: 0, max: 5 },
}],
},
TriangleDef {
triangle_id: TriangleId(301),
@@ -1508,8 +1542,12 @@ mod tests {
RoleId::new("d"),
],
conflict_type: ConflictType::LatentTension,
interest_axes: [NpcAxis::Contentment, NpcAxis::Contentment, NpcAxis::Tolerance],
relationship_constraints: vec![],
interest_axes: [NpcAxis::Want, NpcAxis::Contentment, NpcAxis::Tolerance],
relationship_constraints: vec![RelationshipConstraint {
with_role: RoleId::new("c"),
kind: crate::npc::RelationshipKind::Rival,
required_trust: TrustRange { min: -5, max: 0 },
}],
},
];