@assistant-ui/react-ag-ui 0.0.57 → 0.0.58

package/README.md

@@ -33,6 +33,22 @@ export function Provider({ children }: { children: React.ReactNode }) {
 }
 ```
 
+## Subagents
+
+An AG-UI backend that runs subagents (the agents-as-tools pattern) emits `SUBAGENT_STARTED` / `SUBAGENT_FINISHED` / `SUBAGENT_ERROR` plus a `subagentRunId` on the events each subagent produces. This adapter groups that activity into one nested assistant message per subagent run and attaches it to the spawning tool call as `ToolCallMessagePart.messages`, joined on `SUBAGENT_STARTED.parentToolCallId`. `PartPrimitive.Messages` renders it without extra wiring, and the subagent's name, description, result, and error code ride on that message's `agui` metadata.
+
+A subagent that names no reachable spawning call (`parentToolCallId` is optional, may name a call this run never saw, or two runs may name each other) has nowhere to nest, so its output renders in the parent thread instead of being dropped. This matches the downgrade the protocol's own pre-subagent compatibility middleware performs.
+
+A subagent's frontend-executed tool calls work the same way the root agent's do: a call nested on `ToolCallMessagePart.messages` is reachable by `getPendingToolCalls()`, resolves through `addToolResult`, and its result rides the resume as a `tool` record on the spawning assistant record, the same flattened wire shape these calls had before subagent attribution.
+
+Approval gates cover nested calls too: a gate that names a subagent-scoped call projects onto the nested part, the frontend tool stays unexecuted while the gate is open, decisions recorded through `respondToToolApproval` land on the nested part, and an undecided gate's result is never exported to the backend.
+
+Two limitations are worth knowing before you rely on this:
+
+- **Nested structure does not survive a reload.** Thread restore reads the flattened wire shape, so a restored subagent tool call comes back as a root-level part rather than nested under its spawning call. Results and decisions are preserved; only the nesting is not.
+
+- **Nested human-in-the-loop is not wired up.** A `SUBAGENT_FINISHED` with a `suspended` outcome marks the nested message `requires-action`, and its `interruptIds` are preserved on the message metadata, but there is no resume path that answers them yet.
+
 ## See also
 
 - `@assistant-ui/react-a2a` for the A2A v1.0 protocol.

package/dist/runtime/AgUiThreadRuntimeCore.d.ts

@@ -89,9 +89,9 @@ declare class AgUiThreadRuntimeCore {
    */
   private resumeWithResponses;
   /**
-   * The core seams that reach `respondToToolApproval` discard the promise they
-   * receive, so a rejected decision would otherwise surface only as an
-   * unhandled rejection. A failure raised by the resumed run itself was already
+   * A rejected decision reaches the caller through the approval seam, and
+   * `onError` in addition, because a consumer watching only the runtime would
+   * otherwise miss it. A failure raised by the resumed run itself was already
    * reported by `startRun` before it rethrew, so reporting it here again would
    * give the consumer two notifications for one failure.
    */
@@ -117,7 +117,6 @@ declare class AgUiThreadRuntimeCore {
   private startRun;
   private consumeResumeStream;
   private buildRunInput;
-  private installResumeShim;
   private setRunning;
   private finishRun;
   private insertAssistantPlaceholder;

package/dist/runtime/AgUiThreadRuntimeCore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AgUiThreadRuntimeCore.d.ts","names":[],"sources":["../../src/runtime/AgUiThreadRuntimeCore.ts"],"mappings":";;;;;;KA8EK,YAAY,YAAY;KACxB,gBACH,SAAS,wBACN,eAAe;KACf;EACH;EACA;EACA,WAAW;EACX,SAAS;;KAGN;EACH,OAAO;EACP,QAAQ;EACR;EACA;EACA,WAAW,OAAO;EAClB;EACA,UAAU;EACV;;cAoCW;UACH;UACA;UACA;UACA;UACA;UACA;mBACS;mBACA;UAET;mBACS;UAgBT;UACA;UAGA;UACA;UACA;UACA;UACA;mBACS;mBACA;mBACA;mBACA;UACT;UACA;UACA;UACA;UACA;UACA;EAEI,YAAA,SAAS;EAYrB,cAAc,SAAS,KAAK;EAsB5B,cAAc,SAAS;EAIvB;EAOA,wBAAwB;EAIxB,wBAAwB;EAIxB,YAAY;EAIZ;MAII;EAIJ,mBAAmB;EAsDb,OAAO,SAAS,gBAAgB;UAW9B;UAQA;EAiBF,KAAK,SAAS,gBAAgB;EAI9B,OACJ,yBACA;IAAU,YAAY;MACrB;EAMG,UAAU;EAcV,OAAO,QAAQ,kBAAkB;EAUjC,kBAAkB,mBAAmB,kBAAkB;UAwBrD;UAOA;EAgBR;IACE;IACA,qBAAqB;;EAavB;IACE;IACA;;EAcI,yBACJ,oBAAoB,oBACnB;;;;;;;UAuCW;;;;;;;;EAed,YAAY;UAYJ;EAwBF,sBACJ,SAAS,+BACR;EAsEG,UACJ,SAAS,qBACT,qBAAqB,oBACpB;UAyCK;UAkBA;UAiCA;UA0BA;EAmCR,yBAAyB;UAkBjB;EAiBR,cAAc,SAAS;EAyBvB,eAAe,QAAQ;UA4Bf;UAYA;UA6BA;EAUR,sBAAsB,mBAAmB;EAkDzC,kBAAkB,OAAO;EAKzB,SACE,MACI,sBACE,MAAM,kCAAkC;EAOhD;UAKc;UAyPA;UA2DN;UAkCA;UAqBA;UAKA;UAQA;UAyBA;UAkEA;UAiDA;UA4BA;UA6BA;UAgEA;UA2EA;UA8DA;UAuDA;UAQA;UAIA;UAKA;UAMA;UAQA;UAsDA;UAqBA"}
+{"version":3,"file":"AgUiThreadRuntimeCore.d.ts","names":[],"sources":["../../src/runtime/AgUiThreadRuntimeCore.ts"],"mappings":";;;;;;KA8EK,YAAY,YAAY;KACxB,gBACH,SAAS,wBACN,eAAe;KACf;EACH;EACA;EACA,WAAW;EACX,SAAS;;KAGN;EACH,OAAO;EACP,QAAQ;EACR;EACA;EACA,WAAW,OAAO;EAClB;EACA,UAAU;EACV;;cAoCW;UACH;UACA;UACA;UACA;UACA;UACA;mBACS;mBACA;UAET;mBACS;UAgBT;UACA;UAGA;UACA;UACA;UACA;UACA;mBACS;mBACA;mBACA;mBACA;UACT;UACA;UACA;UACA;UACA;UACA;EAEI,YAAA,SAAS;EAWrB,cAAc,SAAS,KAAK;EAoB5B,cAAc,SAAS;EAIvB;EAOA,wBAAwB;EAIxB,wBAAwB;EAIxB,YAAY;EAIZ;MAII;EAIJ,mBAAmB;EAsDb,OAAO,SAAS,gBAAgB;UAW9B;UAQA;EAiBF,KAAK,SAAS,gBAAgB;EAI9B,OACJ,yBACA;IAAU,YAAY;MACrB;EAMG,UAAU;EAcV,OAAO,QAAQ,kBAAkB;EAUjC,kBAAkB,mBAAmB,kBAAkB;UAwBrD;UAOA;EAgBR;IACE;IACA,qBAAqB;;EAavB;IACE;IACA;;EAaI,yBACJ,oBAAoB,oBACnB;;;;;;;UAuCW;;;;;;;;EAed,YAAY;UAYJ;EAwBF,sBACJ,SAAS,+BACR;EAsEG,UACJ,SAAS,qBACT,qBAAqB,oBACpB;UAyCK;UAkBA;UAiCA;UA0BA;EAmCR,yBAAyB;UAiBjB;EAiBR,cAAc,SAAS;EA+BvB,eAAe,QAAQ;UA4Bf;UAYA;UAiCA;EAUR,sBAAsB,mBAAmB;EAkDzC,kBAAkB,OAAO;EAKzB,SACE,MACI,sBACE,MAAM,kCAAkC;EAOhD;UAKc;UAyPA;UA2DN;UAkCA;UAKA;UAQA;UAyBA;UAkEA;UAiDA;UA0BA;UA6BA;UAgEA;UA0EA;UA6DA;UAuDA;UAQA;UAIA;UAKA;UAMA;UAQA;UAsDA;UAqBA"}

package/dist/runtime/AgUiThreadRuntimeCore.js

@@ -5,14 +5,13 @@ import { AG_UI_METADATA_NAMESPACE, RunAggregator, isPlainObject, tryParseJSON }
 import { fromAgUiMessages, toAgUiMessages, toAgUiTools } from "./adapter/conversions.js";
 import { createAgUiSubscriber } from "./adapter/subscriber.js";
 import { fromThreadMessageLike, generateId, isMcpAppUri } from "@assistant-ui/core";
-import { createMessageRepositorySession, invokeUserCallback } from "@assistant-ui/core/internal";
+import { createMessageRepositorySession, invokeUserCallback, iterateToolCallParts, mapToolCallPartsDeep } from "@assistant-ui/core/internal";
 import jsonpatch from "fast-json-patch";
 //#region src/runtime/AgUiThreadRuntimeCore.ts
 const optimisticPrefix = "__optimistic__";
 const generateOptimisticId = () => `${optimisticPrefix}${generateId()}`;
 const isOptimisticId = (id) => id.startsWith(optimisticPrefix);
 const isResolvedToolCall = (part) => part.type === "tool-call" && "result" in part && part.result !== void 0;
-const symbolResumeShim = Symbol("agui-resume-shim");
 const FALLBACK_USER_STATUS = {
 	type: "complete",
 	reason: "unknown"
@@ -83,7 +82,6 @@ var AgUiThreadRuntimeCore = class {
 		this.onCancel = options.onCancel;
 		this.history = options.history;
 		this.notifyUpdate = options.notifyUpdate;
-		this.installResumeShim();
 	}
 	updateOptions(options) {
 		this.agent = options.agent;
@@ -94,7 +92,6 @@ var AgUiThreadRuntimeCore = class {
 		this.onCancel = options.onCancel;
 		const previousHistory = this.history;
 		this.history = options.history;
-		this.installResumeShim();
 		if (this._loadRequested && !this._loadPromise && !previousHistory && options.history && this.session.getMessages().length === 0) this.__internal_load();
 	}
 	attachRuntime(runtime) {
@@ -234,8 +231,7 @@ var AgUiThreadRuntimeCore = class {
 		const assistant = this.findRequiresActionAssistant("tool-calls");
 		if (!assistant) return null;
 		const toolCallIds = [];
-		for (const part of assistant.content) {
-			if (part.type !== "tool-call") continue;
+		for (const part of iterateToolCallParts(assistant.content)) {
 			if (isResolvedToolCall(part)) continue;
 			toolCallIds.push(part.toolCallId);
 		}
@@ -266,9 +262,9 @@ var AgUiThreadRuntimeCore = class {
 		await this.startRun(messageId, this.lastRunConfig, resume);
 	}
 	/**
-	* The core seams that reach `respondToToolApproval` discard the promise they
-	* receive, so a rejected decision would otherwise surface only as an
-	* unhandled rejection. A failure raised by the resumed run itself was already
+	* A rejected decision reaches the caller through the approval seam, and
+	* `onError` in addition, because a consumer watching only the runtime would
+	* otherwise miss it. A failure raised by the resumed run itself was already
 	* reported by `startRun` before it rethrew, so reporting it here again would
 	* give the consumer two notifications for one failure.
 	*/
@@ -293,7 +289,7 @@ var AgUiThreadRuntimeCore = class {
 		const pending = this.getPendingInterrupts();
 		if (!pending) throw new Error("[agui] respondToToolApproval: no pending interrupts on this thread");
 		const gatedMessage = this.session.tryGetMessage(pending.messageId)?.message;
-		if (![...projectAgUiToolApprovals(pending.interrupts, new Set((gatedMessage?.content ?? []).filter((part) => part.type === "tool-call").map((part) => part.toolCallId))).values()].some((approval) => approval.id === options.approvalId)) throw new Error(`[agui] respondToToolApproval: no pending tool-call interrupt for approval id "${options.approvalId}"`);
+		if (![...projectAgUiToolApprovals(pending.interrupts, new Set(Array.from(iterateToolCallParts(gatedMessage?.content ?? [])).map((part) => part.toolCallId))).values()].some((approval) => approval.id === options.approvalId)) throw new Error(`[agui] respondToToolApproval: no pending tool-call interrupt for approval id "${options.approvalId}"`);
 		this.assertInterruptsAnswerable("respondToToolApproval", pending.interrupts);
 		if (!this.session.updateMessage(pending.messageId, (message) => {
 			if (message.role !== "assistant") return message;
@@ -411,8 +407,8 @@ var AgUiThreadRuntimeCore = class {
 		for (let index = messages.length - 1; index >= 0; index--) {
 			const message = messages[index];
 			if (!message || message.role !== "assistant") continue;
-			for (const part of message.content) {
-				if (part.type !== "tool-call" || part.toolCallId !== toolCallId) continue;
+			for (const part of iterateToolCallParts(message.content)) {
+				if (part.toolCallId !== toolCallId) continue;
 				if (!isResolvedToolCall(part)) return message.id;
 				fallbackMessageId ??= message.id;
 			}
@@ -423,8 +419,8 @@ var AgUiThreadRuntimeCore = class {
 		if (this.session.updateMessage(messageId, (message) => {
 			if (message.role !== "assistant") return message;
 			const assistant = message;
-			const content = assistant.content.map((part) => {
-				if (part.type !== "tool-call" || isResolvedToolCall(part)) return part;
+			const { content } = mapToolCallPartsDeep(assistant.content, (part) => {
+				if (isResolvedToolCall(part)) return part;
 				return {
 					...part,
 					result: { error: "Tool call cancelled by user" },
@@ -438,12 +434,14 @@ var AgUiThreadRuntimeCore = class {
 		})) this.notifyUpdate();
 	}
 	addToolResult(options) {
-		if (!this.session.updateMessage(options.messageId, (message) => {
+		const sessionMessageId = this.session.tryGetMessage(options.messageId) ? options.messageId : this.findMessageIdForToolCall(options.toolCallId);
+		if (sessionMessageId === void 0) return;
+		if (!this.session.updateMessage(sessionMessageId, (message) => {
 			if (message.role !== "assistant") return message;
 			const assistant = message;
 			let matchedToolCall = false;
-			const content = assistant.content.map((part) => {
-				if (part.type !== "tool-call" || part.toolCallId !== options.toolCallId) return part;
+			const { content } = mapToolCallPartsDeep(assistant.content, (part) => {
+				if (part.toolCallId !== options.toolCallId) return part;
 				matchedToolCall = true;
 				return {
 					...part,
@@ -459,7 +457,7 @@ var AgUiThreadRuntimeCore = class {
 			};
 		})) return;
 		this.notifyUpdate();
-		this.maybeResumeAfterToolResults(options.messageId);
+		this.maybeResumeAfterToolResults(sessionMessageId);
 	}
 	sendA2uiAction(action) {
 		this.assertNoPendingInterrupts();
@@ -492,7 +490,12 @@ var AgUiThreadRuntimeCore = class {
 		if (!message || message.role !== "assistant") return false;
 		const assistant = message;
 		if (assistant.status?.type !== "requires-action" || assistant.status.reason !== "tool-calls") return false;
-		if (!assistant.content.every((part) => part.type !== "tool-call" || isResolvedToolCall(part))) return false;
+		let allResolved = true;
+		for (const part of iterateToolCallParts(assistant.content)) if (!isResolvedToolCall(part)) {
+			allResolved = false;
+			break;
+		}
+		if (!allResolved) return false;
 		if (!this.session.updateMessage(messageId, (current) => current.role === "assistant" ? {
 			...current,
 			status: {
@@ -792,21 +795,6 @@ var AgUiThreadRuntimeCore = class {
 		this.pendingA2uiAction = void 0;
 		return input;
 	}
-	installResumeShim() {
-		const agent = this.agent;
-		if (agent[symbolResumeShim]) return;
-		agent[symbolResumeShim] = true;
-		const original = Object.hasOwn(agent, "prepareRunAgentInput") ? agent.prepareRunAgentInput : Object.getPrototypeOf(agent)?.prepareRunAgentInput;
-		if (typeof original !== "function") return;
-		agent.prepareRunAgentInput = function(params) {
-			const input = original.call(this, params);
-			if (params?.resume !== void 0 && input && typeof input === "object") return {
-				...input,
-				resume: params.resume
-			};
-			return input;
-		};
-	}
 	setRunning(running) {
 		this.isRunningFlag = running;
 		this.notifyUpdate();
@@ -914,14 +902,12 @@ var AgUiThreadRuntimeCore = class {
 	}
 	preserveToolResults(previous, next) {
 		const resolved = /* @__PURE__ */ new Map();
-		for (const part of previous) if (part.type === "tool-call" && isResolvedToolCall(part)) resolved.set(part.toolCallId, part);
+		for (const part of iterateToolCallParts(previous)) if (isResolvedToolCall(part)) resolved.set(part.toolCallId, part);
 		if (resolved.size === 0) return next;
-		let changed = false;
-		const merged = next.map((part) => {
-			if (part.type !== "tool-call" || isResolvedToolCall(part)) return part;
+		const { content: merged, changed } = mapToolCallPartsDeep(next, (part) => {
+			if (isResolvedToolCall(part)) return part;
 			const prior = resolved.get(part.toolCallId);
 			if (!prior) return part;
-			changed = true;
 			return {
 				...part,
 				result: prior.result,
@@ -996,8 +982,8 @@ var AgUiThreadRuntimeCore = class {
 			const assistant = message;
 			const mcpAppUri = readMcpAppResourceUri(event.mcpResult?._meta);
 			let matchedToolCall = false;
-			const content = assistant.content.map((part) => {
-				if (part.type !== "tool-call" || part.toolCallId !== event.toolCallId) return part;
+			const { content } = mapToolCallPartsDeep(assistant.content, (part) => {
+				if (part.toolCallId !== event.toolCallId) return part;
 				matchedToolCall = true;
 				if (part.mcp?.app !== void 0 && isPlainObject(part.result) && Array.isArray(part.result["content"])) return {
 					...part,
@@ -1040,8 +1026,8 @@ var AgUiThreadRuntimeCore = class {
 			if (message.role !== "assistant") return message;
 			const assistant = message;
 			let matchedToolCall = false;
-			const content = assistant.content.map((part) => {
-				if (part.type !== "tool-call" || part.toolCallId !== toolCallId) return part;
+			const { content } = mapToolCallPartsDeep(assistant.content, (part) => {
+				if (part.toolCallId !== toolCallId) return part;
 				matchedToolCall = true;
 				return {
 					...part,