ag-ui-validate 0.2.0 → 0.4.0

package/{src → js/src}/cli-args.ts

@@ -3,6 +3,7 @@
 import type { Severity } from "./types.js"
 
 export type CliFormat = "pretty" | "json" | "sarif" | "junit"
+export type FailOn = "error" | "warning" | "none"
 
 export interface CliConfig {
   /** URL, file path, or "-" for stdin. Empty only with --help/--version. */
@@ -11,6 +12,8 @@ export interface CliConfig {
   /** true/false forced; null = auto-detect from TTY. */
   color: boolean | null
   maxWarnings?: number
+  /** Severity threshold for a nonzero exit. Unset behaves like "error", today's default. */
+  failOn?: FailOn
   timeoutMs?: number
   /** Header names lowercased. */
   headers: Record<string, string>
@@ -50,6 +53,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)
@@ -59,6 +63,7 @@ Exit codes: 0 clean, 1 findings at error level (or warnings over --max-warnings)
 `
 
 const SEVERITIES = new Set(["error", "warning", "info", "off"])
+const FAIL_ON_VALUES = new Set<FailOn>(["error", "warning", "none"])
 const RULE_ID = /^AGUI\d{3}$/
 
 interface Flag {
@@ -106,6 +111,14 @@ const FLAGS: Record<string, Flag> = {
       return null
     },
   },
+  "--fail-on": {
+    takesValue: true,
+    apply: (c, v) => {
+      if (!FAIL_ON_VALUES.has(v as FailOn)) return `--fail-on expects error, warning, or none, got '${v}'`
+      c.failOn = v as FailOn
+      return null
+    },
+  },
   "--timeout": {
     takesValue: true,
     apply: (c, v) => {
@@ -206,8 +219,11 @@ export function parseCliArgs(argv: string[]): ParseResult {
 export function decideExitCode(
   summary: { errors: number; warnings: number; info: number },
   maxWarnings?: number,
+  failOn: FailOn = "error",
 ): 0 | 1 {
+  if (failOn === "none") return 0
   if (summary.errors > 0) return 1
+  if (failOn === "warning" && summary.warnings > 0) return 1
   if (maxWarnings !== undefined && summary.warnings > maxWarnings) return 1
   return 0
 }

package/{src → js/src}/cli.ts

@@ -132,7 +132,7 @@ async function main(): Promise<number> {
     process.stdout.write(toJUnit(report, { name: targetLabel }))
   }
 
-  return decideExitCode(report.summary, config.maxWarnings)
+  return decideExitCode(report.summary, config.maxWarnings, config.failOn)
 }
 
 main().then(

package/{src → js/src}/index.ts

@@ -14,6 +14,7 @@ import { newRunState, str } from "./rules/checks/context.js"
 import { checkRunIdStability, endOfRunSteps, handleStepEvent } from "./rules/checks/lifecycle.js"
 import { closeReasoningChunk, endOfRunReasoning, handleReasoningEvent } from "./rules/checks/reasoning.js"
 import { handleStateEvent } from "./rules/checks/state.js"
+import { endOfRunSubagents, handleSubagentEvent } from "./rules/checks/subagents.js"
 import { closeTextChunk, endOfRunText, handleTextEvent } from "./rules/checks/text.js"
 import { closeToolChunk, endOfRunToolCalls, handleToolCallEvent } from "./rules/checks/toolcalls.js"
 import { TRANSPORT_RULE_IDS, TRANSPORT_SKIP_REASON } from "./rules/checks/transport.js"
@@ -156,6 +157,7 @@ export function createValidator(opts: ValidatorOptions = {}): Validator {
     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. */
@@ -325,6 +327,9 @@ export function createValidator(opts: ValidatorOptions = {}): Validator {
       case "activity":
         // No activity rules in the catalog yet.
         break
+      case "subagent":
+        handleSubagentEvent(a)
+        break
       case "special":
         if (type === "RAW") {
           const wrapped = ev.event

package/{src → js/src}/protocol/event-table.ts

@@ -1,4 +1,4 @@
-// AUTO-GENERATED from @ag-ui/core v0.0.58 — do not edit by hand.
+// AUTO-GENERATED from @ag-ui/core v0.0.59 — do not edit by hand.
 // Regenerate with: node scripts/generate-event-table.mjs
 // test/protocol-drift.test.ts fails if this file drifts from the installed SDK.
 
@@ -13,6 +13,7 @@ export type EventCategory =
   | "reasoning"
   | "thinking"
   | "special"
+  | "subagent"
 
 export interface FieldSpec {
   kind: FieldKind
@@ -31,7 +32,7 @@ export interface EventSpec {
 }
 
 /** Version of @ag-ui/core this table was derived from. */
-export const SDK_VERSION = "0.0.58"
+export const SDK_VERSION = "0.0.59"
 
 /** Canonical wire event types and their schemas, derived from @ag-ui/core. */
 export const EVENT_TABLE: Readonly<Record<string, EventSpec>> = {
@@ -39,78 +40,96 @@ export const EVENT_TABLE: Readonly<Record<string, EventSpec>> = {
     category: "text",
     specUrl: "https://docs.ag-ui.com/concepts/events#textmessagestart",
     fields: {
+      "metadata": { kind: "object", required: false },
       "messageId": { kind: "string", required: true },
       "role": { kind: "string", required: false, enum: ["developer","system","assistant","user"] },
       "name": { kind: "string", required: false },
+      "subagentRunId": { kind: "string", required: false },
     },
   },
   "TEXT_MESSAGE_CONTENT": {
     category: "text",
     specUrl: "https://docs.ag-ui.com/concepts/events#textmessagecontent",
     fields: {
+      "metadata": { kind: "object", required: false },
       "messageId": { kind: "string", required: true },
       "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: {
+      "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 },
       "role": { kind: "string", required: false, enum: ["developer","system","assistant","user"] },
       "delta": { kind: "string", required: false },
       "name": { kind: "string", required: false },
+      "subagentRunId": { kind: "string", required: false },
     },
   },
   "TOOL_CALL_START": {
     category: "toolcall",
     specUrl: "https://docs.ag-ui.com/concepts/events#toolcallstart",
     fields: {
+      "metadata": { kind: "object", required: false },
       "toolCallId": { kind: "string", required: true },
       "toolCallName": { kind: "string", required: true },
       "parentMessageId": { kind: "string", required: false },
+      "subagentRunId": { kind: "string", required: false },
     },
   },
   "TOOL_CALL_ARGS": {
     category: "toolcall",
     specUrl: "https://docs.ag-ui.com/concepts/events#toolcallargs",
     fields: {
+      "metadata": { kind: "object", required: false },
       "toolCallId": { kind: "string", required: true },
       "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: {
+      "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 },
       "toolCallName": { kind: "string", required: false },
       "parentMessageId": { kind: "string", required: false },
       "delta": { kind: "string", required: false },
+      "subagentRunId": { kind: "string", required: false },
     },
   },
   "TOOL_CALL_RESULT": {
     category: "toolcall",
     specUrl: "https://docs.ag-ui.com/concepts/events#toolcallresult",
     fields: {
+      "metadata": { kind: "object", required: false },
       "messageId": { kind: "string", required: true },
       "toolCallId": { kind: "string", required: true },
       "content": { kind: "string", required: true },
       "role": { kind: "string", required: false, enum: ["tool"] },
+      "subagentRunId": { kind: "string", required: false },
     },
   },
   "THINKING_START": {
@@ -118,6 +137,7 @@ export const EVENT_TABLE: Readonly<Record<string, EventSpec>> = {
     deprecated: "REASONING_START",
     specUrl: "https://docs.ag-ui.com/concepts/events#thinking-events-deprecated",
     fields: {
+      "metadata": { kind: "object", required: false },
       "title": { kind: "string", required: false },
     },
   },
@@ -126,6 +146,7 @@ export const EVENT_TABLE: Readonly<Record<string, EventSpec>> = {
     deprecated: "REASONING_END",
     specUrl: "https://docs.ag-ui.com/concepts/events#thinking-events-deprecated",
     fields: {
+      "metadata": { kind: "object", required: false },
     },
   },
   "THINKING_TEXT_MESSAGE_START": {
@@ -133,6 +154,7 @@ export const EVENT_TABLE: Readonly<Record<string, EventSpec>> = {
     deprecated: "REASONING_MESSAGE_START",
     specUrl: "https://docs.ag-ui.com/concepts/events#thinking-events-deprecated",
     fields: {
+      "metadata": { kind: "object", required: false },
     },
   },
   "THINKING_TEXT_MESSAGE_CONTENT": {
@@ -140,6 +162,7 @@ export const EVENT_TABLE: Readonly<Record<string, EventSpec>> = {
     deprecated: "REASONING_MESSAGE_CONTENT",
     specUrl: "https://docs.ag-ui.com/concepts/events#thinking-events-deprecated",
     fields: {
+      "metadata": { kind: "object", required: false },
       "delta": { kind: "string", required: true },
     },
   },
@@ -148,26 +171,32 @@ export const EVENT_TABLE: Readonly<Record<string, EventSpec>> = {
     deprecated: "REASONING_MESSAGE_END",
     specUrl: "https://docs.ag-ui.com/concepts/events#thinking-events-deprecated",
     fields: {
+      "metadata": { kind: "object", required: false },
     },
   },
   "STATE_SNAPSHOT": {
     category: "state",
     specUrl: "https://docs.ag-ui.com/concepts/events#statesnapshot",
     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: {
+      "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: {
+      "metadata": { kind: "object", required: false },
       "messages": { kind: "array", required: true },
     },
   },
@@ -175,41 +204,50 @@ export const EVENT_TABLE: Readonly<Record<string, EventSpec>> = {
     category: "activity",
     specUrl: "https://docs.ag-ui.com/concepts/events#activitysnapshot",
     fields: {
+      "metadata": { kind: "object", required: false },
       "messageId": { kind: "string", required: true },
       "activityType": { kind: "string", required: true },
       "content": { kind: "object", required: true },
       "replace": { kind: "boolean", required: false },
+      "subagentRunId": { kind: "string", required: false },
     },
   },
   "ACTIVITY_DELTA": {
     category: "activity",
     specUrl: "https://docs.ag-ui.com/concepts/events#activitydelta",
     fields: {
+      "metadata": { kind: "object", required: false },
       "messageId": { kind: "string", required: true },
       "activityType": { kind: "string", required: true },
       "patch": { kind: "array", required: true },
+      "subagentRunId": { kind: "string", required: false },
     },
   },
   "RAW": {
     category: "special",
     specUrl: "https://docs.ag-ui.com/concepts/events#raw",
     fields: {
+      "metadata": { kind: "object", required: false },
       "event": { kind: "any", required: true },
       "source": { kind: "string", required: false },
+      "subagentRunId": { kind: "string", required: false },
     },
   },
   "CUSTOM": {
     category: "special",
     specUrl: "https://docs.ag-ui.com/concepts/events#custom",
     fields: {
+      "metadata": { kind: "object", required: false },
       "name": { kind: "string", required: true },
       "value": { kind: "any", required: true },
+      "subagentRunId": { kind: "string", required: false },
     },
   },
   "RUN_STARTED": {
     category: "lifecycle",
     specUrl: "https://docs.ag-ui.com/concepts/events#runstarted",
     fields: {
+      "metadata": { kind: "object", required: false },
       "threadId": { kind: "string", required: true },
       "runId": { kind: "string", required: true },
       "parentRunId": { kind: "string", required: false },
@@ -220,6 +258,7 @@ export const EVENT_TABLE: Readonly<Record<string, EventSpec>> = {
     category: "lifecycle",
     specUrl: "https://docs.ag-ui.com/concepts/events#runfinished",
     fields: {
+      "metadata": { kind: "object", required: false },
       "threadId": { kind: "string", required: true },
       "runId": { kind: "string", required: true },
       "result": { kind: "any", required: false },
@@ -231,6 +270,7 @@ export const EVENT_TABLE: Readonly<Record<string, EventSpec>> = {
     category: "lifecycle",
     specUrl: "https://docs.ag-ui.com/concepts/events#runerror",
     fields: {
+      "metadata": { kind: "object", required: false },
       "message": { kind: "string", required: true },
       "code": { kind: "string", required: false },
       "usage": { kind: "array", required: false },
@@ -240,68 +280,119 @@ export const EVENT_TABLE: Readonly<Record<string, EventSpec>> = {
     category: "lifecycle",
     specUrl: "https://docs.ag-ui.com/concepts/events#stepstarted",
     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: {
+      "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: {
+      "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 },
       "role": { kind: "string", required: true, enum: ["reasoning"] },
+      "subagentRunId": { kind: "string", required: false },
     },
   },
   "REASONING_MESSAGE_CONTENT": {
     category: "reasoning",
     specUrl: "https://docs.ag-ui.com/concepts/events#reasoningmessagecontent",
     fields: {
+      "metadata": { kind: "object", required: false },
       "messageId": { kind: "string", required: true },
       "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: {
+      "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 },
       "delta": { kind: "string", required: false },
+      "subagentRunId": { kind: "string", required: false },
     },
   },
   "REASONING_END": {
     category: "reasoning",
     specUrl: "https://docs.ag-ui.com/concepts/events#reasoningend",
     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, enum: ["tool-call","message"] },
       "entityId": { kind: "string", required: true },
       "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 },
     },
   },
 }

package/js/src/report/json.ts

@@ -0,0 +1,31 @@
+// Machine-readable report: the core Report plus tool identification, so a
+// stored document is self-describing.
+import { RULES } from "../rules/catalog.js"
+import type { Diagnostic, Report } from "../types.js"
+
+export interface JsonReportOptions {
+  tool: { name: string; version: string }
+  /** What was validated: URL, file path, or "stdin". */
+  target?: string
+}
+
+export interface JsonDiagnostic extends Diagnostic {
+  /** The rule's catalog category, e.g. "toolcall". Joined in from the catalog by rule id. */
+  category?: string
+}
+
+export interface JsonReportDocument extends Omit<Report, "diagnostics"> {
+  tool: { name: string; version: string }
+  target?: string
+  diagnostics: JsonDiagnostic[]
+}
+
+export function toJsonReport(report: Report, opts: JsonReportOptions): JsonReportDocument {
+  const diagnostics: JsonDiagnostic[] = report.diagnostics.map((d) => {
+    const category = RULES.get(d.rule)?.category
+    return category === undefined ? { ...d } : { ...d, category }
+  })
+  const doc: JsonReportDocument = { tool: opts.tool, ...report, diagnostics }
+  if (opts.target !== undefined) doc.target = opts.target
+  return doc
+}

package/{src → js/src}/report/sarif.ts

@@ -34,12 +34,7 @@ export interface SarifLog {
         name: string
         version: string
         informationUri: string
-        rules: Array<{
-          id: string
-          helpUri: string
-          shortDescription?: { text: string }
-          defaultConfiguration?: { level: SarifLevel }
-        }>
+        rules: SarifRule[]
       }
     }
     results: SarifResult[]
@@ -57,6 +52,7 @@ type SarifRule = {
   helpUri: string
   shortDescription?: { text: string }
   defaultConfiguration?: { level: SarifLevel }
+  properties?: { tags: string[] }
 }
 
 export function toSarif(report: Report, opts: SarifOptions): SarifLog {
@@ -68,6 +64,7 @@ export function toSarif(report: Report, opts: SarifOptions): SarifLog {
     if (catalog !== undefined) {
       entry.shortDescription = { text: catalog.title }
       entry.defaultConfiguration = { level: LEVEL[catalog.severity] }
+      entry.properties = { tags: [catalog.category] }
     }
     rules.set(d.rule, entry)
   }

package/{src → js/src}/rules/catalog.ts

@@ -6,19 +6,22 @@
 // malformed catalog is a programming error in this package, so the loader
 // throws loudly at import time.
 
-import catalogJson from "./catalog.json"
+import catalogJson from "../../../spec/catalog.json"
 
 export type Severity = "error" | "warning" | "info"
 export type SeverityOrOff = Severity | "off"
 
 const SEVERITIES: readonly string[] = ["error", "warning", "info"]
 const LAYERS: readonly string[] = ["core", "transport"]
+export const CATEGORIES: readonly string[] = ["lifecycle", "text", "toolcall", "state", "reasoning", "transport", "hygiene", "subagent"]
 
 export interface RuleDefinition {
   /** e.g. "AGUI203" */
   id: string
   severity: Severity
   title: string
+  /** Which part of the protocol this rule governs, e.g. "toolcall". */
+  category: string
   /** Human template with {placeholder} slots filled per diagnostic. */
   messageTemplate: string
   /** Governing spec section. Mandatory: rules that cannot cite one don't ship. */
@@ -58,6 +61,7 @@ export function validateCatalog(data: unknown): Catalog {
     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`)

package/{src → js/src}/rules/checks/context.ts

@@ -24,6 +24,10 @@ export interface OpenToolCall {
   startIndex: number
   args: string
   sawArgs: boolean
+  /** subagentRunId this call belongs to (explicit, or inherited from the
+   * parentMessageId's owner - AGUI606's "an untagged tool call inherits the
+   * parent message's owner"). undefined means it belongs to the run itself. */
+  owner: string | undefined
 }
 
 export interface RunState {
@@ -34,19 +38,33 @@ export interface RunState {
   implicit: boolean
   terminal: { type: string; index: number } | null
 
-  openMessages: Map<string, { startIndex: number }>
+  openMessages: Map<string, { startIndex: number; owner: string | undefined }>
   /** messageId -> index of the event that closed it. */
   closedMessages: Map<string, number>
   /** Every message id observed (starts, chunks, snapshots, tool results). */
   knownMessageIds: Set<string>
+  /** messageId -> owning subagentRunId (undefined for the run), for AGUI606's
+   * tool-call-inherits-its-parent-message's-owner resolution. Persists past
+   * the message closing, unlike openMessages/closedMessages. */
+  messageOwner: Map<string, string | undefined>
 
   openToolCalls: Map<string, OpenToolCall>
   closedToolCalls: Map<string, number>
   /** Ids also known from MESSAGES_SNAPSHOT history. */
   knownToolCallIds: Set<string>
 
-  /** stepName -> re-entrant open count (SQ-10) and first-open index. */
-  openSteps: Map<string, { count: number; firstIndex: number }>
+  /** stepName -> re-entrant open count (SQ-10), first-open index, and the
+   * subagentRunId recorded from the first STEP_STARTED (AGUI606) - a
+   * re-entrant reopen does not change it. */
+  openSteps: Map<string, { count: number; firstIndex: number; owner: string | undefined }>
+
+  openSubagents: Map<string, { startIndex: number }>
+  /** Closed via SUBAGENT_FINISHED (resumable only when outcome.type ===
+   * "suspended" - the one case where a later SUBAGENT_STARTED reusing this
+   * id is a legitimate continuation, not a duplicate, AGUI601) or SUBAGENT_ERROR. */
+  closedSubagents: Map<string, { index: number; resumable: boolean }>
+  /** Every subagentRunId ever started (open or closed), for parentSubagentRunId checks. */
+  knownSubagentRunIds: Set<string>
 
   openReasoningBlocks: Map<string, number>
   openReasoningMessages: Map<string, number>
@@ -78,10 +96,14 @@ export function newRunState(init: {
     openMessages: new Map(),
     closedMessages: new Map(),
     knownMessageIds: new Set(),
+    messageOwner: new Map(),
     openToolCalls: new Map(),
     closedToolCalls: new Map(),
     knownToolCallIds: new Set(),
     openSteps: new Map(),
+    openSubagents: new Map(),
+    closedSubagents: new Map(),
+    knownSubagentRunIds: new Set(),
     openReasoningBlocks: new Map(),
     openReasoningMessages: new Map(),
     state: { known: false, value: undefined, deltasSinceSnapshot: 0, snapshotSeen: false, agui301Fired: false },
@@ -115,3 +137,26 @@ export function str(event: Record<string, unknown>, field: string): string | und
   const v = event[field]
   return typeof v === "string" ? v : undefined
 }
+
+/** 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. */
+export function checkOwnerConsistency(
+  emit: EmitFn,
+  type: string,
+  entityType: string,
+  entityId: string,
+  event: Record<string, unknown>,
+  owner: string | undefined,
+): void {
+  const actual = str(event, "subagentRunId")
+  if (actual !== undefined && actual !== owner) {
+    emit(
+      "AGUI606",
+      { type, actual, entityType, entityId, expected: owner !== undefined ? `'${owner}'` : "the run" },
+      { pointer: "/subagentRunId" },
+    )
+  }
+}