test: account for §9.2 matched + §8.1 start in activate/fallback e2e

The converse-deactivate (test_activate) and fallback (test_fallback)
ovoscope scenarios each gain two captured messages now that the
orchestrator emits ovos.intent.matched (§9.2) and ovos.intent.handler.
start (§8.1) natively before every dispatch — previously the spec trio
existed only as uncounted bridge-mirrors of workshop's legacy emit.

Verified on a real minicroft: the two extra messages per scenario are
exactly ovos.intent.matched + ovos.intent.handler.start (the
reserved-name converse:skill / fallback .request dispatches carry no
mycroft.skill.handler.* done-signal, so their §8 terminal resolves via
the §8.3 timeout after the end-marker, not captured). No spec-topic
double-emit: ovos.intent.matched, ovos.intent.handler.start and
ovos.utterance.handled each appear exactly once per utterance.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: JarbasAl

test/end2end/test_activate.py

@@ -13,6 +13,13 @@
 SPEC_UTTERANCE = SpecMessage.UTTERANCE.value              # ovos.utterance.handle
 LEGACY_UTTERANCE = migration_counterpart(SPEC_UTTERANCE)  # recognizer_loop:utterance
 UTTERANCE_HANDLED = SpecMessage.UTTERANCE_HANDLED.value   # ovos.utterance.handled
+# PIPELINE-1 orchestrator-emitted matched-path messages: §9.2 ovos.intent.matched
+# (before dispatch) and §8.1 ovos.intent.handler.start. The converse:skill
+# dispatch is a reserved-name dispatch with no mycroft.skill.handler.* done-signal,
+# so its §8 terminal resolves via the §8.3 timeout (after the end-marker, not
+# captured here).
+INTENT_MATCHED = SpecMessage.INTENT_MATCHED.value         # ovos.intent.matched (§9.2)
+HANDLER_START = SpecMessage.INTENT_HANDLER_START.value    # ovos.intent.handler.start (§8.1)
 
 # The two namespace paths the utterance-injecting scenario is run on.
 #   key       -> (modernize, emit_legacy, utterance_topic)
@@ -199,6 +206,16 @@ def _run_deactivate_inside_converse(self, namespace):
                 Message(f"{self.skill_id}.activate",
                         data={},
                         context={"skill_id": self.skill_id}),
+                # PIPELINE-1 §9.2: matched notification precedes the dispatch
+                Message(INTENT_MATCHED,
+                        data={"skill_id": self.skill_id,
+                              "intent_name": "converse:skill"},
+                        context={"skill_id": self.skill_id}),
+                # PIPELINE-1 §8.1: orchestrator start immediately before the dispatch
+                Message(HANDLER_START,
+                        data={"skill_id": self.skill_id,
+                              "intent_name": "skill"},
+                        context={"skill_id": self.skill_id}),
                 Message("converse:skill",
                         data={"utterances": ["deactivate skill from within converse"], "lang": session.lang,
                               "skill_id": self.skill_id},

test/end2end/test_fallback.py

@@ -23,6 +23,12 @@
 LEGACY_UTTERANCE = migration_counterpart(SPEC_UTTERANCE)
 SPEC_SPEAK = SpecMessage.SPEAK.value
 UTTERANCE_HANDLED = SpecMessage.UTTERANCE_HANDLED.value
+# PIPELINE-1 orchestrator-emitted matched-path messages: §9.2 ovos.intent.matched
+# (before dispatch) and §8.1 ovos.intent.handler.start. The fallback pipeline's
+# dispatch carries no mycroft.skill.handler.* done-signal, so its §8 terminal
+# resolves via the §8.3 timeout (after the end-marker, not captured here).
+INTENT_MATCHED = SpecMessage.INTENT_MATCHED.value
+HANDLER_START = SpecMessage.INTENT_HANDLER_START.value
 
 # key -> (modernize, emit_legacy, utterance_topic)
 NAMESPACE_PATHS = {
@@ -73,6 +79,15 @@ def _run_fallback_match(self, namespace: str) -> None:
                 Message("ovos.skills.fallback.ping",
                         {"utterances": ["hello world"], "lang": session.lang, "range": [90, 101]}),
                 Message("ovos.skills.fallback.pong", {"skill_id": self.skill_id, "can_handle": True}),
+                # PIPELINE-1 §9.2: matched notification precedes the dispatch. The
+                # fallback match_type is the .request topic; it bears no ':' so
+                # skill_id/intent_name resolve to that topic.
+                Message(INTENT_MATCHED,
+                        data={"intent_name": f"ovos.skills.fallback.{self.skill_id}.request",
+                              "utterance": "hello world", "lang": session.lang}),
+                # PIPELINE-1 §8.1: orchestrator start immediately before the dispatch
+                Message(HANDLER_START,
+                        data={"intent_name": f"ovos.skills.fallback.{self.skill_id}.request"}),
                 Message(f"ovos.skills.fallback.{self.skill_id}.request",
                         {"utterances": ["hello world"], "lang": session.lang, "range": [90, 101], "skill_id": self.skill_id}),
                 Message(f"ovos.skills.fallback.{self.skill_id}.start", {}),