feat(physics): C4 route 4b-3 — remote teleport + cell-less through the canonical placement
Flips the last remote classification (SetPosition: teleport-advanced and
cell-less) onto 4b-1's RuntimeRemotePlacementDriveController, runs retail's
teleport_hook before the placement, and deletes the legacy remote-teleport
machinery. Contract: docs/research/2026-08-04-c4-route-4b-3-contract.md.
Retail: MoveOrTeleport @0x00516330's branch @0x00516386 -> teleport_hook
@0x005163EF -> SetFlags(0x1012) @0x00516414 -> SetPosition @0x00516420 ->
return 1 @0x00516438. The hook @0x00514ED0 runs BEFORE the placement and
regardless of its outcome. Retail places this branch unconditionally, at any
distance and any contact state (arg4 is read only @0x0051638E, after the
branch) — which is what retires AP-137's cell-less enqueue-vs-place delta.
D1 — the classifier's cell-less input is now the PRE-merge committed cell.
Retail's predicate is `this_1->cell == 0`, the BODY's own cell at
MoveOrTeleport entry (this_1 is assigned from this @0x00516334). acdream fed
the POST-merge canonical.FullCellId, which RefreshSnapshot ->
RefreshDerivedState -> SetFullCell has already stamped with the accepted wire
cell; a zero wire cell fails validation into RejectedData first. The shipped
remote cell-less predicate was therefore dead code, not merely different from
remotePlacementRequired. Threaded via a builder overload; route 1's overload
is untouched. The graphical !IsSpatiallyVisible arm of
projectionRequiresTeleportHook is deleted — a presentation predicate with no
retail analogue that fired the teleport machinery on a routine hot path.
Deleted: RemoteTeleportController (605), RemoteTeleportPlacement (85),
RemoteShadowPlacementSynchronizer (49), their 1,709 lines of tests, the
remotePlacementRequired predicate, the TeleportHookRequired plumbing, the
legacy pre-operation ConstrainTo fallback, and the player arm's legacy
!IsGrounded fallback. Net -2,030 lines.
Structural fix (two independent Opus reviews, round 1 FAIL/FAIL): three of the
four MAJORs were one defect — OnPosition carried two parallel inline copies of
the routing tail (player-guid, NPC-guid) that had drifted. Extracted
RunRemoteArmTail (3 call sites) and ApplyWireAirborneLeftoverBookkeeping (2),
both branches now share one implementation.
A1 ToConstraintArm mapped AirborneSnap -> AirborneNoOperation, so the NPC
arm armed ConstrainTo ZERO times for an out-of-contact wire-grounded
creature — a regression this slice introduced while closing a
structurally identical hole. Now maps to NearInterpolate; switch made
total with a throwing default proven unreachable.
R1 D2's write-nothing shape existed on the player arm only; NPC packets
fell through and wrote the body. Retail makes no player/NPC distinction.
R2 report_collision_end(this,1) @0x00514F31 was bound to
ShadowObjects.Suspend, a port of a DIFFERENT retail function
(remove_shadows_from_cells) that teleport_hook never calls. Now routes
to RuntimeCollisionReportingState.LeaveWorld, which wraps the private
ForceEnd in an admission-blocking transaction so a DoCollisionEnd
callback cannot recreate the contact table.
R3/A2 A teleported NPC synthesized ServerVelocity from the teleport distance
(~1,000+ m/s) and planned a run cycle from it. Both the install and
RemoteServerControlledVelocityCycle.Apply now gate on !isTeleportRoute.
BISECT HAZARD — A1's fix is correct only BECAUSE R1 landed. AirborneSnap is
reachable wire-airborne on the NPC arm only while D2's shape is missing there.
Reverting R1 alone silently inverts A1 into the opposite divergence: arming
where retail returns 0. Revert both or neither.
Also in the velocity hunk: the NPC block's two !IsPlayerGuid(update.Guid)
guards were dropped when it was wrapped in `if (!isTeleportRoute)`. Safe — all
five exit paths of the enclosing IsPlayerGuid block return, so the predicate is
unconditionally false below it — but it was unremarked by both reviews.
Register: AP-137 REWRITTEN (not deleted) to the surviving acdream-only
divergences — null classification during the login window and Rejected*
through UnroutedCatchUp keep a row. AD-42's RemoteTeleportController citation
retired; AP-136/AP-138 writer lists corrected to the two surviving non-Position
rebucket writers; AP-138 gains the teleport arm as a second producer of the
visible-without-collision residual (retirement path remains #309). AP-135 is
untouched and its two airborne bookkeeping writes are preserved on both arms.
AP-131 does not retire; #276 does not close.
Proof obligation 1: ParkCollisionResidents' overlap throw stays unreachable —
the teleport arm adds packets to the same TryBeginExclusiveAuthoredPlacement
one-operation-per-key machinery the far arm uses, opens no new operation shape,
and every DeferredCell outcome cancels synchronously with
restoreCancelledPark: true. The guarded property remains
HasOldPrefixPlacementDebt's stall, not a throw (4b-1's B2 caveat stands).
Correction to an earlier claim: LiveEntityPresentationController's
_activePlacementOwners was NOT write-never at HEAD —
remotePlacementRequired -> BeginPlacement -> Begin -> BeginAuthoritativePlacement
was a live writer chain. It becomes write-never BECAUSE this slice deletes that
chain, which is why deleting the dead half is behaviour-preserving.
Probe: ACDREAM_PROBE_REMOTE_TELEPORT=1 emits one [remote-teleport] line per
routed arm (guid, cause, hook-ran, placement status). TEMPORARY, strip with the
probe family.
Carried, disclosed not fixed: no dedicated bidirectional collision-partner test
for R2 (the wiring, not LeaveWorld itself, is what lacks coverage); the
stress test's teleport step drives hand-written field assignments rather than
the canonical arm; the per-packet runTeleportHook closure allocation (network
path, not the resolve path Slice I's 0 B discipline governs — file before
route 5 adds a fourth call site). B2: IRuntimeCollisionReportObserver has zero
production implementations, so retail's bidirectional DoCollisionEnd half still
reaches no gameplay consumer — this fix closes the wrong-function binding, not
that nobody listens.
Complete Release suite MEASURED at 11,013 passed / 4 skipped / 0 failed
(baseline 11,027/4/0; net -14 = ~33 deleted test cases against ~19 added).
Neither known flake fired (#302 PortalProjectionTests GC-allocation, #308
NakEmissionTests wall-clock).
STILL OWED: the two-client connected gate, which MUST use an NPC/creature
teleport target. Both round-1 MAJORs lived on the NPC arm and the velocity
cycle early-returns for 0x50xxxxxx guids, so a player target structurally
cannot observe A1, A2, or R3.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
parent
3e002993dd
commit
6dc7ba51ee
53 changed files with 2980 additions and 3372 deletions
|
|
@ -263,12 +263,8 @@ public sealed class LiveEntityLifecycleStressTests
|
|||
Assert.Equal(1, fixture.Presentation.DeferredShadowRestoreCount);
|
||||
|
||||
fixture.BeginDeferredTeleport();
|
||||
Assert.Equal(1, fixture.Teleport.PendingPlacementCount);
|
||||
Assert.Equal(1, fixture.Presentation.ActivePlacementCount);
|
||||
|
||||
fixture.LoadDestination();
|
||||
Assert.Equal(0, fixture.Teleport.PendingPlacementCount);
|
||||
Assert.Equal(0, fixture.Presentation.ActivePlacementCount);
|
||||
Assert.Equal(1, fixture.Presentation.DeferredShadowRestoreCount);
|
||||
|
||||
fixture.ApplyVisible();
|
||||
|
|
@ -293,10 +289,8 @@ public sealed class LiveEntityLifecycleStressTests
|
|||
Assert.Equal(0, fixture.ParticleSink.ActiveBindingCount);
|
||||
Assert.Equal(0, fixture.Poses.Count);
|
||||
Assert.Equal(0, fixture.Engine.ShadowObjects.RetainedRegistrationCount);
|
||||
Assert.Equal(0, fixture.Teleport.PendingPlacementCount);
|
||||
Assert.Equal(0, fixture.Presentation.ReadyOwnerCount);
|
||||
Assert.Equal(0, fixture.Presentation.DeferredShadowRestoreCount);
|
||||
Assert.Equal(0, fixture.Presentation.ActivePlacementCount);
|
||||
Assert.Equal(0, fixture.Spatial.PendingLiveEntityCount);
|
||||
Assert.Equal(0, fixture.Spatial.PendingBucketCount);
|
||||
}
|
||||
|
|
@ -590,7 +584,6 @@ public sealed class LiveEntityLifecycleStressTests
|
|||
|
||||
EntityEffectController? effects = null;
|
||||
LiveEntityPresentationController? presentation = null;
|
||||
RemoteTeleportController? teleport = null;
|
||||
Runtime = LiveEntityRuntimeFixture.Create(
|
||||
Spatial,
|
||||
new DelegateLiveEntityResourceLifecycle(
|
||||
|
|
@ -609,7 +602,6 @@ public sealed class LiveEntityLifecycleStressTests
|
|||
{
|
||||
effects?.OnLiveEntityUnregistered(record);
|
||||
presentation?.Forget(record);
|
||||
teleport?.Forget(record);
|
||||
if (record.WorldEntity is { } entity)
|
||||
Engine.ShadowObjects.Deregister(entity.Id);
|
||||
});
|
||||
|
|
@ -669,25 +661,6 @@ public sealed class LiveEntityLifecycleStressTests
|
|||
liveCenter: () => (1, 1));
|
||||
Assert.True(Presentation.OnLiveEntityReady(Guid));
|
||||
|
||||
Teleport = teleport = new RemoteTeleportController(
|
||||
Engine,
|
||||
Runtime,
|
||||
(_, _) => (0.48f, 1.835f),
|
||||
(position, _) => position,
|
||||
(_, _, _) => { },
|
||||
(guid, generation, defer) =>
|
||||
Presentation.CompleteAuthoritativePlacement(guid, generation, defer),
|
||||
(guid, generation) =>
|
||||
Presentation.BeginAuthoritativePlacement(guid, generation),
|
||||
resolvePlacement: (position, cell, _, _, _, _) => new ResolveResult(
|
||||
position,
|
||||
cell,
|
||||
IsOnGround: true,
|
||||
InContact: true,
|
||||
OnWalkable: true,
|
||||
ContactPlane: new Plane(Vector3.UnitZ, 0f),
|
||||
ContactPlaneCellId: cell));
|
||||
|
||||
Runtime.ProjectionVisibilityChanged += OnProjectionVisibilityChanged;
|
||||
_hookQueue = new AnimationHookFrameQueue(Router, Poses);
|
||||
}
|
||||
|
|
@ -703,7 +676,6 @@ public sealed class LiveEntityLifecycleStressTests
|
|||
internal EntityEffectController Effects { get; }
|
||||
internal WorldEntity Entity { get; }
|
||||
internal LiveEntityPresentationController Presentation { get; }
|
||||
internal RemoteTeleportController Teleport { get; }
|
||||
internal List<uint> TypedScripts { get; } = [];
|
||||
internal int RecallHookCount { get; private set; }
|
||||
|
||||
|
|
@ -735,25 +707,27 @@ public sealed class LiveEntityLifecycleStressTests
|
|||
Assert.True(Presentation.OnStateAccepted(Guid));
|
||||
}
|
||||
|
||||
// C4 route 4b-3 deleted the standalone RemoteTeleportController this
|
||||
// step used to drive. The scenario this fixture exists to cover —
|
||||
// Hidden/DeferredShadowRestore correctness across a landblock churn
|
||||
// while an entity is mid-teleport — does not depend on that
|
||||
// controller's own bookkeeping (BeginAuthoritativePlacement/
|
||||
// CompleteAuthoritativePlacement are confirmed dead: their only
|
||||
// production caller was the deleted presentation adapter). This
|
||||
// reproduces the same observable state the canonical teleport arm's
|
||||
// tail produces: the destination cell adopted and the body/entity
|
||||
// moved to the destination pose, still Hidden.
|
||||
internal void BeginDeferredTeleport()
|
||||
{
|
||||
_destinationCell = _currentCell == CellOne ? CellTwo : CellOne;
|
||||
Assert.False(Spatial.IsLoaded((_destinationCell & 0xFFFF0000u) | 0xFFFFu));
|
||||
Teleport.BeginPlacement(Guid, generation: 1);
|
||||
Assert.True(Runtime.RebucketLiveEntity(Guid, _destinationCell));
|
||||
RemoteTeleportController.Result result = Teleport.TryApply(
|
||||
_remote,
|
||||
Entity,
|
||||
new Vector3(Entity.Position.X + 3f, Entity.Position.Y, Entity.Position.Z),
|
||||
_destinationCell,
|
||||
Entity.Position,
|
||||
Quaternion.Identity,
|
||||
gameTime: _stateSequence,
|
||||
destinationProjectionVisible: false,
|
||||
generation: 1,
|
||||
positionSequence: 1);
|
||||
Assert.True(result.Applied);
|
||||
Assert.False(result.ContactResolved);
|
||||
var destination = new Vector3(
|
||||
Entity.Position.X + 3f, Entity.Position.Y, Entity.Position.Z);
|
||||
_remote.Body.Position = destination;
|
||||
_remote.CellId = _destinationCell;
|
||||
Entity.SetPosition(destination);
|
||||
Entity.ParentCellId = _destinationCell;
|
||||
}
|
||||
|
||||
internal void LoadDestination()
|
||||
|
|
@ -797,7 +771,6 @@ public sealed class LiveEntityLifecycleStressTests
|
|||
{
|
||||
Clear();
|
||||
Runtime.ProjectionVisibilityChanged -= OnProjectionVisibilityChanged;
|
||||
Teleport.Dispose();
|
||||
Presentation.Dispose();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -596,51 +596,12 @@ public sealed class LiveEntityPresentationControllerTests
|
|||
controller.Dispose();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ActivePlacement_IsGenerationScopedAndClearsOnTeardownAndReset()
|
||||
{
|
||||
Fixture fixture = new(PhysicsStateFlags.ReportCollisions);
|
||||
Assert.True(fixture.Controller.OnLiveEntityReady(Fixture.Guid));
|
||||
Assert.True(fixture.Controller.BeginAuthoritativePlacement(Fixture.Guid, 1));
|
||||
Assert.True(fixture.Controller.HasActivePlacement(Fixture.Guid));
|
||||
Assert.True(fixture.Runtime.TryGetRecord(Fixture.Guid, out LiveEntityRecord oldRecord));
|
||||
|
||||
fixture.Controller.Forget(oldRecord);
|
||||
Assert.True(fixture.Runtime.UnregisterLiveEntity(
|
||||
new DeleteObject.Parsed(Fixture.Guid, 1),
|
||||
isLocalPlayer: false));
|
||||
Assert.False(fixture.Controller.HasActivePlacement(Fixture.Guid));
|
||||
|
||||
fixture.Runtime.RegisterLiveEntity(Fixture.Spawn(
|
||||
PhysicsStateFlags.ReportCollisions,
|
||||
instanceSequence: 2));
|
||||
fixture.Runtime.MaterializeLiveEntity(
|
||||
Fixture.Guid,
|
||||
0x01010001u,
|
||||
id => new WorldEntity
|
||||
{
|
||||
Id = id,
|
||||
ServerGuid = Fixture.Guid,
|
||||
SourceGfxObjOrSetupId = 0x02000001u,
|
||||
Position = new Vector3(10f, 10f, 5f),
|
||||
Rotation = Quaternion.Identity,
|
||||
MeshRefs = Array.Empty<MeshRef>(),
|
||||
});
|
||||
Assert.True(fixture.Controller.OnLiveEntityReady(Fixture.Guid));
|
||||
|
||||
Assert.False(fixture.Controller.CompleteAuthoritativePlacement(
|
||||
Fixture.Guid,
|
||||
generation: 1,
|
||||
deferShadowRestore: true));
|
||||
Assert.False(fixture.Controller.HasDeferredShadowRestore(Fixture.Guid));
|
||||
Assert.True(fixture.Controller.BeginAuthoritativePlacement(Fixture.Guid, 2));
|
||||
Assert.True(fixture.Controller.HasActivePlacement(Fixture.Guid));
|
||||
|
||||
fixture.Controller.Clear();
|
||||
|
||||
Assert.False(fixture.Controller.HasActivePlacement(Fixture.Guid));
|
||||
Assert.False(fixture.Controller.HasDeferredShadowRestore(Fixture.Guid));
|
||||
}
|
||||
// C4 route 4b-3: ActivePlacement_IsGenerationScopedAndClearsOnTeardownAndReset
|
||||
// deleted — BeginAuthoritativePlacement/CompleteAuthoritativePlacement/
|
||||
// HasActivePlacement/DeferShadowRestore and the backing
|
||||
// _activePlacementOwners set are dead (their only production caller was
|
||||
// the deleted RemoteTeleportPlacementPresentation); see
|
||||
// docs/research/2026-08-04-c4-route-4b-3-contract.md's deletion inventory.
|
||||
|
||||
private sealed class Fixture
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1785,11 +1785,25 @@ public sealed class LiveEntityRuntimeTests
|
|||
out AcceptedPhysicsTimestamps timestamps));
|
||||
Assert.Equal(PositionTimestampDisposition.Apply, disposition);
|
||||
Assert.False(timestamps.TeleportAdvanced);
|
||||
Assert.True(timestamps.TeleportHookRequired);
|
||||
// C4 route 4b-3 (D1): the pickup left the record cell-less
|
||||
// (FullCellId == 0, unwield-to-3D), and TryApplyPosition measures
|
||||
// that PRE-merge value — the classifier's remote cell-less predicate
|
||||
// reads this, not the post-merge canonical.FullCellId.
|
||||
Assert.Equal(0u, timestamps.PreMergeCommittedCellId);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// C4 route 4b-3 (D1): before this slice, losing spatial visibility alone
|
||||
/// (no cell-less body, no fresh TELEPORT_TS) flagged
|
||||
/// <c>projectionRequiresTeleportHook</c> — a presentation predicate with
|
||||
/// no retail analogue (the deleted D1 evidence-chain arm). This is the
|
||||
/// regression guard: a record that is still resident at a real cell
|
||||
/// (materialized at 0x01010001u) but has lost spatial projection reports
|
||||
/// its HONEST pre-merge committed cell, not a fabricated cell-less
|
||||
/// signal — visibility is presentation-only now.
|
||||
/// </summary>
|
||||
[Fact]
|
||||
public void PositionFromPendingProjection_RequiresTeleportHookWithEqualTeleportStamp()
|
||||
public void PositionFromPendingProjection_ReportsTheHonestPreMergeCellNotVisibility()
|
||||
{
|
||||
const uint guid = 0x70000044u;
|
||||
var spatial = new GpuWorldState();
|
||||
|
|
@ -1824,7 +1838,7 @@ public sealed class LiveEntityRuntimeTests
|
|||
|
||||
Assert.Equal(PositionTimestampDisposition.Apply, disposition);
|
||||
Assert.False(timestamps.TeleportAdvanced);
|
||||
Assert.True(timestamps.TeleportHookRequired);
|
||||
Assert.Equal(0x01010001u, timestamps.PreMergeCommittedCellId);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
|
|
|||
|
|
@ -122,9 +122,7 @@ public sealed class RuntimeEntityOwnershipTests
|
|||
AssertExactKeyFields(
|
||||
typeof(LiveEntityPresentationController),
|
||||
"_readyOwners",
|
||||
"_suspendedShadowOwners",
|
||||
"_activePlacementOwners");
|
||||
AssertExactKeyFields(typeof(RemoteTeleportController), "_pending");
|
||||
"_suspendedShadowOwners");
|
||||
AssertExactKeyFields(typeof(LiveRenderProjectionJournal), "_byKey");
|
||||
AssertExactKeyFields(
|
||||
typeof(EntityEffectController),
|
||||
|
|
@ -185,7 +183,6 @@ public sealed class RuntimeEntityOwnershipTests
|
|||
[
|
||||
typeof(LiveEntityProjectionStore),
|
||||
typeof(LiveEntityPresentationController),
|
||||
typeof(RemoteTeleportController),
|
||||
typeof(LiveRenderProjectionJournal),
|
||||
typeof(LiveEntityLightController),
|
||||
typeof(EquippedChildRenderController),
|
||||
|
|
|
|||
|
|
@ -911,8 +911,6 @@ public sealed class UpdateFrameOrchestratorTests
|
|||
typeof(LiveSessionLocalPhysicsTimestampPublisher),
|
||||
typeof(AcDream.App.Physics.LiveEntityNetworkUpdateController),
|
||||
typeof(AcDream.App.Rendering.LiveEntityPartArrayLifecycle),
|
||||
typeof(AcDream.App.Physics.RemoteShadowPlacementSynchronizer),
|
||||
typeof(AcDream.App.Physics.RemoteTeleportPlacementPresentation),
|
||||
typeof(AcDream.App.Net.LiveEntitySessionController),
|
||||
];
|
||||
foreach (Type owner in typedProductionOwners)
|
||||
|
|
@ -965,8 +963,11 @@ public sealed class UpdateFrameOrchestratorTests
|
|||
StringComparison.Ordinal);
|
||||
Assert.Contains("d.WorldOrigin.GetCenter", livePresentation,
|
||||
StringComparison.Ordinal);
|
||||
Assert.Contains("d.WorldOrigin.CellLocalForSeed", livePresentation,
|
||||
StringComparison.Ordinal);
|
||||
// C4 route 4b-3 deleted the sole consumer of
|
||||
// d.WorldOrigin.CellLocalForSeed in this file — the standalone
|
||||
// RemoteTeleportController construction. LiveWorldOriginState.
|
||||
// CellLocalForSeed itself is not deleted (LocalPlayerTeleportController
|
||||
// still uses it).
|
||||
Assert.DoesNotContain("CreateLiveSessionEventRouter", source,
|
||||
StringComparison.Ordinal);
|
||||
Assert.Contains("_world.EntitySession.CreateSink()", sessionRuntime,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue