fix(ui): address PR #49 review — 6 warnings + 2 suggestions (#122)

Warnings fixed:
- BBCode injection (line 153): escape [ → [lb] in server text before interpolation
- sort_custom on silent-drop (line 125): sort now only runs on actual insertion/replacement
- clip_contents: add clip_contents=true to MonologueDisplay Control (overflow guard)
- confrontation tick guard (main.gd): _last_confrontation_tick deduplicates same-tick signals
- GameState decoupling: show_monologue() reads lattice_profile once and passes it through
  _show_line() → _build_line_node(); renderer no longer reaches into autoload (D-020)
- Equal-priority eviction: >= tiebreak (was >); FIFO for equal-priority queue overflow

Suggestions fixed:
- Minimum duration clamp: maxf(duration, FADE_IN_SEC + 0.1) — line survives own fade-in
- _label_text bounds check: guard against empty _visible before indexing [0]

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

client/ui/monologue_display.gd

@@ -5,20 +5,22 @@ extends Control
 #
 # Up to MAX_VISIBLE lines display simultaneously in a VBoxContainer.
 # Additional arrivals queue up to MAX_QUEUE depth; lowest-priority entry is
-# dropped when the queue is full and a higher-priority line arrives.
+# dropped when the queue is full and an equal-or-higher-priority line arrives
+# (>= tiebreak = FIFO: newest replaces oldest at same priority).
 #
 # Stagger: 0.15s minimum gap between consecutive fade-ins (spec §5.4).
-# Colour: derived from GameState.lattice_profile at render time (D-032).
+# Colour: lattice_profile passed in at call time — no autoload access in renderer.
 # is_urgent=true → opacity 1.0 and elevated colour variant (bloom deferred).
 
 const MAX_VISIBLE: int = 3
 const MAX_QUEUE:   int = 5
 
-const STAGGER_SEC:  float = 0.15
-const FADE_IN_SEC:  float = 0.3
-const FADE_OUT_SEC: float = 0.5
+const STAGGER_SEC:   float = 0.15
+const FADE_IN_SEC:   float = 0.3
+const FADE_OUT_SEC:  float = 0.5
+const MIN_DURATION:  float = FADE_IN_SEC + 0.1  # clamp: line must survive its own fade-in
 
-# Lattice colour palette — keyed by GameState.lattice_profile.
+# Lattice colour palette — keyed by lattice_profile passed from GameState at show time.
 # standard opacity = 0.85, urgent opacity = 1.0.
 # Source: Tyre architecture review, Sprint 14.
 const _LATTICE_COLORS: Dictionary = {
@@ -38,7 +40,7 @@ const _FALLBACK_URGENT:   Color = Color("#e0e8f8")
 
 # Visible slot: {node: Control, expire_timer: float, priority: int, tween: Tween}
 var _visible: Array[Dictionary] = []
-# Queue entry: {text: String, duration: float, priority: int, is_urgent: bool}
+# Queue entry: {text, duration, priority, is_urgent, lattice_profile}
 var _queue: Array[Dictionary] = []
 # Msec timestamp when the next fade-in may begin (stagger enforcement)
 var _next_fade_in_msec: float = 0.0
@@ -60,34 +62,37 @@ func _process(delta: float) -> void:
 		var now := float(Time.get_ticks_msec())
 		if now >= _next_fade_in_msec:
 			var next: Dictionary = _queue.pop_front()
-			_show_line(next.text, next.duration, next.priority, next.is_urgent)
+			_show_line(next.text, next.duration, next.priority, next.is_urgent, next.lattice_profile)
 
 
 # Display a monologue line.
 # priority: higher number = more important (default 2; urgent beats normal).
 # is_urgent: visual flag — full opacity + elevated colour. Bloom deferred.
 # Empty text is silently ignored — no slot created, no queue entry.
+# lattice_profile is read from GameState here and passed down — renderer stays
+# decoupled from the autoload (D-020 renderer contract).
 func show_monologue(text: String, duration: float, priority: int = 2, is_urgent: bool = false) -> void:
 	if text.is_empty():
 		return
+	var profile := GameState.lattice_profile
 	var now := float(Time.get_ticks_msec())
 	if _visible.size() < MAX_VISIBLE and now >= _next_fade_in_msec:
-		_show_line(text, duration, priority, is_urgent)
+		_show_line(text, duration, priority, is_urgent, profile)
 	else:
-		_enqueue(text, duration, priority, is_urgent)
+		_enqueue(text, duration, priority, is_urgent, profile)
 
 
 # ---------------------------------------------------------------------------
 # Internal
 # ---------------------------------------------------------------------------
 
-func _show_line(text: String, duration: float, priority: int, is_urgent: bool) -> void:
-	var line_node := _build_line_node(text, is_urgent)
+func _show_line(text: String, duration: float, priority: int, is_urgent: bool, lattice_profile: String) -> void:
+	var line_node := _build_line_node(text, is_urgent, lattice_profile)
 	_vbox.add_child(line_node)
 
 	var slot := {
 		node         = line_node,
-		expire_timer = duration,
+		expire_timer = maxf(duration, MIN_DURATION),  # clamp: survives own fade-in
 		priority     = priority,
 		tween        = null as Tween,
 	}
@@ -112,17 +117,17 @@ func _retire_slot(slot: Dictionary) -> void:
 	tween.tween_callback(node.queue_free)
 
 
-func _enqueue(text: String, duration: float, priority: int, is_urgent: bool) -> void:
+func _enqueue(text: String, duration: float, priority: int, is_urgent: bool, lattice_profile: String) -> void:
 	if _queue.size() < MAX_QUEUE:
-		_queue.append({text = text, duration = duration, priority = priority, is_urgent = is_urgent})
+		_queue.append({text = text, duration = duration, priority = priority, is_urgent = is_urgent, lattice_profile = lattice_profile})
+		_queue.sort_custom(func(a: Dictionary, b: Dictionary) -> bool: return a.priority > b.priority)
 	else:
-		# Replace the lowest-priority queued entry if new one outranks it
+		# >= tiebreak: newest replaces oldest at equal priority (FIFO for equal ranks)
 		var lowest := _lowest_priority_idx()
-		if priority > _queue[lowest].priority:
-			_queue[lowest] = {text = text, duration = duration, priority = priority, is_urgent = is_urgent}
-		# else: incoming line is lower/equal priority — silently drop
-	# Re-sort: highest priority at front (next to display)
-	_queue.sort_custom(func(a: Dictionary, b: Dictionary) -> bool: return a.priority > b.priority)
+		if priority >= _queue[lowest].priority:
+			_queue[lowest] = {text = text, duration = duration, priority = priority, is_urgent = is_urgent, lattice_profile = lattice_profile}
+			_queue.sort_custom(func(a: Dictionary, b: Dictionary) -> bool: return a.priority > b.priority)
+		# else: incoming line is strictly lower priority — silently drop; no sort needed
 
 
 func _lowest_priority_idx() -> int:
@@ -133,9 +138,8 @@ func _lowest_priority_idx() -> int:
 	return idx
 
 
-func _build_line_node(text: String, is_urgent: bool) -> Control:
-	var profile: String = GameState.lattice_profile
-	var palette: Dictionary = _LATTICE_COLORS.get(profile, {})
+func _build_line_node(text: String, is_urgent: bool, lattice_profile: String) -> Control:
+	var palette: Dictionary = _LATTICE_COLORS.get(lattice_profile, {})
 	var color: Color = palette.get("urgent", _FALLBACK_URGENT) if is_urgent \
 		else palette.get("standard", _FALLBACK_STANDARD)
 
@@ -150,7 +154,10 @@ func _build_line_node(text: String, is_urgent: bool) -> Control:
 	label.fit_content = true
 	label.scroll_active = false
 	label.add_theme_font_size_override("normal_font_size", 13)
-	label.text = "[i][color=#%s]%s[/color][/i]" % [color.to_html(false), text]
+	# Escape [ to prevent BBCode injection from server-sourced text.
+	# [lb] is Godot's BBCode entity for a literal left bracket.
+	var safe_text := text.replace("[", "[lb]")
+	label.text = "[i][color=#%s]%s[/color][/i]" % [color.to_html(false), safe_text]
 
 	container.add_child(label)
 	return container

client/ui/monologue_display.tscn

@@ -13,6 +13,7 @@ anchor_right = 0.55
 anchor_bottom = 0.98
 grow_horizontal = 1
 grow_vertical = 0
+clip_contents = true
 mouse_filter = 2
 script = ExtResource("1_monologue")