Merge branch 'main' into feat/CPK-7193-inspector-threads-clean

Author: marthakelly

docs/lib/providers/posthog-provider.tsx

@@ -7,7 +7,11 @@ import { usePathname } from "next/navigation";
 import { normalizePathnameForAnalytics } from "@/lib/analytics-utils";
 
 const POSTHOG_KEY = process.env.NEXT_PUBLIC_POSTHOG_KEY;
-const POSTHOG_HOST = process.env.NEXT_PUBLIC_POSTHOG_HOST;
+// Reverse-proxied via /ingest/* rewrites in next.config.mjs so requests
+// flow through docs.copilotkit.ai instead of *.i.posthog.com — bypasses
+// ad blockers / tracking-protection that target the PostHog hostname.
+const POSTHOG_HOST = "/ingest";
+const POSTHOG_UI_HOST = "https://eu.posthog.com";
 
 export function PostHogProvider({ children }: { children: React.ReactNode }) {
   const pathname = usePathname();
@@ -24,12 +28,7 @@ export function PostHogProvider({ children }: { children: React.ReactNode }) {
 
   // Initialize PostHog once (only on mount)
   useEffect(() => {
-    if (
-      POSTHOG_KEY &&
-      POSTHOG_HOST &&
-      !posthog?.__loaded &&
-      !isInitializedRef.current
-    ) {
+    if (POSTHOG_KEY && !posthog?.__loaded && !isInitializedRef.current) {
       isInitializedRef.current = true;
 
       // Read sessionId from URL at initialization time
@@ -94,6 +93,7 @@ export function PostHogProvider({ children }: { children: React.ReactNode }) {
 
         posthog.init(POSTHOG_KEY, {
           api_host: POSTHOG_HOST,
+          ui_host: POSTHOG_UI_HOST,
           person_profiles: "identified_only",
           bootstrap: initSessionId
             ? {
@@ -117,7 +117,7 @@ export function PostHogProvider({ children }: { children: React.ReactNode }) {
 
   // Capture pageview only after PostHog is initialized
   useEffect(() => {
-    if (POSTHOG_KEY && POSTHOG_HOST && posthog?.__loaded) {
+    if (POSTHOG_KEY && posthog?.__loaded) {
       try {
         const normalizedPathname = normalizePathnameForAnalytics(pathname);
         posthog.capture("$pageview", {

docs/middleware.ts

@@ -149,6 +149,6 @@ export const config = {
      * - _next/image (image optimization files)
      * - favicon.ico (favicon file)
      */
-    "/((?!api|_next/static|_next/image|favicon.ico).*)",
+    "/((?!api|ingest|_next/static|_next/image|favicon.ico).*)",
   ],
 };

docs/next.config.mjs

@@ -140,6 +140,15 @@ const config = {
 
     return {
       beforeFiles: [
+        // PostHog reverse proxy — routes analytics through our domain to bypass ad blockers
+        {
+          source: '/ingest/static/:path*',
+          destination: 'https://eu-assets.i.posthog.com/static/:path*',
+        },
+        {
+          source: '/ingest/:path*',
+          destination: 'https://eu.i.posthog.com/:path*',
+        },
         // Map /guides/* to /built-in-agent/guides/* (legacy path)
         {
           source: '/guides/:path*',

showcase/integrations/built-in-agent/src/app/demos/gen-ui-interrupt/page.tsx

@@ -13,8 +13,8 @@
 // the user decides.
 
 import React, { useRef } from "react";
-import { CopilotKit } from "@copilotkit/react-core";
 import {
+  CopilotKitProvider,
   CopilotChat,
   useConfigureSuggestions,
   useFrontendTool,
@@ -35,13 +35,13 @@ type PickerResult =
 
 export default function GenUiInterruptDemo() {
   return (
-    <CopilotKit runtimeUrl="/api/copilotkit" agent="gen-ui-interrupt">
+    <CopilotKitProvider runtimeUrl="/api/copilotkit" useSingleEndpoint>
       <div className="flex justify-center items-center h-screen w-full">
         <div className="h-full w-full max-w-4xl">
           <Chat />
         </div>
       </div>
-    </CopilotKit>
+    </CopilotKitProvider>
   );
 }
 
@@ -117,6 +117,6 @@ function Chat() {
   // @endregion[frontend-promise-handler]
 
   return (
-    <CopilotChat agentId="gen-ui-interrupt" className="h-full rounded-2xl" />
+    <CopilotChat className="h-full rounded-2xl" />
   );
 }

showcase/integrations/built-in-agent/src/app/demos/interrupt-headless/page.tsx

@@ -19,8 +19,8 @@
 // — equivalent UX, different mechanism.
 
 import React, { useRef, useState } from "react";
-import { CopilotKit } from "@copilotkit/react-core";
 import {
+  CopilotKitProvider,
   CopilotChat,
   useConfigureSuggestions,
   useFrontendTool,
@@ -47,9 +47,9 @@ const DEFAULT_SLOTS: TimeSlot[] = [
 
 export default function InterruptHeadlessDemo() {
   return (
-    <CopilotKit runtimeUrl="/api/copilotkit" agent="interrupt-headless">
+    <CopilotKitProvider runtimeUrl="/api/copilotkit" useSingleEndpoint>
       <Layout />
-    </CopilotKit>
+    </CopilotKitProvider>
   );
 }
 
@@ -129,7 +129,7 @@ function Layout() {
     <div className="grid h-screen grid-cols-[1fr_420px] bg-[#FAFAFC]">
       <AppSurface pending={pending} resolve={resolve} />
       <div className="border-l border-[#DBDBE5] bg-white">
-        <CopilotChat agentId="interrupt-headless" className="h-full" />
+        <CopilotChat className="h-full" />
       </div>
     </div>
   );

showcase/integrations/langroid/src/agents/multimodal_agent.py

@@ -116,13 +116,22 @@ def _normalize_part(part: Any) -> dict[str, Any] | None:
     - ``{"type": "binary", "mimeType": "...", "data": "<b64>"}`` (legacy)
     - ``{"type": "image_url", "image_url": {"url": "data:..."}}`` (already OpenAI shape)
     - bare strings (treated as text).
+    - Pydantic model instances (e.g. ``TextInputContent``, ``ImageInputContent``,
+      ``DocumentInputContent`` from ``ag_ui.core``) — converted to dicts via
+      ``model_dump()`` so the rest of the function can use ``.get()``.
     """
     if isinstance(part, str):
         if not part:
             return None
         return {"type": "text", "text": part}
+    # Pydantic model instances (from ag_ui.core deserialization) are not
+    # dicts but expose model_dump(). Convert once so the rest of the
+    # function can use dict-style .get() access uniformly.
     if not isinstance(part, dict):
-        return None
+        if hasattr(part, "model_dump"):
+            part = part.model_dump(by_alias=True)
+        else:
+            return None
     ptype = part.get("type")
 
     if ptype == "text":

showcase/integrations/ms-agent-python/src/agents/multimodal_agent.py

@@ -30,12 +30,10 @@
 - showcase/integrations/langgraph-python/src/agents/multimodal_agent.py
 """
 
-from __future__ import annotations
-
 import base64
 import io
 from textwrap import dedent
-from typing import Any
+from typing import Any, Optional, Tuple
 
 from agent_framework import Agent, BaseChatClient
 from agent_framework_ag_ui import AgentFrameworkAgent
@@ -101,7 +99,7 @@ def _extract_pdf_text(b64: str) -> str:
         return ""
 
 
-def _classify_attachment_part(part: Any) -> tuple[str, str, str] | None:
+def _classify_attachment_part(part: Any) -> Optional[Tuple[str, str, str]]:
     """Inspect a content part and return (kind, mime, base64_payload).
 
     ``kind`` is one of ``"image"``, ``"pdf"``, ``"other"``. Returns ``None``
@@ -124,7 +122,7 @@ def _classify_attachment_part(part: Any) -> tuple[str, str, str] | None:
 
     if part_type == "image_url":
         image_url = part.get("image_url")
-        url: str | None = None
+        url: Optional[str] = None
         if isinstance(image_url, str):
             url = image_url
         elif isinstance(image_url, dict):
@@ -217,14 +215,12 @@ def _flatten_messages(self, messages: Any) -> Any:
             rewritten.append({**message, "content": new_parts})
         return rewritten
 
-    async def run(self, *args: Any, **kwargs: Any) -> Any:  # type: ignore[override]
-        # AG-UI may hand us messages via a positional or keyword argument;
-        # normalize both shapes before delegating to the base implementation.
-        if "messages" in kwargs:
-            kwargs["messages"] = self._flatten_messages(kwargs["messages"])
-        elif args and isinstance(args[0], list):
-            args = (self._flatten_messages(args[0]), *args[1:])
-        return await super().run(*args, **kwargs)
+    async def run(self, input_data: dict[str, Any]):  # type: ignore[override]
+        messages = input_data.get("messages")
+        if isinstance(messages, list):
+            input_data = {**input_data, "messages": self._flatten_messages(messages)}
+        async for event in super().run(input_data):
+            yield event
 
 
 def create_multimodal_agent(chat_client: BaseChatClient) -> AgentFrameworkAgent: