fix: prune stale static actor vids on update

Author: MikelCalvo

internal/worldruntime/non_player_directory.go

@@ -62,16 +62,13 @@ func (d *NonPlayerDirectory) Update(actor StaticEntity) bool {
 	if d == nil || !validStaticEntity(actor) {
 		return false
 	}
-	previous, ok := d.byEntityID[actor.Entity.ID]
-	if !ok {
+	if _, ok := d.byEntityID[actor.Entity.ID]; !ok {
 		return false
 	}
 	if vid, ok := StaticActorVisibilityVID(actor); ok && conflictingEntityID(d.entityIDByVID, vid, actor.Entity.ID) {
 		return false
 	}
-	if previousVID, ok := StaticActorVisibilityVID(previous); ok {
-		delete(d.entityIDByVID, previousVID)
-	}
+	d.removeVisibilityVIDsForEntityID(actor.Entity.ID)
 	d.byEntityID[actor.Entity.ID] = cloneStaticEntity(actor)
 	if vid, ok := StaticActorVisibilityVID(actor); ok {
 		d.entityIDByVID[vid] = actor.Entity.ID

internal/worldruntime/non_player_directory_test.go

@@ -132,6 +132,33 @@ func TestNonPlayerDirectoryUpdateClearsVisibilityVIDLookupWhenActorStopsBeingEnc
 	}
 }
 
+func TestNonPlayerDirectoryUpdateClearsStaleVisibilityVIDsForSameEntityID(t *testing.T) {
+	directory := NewNonPlayerDirectory()
+	actor := StaticEntity{
+		Entity:   Entity{ID: 13, Kind: EntityKindStaticActor, Name: "VillageGuard"},
+		Position: NewPosition(42, 1700, 2800),
+		RaceNum:  20300,
+	}
+	if !directory.Register(actor) {
+		t.Fatal("expected static actor registration to succeed")
+	}
+	directory.entityIDByVID[99] = actor.Entity.ID
+
+	updated := actor
+	updated.Entity.Name = "Blacksmith"
+	if !directory.Update(updated) {
+		t.Fatal("expected static actor update to repair stale VID ownership")
+	}
+
+	if _, ok := directory.ByVID(99); ok {
+		t.Fatal("expected stale visibility VID lookup to be cleared after update")
+	}
+	lookup, ok := directory.ByVID(13)
+	if !ok || lookup.Entity.ID != actor.Entity.ID || lookup.Entity.Name != "Blacksmith" {
+		t.Fatalf("expected current visibility VID lookup to return Blacksmith, got actor=%+v ok=%v", lookup, ok)
+	}
+}
+
 func TestNonPlayerDirectoryPreservesCombatProfileOnRegisterAndUpdate(t *testing.T) {
 	directory := NewNonPlayerDirectory()
 	actor := StaticEntity{

spec/protocol/non-player-entity-bootstrap.md

@@ -100,7 +100,7 @@ This slice does not yet freeze:
   - if a partially torn-down static actor is still present in the non-player directory but missing from the map index, a later in-place update must rebuild map presence while preserving the authored/bootstrap death reward instead of requiring delete-and-recreate
   - if the reverse partial-teardown shape leaves only map-index presence behind, in-place update must repair the entity index and move the actor to the requested effective map instead of failing closed; this keeps operator/static-spawn edit paths tolerant of index cleanup order without treating an unknown actor ID as creatable
   - if a bad partial-teardown or repair path leaves duplicate map-bucket presence for the same static actor entity ID, later register, in-place update, or remove must prune all stale map buckets before inserting the new effective-map presence or reporting final removal; map occupancy must never keep ghost static actors for the same entity ID on older maps
-  - if a stale visibility-VID index entry survives for the same static actor entity ID, later registration must prune the stale VID before inserting the actor's current encodable visibility VID; visible-VID lookup must never keep an old alias for the same static actor after registration repair
+  - if a stale visibility-VID index entry survives for the same static actor entity ID, later registration or in-place update must prune the stale VID before inserting the actor's current encodable visibility VID; visible-VID lookup must never keep an old alias for the same static actor after registration or update repair
   - if a stale visibility-VID index entry points at a missing static actor entity ID, a later `ByVID` lookup must prune that orphaned index entry before failing closed; visible-VID lookup must not keep returning through stale non-player directory aliases after partial teardown
 - inter-channel ownership