ag-ui-validate 0.2.0 → 0.4.0

package/dist/cli.js

@@ -24,6 +24,7 @@ Rules:
   --off AGUI###                   shorthand for --rule AGUI###=off
   --features <a,b,...>            declare exercised features (enables e.g. AGUI305)
   --max-warnings <n>              exit 1 when warnings exceed n
+  --fail-on <error|warning|none>  severity that triggers a nonzero exit (default: error)
 
 Endpoint options:
   --header "Name: value"          extra request header (repeatable)
@@ -37,6 +38,11 @@ const SEVERITIES$1 = /* @__PURE__ */ new Set([
 	"info",
 	"off"
 ]);
+const FAIL_ON_VALUES = /* @__PURE__ */ new Set([
+	"error",
+	"warning",
+	"none"
+]);
 const RULE_ID = /^AGUI\d{3}$/;
 const FLAGS = {
 	"--help": {
@@ -97,6 +103,14 @@ const FLAGS = {
 			return null;
 		}
 	},
+	"--fail-on": {
+		takesValue: true,
+		apply: (c, v) => {
+			if (!FAIL_ON_VALUES.has(v)) return `--fail-on expects error, warning, or none, got '${v}'`;
+			c.failOn = v;
+			return null;
+		}
+	},
 	"--timeout": {
 		takesValue: true,
 		apply: (c, v) => {
@@ -206,22 +220,25 @@ function parseCliArgs(argv) {
 		config
 	};
 }
-function decideExitCode(summary, maxWarnings) {
+function decideExitCode(summary, maxWarnings, failOn = "error") {
+	if (failOn === "none") return 0;
 	if (summary.errors > 0) return 1;
+	if (failOn === "warning" && summary.warnings > 0) return 1;
 	if (maxWarnings !== void 0 && summary.warnings > maxWarnings) return 1;
 	return 0;
 }
 //#endregion
-//#region src/rules/catalog.json
+//#region ../spec/catalog.json
 var catalog_default = {
 	$comment: "AG-UI conformance rule catalog. Data, not code: a Python/Go implementation shares these rules. Severities follow the working agreement that behaviour the spec does not clearly govern is at most 'info' — entries with 'specQuestion' were downgraded accordingly; see docs/spec-questions.md.",
-	catalogVersion: "0.1.0",
+	catalogVersion: "0.4.0",
 	spec: "0.x",
 	rules: [
 		{
 			"id": "AGUI001",
 			"severity": "error",
 			"title": "Run does not start with RUN_STARTED",
+			"category": "lifecycle",
 			"messageTemplate": "First event of the run is {type}; expected RUN_STARTED",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#runstarted",
 			"specQuote": "The RunStarted event is the first event emitted when an agent begins processing a request.",
@@ -232,6 +249,7 @@ var catalog_default = {
 			"id": "AGUI002",
 			"severity": "error",
 			"title": "Multiple RUN_STARTED in one run",
+			"category": "lifecycle",
 			"messageTemplate": "Duplicate RUN_STARTED (runId '{runId}') before the active run terminated",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#lifecycle-events",
 			"specQuote": "The RunStarted and either RunFinished or RunError events are mandatory, forming the boundaries of an agent run.",
@@ -242,6 +260,7 @@ var catalog_default = {
 			"id": "AGUI003",
 			"severity": "error",
 			"title": "Run not terminated",
+			"category": "lifecycle",
 			"messageTemplate": "Run '{runId}' ended without RUN_FINISHED or RUN_ERROR",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#runfinished",
 			"specQuote": "Every run terminates with either RunFinished or RunError.",
@@ -252,6 +271,7 @@ var catalog_default = {
 			"id": "AGUI004",
 			"severity": "error",
 			"title": "Event after terminal event",
+			"category": "lifecycle",
 			"messageTemplate": "{type} follows the run's terminal {terminalType}",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#lifecycle-events",
 			"specQuote": "The RunStarted and either RunFinished or RunError events are mandatory, forming the boundaries of an agent run.",
@@ -262,6 +282,7 @@ var catalog_default = {
 			"id": "AGUI005",
 			"severity": "error",
 			"title": "RUN_FINISHED and RUN_ERROR are mutually exclusive",
+			"category": "lifecycle",
 			"messageTemplate": "{type} emitted after the run already terminated with {terminalType}",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#runfinished",
 			"specQuote": "Every run terminates with either RunFinished or RunError.",
@@ -272,6 +293,7 @@ var catalog_default = {
 			"id": "AGUI006",
 			"severity": "error",
 			"title": "STEP_FINISHED without matching STEP_STARTED",
+			"category": "lifecycle",
 			"messageTemplate": "STEP_FINISHED '{stepName}' has no open STEP_STARTED",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#stepfinished",
 			"specQuote": "The stepName must match the corresponding StepStarted event.",
@@ -282,6 +304,7 @@ var catalog_default = {
 			"id": "AGUI007",
 			"severity": "error",
 			"title": "Step unterminated at run end",
+			"category": "lifecycle",
 			"messageTemplate": "STEP_STARTED '{stepName}' never finished",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#stepstarted",
 			"specQuote": "The stepName must match the corresponding StepStarted event.",
@@ -292,6 +315,7 @@ var catalog_default = {
 			"id": "AGUI008",
 			"severity": "warning",
 			"title": "Unstable threadId/runId across the run",
+			"category": "lifecycle",
 			"messageTemplate": "RUN_FINISHED {field} '{actual}' does not match RUN_STARTED {field} '{expected}'",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#runstarted",
 			"specQuote": "It also provides crucial identifiers that can be used to associate subsequent events with this specific run.",
@@ -302,6 +326,7 @@ var catalog_default = {
 			"id": "AGUI101",
 			"severity": "error",
 			"title": "TEXT_MESSAGE_CONTENT without start",
+			"category": "text",
 			"messageTemplate": "TEXT_MESSAGE_CONTENT for messageId '{messageId}' with no open TEXT_MESSAGE_START",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#text-message-events",
 			"specQuote": "A message begins with a TextMessageStart event, followed by one or more TextMessageContent events that deliver chunks of text as they become available, and concludes with a TextMessageEnd event.",
@@ -313,6 +338,7 @@ var catalog_default = {
 			"id": "AGUI102",
 			"severity": "error",
 			"title": "TEXT_MESSAGE_END without start",
+			"category": "text",
 			"messageTemplate": "TEXT_MESSAGE_END for messageId '{messageId}' with no open TEXT_MESSAGE_START",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#textmessageend",
 			"specQuote": "messageId: Matches the ID from TextMessageStart",
@@ -324,6 +350,7 @@ var catalog_default = {
 			"id": "AGUI103",
 			"severity": "error",
 			"title": "Text message unterminated at run end",
+			"category": "text",
 			"messageTemplate": "TEXT_MESSAGE_START messageId '{messageId}' never ended",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#text-message-events",
 			"specQuote": "A message begins with a TextMessageStart event, followed by one or more TextMessageContent events that deliver chunks of text as they become available, and concludes with a TextMessageEnd event.",
@@ -335,6 +362,7 @@ var catalog_default = {
 			"id": "AGUI104",
 			"severity": "error",
 			"title": "Duplicate messageId within a run",
+			"category": "text",
 			"messageTemplate": "messageId '{messageId}' was already used by a completed message",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#textmessagestart",
 			"specQuote": "It establishes a unique messageId that will be referenced by subsequent content chunks and the end event.",
@@ -346,6 +374,7 @@ var catalog_default = {
 			"id": "AGUI105",
 			"severity": "warning",
 			"title": "Empty content delta",
+			"category": "text",
 			"messageTemplate": "TEXT_MESSAGE_CONTENT for messageId '{messageId}' has an empty delta",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#textmessagecontent",
 			"specQuote": "delta: Text content chunk (non-empty)",
@@ -358,6 +387,7 @@ var catalog_default = {
 			"id": "AGUI106",
 			"severity": "error",
 			"title": "Interleaved message streams sharing a messageId",
+			"category": "text",
 			"messageTemplate": "TEXT_MESSAGE_START for messageId '{messageId}', which is already open",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#implementation-considerations",
 			"specQuote": "Events with the same ID (e.g., messageId, toolCallId) belong to the same logical stream",
@@ -369,6 +399,7 @@ var catalog_default = {
 			"id": "AGUI201",
 			"severity": "error",
 			"title": "TOOL_CALL_ARGS without start",
+			"category": "toolcall",
 			"messageTemplate": "TOOL_CALL_ARGS for toolCallId '{toolCallId}' with no open TOOL_CALL_START",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#tool-call-events",
 			"specQuote": "When an agent needs to use a tool, it emits a ToolCallStart event, followed by one or more ToolCallArgs events that stream the arguments being passed to the tool, and concludes with a ToolCallEnd event.",
@@ -380,6 +411,7 @@ var catalog_default = {
 			"id": "AGUI202",
 			"severity": "error",
 			"title": "TOOL_CALL_END without start",
+			"category": "toolcall",
 			"messageTemplate": "TOOL_CALL_END for toolCallId '{toolCallId}' with no open TOOL_CALL_START",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#toolcallend",
 			"specQuote": "toolCallId: Matches the ID from ToolCallStart",
@@ -391,6 +423,7 @@ var catalog_default = {
 			"id": "AGUI203",
 			"severity": "error",
 			"title": "Unterminated tool call",
+			"category": "toolcall",
 			"messageTemplate": "TOOL_CALL_START id '{toolCallId}' never terminated",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#tool-call-events",
 			"specQuote": "When an agent needs to use a tool, it emits a ToolCallStart event, followed by one or more ToolCallArgs events that stream the arguments being passed to the tool, and concludes with a ToolCallEnd event.",
@@ -402,6 +435,7 @@ var catalog_default = {
 			"id": "AGUI204",
 			"severity": "error",
 			"title": "Tool call arguments are not valid JSON",
+			"category": "toolcall",
 			"messageTemplate": "Concatenated TOOL_CALL_ARGS for toolCallId '{toolCallId}' do not parse as JSON: {error}",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#toolcallargs",
 			"specQuote": "Frontends should concatenate these deltas in the order received to construct the complete arguments object.",
@@ -413,6 +447,7 @@ var catalog_default = {
 			"id": "AGUI205",
 			"severity": "error",
 			"title": "Duplicate toolCallId within a run",
+			"category": "toolcall",
 			"messageTemplate": "toolCallId '{toolCallId}' was already used by a completed tool call",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#toolcallstart",
 			"specQuote": "toolCallId: Unique identifier for the tool call",
@@ -424,6 +459,7 @@ var catalog_default = {
 			"id": "AGUI206",
 			"severity": "warning",
 			"title": "TOOL_CALL_RESULT before TOOL_CALL_END",
+			"category": "toolcall",
 			"messageTemplate": "TOOL_CALL_RESULT for toolCallId '{toolCallId}' arrived while the call is still open",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#toolcallresult",
 			"specQuote": "This event is sent after the tool has been executed by the system and contains the actual output generated by the tool.",
@@ -435,6 +471,7 @@ var catalog_default = {
 			"id": "AGUI207",
 			"severity": "error",
 			"title": "TOOL_CALL_RESULT references unknown toolCallId",
+			"category": "toolcall",
 			"messageTemplate": "TOOL_CALL_RESULT references toolCallId '{toolCallId}', which was never started",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#toolcallresult",
 			"specQuote": "toolCallId: Matches the ID from the corresponding ToolCallStart event",
@@ -446,6 +483,7 @@ var catalog_default = {
 			"id": "AGUI208",
 			"severity": "info",
 			"title": "parentMessageId references unknown message",
+			"category": "toolcall",
 			"messageTemplate": "TOOL_CALL_START parentMessageId '{parentMessageId}' matches no message observed in this stream",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#toolcallstart",
 			"specQuote": "The optional parentMessageId allows linking the tool call to a specific message in the conversation, providing context for why the tool is being used.",
@@ -458,6 +496,7 @@ var catalog_default = {
 			"id": "AGUI301",
 			"severity": "info",
 			"title": "STATE_DELTA before any STATE_SNAPSHOT",
+			"category": "state",
 			"messageTemplate": "STATE_DELTA precedes any STATE_SNAPSHOT; the base it applies to is not observable on this stream",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#statesnapshot",
 			"specQuote": "This event is typically sent at the beginning of an interaction or when synchronization is needed.",
@@ -470,6 +509,7 @@ var catalog_default = {
 			"id": "AGUI302",
 			"severity": "error",
 			"title": "STATE_DELTA failed to apply",
+			"category": "state",
 			"messageTemplate": "STATE_DELTA failed to apply: {error}",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#statedelta",
 			"specQuote": "Each delta represents specific changes to apply to the current state model.",
@@ -481,6 +521,7 @@ var catalog_default = {
 			"id": "AGUI303",
 			"severity": "error",
 			"title": "STATE_DELTA is not a valid RFC 6902 patch document",
+			"category": "state",
 			"messageTemplate": "STATE_DELTA is not a valid RFC 6902 patch document: {error}",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#statedelta",
 			"specQuote": "The StateDelta event contains incremental updates to the agent's state in the form of JSON Patch operations (as defined in RFC 6902).",
@@ -492,6 +533,7 @@ var catalog_default = {
 			"id": "AGUI304",
 			"severity": "info",
 			"title": "Mid-run STATE_SNAPSHOT discards accumulated deltas",
+			"category": "state",
 			"messageTemplate": "STATE_SNAPSHOT replaces state previously built from {deltaCount} delta(s)",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#statesnapshot",
 			"specQuote": "This event is typically sent at the beginning of an interaction or when synchronization is needed.",
@@ -503,6 +545,7 @@ var catalog_default = {
 			"id": "AGUI305",
 			"severity": "warning",
 			"title": "Shared state declared but never established",
+			"category": "state",
 			"messageTemplate": "features include 'shared-state' but no STATE_SNAPSHOT was emitted",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#state-management-events",
 			"specQuote": "These events are used to manage and synchronize the agent's state with the frontend.",
@@ -515,6 +558,7 @@ var catalog_default = {
 			"id": "AGUI401",
 			"severity": "error",
 			"title": "REASONING_MESSAGE_CONTENT without start",
+			"category": "reasoning",
 			"messageTemplate": "REASONING_MESSAGE_CONTENT for messageId '{messageId}' with no open REASONING_MESSAGE_START",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#reasoningmessagecontent",
 			"specQuote": "Multiple content events with the same messageId should be concatenated to form the complete visible reasoning.",
@@ -526,6 +570,7 @@ var catalog_default = {
 			"id": "AGUI402",
 			"severity": "warning",
 			"title": "Reasoning unterminated at run end",
+			"category": "reasoning",
 			"messageTemplate": "{startType} messageId '{messageId}' never ended",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#reasoning-events",
 			"specQuote": "Reasoning events support LLM reasoning visibility and continuity, enabling chain-of-thought reasoning while maintaining privacy.",
@@ -537,6 +582,7 @@ var catalog_default = {
 			"id": "AGUI501",
 			"severity": "error",
 			"title": "Malformed SSE framing",
+			"category": "transport",
 			"messageTemplate": "Malformed SSE framing: {detail}",
 			"specUrl": "https://html.spec.whatwg.org/multipage/server-sent-events.html#event-stream-interpretation",
 			"since": "0.x",
@@ -546,6 +592,7 @@ var catalog_default = {
 			"id": "AGUI502",
 			"severity": "error",
 			"title": "Event payload is not valid JSON",
+			"category": "transport",
 			"messageTemplate": "Event payload is not valid JSON: {error}",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#base-event-properties",
 			"specQuote": "All events share a common set of base properties.",
@@ -556,7 +603,8 @@ var catalog_default = {
 			"id": "AGUI503",
 			"severity": "error",
 			"title": "Unknown event type",
-			"messageTemplate": "Unknown event type '{type}' (not in @ag-ui/core v{sdkVersion}, and not RAW or CUSTOM)",
+			"category": "transport",
+			"messageTemplate": "Unknown event type '{type}' (not in the installed AG-UI SDK v{sdkVersion}, and not RAW or CUSTOM)",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#event-types-overview",
 			"specQuote": "Events in the protocol are categorized by their purpose.",
 			"since": "0.x",
@@ -566,6 +614,7 @@ var catalog_default = {
 			"id": "AGUI504",
 			"severity": "error",
 			"title": "Event fails schema validation for its declared type",
+			"category": "transport",
 			"messageTemplate": "{type}: {detail}",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#base-event-properties",
 			"specQuote": "All events share a common set of base properties.",
@@ -576,6 +625,7 @@ var catalog_default = {
 			"id": "AGUI505",
 			"severity": "warning",
 			"title": "Unexpected Content-Type",
+			"category": "transport",
 			"messageTemplate": "Content-Type '{contentType}' is neither text/event-stream nor application/x-ndjson",
 			"specUrl": "https://html.spec.whatwg.org/multipage/server-sent-events.html#sse-processing-model",
 			"since": "0.x",
@@ -585,6 +635,7 @@ var catalog_default = {
 			"id": "AGUI506",
 			"severity": "info",
 			"title": "No keepalive frame within the configured window",
+			"category": "transport",
 			"messageTemplate": "No event or keepalive frame for {seconds}s",
 			"specUrl": "https://docs.ag-ui.com/concepts/architecture#standard-http-client",
 			"since": "0.x",
@@ -595,6 +646,7 @@ var catalog_default = {
 			"id": "AGUI507",
 			"severity": "info",
 			"title": "Response appears buffered rather than incrementally flushed",
+			"category": "transport",
 			"messageTemplate": "Response appears buffered: {detail}",
 			"specUrl": "https://docs.ag-ui.com/concepts/architecture#standard-http-client",
 			"since": "0.x",
@@ -605,16 +657,85 @@ var catalog_default = {
 			"id": "AGUI508",
 			"severity": "error",
 			"title": "Stream ended without a terminal event",
+			"category": "transport",
 			"messageTemplate": "Connection ended mid-run '{runId}' without RUN_FINISHED or RUN_ERROR",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#runfinished",
 			"specQuote": "Every run terminates with either RunFinished or RunError.",
 			"since": "0.x",
 			"checkedIn": "transport"
 		},
+		{
+			"id": "AGUI601",
+			"severity": "error",
+			"title": "Duplicate SUBAGENT_STARTED for a subagentRunId",
+			"category": "subagent",
+			"messageTemplate": "SUBAGENT_STARTED reuses subagentRunId '{subagentRunId}', which is already in use this run",
+			"specUrl": "https://docs.ag-ui.com/concepts/subagents#rules-clients-enforce",
+			"specQuote": "a subagent is not started twice within a run",
+			"since": "0.x",
+			"checkedIn": "core"
+		},
+		{
+			"id": "AGUI602",
+			"severity": "error",
+			"title": "SUBAGENT_FINISHED without matching SUBAGENT_STARTED",
+			"category": "subagent",
+			"messageTemplate": "SUBAGENT_FINISHED for subagentRunId '{subagentRunId}' with no open SUBAGENT_STARTED",
+			"specUrl": "https://docs.ag-ui.com/concepts/subagents#rules-clients-enforce",
+			"specQuote": "SubagentFinished and SubagentError name a subagent that is currently active",
+			"since": "0.x",
+			"checkedIn": "core"
+		},
+		{
+			"id": "AGUI603",
+			"severity": "error",
+			"title": "SUBAGENT_ERROR without matching SUBAGENT_STARTED",
+			"category": "subagent",
+			"messageTemplate": "SUBAGENT_ERROR for subagentRunId '{subagentRunId}' with no open SUBAGENT_STARTED",
+			"specUrl": "https://docs.ag-ui.com/concepts/subagents#rules-clients-enforce",
+			"specQuote": "SubagentFinished and SubagentError name a subagent that is currently active",
+			"since": "0.x",
+			"checkedIn": "core"
+		},
+		{
+			"id": "AGUI604",
+			"severity": "error",
+			"title": "Subagent unterminated at run end",
+			"category": "subagent",
+			"messageTemplate": "SUBAGENT_STARTED subagentRunId '{subagentRunId}' never closed with SUBAGENT_FINISHED or SUBAGENT_ERROR",
+			"specUrl": "https://docs.ag-ui.com/concepts/subagents#rules-clients-enforce",
+			"specQuote": "Every started subagent is closed before RunFinished.",
+			"since": "0.x",
+			"checkedIn": "core"
+		},
+		{
+			"id": "AGUI605",
+			"severity": "warning",
+			"title": "parentSubagentRunId references a subagent never started",
+			"category": "subagent",
+			"messageTemplate": "SUBAGENT_STARTED parentSubagentRunId '{parentSubagentRunId}' matches no subagent observed in this stream",
+			"specUrl": "https://docs.ag-ui.com/concepts/subagents#nesting-and-concurrency",
+			"specQuote": "parentSubagentRunId need only name a subagent that has been started, not one still active",
+			"since": "0.x",
+			"checkedIn": "core"
+		},
+		{
+			"id": "AGUI606",
+			"severity": "warning",
+			"title": "Continuation event's subagentRunId disagrees with its entity's owner",
+			"category": "subagent",
+			"messageTemplate": "{type} declares subagentRunId '{actual}', but {entityType} '{entityId}' was opened under {expected}",
+			"specUrl": "https://docs.ag-ui.com/concepts/subagents#rules-clients-enforce",
+			"specQuote": "Continuation and close events agree with the owner their entity was created under.",
+			"since": "0.x",
+			"specQuestion": "SQ-15",
+			"checkedIn": "core"
+		},
 		{
 			"id": "AGUI901",
 			"severity": "info",
 			"title": "RAW event wraps a typed AG-UI event",
+			"category": "hygiene",
 			"messageTemplate": "RAW event wraps an event of type '{wrappedType}', which has a typed AG-UI equivalent",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#raw",
 			"specQuote": "The Raw event acts as a container for events originating from external systems or sources that don't natively follow the Agent UI Protocol.",
@@ -625,6 +746,7 @@ var catalog_default = {
 			"id": "AGUI902",
 			"severity": "info",
 			"title": "Events carry no timestamps",
+			"category": "hygiene",
 			"messageTemplate": "None of the {eventCount} events carry the optional timestamp property",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#base-event-properties",
 			"specQuote": "timestamp: Optional timestamp indicating when the event was created",
@@ -635,6 +757,7 @@ var catalog_default = {
 			"id": "AGUI903",
 			"severity": "info",
 			"title": "CUSTOM event name is not namespaced",
+			"category": "hygiene",
 			"messageTemplate": "CUSTOM event name '{name}' has no namespace prefix (e.g. 'vendor.event')",
 			"specUrl": "https://docs.ag-ui.com/concepts/events#custom",
 			"specQuote": "Teams should document their custom events to ensure consistent implementation across frontends and agents.",
@@ -652,6 +775,16 @@ const SEVERITIES = [
 	"info"
 ];
 const LAYERS = ["core", "transport"];
+const CATEGORIES = [
+	"lifecycle",
+	"text",
+	"toolcall",
+	"state",
+	"reasoning",
+	"transport",
+	"hygiene",
+	"subagent"
+];
 /** Validates catalog data and returns it typed. Throws on structural problems. */
 function validateCatalog(data) {
 	const problems = [];
@@ -665,6 +798,7 @@ function validateCatalog(data) {
 		seen.add(rule.id);
 		if (!SEVERITIES.includes(rule.severity)) problems.push(`${where}: bad severity '${rule.severity}'`);
 		if (!rule.title) problems.push(`${where}: missing title`);
+		if (!CATEGORIES.includes(rule.category)) problems.push(`${where}: bad category '${rule.category}'`);
 		if (!rule.messageTemplate) problems.push(`${where}: missing messageTemplate`);
 		if (!rule.specUrl?.startsWith("https://")) problems.push(`${where}: specUrl must be an https URL`);
 		if (!rule.since) problems.push(`${where}: missing since`);
@@ -765,9 +899,17 @@ function formatReportSummary(report, opts) {
 //#endregion
 //#region src/report/json.ts
 function toJsonReport(report, opts) {
+	const diagnostics = report.diagnostics.map((d) => {
+		const category = RULES.get(d.rule)?.category;
+		return category === void 0 ? { ...d } : {
+			...d,
+			category
+		};
+	});
 	const doc = {
 		tool: opts.tool,
-		...report
+		...report,
+		diagnostics
 	};
 	if (opts.target !== void 0) doc.target = opts.target;
 	return doc;
@@ -791,6 +933,7 @@ function toSarif(report, opts) {
 		if (catalog !== void 0) {
 			entry.shortDescription = { text: catalog.title };
 			entry.defaultConfiguration = { level: LEVEL[catalog.severity] };
+			entry.properties = { tags: [catalog.category] };
 		}
 		rules.set(d.rule, entry);
 	}
@@ -854,13 +997,17 @@ function toJUnit(report, opts) {
 //#endregion
 //#region src/protocol/event-table.ts
 /** Version of @ag-ui/core this table was derived from. */
-const SDK_VERSION = "0.0.58";
+const SDK_VERSION = "0.0.59";
 /** Canonical wire event types and their schemas, derived from @ag-ui/core. */
 const EVENT_TABLE = {
 	"TEXT_MESSAGE_START": {
 		category: "text",
 		specUrl: "https://docs.ag-ui.com/concepts/events#textmessagestart",
 		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
 			"messageId": {
 				kind: "string",
 				required: true
@@ -878,6 +1025,10 @@ const EVENT_TABLE = {
 			"name": {
 				kind: "string",
 				required: false
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
 			}
 		}
 	},
@@ -885,6 +1036,10 @@ const EVENT_TABLE = {
 		category: "text",
 		specUrl: "https://docs.ag-ui.com/concepts/events#textmessagecontent",
 		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
 			"messageId": {
 				kind: "string",
 				required: true
@@ -892,21 +1047,39 @@ const EVENT_TABLE = {
 			"delta": {
 				kind: "string",
 				required: true
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
 			}
 		}
 	},
 	"TEXT_MESSAGE_END": {
 		category: "text",
 		specUrl: "https://docs.ag-ui.com/concepts/events#textmessageend",
-		fields: { "messageId": {
-			kind: "string",
-			required: true
-		} }
+		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
+			"messageId": {
+				kind: "string",
+				required: true
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
+			}
+		}
 	},
 	"TEXT_MESSAGE_CHUNK": {
 		category: "text",
 		specUrl: "https://docs.ag-ui.com/concepts/events#textmessagechunk",
 		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
 			"messageId": {
 				kind: "string",
 				required: false
@@ -928,6 +1101,10 @@ const EVENT_TABLE = {
 			"name": {
 				kind: "string",
 				required: false
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
 			}
 		}
 	},
@@ -935,6 +1112,10 @@ const EVENT_TABLE = {
 		category: "toolcall",
 		specUrl: "https://docs.ag-ui.com/concepts/events#toolcallstart",
 		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
 			"toolCallId": {
 				kind: "string",
 				required: true
@@ -946,6 +1127,10 @@ const EVENT_TABLE = {
 			"parentMessageId": {
 				kind: "string",
 				required: false
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
 			}
 		}
 	},
@@ -953,6 +1138,10 @@ const EVENT_TABLE = {
 		category: "toolcall",
 		specUrl: "https://docs.ag-ui.com/concepts/events#toolcallargs",
 		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
 			"toolCallId": {
 				kind: "string",
 				required: true
@@ -960,21 +1149,39 @@ const EVENT_TABLE = {
 			"delta": {
 				kind: "string",
 				required: true
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
 			}
 		}
 	},
 	"TOOL_CALL_END": {
 		category: "toolcall",
 		specUrl: "https://docs.ag-ui.com/concepts/events#toolcallend",
-		fields: { "toolCallId": {
-			kind: "string",
-			required: true
-		} }
+		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
+			"toolCallId": {
+				kind: "string",
+				required: true
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
+			}
+		}
 	},
 	"TOOL_CALL_CHUNK": {
 		category: "toolcall",
 		specUrl: "https://docs.ag-ui.com/concepts/events#toolcallchunk",
 		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
 			"toolCallId": {
 				kind: "string",
 				required: false
@@ -990,6 +1197,10 @@ const EVENT_TABLE = {
 			"delta": {
 				kind: "string",
 				required: false
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
 			}
 		}
 	},
@@ -997,6 +1208,10 @@ const EVENT_TABLE = {
 		category: "toolcall",
 		specUrl: "https://docs.ag-ui.com/concepts/events#toolcallresult",
 		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
 			"messageId": {
 				kind: "string",
 				required: true
@@ -1013,6 +1228,10 @@ const EVENT_TABLE = {
 				kind: "string",
 				required: false,
 				enum: ["tool"]
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
 			}
 		}
 	},
@@ -1020,66 +1239,117 @@ const EVENT_TABLE = {
 		category: "thinking",
 		deprecated: "REASONING_START",
 		specUrl: "https://docs.ag-ui.com/concepts/events#thinking-events-deprecated",
-		fields: { "title": {
-			kind: "string",
-			required: false
-		} }
+		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
+			"title": {
+				kind: "string",
+				required: false
+			}
+		}
 	},
 	"THINKING_END": {
 		category: "thinking",
 		deprecated: "REASONING_END",
 		specUrl: "https://docs.ag-ui.com/concepts/events#thinking-events-deprecated",
-		fields: {}
+		fields: { "metadata": {
+			kind: "object",
+			required: false
+		} }
 	},
 	"THINKING_TEXT_MESSAGE_START": {
 		category: "thinking",
 		deprecated: "REASONING_MESSAGE_START",
 		specUrl: "https://docs.ag-ui.com/concepts/events#thinking-events-deprecated",
-		fields: {}
+		fields: { "metadata": {
+			kind: "object",
+			required: false
+		} }
 	},
 	"THINKING_TEXT_MESSAGE_CONTENT": {
 		category: "thinking",
 		deprecated: "REASONING_MESSAGE_CONTENT",
 		specUrl: "https://docs.ag-ui.com/concepts/events#thinking-events-deprecated",
-		fields: { "delta": {
-			kind: "string",
-			required: true
-		} }
+		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
+			"delta": {
+				kind: "string",
+				required: true
+			}
+		}
 	},
 	"THINKING_TEXT_MESSAGE_END": {
 		category: "thinking",
 		deprecated: "REASONING_MESSAGE_END",
 		specUrl: "https://docs.ag-ui.com/concepts/events#thinking-events-deprecated",
-		fields: {}
+		fields: { "metadata": {
+			kind: "object",
+			required: false
+		} }
 	},
 	"STATE_SNAPSHOT": {
 		category: "state",
 		specUrl: "https://docs.ag-ui.com/concepts/events#statesnapshot",
-		fields: { "snapshot": {
-			kind: "any",
-			required: true
-		} }
+		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
+			"snapshot": {
+				kind: "any",
+				required: true
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
+			}
+		}
 	},
 	"STATE_DELTA": {
 		category: "state",
 		specUrl: "https://docs.ag-ui.com/concepts/events#statedelta",
-		fields: { "delta": {
-			kind: "array",
-			required: true
-		} }
+		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
+			"delta": {
+				kind: "array",
+				required: true
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
+			}
+		}
 	},
 	"MESSAGES_SNAPSHOT": {
 		category: "state",
 		specUrl: "https://docs.ag-ui.com/concepts/events#messagessnapshot",
-		fields: { "messages": {
-			kind: "array",
-			required: true
-		} }
+		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
+			"messages": {
+				kind: "array",
+				required: true
+			}
+		}
 	},
 	"ACTIVITY_SNAPSHOT": {
 		category: "activity",
 		specUrl: "https://docs.ag-ui.com/concepts/events#activitysnapshot",
 		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
 			"messageId": {
 				kind: "string",
 				required: true
@@ -1095,6 +1365,10 @@ const EVENT_TABLE = {
 			"replace": {
 				kind: "boolean",
 				required: false
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
 			}
 		}
 	},
@@ -1102,6 +1376,10 @@ const EVENT_TABLE = {
 		category: "activity",
 		specUrl: "https://docs.ag-ui.com/concepts/events#activitydelta",
 		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
 			"messageId": {
 				kind: "string",
 				required: true
@@ -1113,6 +1391,10 @@ const EVENT_TABLE = {
 			"patch": {
 				kind: "array",
 				required: true
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
 			}
 		}
 	},
@@ -1120,6 +1402,10 @@ const EVENT_TABLE = {
 		category: "special",
 		specUrl: "https://docs.ag-ui.com/concepts/events#raw",
 		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
 			"event": {
 				kind: "any",
 				required: true
@@ -1127,6 +1413,10 @@ const EVENT_TABLE = {
 			"source": {
 				kind: "string",
 				required: false
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
 			}
 		}
 	},
@@ -1134,6 +1424,10 @@ const EVENT_TABLE = {
 		category: "special",
 		specUrl: "https://docs.ag-ui.com/concepts/events#custom",
 		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
 			"name": {
 				kind: "string",
 				required: true
@@ -1141,6 +1435,10 @@ const EVENT_TABLE = {
 			"value": {
 				kind: "any",
 				required: true
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
 			}
 		}
 	},
@@ -1148,6 +1446,10 @@ const EVENT_TABLE = {
 		category: "lifecycle",
 		specUrl: "https://docs.ag-ui.com/concepts/events#runstarted",
 		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
 			"threadId": {
 				kind: "string",
 				required: true
@@ -1170,6 +1472,10 @@ const EVENT_TABLE = {
 		category: "lifecycle",
 		specUrl: "https://docs.ag-ui.com/concepts/events#runfinished",
 		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
 			"threadId": {
 				kind: "string",
 				required: true
@@ -1196,6 +1502,10 @@ const EVENT_TABLE = {
 		category: "lifecycle",
 		specUrl: "https://docs.ag-ui.com/concepts/events#runerror",
 		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
 			"message": {
 				kind: "string",
 				required: true
@@ -1213,31 +1523,65 @@ const EVENT_TABLE = {
 	"STEP_STARTED": {
 		category: "lifecycle",
 		specUrl: "https://docs.ag-ui.com/concepts/events#stepstarted",
-		fields: { "stepName": {
-			kind: "string",
-			required: true
-		} }
+		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
+			"stepName": {
+				kind: "string",
+				required: true
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
+			}
+		}
 	},
 	"STEP_FINISHED": {
 		category: "lifecycle",
 		specUrl: "https://docs.ag-ui.com/concepts/events#stepfinished",
-		fields: { "stepName": {
-			kind: "string",
-			required: true
-		} }
+		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
+			"stepName": {
+				kind: "string",
+				required: true
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
+			}
+		}
 	},
 	"REASONING_START": {
 		category: "reasoning",
 		specUrl: "https://docs.ag-ui.com/concepts/events#reasoningstart",
-		fields: { "messageId": {
-			kind: "string",
-			required: true
-		} }
+		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
+			"messageId": {
+				kind: "string",
+				required: true
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
+			}
+		}
 	},
 	"REASONING_MESSAGE_START": {
 		category: "reasoning",
 		specUrl: "https://docs.ag-ui.com/concepts/events#reasoningmessagestart",
 		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
 			"messageId": {
 				kind: "string",
 				required: true
@@ -1246,6 +1590,10 @@ const EVENT_TABLE = {
 				kind: "string",
 				required: true,
 				enum: ["reasoning"]
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
 			}
 		}
 	},
@@ -1253,6 +1601,10 @@ const EVENT_TABLE = {
 		category: "reasoning",
 		specUrl: "https://docs.ag-ui.com/concepts/events#reasoningmessagecontent",
 		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
 			"messageId": {
 				kind: "string",
 				required: true
@@ -1260,21 +1612,39 @@ const EVENT_TABLE = {
 			"delta": {
 				kind: "string",
 				required: true
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
 			}
 		}
 	},
 	"REASONING_MESSAGE_END": {
 		category: "reasoning",
 		specUrl: "https://docs.ag-ui.com/concepts/events#reasoningmessageend",
-		fields: { "messageId": {
-			kind: "string",
-			required: true
-		} }
+		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
+			"messageId": {
+				kind: "string",
+				required: true
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
+			}
+		}
 	},
 	"REASONING_MESSAGE_CHUNK": {
 		category: "reasoning",
 		specUrl: "https://docs.ag-ui.com/concepts/events#reasoningmessagechunk",
 		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
 			"messageId": {
 				kind: "string",
 				required: false
@@ -1282,21 +1652,39 @@ const EVENT_TABLE = {
 			"delta": {
 				kind: "string",
 				required: false
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
 			}
 		}
 	},
 	"REASONING_END": {
 		category: "reasoning",
 		specUrl: "https://docs.ag-ui.com/concepts/events#reasoningend",
-		fields: { "messageId": {
-			kind: "string",
-			required: true
-		} }
+		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
+			"messageId": {
+				kind: "string",
+				required: true
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
+			}
+		}
 	},
 	"REASONING_ENCRYPTED_VALUE": {
 		category: "reasoning",
 		specUrl: "https://docs.ag-ui.com/concepts/events#reasoningencryptedvalue",
 		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
 			"subtype": {
 				kind: "string",
 				required: true,
@@ -1309,6 +1697,88 @@ const EVENT_TABLE = {
 			"encryptedValue": {
 				kind: "string",
 				required: true
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: false
+			}
+		}
+	},
+	"SUBAGENT_STARTED": {
+		category: "subagent",
+		specUrl: "https://docs.ag-ui.com/concepts/events#subagent-events",
+		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: true
+			},
+			"name": {
+				kind: "string",
+				required: true
+			},
+			"description": {
+				kind: "string",
+				required: false
+			},
+			"parentSubagentRunId": {
+				kind: "string",
+				required: false
+			},
+			"parentToolCallId": {
+				kind: "string",
+				required: false
+			},
+			"parentMessageId": {
+				kind: "string",
+				required: false
+			}
+		}
+	},
+	"SUBAGENT_FINISHED": {
+		category: "subagent",
+		specUrl: "https://docs.ag-ui.com/concepts/events#subagent-events",
+		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: true
+			},
+			"result": {
+				kind: "any",
+				required: false
+			},
+			"outcome": {
+				kind: "object",
+				required: false
+			}
+		}
+	},
+	"SUBAGENT_ERROR": {
+		category: "subagent",
+		specUrl: "https://docs.ag-ui.com/concepts/events#subagent-events",
+		fields: {
+			"metadata": {
+				kind: "object",
+				required: false
+			},
+			"subagentRunId": {
+				kind: "string",
+				required: true
+			},
+			"message": {
+				kind: "string",
+				required: true
+			},
+			"code": {
+				kind: "string",
+				required: false
 			}
 		}
 	}
@@ -1329,10 +1799,14 @@ function newRunState(init) {
 		openMessages: /* @__PURE__ */ new Map(),
 		closedMessages: /* @__PURE__ */ new Map(),
 		knownMessageIds: /* @__PURE__ */ new Set(),
+		messageOwner: /* @__PURE__ */ new Map(),
 		openToolCalls: /* @__PURE__ */ new Map(),
 		closedToolCalls: /* @__PURE__ */ new Map(),
 		knownToolCallIds: /* @__PURE__ */ new Set(),
 		openSteps: /* @__PURE__ */ new Map(),
+		openSubagents: /* @__PURE__ */ new Map(),
+		closedSubagents: /* @__PURE__ */ new Map(),
+		knownSubagentRunIds: /* @__PURE__ */ new Set(),
 		openReasoningBlocks: /* @__PURE__ */ new Map(),
 		openReasoningMessages: /* @__PURE__ */ new Map(),
 		state: {
@@ -1352,6 +1826,21 @@ function str(event, field) {
 	const v = event[field];
 	return typeof v === "string" ? v : void 0;
 }
+/** AGUI606 — a continuation/close event's explicit subagentRunId must agree
+* with the owner recorded when its entity opened. Only compared when the
+* event explicitly tags itself; omitting the field is never flagged (SQ-15).
+* Shared by text/toolcalls/lifecycle — not the *_CHUNK forms or
+* TOOL_CALL_RESULT, which are independently attributed by spec. */
+function checkOwnerConsistency(emit, type, entityType, entityId, event, owner) {
+	const actual = str(event, "subagentRunId");
+	if (actual !== void 0 && actual !== owner) emit("AGUI606", {
+		type,
+		actual,
+		entityType,
+		entityId,
+		expected: owner !== void 0 ? `'${owner}'` : "the run"
+	}, { pointer: "/subagentRunId" });
+}
 //#endregion
 //#region src/rules/checks/lifecycle.ts
 function handleStepEvent(api) {
@@ -1363,7 +1852,8 @@ function handleStepEvent(api) {
 		if (open !== void 0) open.count += 1;
 		else run.openSteps.set(stepName, {
 			count: 1,
-			firstIndex: index
+			firstIndex: index,
+			owner: str(event, "subagentRunId")
 		});
 		return;
 	}
@@ -1373,6 +1863,7 @@ function handleStepEvent(api) {
 			emit("AGUI006", { stepName }, { pointer: "/stepName" });
 			return;
 		}
+		checkOwnerConsistency(emit, type, "stepName", stepName, event, open.owner);
 		open.count -= 1;
 		if (open.count === 0) run.openSteps.delete(stepName);
 	}
@@ -1775,6 +2266,76 @@ function handleStateEvent(api) {
 	}
 }
 //#endregion
+//#region src/rules/checks/subagents.ts
+function handleSubagentEvent(api) {
+	const { type, event, run, emit, index } = api;
+	switch (type) {
+		case "SUBAGENT_STARTED": {
+			const id = str(event, "subagentRunId");
+			if (id === void 0) return;
+			run.knownSubagentRunIds.add(id);
+			const open = run.openSubagents.get(id);
+			if (open !== void 0) {
+				emit("AGUI601", { subagentRunId: id }, {
+					pointer: "/subagentRunId",
+					relatedEventIndex: open.startIndex
+				});
+				return;
+			}
+			const closed = run.closedSubagents.get(id);
+			if (closed !== void 0 && !closed.resumable) {
+				emit("AGUI601", { subagentRunId: id }, {
+					pointer: "/subagentRunId",
+					relatedEventIndex: closed.index
+				});
+				return;
+			}
+			run.openSubagents.set(id, { startIndex: index });
+			if (closed !== void 0) run.closedSubagents.delete(id);
+			const parent = str(event, "parentSubagentRunId");
+			if (parent !== void 0 && !run.knownSubagentRunIds.has(parent)) emit("AGUI605", { parentSubagentRunId: parent }, { pointer: "/parentSubagentRunId" });
+			return;
+		}
+		case "SUBAGENT_FINISHED": {
+			const id = str(event, "subagentRunId");
+			if (id === void 0) return;
+			if (run.openSubagents.get(id) === void 0) {
+				emit("AGUI602", { subagentRunId: id }, { pointer: "/subagentRunId" });
+				return;
+			}
+			run.openSubagents.delete(id);
+			const outcome = event.outcome;
+			const resumable = typeof outcome === "object" && outcome !== null && outcome.type === "suspended";
+			run.closedSubagents.set(id, {
+				index,
+				resumable
+			});
+			return;
+		}
+		case "SUBAGENT_ERROR": {
+			const id = str(event, "subagentRunId");
+			if (id === void 0) return;
+			if (run.openSubagents.get(id) === void 0) {
+				emit("AGUI603", { subagentRunId: id }, { pointer: "/subagentRunId" });
+				return;
+			}
+			run.openSubagents.delete(id);
+			run.closedSubagents.set(id, {
+				index,
+				resumable: false
+			});
+			return;
+		}
+	}
+}
+/** AGUI604 — open subagents when the run reaches a clean end. */
+function endOfRunSubagents(run, emit, atIndex) {
+	for (const [id, open] of run.openSubagents) emit("AGUI604", { subagentRunId: id }, {
+		eventIndex: atIndex,
+		relatedEventIndex: open.startIndex
+	});
+}
+//#endregion
 //#region src/rules/checks/text.ts
 function handleTextEvent(api) {
 	const { type, event, run, emit, index } = api;
@@ -1797,8 +2358,13 @@ function handleTextEvent(api) {
 				});
 				return;
 			}
-			run.openMessages.set(id, { startIndex: index });
+			const owner = str(event, "subagentRunId");
+			run.openMessages.set(id, {
+				startIndex: index,
+				owner
+			});
 			run.knownMessageIds.add(id);
+			run.messageOwner.set(id, owner);
 			return;
 		}
 		case "TEXT_MESSAGE_CONTENT": {
@@ -1817,15 +2383,18 @@ function handleTextEvent(api) {
 				pointer: "/delta",
 				relatedEventIndex: open.startIndex
 			});
+			checkOwnerConsistency(emit, type, "messageId", id, event, open.owner);
 			return;
 		}
 		case "TEXT_MESSAGE_END": {
 			const id = str(event, "messageId");
 			if (id === void 0) return;
-			if (!run.openMessages.has(id)) {
+			const open = run.openMessages.get(id);
+			if (open === void 0) {
 				emit("AGUI102", { messageId: id }, { pointer: "/messageId" });
 				return;
 			}
+			checkOwnerConsistency(emit, type, "messageId", id, event, open.owner);
 			run.openMessages.delete(id);
 			run.closedMessages.set(id, index);
 			return;
@@ -1854,6 +2423,7 @@ function handleTextEvent(api) {
 				startIndex: index
 			};
 			run.knownMessageIds.add(id);
+			run.messageOwner.set(id, str(event, "subagentRunId"));
 			return;
 		}
 	}
@@ -1888,12 +2458,14 @@ function handleToolCallEvent(api) {
 				});
 				return;
 			}
+			const parent = str(event, "parentMessageId");
+			const owner = str(event, "subagentRunId") ?? (parent !== void 0 ? run.messageOwner.get(parent) : void 0);
 			run.openToolCalls.set(id, {
 				startIndex: index,
 				args: "",
-				sawArgs: false
+				sawArgs: false,
+				owner
 			});
-			const parent = str(event, "parentMessageId");
 			if (parent !== void 0 && !run.knownMessageIds.has(parent)) emit("AGUI208", { parentMessageId: parent }, { pointer: "/parentMessageId" });
 			return;
 		}
@@ -1910,6 +2482,7 @@ function handleToolCallEvent(api) {
 				open.args += delta;
 				open.sawArgs = true;
 			}
+			checkOwnerConsistency(emit, type, "toolCallId", id, event, open.owner);
 			return;
 		}
 		case "TOOL_CALL_END": {
@@ -1920,6 +2493,7 @@ function handleToolCallEvent(api) {
 				emit("AGUI202", { toolCallId: id }, { pointer: "/toolCallId" });
 				return;
 			}
+			checkOwnerConsistency(emit, type, "toolCallId", id, event, open.owner);
 			run.openToolCalls.delete(id);
 			run.closedToolCalls.set(id, index);
 			checkArgsJson(id, open, emit, index);
@@ -2142,6 +2716,7 @@ function createValidator(opts = {}) {
 		endOfRunToolCalls(r, emit, atIndex);
 		endOfRunSteps(r, emit, atIndex);
 		endOfRunReasoning(r, emit, atIndex);
+		endOfRunSubagents(r, emit, atIndex);
 	}
 	/** Opens the implicit run scope for streams that never announced one. */
 	function ensureRun(index, type, emit) {
@@ -2292,6 +2867,9 @@ function createValidator(opts = {}) {
 				break;
 			case "thinking": break;
 			case "activity": break;
+			case "subagent":
+				handleSubagentEvent(a);
+				break;
 			case "special": if (type === "RAW") {
 				const wrapped = ev.event;
 				if (typeof wrapped === "object" && wrapped !== null) {
@@ -2820,7 +3398,7 @@ async function main() {
 		process.stdout.write(`${JSON.stringify(doc, null, 2)}\n`);
 	} else if (config.format === "sarif") process.stdout.write(`${JSON.stringify(toSarif(report, sarifOptions), null, 2)}\n`);
 	else process.stdout.write(toJUnit(report, { name: targetLabel }));
-	return decideExitCode(report.summary, config.maxWarnings);
+	return decideExitCode(report.summary, config.maxWarnings, config.failOn);
 }
 main().then((code) => {
 	process.exitCode = code;