Merge branch 'ag-ui-protocol:main' into fix/issue-400-clean

Author: contextablemark

.gitignore

@@ -1,3 +1,5 @@
 **/.claude/settings.local.json
 .vscode/
 .idea/
+
+.DS_Store

typescript-sdk/integrations/a2a-middleware/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ag-ui/a2a-middleware",
   "author": "Markus Ecker <[email protected]>",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -20,14 +20,15 @@
   },
   "dependencies": {
     "@a2a-js/sdk": "^0.2.2",
-    "@ag-ui/client": "workspace:*",
+    "@ag-ui/client": ">=0.0.40",
     "ai": "^4.3.16",
     "zod": "^3.22.4"
   },
   "peerDependencies": {
     "rxjs": "7.8.1"
   },
   "devDependencies": {
+    "@ag-ui/client": "workspace:*",
     "@types/jest": "^29.5.14",
     "@types/node": "^20.11.19",
     "jest": "^29.7.0",

typescript-sdk/integrations/a2a-middleware/src/index.ts

@@ -20,7 +20,6 @@ import { AgentCard, SendMessageResponse, SendMessageSuccessResponse } from "@a2a
 import { Observable, Subscriber, tap } from "rxjs";
 import { createSystemPrompt, sendMessageToA2AAgentTool } from "./utils";
 import { randomUUID } from "crypto";
-import { text } from "stream/consumers";
 
 export interface A2AAgentConfig extends AgentConfig {
   agentUrls: string[];
@@ -129,6 +128,9 @@ export class A2AMiddlewareAgent extends AbstractAgent {
             this.finishTextMessages(observer, pendingTextMessages);
 
             if (pendingA2ACalls.size > 0) {
+              // Array to collect all new tool result messages
+              const newToolMessages: Message[] = [];
+
               const callProms = [...pendingA2ACalls].map((toolCallId) => {
                 const toolCallsFromMessages = this.messages
                   .filter((message) => message.role === "assistant")
@@ -160,6 +162,9 @@ export class A2AMiddlewareAgent extends AbstractAgent {
                     this.addMessage(newMessage);
                     this.orchestrationAgent.addMessage(newMessage);
 
+                    // Collect the message so we can add it to input.messages
+                    newToolMessages.push(newMessage);
+
                     const newEvent: ToolCallResultEvent = {
                       type: EventType.TOOL_CALL_RESULT,
                       toolCallId: toolCallId,
@@ -184,6 +189,12 @@ export class A2AMiddlewareAgent extends AbstractAgent {
                   runId: input.runId,
                 } as RunFinishedEvent);
 
+                // Add all tool result messages to input.messages BEFORE triggering new run
+                // This ensures the orchestrator sees the tool results in its context
+                newToolMessages.forEach((msg) => {
+                  input.messages.push(msg);
+                });
+
                 this.triggerNewRun(observer, input, pendingA2ACalls, pendingTextMessages);
               });
             } else {

typescript-sdk/integrations/mastra/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ag-ui/mastra",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -63,7 +63,7 @@
   },
   "peerDependencies": {
     "@ag-ui/core": ">=0.0.39",
-    "@ag-ui/client": ">=0.0.39",
+    "@ag-ui/client": ">=0.0.40",
     "@copilotkit/runtime": "^1.10.5",
     "@mastra/core": ">=0.19.0",
     "zod": "^3.25.67"

typescript-sdk/integrations/vercel-ai-sdk/package.json

@@ -20,7 +20,7 @@
   },
   "peerDependencies": {
     "@ag-ui/core": ">=0.0.37",
-    "@ag-ui/client": ">=0.0.37",
+    "@ag-ui/client": ">=0.0.40",
     "rxjs": "7.8.1"
   },
   "devDependencies": {

typescript-sdk/packages/client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ag-ui/client",
   "author": "Markus Ecker <[email protected]>",
-  "version": "0.0.39",
+  "version": "0.0.40",
   "private": false,
   "publishConfig": {
     "access": "public"