Merge origin/main into codex/ent-734-agent-spec

Conflict resolution (contract test): keep main's 6-entry array + appRoots
map, add agent-spec (src/app), and merge her REST-transport relaxation
(layout+page concat — agent-spec's provider is page-level) with main's
appRoots-based paths. 43/43 passing.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

scripts/__tests__/integration-intelligence-migration.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, test } from "vitest";
 import * as fs from "node:fs";
 import * as path from "node:path";
 
@@ -8,8 +8,21 @@ const integrationsDir = path.join(repoRoot, "examples", "integrations");
 const migratedIntegrations = [
   "crewai-flows",
   "llamaindex",
+  "langgraph-fastapi",
+  "pydantic-ai",
+  "mcp-apps",
   "agent-spec",
 ] as const;
+const a2aMiddlewareRoot = path.join(integrationsDir, "a2a-middleware");
+
+const appRoots: Record<(typeof migratedIntegrations)[number], string> = {
+  "crewai-flows": "src/app",
+  llamaindex: "src/app",
+  "langgraph-fastapi": "src/app",
+  "pydantic-ai": "src/app",
+  "mcp-apps": "app",
+  "agent-spec": "src/app",
+};
 
 function readIntegrationFile(
   integration: string,
@@ -29,12 +42,16 @@ function readOptionalIntegrationFile(
   return fs.existsSync(filePath) ? fs.readFileSync(filePath, "utf8") : "";
 }
 
+function readA2AMiddlewareFile(pathFromRoot: string): string {
+  return fs.readFileSync(path.join(a2aMiddlewareRoot, pathFromRoot), "utf8");
+}
+
 describe("batch-2 Intelligence integration migration", () => {
   for (const integration of migratedIntegrations) {
     it(`${integration} has the env-gated Intelligence runtime route`, () => {
       const route = readIntegrationFile(
         integration,
-        "src/app/api/copilotkit/[[...slug]]/route.ts",
+        `${appRoots[integration]}/api/copilotkit/[[...slug]]/route.ts`,
       );
 
       expect(route).toContain("CopilotKitIntelligence");
@@ -51,20 +68,41 @@ describe("batch-2 Intelligence integration migration", () => {
     });
 
     it(`${integration} forces REST transport for thread routes`, () => {
-      const layout = readIntegrationFile(integration, "src/app/layout.tsx");
-      const page = readIntegrationFile(integration, "src/app/page.tsx");
+      const layout = readIntegrationFile(
+        integration,
+        `${appRoots[integration]}/layout.tsx`,
+      );
+      const page = readIntegrationFile(
+        integration,
+        `${appRoots[integration]}/page.tsx`,
+      );
 
       expect(`${layout}\n${page}`).toContain("useSingleEndpoint={false}");
     });
 
     it(`${integration} wires the threads drawer into the chat thread context`, () => {
-      const page = readIntegrationFile(integration, "src/app/page.tsx");
+      const page = readIntegrationFile(
+        integration,
+        `${appRoots[integration]}/page.tsx`,
+      );
 
       expect(page).toContain("ThreadsDrawer");
       expect(page).toContain("ThreadsPanelGate");
       expect(page).toContain("CopilotChatConfigurationProvider");
       expect(page).toContain("threadId");
       expect(page).toContain("onThreadChange={setThreadId}");
+
+      if (integration === "mcp-apps") {
+        expect(page).toContain('key={threadId ?? "new-thread"}');
+        expect(page).toContain("threadId={threadId}");
+
+        const drawer = readIntegrationFile(
+          integration,
+          "app/components/threads-drawer/threads-drawer.tsx",
+        );
+        expect(drawer).toContain("onThreadChange(undefined)");
+        expect(drawer).not.toContain("crypto.randomUUID()");
+      }
     });
 
     it(`${integration} exposes the client-safe threads enabled gate`, () => {
@@ -98,3 +136,97 @@ describe("batch-2 Intelligence integration migration", () => {
     });
   }
 });
+
+test("a2a-middleware runtime route is gated for Intelligence threads", () => {
+  const route = readA2AMiddlewareFile(
+    "app/api/copilotkit/[[...slug]]/route.ts",
+  );
+
+  expect(route).toContain("CopilotKitIntelligence");
+  expect(route).toContain(
+    "class RuntimeA2AMiddlewareAgent extends A2AMiddlewareAgent",
+  );
+  expect(route).toContain("const isolatedAgent = new A2AMiddlewareAgent");
+  expect(route).toContain("new HttpAgent({");
+  expect(route).toContain("isolatedAgent.setMessages(parameters.messages)");
+  expect(route).toContain("return isolatedAgent.runAgent(");
+  expect(route).toContain("process.env.COPILOTKIT_LICENSE_TOKEN");
+  expect(route).toContain("process.env.INTELLIGENCE_API_KEY");
+  expect(route).toContain("process.env.INTELLIGENCE_API_URL");
+  expect(route).toContain("process.env.INTELLIGENCE_GATEWAY_WS_URL");
+  expect(route).toContain('id: "demo-user"');
+  expect(route).toContain("licenseToken: process.env.COPILOTKIT_LICENSE_TOKEN");
+  expect(route).toContain(": { runner: new InMemoryAgentRunner() }");
+  expect(route).toContain("export const GET = handle(app);");
+  expect(route).toContain("export const POST = handle(app);");
+  expect(route).toContain("export const PATCH = handle(app);");
+  expect(route).toContain("export const DELETE = handle(app);");
+});
+
+test("a2a-middleware preserves its three-agent URL configuration", () => {
+  const route = readA2AMiddlewareFile(
+    "app/api/copilotkit/[[...slug]]/route.ts",
+  );
+
+  expect(route).toContain("process.env.RESEARCH_AGENT_URL");
+  expect(route).toContain("process.env.ANALYSIS_AGENT_URL");
+  expect(route).toContain("process.env.ORCHESTRATOR_URL");
+  expect(route).toContain('agentId: "a2a_chat"');
+  expect(route).toContain("agentUrls: [researchAgentUrl, analysisAgentUrl]");
+  expect(route).toContain("orchestrationAgentUrl: orchestratorUrl");
+});
+
+test("a2a-middleware page uses REST transport for Threads APIs", () => {
+  const page = readA2AMiddlewareFile("app/page.tsx");
+
+  expect(page).toContain('runtimeUrl="/api/copilotkit"');
+  expect(page).toContain("useSingleEndpoint={false}");
+  expect(page).toContain('agentId="a2a_chat"');
+  expect(page).toContain("ThreadsDrawer");
+  expect(page).toContain("ThreadsPanelGate");
+  expect(page).toContain("CopilotChatConfigurationProvider");
+  expect(page).toContain("const [threadId, setThreadId]");
+  expect(page).toContain("threadId={threadId}");
+});
+
+test("a2a-middleware chat keeps A2A visualization tools inside the configured chat", () => {
+  const chat = readA2AMiddlewareFile("components/chat.tsx");
+
+  expect(chat).toContain("useFrontendTool");
+  expect(chat).toContain('name: "send_message_to_a2a_agent"');
+  expect(chat).toContain("MessageToA2A");
+  expect(chat).toContain("MessageFromA2A");
+  expect(chat).not.toContain("<CopilotKit");
+});
+
+test("a2a-middleware exposes local Intelligence env documentation", () => {
+  const envExample = readA2AMiddlewareFile(".env.example");
+
+  expect(envExample).toContain("GOOGLE_API_KEY=");
+  expect(envExample).toContain("OPENAI_API_KEY=");
+  expect(envExample).toContain("COPILOTKIT_LICENSE_TOKEN=");
+  expect(envExample).toContain("INTELLIGENCE_API_KEY=");
+  expect(envExample).toContain("INTELLIGENCE_API_URL=http://localhost:4201");
+  expect(envExample).toContain(
+    "INTELLIGENCE_GATEWAY_WS_URL=ws://localhost:4401",
+  );
+});
+
+test("a2a-middleware package is pinned to the Intelligence-ready CopilotKit SDK", () => {
+  const packageJson = JSON.parse(readA2AMiddlewareFile("package.json")) as {
+    dependencies: Record<string, string>;
+  };
+
+  expect(packageJson.dependencies["@copilotkit/react-core"]).toBe("1.59.1");
+  expect(packageJson.dependencies["@copilotkit/runtime"]).toBe("1.59.1");
+  expect(packageJson.dependencies["lucide-react"]).toBeDefined();
+});
+
+test("a2a-middleware Next config enables the Threads feature flag", () => {
+  const nextConfig = readA2AMiddlewareFile("next.config.ts");
+
+  expect(nextConfig).toContain('output: "standalone"');
+  expect(nextConfig).toContain("NEXT_PUBLIC_COPILOTKIT_THREADS_ENABLED");
+  expect(nextConfig).toContain("process.env");
+  expect(nextConfig).toContain("COPILOTKIT_LICENSE_TOKEN");
+});