fix(chat): CH4 re-review fixes — dialog-queue reentrancy, settings option-bit chokepoint

Should-fix 1: RetailDialogFactory.CloseDialog's queued branch removed the
active DialogInfo, ran DialogDone (whose callback can synchronously open a
new dialog under the SAME queue key — the two-stage house-abandon
confirmation does exactly this), then called OpenNextDialog, which did an
unconditional Dictionary.Add on a key the reentrant dialog had already
re-occupied. Retail's HashTable::add tolerates the duplicate; Dictionary
throws. OpenNextDialog now returns early when the queue key is already
active — the reentrant dialog's own eventual close drains the queue.

Should-fix 2: @join/@leave wrote the local RuntimeCharacterOptionsState bit
before sending, but the Settings Chat toggles reached a second binding
(SendSingleCharacterOption) that only sent the wire message, leaving the
Turbine membership gate stale until the next PlayerDescription.
LiveSessionRuntimeFactory.CreateCommandBindings now has one shared local
function for both entrances.

Should-fix 3: corrected TS-68/#360 wording again — retail's DoAllegiance
dispatcher table EXECUTES boot/ban/officer/title/motd/name/lock/house/
chat/broadcast locally through their own handlers; acdream shows the
unrecognized-subcommand refusal for all nine pending the #360 port. What
matches retail is the ownership rule (the verb never reaches
DoChannelCommand/the server), not the subcommand behavior itself. Removed
the inaccurate "matching retail, not merely harmless" / "now matches
this" claims from both the register row and the issue.

Nits: corrected the HouseAbandonDialogCallback_First citation (0x00580E1A
is DoHouse's load site for the callback pointer, not the function entry —
the entry is 0x00580240, with the stage-2 confirmation string built at
0x005802D8) in both ClientCommandController.cs and the mirrored test
comment; added an InlineData case pinning "@clist allegiance" to
RequestChannelList(0x02000000); converted RetailClientCommandCatalog.
KnownVerbs from a plain array to a FrozenSet<string> with
StringComparer.OrdinalIgnoreCase, matching the file's other lookup tables.

Suite: 12,221 passed / 4 skipped / 0 failed (Release), up from CH4's
12,216/4/0 — net +5 tests, no removals.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Erik 2026-08-09 22:24:43 +02:00
parent 59c053ee47
commit 5d247d5518
10 changed files with 204 additions and 34 deletions

View file

@ -255,6 +255,51 @@ public sealed class RetailDialogFactoryTests
Assert.Empty(root.Children);
}
[Fact]
public void AcceptingChainedReentrantDialogDoesNotThrowAndDrainsQueueAfterChainCompletes()
{
// CH4 re-review should-fix 1: a callback that synchronously reopens a new
// dialog under the SAME queue key (retail's two-stage house-abandon
// confirmation) used to crash OpenNextDialog with a duplicate-key
// ArgumentException whenever a third confirmation was already queued
// behind the chain. See RetailDialogFactory.OpenNextDialog.
var root = new UiRoot { Width = 800f, Height = 600f };
var layouts = new List<ImportedLayout>();
var factory = CreateFactory(root, layouts);
var completed = new List<string>();
factory.MakeConfirmation("stage1", _ =>
{
completed.Add("stage1");
factory.MakeConfirmation("stage2", _ => completed.Add("stage2"));
});
factory.MakeConfirmation("queued behind chain", _ => completed.Add("queued"));
Assert.Equal(1, factory.PendingCount);
Exception? thrown = Record.Exception(() => Accept(layouts[0]));
Assert.Null(thrown);
Assert.Equal(["stage1"], completed);
Assert.Equal(2, layouts.Count);
Assert.Equal("stage2", Message(layouts[1]));
Assert.Same(layouts[1].Root, root.Modal);
Assert.Equal(1, factory.PendingCount);
Accept(layouts[1]);
Assert.Equal(["stage1", "stage2"], completed);
Assert.Equal(3, layouts.Count);
Assert.Equal("queued behind chain", Message(layouts[2]));
Assert.Same(layouts[2].Root, root.Modal);
Assert.Equal(0, factory.PendingCount);
Accept(layouts[2]);
Assert.Equal(["stage1", "stage2", "queued"], completed);
Assert.False(factory.IsOpen);
}
private static RetailDialogFactory CreateFactory(
UiRoot root,
List<ImportedLayout> layouts)