fix: restore mode clicks and compose seat-aware assistant scenes

src/cognitive_agent/application/seat_service.py

@@ -2195,6 +2195,7 @@ class SeatDemoService:
         assistant_plan: dict[str, Any] | None = None,
         allow_fuzzy_mode_profile_match: bool = True,
         allow_scene_composition: bool = False,
+        scene_scope_utterance: str | None = None,
         mode_profile_draft_context: dict[str, Any] | None = None,
     ) -> dict[str, Any]:
         control_transport = self._validate_control_transport(control_transport)
@@ -2526,8 +2527,12 @@ class SeatDemoService:
                 model_parse_source=model_parse_source,
                 assistant_plan=assistant_plan,
                 allow_scene_composition=allow_scene_composition,
+                scene_scope_utterance=scene_scope_utterance,
+            )
+            scene_label_only = assistant_plan is not None and allow_scene_composition
+            dynamic_mode_stop = (
+                not scene_label_only and self._is_dynamic_mode_stop_request(utterance)
             )
-            dynamic_mode_stop = self._is_dynamic_mode_stop_request(utterance)
             if dynamic_mode_stop:
                 parsed = self._apply_dynamic_mode_stop_request(parsed, utterance)
             # Reuse the same conservative clause segmentation for the final
@@ -2535,7 +2540,12 @@ class SeatDemoService:
             # comma between independent controls can leak an early target
             # (for example ``副驾``) into a later HVAC clause and can also
             # hide otherwise valid window/temperature actions.
-            segmented_utterance = "，".join(
+            # Name-only scene plans have already been checked against exact
+            # targets by _interpret. Their synthesized 进入<name> label is not
+            # another atomic instruction: reparsing 座椅舒适模式 here applies
+            # the unscoped-seat driver default and discards valid passenger
+            # actions. Explicit user instructions never enter this branch.
+            segmented_utterance = "" if scene_label_only else "，".join(
                 self._split_intent_clauses(utterance)
             )
             relative_resolution = (
@@ -2617,7 +2627,12 @@ class SeatDemoService:
                 parsed,
                 excluded_control_signatures,
             )
-        parsed = apply_language_safety_guards(parsed, utterance)
+        parsed = apply_language_safety_guards(
+            parsed,
+            utterance,
+            scene_composition=assistant_plan is not None and allow_scene_composition,
+            scene_scope_utterance=scene_scope_utterance,
+        )
         parsed = self._partition_native_actions(
             parsed,
             promote_supported=(
@@ -5474,6 +5489,11 @@ class SeatDemoService:
                     and source_profile is None
                     and not requested_instruction
                 ),
+                # A revision combines a server-loaded draft with changes that
+                # already passed the ordinary text/target authorization path.
+                # Its old display name cannot veto an explicitly requested new
+                # seat. This override is internal, never accepted from payloads.
+                scene_scope_utterance="" if source_draft is not None else None,
             )
         except NativeCanCompileError:
             # Repository modes and model-composed scenes share the same native
@@ -7500,6 +7520,7 @@ class SeatDemoService:
         model_parse_source: str = "cloud_model",
         assistant_plan: dict[str, Any] | None = None,
         allow_scene_composition: bool = False,
+        scene_scope_utterance: str | None = None,
     ) -> tuple[dict[str, Any], str, str | None]:
         vehicle_profile = vehicle_profile or self.vehicle_profiles.default()
         if assistant_plan is not None and allow_scene_composition:
@@ -7561,6 +7582,7 @@ class SeatDemoService:
                 ],
                 trusted_local=trusted_local,
                 allow_scene_composition=allow_scene_composition,
+                scene_scope_utterance=scene_scope_utterance,
             )
             model = self.model_plan_adapter.adapt(
                 guarded.plan,