Merge branch 'adk-middleware' into issue-35

Author: contextablemark

.github/workflows/check-generated-files.yml

@@ -0,0 +1,38 @@
+name: Check Generated Files
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  check-files-json:
+    name: Check files.json
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Regenerate files.json
+        working-directory: typescript-sdk/apps/dojo
+        run: npm run generate-content-json
+
+      - name: Check files.json
+        working-directory: typescript-sdk/apps/dojo
+        run: |
+          if git diff --exit-code src/files.json > /dev/null; then
+            echo "✅ No changes detected in dojo/src/files.json. Everything is up to date."
+          else
+            echo "❌ Detected changes in dojo/src/files.json."
+            echo ""
+            echo "Please run \`(p)npm run generate-content-json\` in the typescript-sdk/apps/dojo folder and commit the changes."
+            echo ""
+            echo "The detected diff was as follows:"
+            echo "::group::Diff for dojo/src/files.json"
+            git diff src/files.json
+            echo "::endgroup::"
+            exit 1
+          fi
+
+

.github/workflows/dojo-e2e.yml

@@ -0,0 +1,90 @@
+name: e2e
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  e2e:
+    name: E2E Tests
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: '22'
+
+    - name: Install pnpm
+      uses: pnpm/action-setup@v4
+      with:
+        version: 10.13.1
+
+    - name: Install Poetry
+      uses: snok/install-poetry@v1
+      with:
+        version: latest
+        virtualenvs-create: true
+        virtualenvs-in-project: true
+
+    - name: Install uv
+      uses: astral-sh/setup-uv@v6
+
+    - name: Setup pnpm cache
+      uses: actions/cache@v4
+      with:
+        path: ~/.local/share/pnpm/store
+        key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+        restore-keys: |
+          ${{ runner.os }}-pnpm-store-
+
+    - name: Install dependencies
+      working-directory: typescript-sdk
+      run: pnpm install --frozen-lockfile
+
+    - name: Prepare dojo for e2e
+      working-directory: typescript-sdk/apps/dojo
+      run: node ./scripts/prep-dojo-everything.js -e2e
+
+    - name: Install e2e dependencies
+      working-directory: typescript-sdk/apps/dojo/e2e2
+      run: |
+        pnpm install --frozen-lockfile
+        pnpm dlx playwright install --with-deps
+
+    - name: write langgraph env files
+      working-directory: typescript-sdk/integrations/langgraph
+      env:
+        OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+        LANGSMITH_API_KEY: ${{ secrets.LANGSMITH_API_KEY }}
+      run: |
+        echo "OPENAI_API_KEY=${OPENAI_API_KEY}" > examples/python/.env
+        echo "LANGSMITH_API_KEY=${LANGSMITH_API_KEY}" >> examples/python/.env
+        echo "OPENAI_API_KEY=${OPENAI_API_KEY}" > examples/typescript/.env
+        echo "LANGSMITH_API_KEY=${LANGSMITH_API_KEY}" >> examples/typescript/.env
+        echo "OPENAI_API_KEY=${OPENAI_API_KEY}" > python/ag_ui_langgraph/.env
+        echo "LANGSMITH_API_KEY=${LANGSMITH_API_KEY}" >> python/ag_ui_langgraph/.env
+
+    - name: Run dojo+agents and tests
+      working-directory: typescript-sdk/apps/dojo/e2e2
+      env:
+        OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+        LANGSMITH_API_KEY: ${{ secrets.LANGSMITH_API_KEY }}
+      run: |
+        node ../scripts/run-dojo-everything.js &
+        npx wait-port 9999
+        sleep 10
+        pnpm exec playwright test --reporter=dot
+
+    - name: Upload traces
+      if: always() # Uploads artifacts even if tests fail
+      uses: actions/upload-artifact@v4
+      with:
+        name: playwright-traces
+        path: typescript-sdk/apps/dojo/e2e2/test-results/
+        retention-days: 7

.github/workflows/test.yml

@@ -10,79 +10,83 @@ jobs:
   python:
     name: Python SDK Tests
     runs-on: ubuntu-latest
-    
+
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
-      
+
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
         python-version: '3.9'
-        
+
     - name: Install Poetry
       uses: snok/install-poetry@v1
       with:
         version: latest
         virtualenvs-create: true
         virtualenvs-in-project: true
-        
+
     - name: Load cached venv
       id: cached-poetry-dependencies
       uses: actions/cache@v4
       with:
         path: python-sdk/.venv
         key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
-        
+
     - name: Install dependencies
       if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
       working-directory: python-sdk
       run: poetry install --no-interaction --no-root
-      
+
     - name: Install project
       working-directory: python-sdk
       run: poetry install --no-interaction
-      
+
     - name: Run tests
       working-directory: python-sdk
       run: poetry run python -m unittest discover tests -v
 
   typescript:
     name: TypeScript SDK Tests
     runs-on: ubuntu-latest
-    
+
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
-      
+
     - name: Set up Node.js
       uses: actions/setup-node@v4
       with:
         node-version: '18'
-        
+
     - name: Install protoc
       uses: arduino/setup-protoc@v3
       with:
         version: "25.x"
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-        
+
     - name: Install pnpm
       uses: pnpm/action-setup@v4
       with:
-        version: 9.0.0
-        
+        version: 10.13.1
+
     - name: Setup pnpm cache
       uses: actions/cache@v4
       with:
         path: ~/.local/share/pnpm/store
         key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
         restore-keys: |
           ${{ runner.os }}-pnpm-store-
-        
+
     - name: Install dependencies
       working-directory: typescript-sdk
       run: pnpm install --frozen-lockfile
-      
+
+    - name: Test Build
+      working-directory: typescript-sdk
+      run: pnpm run build
+
     - name: Run tests
       working-directory: typescript-sdk
-      run: pnpm run test 
+      run: pnpm run test

.gitignore

@@ -1 +1,2 @@
 **/.claude/settings.local.json
+.vscode/

CONTRIBUTING.md

@@ -42,6 +42,8 @@ Pick the right spot so we can help you faster:
    - A maintainer will review your code and leave comments if needed  
    - Once it’s approved, we’ll merge it and move the issue to “done.”
 
+**NOTE:** All community integrations (ie, .NET, Golang SDK, etc.) will need to be maintained by the community
+
 ---
 
 ## 📝 Want to Contribute to the Docs?

README.md

@@ -1,8 +1,15 @@
 
-# <img src="https://github.com/user-attachments/assets/ebc0dd08-8732-4519-9b6c-452ce54d8058" alt="ag-ui Logo" width="45"/> AG-UI: The Agent-User Interaction Protocol
+# <img src="https://github.com/user-attachments/assets/ebc0dd08-8732-4519-9b6c-452ce54d8058" alt="ag-ui Logo" width="22"/> AG-UI: The Agent-User Interaction Protocol
 
 AG-UI is a lightweight, event-based protocol that standardizes how AI agents connect to user-facing applications.
-Built for simplicity and flexibility, it enables seamless integration between AI agents, realtime user context, and user interfaces.
+Built for simplicity and flexibility, it enables seamless integration between AI agents, real time user context, and user interfaces.
+
+---
+
+[📅 Upcoming Event: August 6th - AG-UI + Mastra: Build a Project Management Canvas](https://lu.ma/94688z7e)
+
+<br>
+
 
 [![Version](https://img.shields.io/npm/v/@ag-ui/core?label=Version&color=6963ff&logo=npm&logoColor=white)](https://www.npmjs.com/package/@ag-ui/core)
 ![MIT](https://img.shields.io/github/license/copilotkit/copilotkit?color=%236963ff&label=License)
@@ -18,12 +25,11 @@ Built for simplicity and flexibility, it enables seamless integration between AI
    Follow us →
   </a> 
 
-<img width="4096" height="1816" alt="Readme 3 - Redesign" src="https://github.com/user-attachments/assets/af15b751-a72a-434f-a93c-9103f2a17006" />
-
+<img width="4096" height="1752" alt="Your application-AG-UI protocol" src="https://github.com/user-attachments/assets/dc58c64c-3257-490a-b827-e163475f4166" />
 
 ## 🚀 Getting Started
 Create a new AG-UI application in seconds:
-```ts
+```bash
 npx create-ag-ui-app my-agent-app
 ```
 <h3>Building AG-UI Integrations (new frameworks):</h3>
@@ -75,35 +81,39 @@ AG-UI is complementary to the other 2 top agentic protocols
 - 🛠️ Frontend tool integration
 - 🧑‍💻 Human-in-the-loop collaboration
 
-### 1st party integrations with top agentic frameworks
 
 ## 🛠 Supported Frameworks
 
+AG-UI was born from CopilotKit's initial partnership with LangGraph and CrewAI - and brings the incredibly popular agent-user-interactivity infrastructure to the wider agentic ecosystem.
+
+| Framework                                                          | Status                   | AG-UI Resources                                                              | Integrations |
+| ------------------------------------------------------------------ | ------------------------ | ---------------------------------------------------------------------------- | ------------------------ |
+| No-framework                                                       | ✅ Supported             | ➡️ Docs coming soon                                                          |                          |
+| [LangGraph](https://www.langchain.com/langgraph)                   | ✅ Supported             | ➡️ [Demo](https://v0-langgraph-land.vercel.app/)                             | Partnership              |
+| [CrewAI](https://crewai.com/)                                      | ✅ Supported             | ➡️ [Demo](https://v0-crew-land.vercel.app/)                                  | Partnership              |
+| [Mastra](https://mastra.ai/)                                       | ✅ Supported             | ➡️ [Demo](https://v0-mastra-land.vercel.app/)                                | 1st party                |
+| [AG2](https://ag2.ai/)                                             | ✅ Supported             | ➡️ [Demo](https://v0-ag2-land.vercel.app/)                                   | 1st party                |
+| [Agno](https://github.com/agno-agi/agno)                           | ✅ Supported             | ➡️ [Docs](https://docs.copilotkit.ai/agno)                                   | 1st party                |
+| [LlamaIndex](https://github.com/run-llama/llama_index)             | ✅ Supported             | ➡️ [Docs](https://docs.copilotkit.ai/llamaindex)                             | 1st party                |
+| [Pydantic AI](https://github.com/pydantic/pydantic-ai)             | ✅ Supported             | ➡️ [Docs](https://docs.copilotkit.ai/pydantic-ai)                            | 1st party                |
+| [Vercel AI SDK](https://github.com/vercel/ai)                      | 🛠️ In Progress           | –                                                                            | Community                |
+| [Google ADK](https://google.github.io/adk-docs/get-started/)       | 🛠️ In Progress           | –                                                                            | Community                |
+| [OpenAI Agent SDK](https://openai.github.io/openai-agents-python/) | 🛠️ In Progress           | –                                                                            | Community                |
+| [AWS Bedrock Agents](https://aws.amazon.com/bedrock/agents/)       | 🛠️ In Progress           | –                                                                            | 1st party                |
+| [Cloudflare Agents](https://developers.cloudflare.com/agents/)     | 💡 Open to Contributions | –                                                                            | Community                |
+| [Strands Agents SDK](https://github.com/strands-agents/sdk-python) | 💡 Open to Contributions | –                                                                            | Community                |   
+
+[View all supported frameworks →](https://ag-ui.com/frameworks)
+
 
-AG-UI integrates with many popular agent frameworks
-
-| Framework                                                          | Status                   | AG-UI Resources                                                              | 
-| ------------------------------------------------------------------ | ------------------------ | ---------------------------------------------------------------------------- | 
-| No-framework                                                       | ✅ Supported             | ➡️ Docs coming soon       |
-| [LangGraph](https://www.langchain.com/langgraph)                   | ✅ Supported             | ➡️ [Demo](https://v0-langgraph-land.vercel.app/) |  
-| [Mastra](https://mastra.ai/)                                       | ✅ Supported             | ➡️ [Demo](https://v0-mastra-land.vercel.app/)    |
-| [CrewAI](https://crewai.com/)                                      | ✅ Supported             | ➡️ [Demo](https://v0-crew-land.vercel.app/)      |
-| [AG2](https://ag2.ai/)                                             | ✅ Supported             | ➡️ [Demo](https://v0-ag2-land.vercel.app/)       |
-| [Agno](https://github.com/agno-agi/agno)                           | ✅ Supported             | ➡️ [Docs](https://docs.copilotkit.ai/agno)     |                                                  |
-| [LlamaIndex](https://github.com/run-llama/llama_index)             | ✅ Supported             | ➡️ [Docs](https://docs.copilotkit.ai/llamaindex)      |                                               |
-| [Pydantic AI](https://github.com/pydantic/pydantic-ai)             | 🛠️ In Progress           | –                                                                            |
-| [Vercel AI SDK](https://github.com/vercel/ai)                      | 🛠️ In Progress           | –                                                                            |
-| [Google ADK](https://google.github.io/adk-docs/get-started/)       | 🛠️ In Progress           | –                                                                            |
-| [OpenAI Agent SDK](https://openai.github.io/openai-agents-python/) | 💡 Open to Contributions | –                                                                            |
-| [AWS Bedrock Agents](https://aws.amazon.com/bedrock/agents/)       | 💡 Open to Contributions | –                                                                            |
-| [Cloudflare Agents](https://developers.cloudflare.com/agents/)     | 💡 Open to Contributions | –                                                                            |
-| [Strands Agents SDK](https://github.com/strands-agents/sdk-python) | 💡 Open to Contributions | –                                                                            |
-
-| Language SDK                                                      | Status                | AG-UI Resources                                                                 |
-| ------------------------------------------------------------------ | ------------------------ | ---------------------------------------------------------------------------- |
-| [.NET]()                                                           | 🛠️ In Progress               | ➡️ [PR](https://github.com/ag-ui-protocol/ag-ui/pull/38)                 |
-| [Nim]()                                                            | 🛠️ In Progress               | ➡️ [PR](https://github.com/ag-ui-protocol/ag-ui/pull/29)                 |
-| [Rust]()                                                           | 🛠️ In Progress               |                    |
+| Language SDK                                                       | Status                    | AG-UI Resources                                                              |
+| ------------------------------------------------------------------ | ------------------------  | ---------------------------------------------------------------------------- |
+| [Kotlin]()                                                         | ✅ Supported              | ➡️ [GitHub Source](https://github.com/Contextable/ag-ui-4k)                  |
+| [.NET]()                                                           | 🛠️ In Progress            | ➡️ [PR](https://github.com/ag-ui-protocol/ag-ui/pull/38)                     |
+| [Nim]()                                                            | 🛠️ In Progress            | ➡️ [PR](https://github.com/ag-ui-protocol/ag-ui/pull/29)                     |
+| [Golang]()                                                         | 🛠️ In Progress            | ➡️ [Issue](https://github.com/ag-ui-protocol/ag-ui/issues/156)               |
+| [Rust]()                                                           | 🛠️ In Progress            | ➡️ [Issue](https://github.com/ag-ui-protocol/ag-ui/issues/239)               |
+| [Java]()                                                           | 💡 Open to Contributions  | ➡️ [Issue](https://github.com/ag-ui-protocol/ag-ui/issues/20)                |
 
 
 [View all supported frameworks →](https://ag-ui.com/frameworks)
@@ -133,7 +143,7 @@ https://github.com/user-attachments/assets/a67d3d54-36b2-4c7a-ac69-a0ca01365d5b
 Check out the [Contributing guide](https://github.com/ag-ui-protocol/ag-ui/blob/main/CONTRIBUTING.md)
 
 - **[Weekely AG-UI Working Group](https://lu.ma/CopilotKit?k=c)**  
-  📅 Follow the CopilotKit Luma Events Page
+  📅 Follow the CopilotKit Luma Events Calendar
 
 ## Roadmap
 

docs/quickstart/clients.mdx

@@ -15,7 +15,7 @@ AG-UI protocol.
 
 Building your own client is useful if you want to explore/hack on the AG-UI
 protocol. For production use, use a full-featured client like
-[CopilotKit ](https://copilokit.ai).
+[CopilotKit](https://copilotkit.ai).
 
 ## What you'll build
 

docs/sdk/js/core/types.mdx

@@ -143,6 +143,7 @@ type ToolMessage = {
   content: string
   role: "tool"
   toolCallId: string
+  error?: string
 }
 ```
 
@@ -152,6 +153,7 @@ type ToolMessage = {
 | `content`    | `string` | Text content of the message                  |
 | `role`       | `"tool"` | Role of the message sender, fixed as "tool"  |
 | `toolCallId` | `string` | ID of the tool call this message responds to |
+| `error`      | `string` | Error message if the tool call failed        |
 
 ### Message
 

docs/sdk/python/core/types.mdx

@@ -144,6 +144,7 @@ class ToolMessage(ConfiguredBaseModel):
     role: Literal["tool"]
     content: str
     tool_call_id: str
+    error: Optional[str] = None
 ```
 
 | Property       | Type              | Description                                  |
@@ -152,6 +153,7 @@ class ToolMessage(ConfiguredBaseModel):
 | `content`      | `str`             | Text content of the message                  |
 | `role`         | `Literal["tool"]` | Role of the message sender, fixed as "tool"  |
 | `tool_call_id` | `str`             | ID of the tool call this message responds to |
+| `error`        | `Optional[str]`   | Error message if the tool call failed        |
 
 ### Message