@copilotkit/runtime 0.0.0-fix-debug-infosys-20251107162427 → 0.0.0-fix-restore-handle-method-node-http-20251222114321

package/src/lib/runtime/copilot-runtime.ts

@@ -13,111 +13,52 @@
  */
 
 import {
-  Action,
-  actionParametersToJsonSchema,
-  Parameter,
-  ResolvedCopilotKitError,
-  CopilotKitApiDiscoveryError,
-  randomId,
-  CopilotKitError,
-  CopilotKitAgentDiscoveryError,
+  type Action,
+  type CopilotErrorHandler,
   CopilotKitMisuseError,
-  CopilotKitErrorCode,
-  CopilotKitLowLevelError,
-  CopilotErrorHandler,
-  CopilotErrorEvent,
-  CopilotRequestContext,
-  ensureStructuredError,
+  type MaybePromise,
+  type NonEmptyRecord,
+  type Parameter,
+  readBody,
+  getZodParameters,
+  type PartialBy,
+  isTelemetryDisabled,
 } from "@copilotkit/shared";
+import type { RunAgentInput } from "@ag-ui/core";
+import { aguiToGQL } from "../../graphql/message-conversion/agui-to-gql";
+import type { CopilotServiceAdapter, RemoteChainParameters } from "../../service-adapters";
 import {
-  CopilotServiceAdapter,
-  EmptyAdapter,
-  RemoteChain,
-  RemoteChainParameters,
-} from "../../service-adapters";
-
-import { MessageInput } from "../../graphql/inputs/message.input";
-import { ActionInput } from "../../graphql/inputs/action.input";
-import { RuntimeEventSource, RuntimeEventTypes } from "../../service-adapters/events";
-import { convertGqlInputToMessages } from "../../service-adapters/conversion";
-import { Message } from "../../graphql/types/converted";
-import { ForwardedParametersInput } from "../../graphql/inputs/forwarded-parameters.input";
+  CopilotRuntime as CopilotRuntimeVNext,
+  type CopilotRuntimeOptions,
+  type CopilotRuntimeOptions as CopilotRuntimeOptionsVNext,
+  InMemoryAgentRunner,
+} from "@copilotkitnext/runtime";
+import { TelemetryAgentRunner } from "./telemetry-agent-runner";
+import telemetry from "../telemetry-client";
+
+import type { MessageInput } from "../../graphql/inputs/message.input";
+import type { Message } from "../../graphql/types/converted";
 
 import {
-  isRemoteAgentAction,
   EndpointType,
-  setupRemoteActions,
-  EndpointDefinition,
-  CopilotKitEndpoint,
-  LangGraphPlatformEndpoint,
-} from "./remote-actions";
-
-import { GraphQLContext } from "../integrations/shared";
-import { AgentSessionInput } from "../../graphql/inputs/agent-session.input";
-import { from } from "rxjs";
-import { AgentStateInput } from "../../graphql/inputs/agent-state.input";
-import { ActionInputAvailability } from "../../graphql/types/enums";
-import { createHeaders } from "./remote-action-constructors";
-import { fetchWithRetry } from "./retry-utils";
-import { Agent } from "../../graphql/types/agents-response.type";
-import { ExtensionsInput } from "../../graphql/inputs/extensions.input";
-import { ExtensionsResponse } from "../../graphql/types/extensions-response.type";
-import { LoadAgentStateResponse } from "../../graphql/types/load-agent-state-response.type";
-import { Client as LangGraphClient } from "@langchain/langgraph-sdk";
-import { langchainMessagesToCopilotKit } from "./remote-lg-action";
-import { MetaEventInput } from "../../graphql/inputs/meta-event.input";
-import {
-  CopilotObservabilityConfig,
-  LLMRequestData,
-  LLMResponseData,
-  LLMErrorData,
-} from "../observability";
-import { AbstractAgent } from "@ag-ui/client";
-import { MessageRole } from "../../graphql/types/enums";
+  type EndpointDefinition,
+  type CopilotKitEndpoint,
+  type LangGraphPlatformEndpoint,
+} from "./types";
+
+import type { CopilotObservabilityConfig, LLMRequestData, LLMResponseData } from "../observability";
+import type { AbstractAgent } from "@ag-ui/client";
 
 // +++ MCP Imports +++
 import {
-  MCPClient,
-  MCPEndpointConfig,
-  MCPTool,
-  convertMCPToolsToActions,
-  generateMcpToolInstructions,
+  type MCPClient,
+  type MCPEndpointConfig,
+  type MCPTool,
+  extractParametersFromSchema,
 } from "./mcp-tools-utils";
-import { LangGraphAgent } from "./langgraph/langgraph-agent";
+import { BuiltInAgent, type BuiltInAgentConfiguration } from "@copilotkitnext/agent";
 // Define the function type alias here or import if defined elsewhere
 type CreateMCPClientFunction = (config: MCPEndpointConfig) => Promise<MCPClient>;
-// --- MCP Imports ---
-
-import { generateHelpfulErrorMessage } from "../streaming";
-import { CopilotContextInput } from "../../graphql/inputs/copilot-context.input";
-import { RemoteAgentAction } from "./agui-action";
-
-export interface CopilotRuntimeRequest {
-  serviceAdapter: CopilotServiceAdapter;
-  messages: MessageInput[];
-  actions: ActionInput[];
-  agentSession?: AgentSessionInput;
-  agentStates?: AgentStateInput[];
-  outputMessagesPromise: Promise<Message[]>;
-  threadId?: string;
-  runId?: string;
-  publicApiKey?: string;
-  graphqlContext: GraphQLContext;
-  forwardedParameters?: ForwardedParametersInput;
-  url?: string;
-  extensions?: ExtensionsInput;
-  metaEvents?: MetaEventInput[];
-  context?: CopilotContextInput[];
-}
-
-interface CopilotRuntimeResponse {
-  threadId: string;
-  runId?: string;
-  eventSource: RuntimeEventSource;
-  serverSideActions: Action<any>[];
-  actionInputsWithoutAgents: ActionInput[];
-  extensions?: ExtensionsResponse;
-}
 
 type ActionsConfiguration<T extends Parameter[] | [] = []> =
   | Action<T>[]
@@ -157,17 +98,23 @@ interface Middleware {
   /**
    * A function that is called before the request is processed.
    */
+  /**
+   * @deprecated This middleware hook is deprecated and will be removed in a future version.
+   * Use updated middleware integration methods in CopilotRuntimeVNext instead.
+   */
   onBeforeRequest?: OnBeforeRequestHandler;
 
   /**
    * A function that is called after the request is processed.
    */
+  /**
+   * @deprecated This middleware hook is deprecated and will be removed in a future version.
+   * Use updated middleware integration methods in CopilotRuntimeVNext instead.
+   */
   onAfterRequest?: OnAfterRequestHandler;
 }
 
-type AgentWithEndpoint = Agent & { endpoint: EndpointDefinition };
-
-export interface CopilotRuntimeConstructorParams<T extends Parameter[] | [] = []> {
+export interface CopilotRuntimeConstructorParams_BASE<T extends Parameter[] | [] = []> {
   /**
    * Middleware to be used by the runtime.
    *
@@ -190,6 +137,10 @@ export interface CopilotRuntimeConstructorParams<T extends Parameter[] | [] = []
    * }) => void | Promise<void>;
    * ```
    */
+  /**
+   * @deprecated This middleware hook is deprecated and will be removed in a future version.
+   * Use updated middleware integration methods in CopilotRuntimeVNext instead.
+   */
   middleware?: Middleware;
 
   /*
@@ -312,1345 +263,421 @@ export interface CopilotRuntimeConstructorParams<T extends Parameter[] | [] = []
   onError?: CopilotErrorHandler;
 
   onStopGeneration?: OnStopGenerationHandler;
+
+  // /** Optional transcription service for audio processing. */
+  // transcriptionService?: CopilotRuntimeOptionsVNext["transcriptionService"];
+  // /** Optional *before* middleware – callback function or webhook URL. */
+  // beforeRequestMiddleware?: CopilotRuntimeOptionsVNext["beforeRequestMiddleware"];
+  // /** Optional *after* middleware – callback function or webhook URL. */
+  // afterRequestMiddleware?: CopilotRuntimeOptionsVNext["afterRequestMiddleware"];
 }
 
+type BeforeRequestMiddleware = CopilotRuntimeOptionsVNext["beforeRequestMiddleware"];
+type AfterRequestMiddleware = CopilotRuntimeOptionsVNext["afterRequestMiddleware"];
+type BeforeRequestMiddlewareFn = Exclude<BeforeRequestMiddleware, string>;
+type BeforeRequestMiddlewareFnParameters = Parameters<BeforeRequestMiddlewareFn>;
+type BeforeRequestMiddlewareFnResult = ReturnType<BeforeRequestMiddlewareFn>;
+type AfterRequestMiddlewareFn = Exclude<AfterRequestMiddleware, string>;
+type AfterRequestMiddlewareFnParameters = Parameters<AfterRequestMiddlewareFn>;
+
+interface CopilotRuntimeConstructorParams<T extends Parameter[] | [] = []>
+  extends Omit<CopilotRuntimeConstructorParams_BASE<T>, "agents">,
+    Omit<CopilotRuntimeOptionsVNext, "agents" | "transcriptionService"> {
+  /**
+   * TODO: un-omit `transcriptionService` above once it's supported
+   *
+   * This satisfies...
+   *  – the optional constraint in `CopilotRuntimeConstructorParams_BASE`
+   *  – the `MaybePromise<NonEmptyRecord<T>>` constraint in `CopilotRuntimeOptionsVNext`
+   *  – the `Record<string, AbstractAgent>` constraint in `both
+   */
+  agents?: MaybePromise<NonEmptyRecord<Record<string, AbstractAgent>>>;
+}
+
+/**
+ * Central runtime object passed to all request handlers.
+ */
 export class CopilotRuntime<const T extends Parameter[] | [] = []> {
-  public actions: ActionsConfiguration<T>;
-  public agents: Record<string, AbstractAgent>;
-  public remoteEndpointDefinitions: EndpointDefinition[];
-  private langserve: Promise<Action<any>>[] = [];
-  private onBeforeRequest?: OnBeforeRequestHandler;
-  private onAfterRequest?: OnAfterRequestHandler;
-  private onStopGeneration?: OnStopGenerationHandler;
-  private delegateAgentProcessingToServiceAdapter: boolean;
+  params?: CopilotRuntimeConstructorParams<T>;
   private observability?: CopilotObservabilityConfig;
-  private availableAgents: Pick<AgentWithEndpoint, "name" | "id">[];
-  private onError?: CopilotErrorHandler;
-  private hasWarnedAboutError = false;
+  // Cache MCP tools per endpoint to avoid re-fetching repeatedly
+  private mcpToolsCache: Map<string, BuiltInAgentConfiguration["tools"]> = new Map();
+  private runtimeArgs: CopilotRuntimeOptions;
+  private _instance: CopilotRuntimeVNext;
+
+  constructor(
+    params?: CopilotRuntimeConstructorParams<T> & PartialBy<CopilotRuntimeOptions, "agents">,
+  ) {
+    const agents = params?.agents ?? {};
+    const endpointAgents = this.assignEndpointsToAgents(params?.remoteEndpoints ?? []);
+
+    // Determine the base runner (user-provided or default)
+    const baseRunner = params?.runner ?? new InMemoryAgentRunner();
+
+    // Wrap with TelemetryAgentRunner unless telemetry is disabled
+    // This ensures we always capture agent execution telemetry when enabled,
+    // even if the user provides their own custom runner
+    const runner = isTelemetryDisabled()
+      ? baseRunner
+      : new TelemetryAgentRunner({ runner: baseRunner });
+
+    this.runtimeArgs = {
+      agents: { ...endpointAgents, ...agents },
+      runner,
+      // TODO: add support for transcriptionService from CopilotRuntimeOptionsVNext once it is ready
+      // transcriptionService: params?.transcriptionService,
+
+      beforeRequestMiddleware: this.createOnBeforeRequestHandler(params).bind(this),
+      afterRequestMiddleware: this.createOnAfterRequestHandler(params).bind(this),
+    };
+    this.params = params;
+    this.observability = params?.observability_c;
+  }
 
-  // +++ MCP Properties +++
-  private readonly mcpServersConfig?: MCPEndpointConfig[];
-  private mcpActionCache = new Map<string, Action<any>[]>();
-  // --- MCP Properties ---
+  get instance() {
+    if (!this._instance) {
+      this._instance = new CopilotRuntimeVNext(this.runtimeArgs);
+    }
 
-  // +++ MCP Client Factory +++
-  private readonly createMCPClientImpl?: CreateMCPClientFunction;
-  // --- MCP Client Factory ---
+    return this._instance;
+  }
 
-  constructor(params?: CopilotRuntimeConstructorParams<T>) {
-    if (
-      params?.remoteEndpoints &&
-      params?.remoteEndpoints.some((e) => e.type === EndpointType.LangGraphPlatform)
-    ) {
-      throw new CopilotKitMisuseError({
-        message:
-          "LangGraph Platform remote endpoints are deprecated in favor of the `agents` property. Refer to https://docs.copilotkit.ai/langgraph for more information.",
-      });
-    }
+  private assignEndpointsToAgents(
+    endpoints: CopilotRuntimeConstructorParams<T>["remoteEndpoints"],
+  ): Record<string, AbstractAgent> {
+    let result: Record<string, AbstractAgent> = {};
 
     if (
-      params?.actions &&
-      params?.remoteEndpoints &&
-      params?.remoteEndpoints.some((e) => e.type === EndpointType.LangGraphPlatform)
+      endpoints.some((endpoint) => resolveEndpointType(endpoint) == EndpointType.LangGraphPlatform)
     ) {
-      console.warn("Actions set in runtime instance will not be available for the agent");
-      console.warn(
-        `LangGraph Platform remote endpoints are deprecated in favor of the "agents" property`,
-      );
-    }
-
-    // TODO: finalize
-    // if (
-    //   params?.agents &&
-    //   Object.values(params.agents).some((agent) => {
-    //     return agent instanceof AguiLangGraphAgent && !(agent instanceof LangGraphAgent);
-    //   })
-    // ) {
-    //   console.warn('LangGraph Agent class should be imported from @copilotkit/runtime. ')
-    // }
-
-    this.actions = params?.actions || [];
-    this.availableAgents = [];
-
-    for (const chain of params?.langserve || []) {
-      const remoteChain = new RemoteChain(chain);
-      this.langserve.push(remoteChain.toAction());
-    }
-
-    this.remoteEndpointDefinitions = params?.remoteEndpoints ?? params?.remoteActions ?? [];
-
-    this.onBeforeRequest = params?.middleware?.onBeforeRequest;
-    this.onAfterRequest = params?.middleware?.onAfterRequest;
-    this.onStopGeneration = params?.onStopGeneration;
-    this.delegateAgentProcessingToServiceAdapter =
-      params?.delegateAgentProcessingToServiceAdapter || false;
-    this.observability = params?.observability_c;
-    this.agents = params?.agents ?? {};
-    this.onError = params?.onError;
-    // +++ MCP Initialization +++
-    this.mcpServersConfig = params?.mcpServers;
-    this.createMCPClientImpl = params?.createMCPClient;
-
-    // Validate: If mcpServers are provided, createMCPClient must also be provided
-    if (this.mcpServersConfig && this.mcpServersConfig.length > 0 && !this.createMCPClientImpl) {
       throw new CopilotKitMisuseError({
         message:
-          "MCP Integration Error: `mcpServers` were provided, but the `createMCPClient` function was not passed to the CopilotRuntime constructor. " +
-          "Please provide an implementation for `createMCPClient`.",
+          "LangGraphPlatformEndpoint in remoteEndpoints is deprecated. " +
+          'Please use the "agents" option instead with LangGraphAgent from "@copilotkit/runtime/langgraph". ' +
+          'Example: agents: { myAgent: new LangGraphAgent({ deploymentUrl: "...", graphId: "..." }) }',
       });
     }
 
-    // Warning if actions are defined alongside LangGraph platform (potentially MCP too?)
-    if (
-      params?.actions &&
-      (params?.remoteEndpoints?.some((e) => e.type === EndpointType.LangGraphPlatform) ||
-        this.mcpServersConfig?.length)
-    ) {
-      console.warn(
-        "Local 'actions' defined in CopilotRuntime might not be available to remote agents (LangGraph, MCP). Consider defining actions closer to the agent implementation if needed.",
-      );
-    }
+    return result;
   }
 
-  // +++ MCP Instruction Injection Method +++
-  private injectMCPToolInstructions(
-    messages: MessageInput[],
-    currentActions: Action<any>[],
-  ): MessageInput[] {
-    // Filter the *passed-in* actions for MCP tools
-    const mcpActionsForRequest = currentActions.filter((action) => (action as any)._isMCPTool);
-
-    if (!mcpActionsForRequest || mcpActionsForRequest.length === 0) {
-      return messages; // No MCP tools for this specific request
-    }
-
-    // Create a map to deduplicate tools by name (keeping the last one if duplicates exist)
-    const uniqueMcpTools = new Map<string, Action<any>>();
-
-    // Add all MCP tools to the map with their names as keys
-    mcpActionsForRequest.forEach((action) => {
-      uniqueMcpTools.set(action.name, action);
-    });
-
-    // Format instructions from the unique tools map
-    // Convert Action objects to MCPTool format for the instruction generator
-    const toolsMap: Record<string, MCPTool> = {};
-    Array.from(uniqueMcpTools.values()).forEach((action) => {
-      toolsMap[action.name] = {
-        description: action.description || "",
-        schema: action.parameters
-          ? {
-              parameters: {
-                properties: action.parameters.reduce(
-                  (acc, p) => ({
-                    ...acc,
-                    [p.name]: { type: p.type, description: p.description },
-                  }),
-                  {},
-                ),
-                required: action.parameters.filter((p) => p.required).map((p) => p.name),
-              },
-            }
-          : {},
-        execute: async () => ({}), // Placeholder, not used for instructions
-      };
-    });
-
-    // Generate instructions using the exported helper
-    const mcpToolInstructions = generateMcpToolInstructions(toolsMap);
-
-    if (!mcpToolInstructions) {
-      return messages; // No MCP tools to describe
-    }
-
-    const instructions =
-      mcpToolInstructions + "\nUse them when appropriate to fulfill the user's request.";
-
-    const systemMessageIndex = messages.findIndex((msg) => msg.textMessage?.role === "system");
-
-    const newMessages = [...messages]; // Create a mutable copy
-
-    if (systemMessageIndex !== -1) {
-      const existingMsg = newMessages[systemMessageIndex];
-      if (existingMsg.textMessage) {
-        existingMsg.textMessage.content =
-          (existingMsg.textMessage.content ? existingMsg.textMessage.content + "\n\n" : "") +
-          instructions;
-      }
-    } else {
-      newMessages.unshift({
-        id: randomId(),
-        createdAt: new Date(),
-        textMessage: {
-          role: MessageRole.system,
-          content: instructions,
-        },
-        actionExecutionMessage: undefined,
-        resultMessage: undefined,
-        agentStateMessage: undefined,
-      });
-    }
-
-    return newMessages;
-  }
-
-  async processRuntimeRequest(request: CopilotRuntimeRequest): Promise<CopilotRuntimeResponse> {
-    const {
-      serviceAdapter,
-      messages: rawMessages,
-      actions: clientSideActionsInput,
-      threadId,
-      runId,
-      outputMessagesPromise,
-      graphqlContext,
-      forwardedParameters,
-      url,
-      extensions,
-      agentSession,
-      agentStates,
-      publicApiKey,
-      context,
-    } = request;
-    graphqlContext.request.signal.addEventListener(
-      "abort",
-      () =>
-        this.onStopGeneration?.({
-          threadId,
-          runId,
-          url,
-          agentName: agentSession?.agentName,
-          lastMessage: rawMessages[rawMessages.length - 1],
-        }),
-      { once: true }, // optional: fire only once
-    );
-
-    const eventSource = new RuntimeEventSource({
-      errorHandler: async (error, context) => {
-        await this.error("error", context, error, publicApiKey);
-      },
-      errorContext: {
-        threadId,
-        runId,
-        source: "runtime",
-        request: {
-          operation: "processRuntimeRequest",
-          method: "POST",
-          url: url,
-          startTime: Date.now(),
-        },
-        agent: agentSession ? { name: agentSession.agentName } : undefined,
-        technical: {
-          environment: process.env.NODE_ENV,
-        },
-      },
-    });
-    // Track request start time for logging
-    const requestStartTime = Date.now();
-    // For storing streamed chunks if progressive logging is enabled
-    const streamedChunks: any[] = [];
-
-    try {
-      console.log("Processing request:", request);
-      if (
-        Object.keys(this.agents).length &&
-        agentSession?.agentName &&
-        !this.delegateAgentProcessingToServiceAdapter
-      ) {
-        this.agents = { [agentSession.agentName]: this.agents[agentSession.agentName] };
-      }
-
-      if (agentSession && !this.delegateAgentProcessingToServiceAdapter) {
-        return await this.processAgentRequest(request);
-      }
-      if (serviceAdapter instanceof EmptyAdapter) {
-        throw new CopilotKitMisuseError({
-          message: `Invalid adapter configuration: EmptyAdapter is only meant to be used with agent lock mode. 
-For non-agent components like useCopilotChatSuggestions, CopilotTextarea, or CopilotTask, 
-please use an LLM adapter instead.`,
-        });
-      }
-
-      // +++ Get Server Side Actions (including dynamic MCP) EARLY +++
-      const serverSideActions = await this.getServerSideActions(request);
-      // --- Get Server Side Actions (including dynamic MCP) EARLY ---
-
-      // Filter raw messages *before* injection
-      const filteredRawMessages = rawMessages.filter((message) => !message.agentStateMessage);
-
-      // +++ Inject MCP Instructions based on current actions +++
-      const messagesWithInjectedInstructions = this.injectMCPToolInstructions(
-        filteredRawMessages,
-        serverSideActions,
-      );
-      const inputMessages = convertGqlInputToMessages(messagesWithInjectedInstructions);
-      // --- Inject MCP Instructions based on current actions ---
-
-      // Log LLM request if logging is enabled
-      if (this.observability?.enabled && publicApiKey) {
-        try {
-          const requestData: LLMRequestData = {
-            threadId,
-            runId,
-            model: forwardedParameters?.model,
-            messages: inputMessages,
-            actions: clientSideActionsInput,
-            forwardedParameters,
-            timestamp: requestStartTime,
-            provider: this.detectProvider(serviceAdapter),
-          };
-
-          await this.observability.hooks.handleRequest(requestData);
-        } catch (error) {
-          console.error("Error logging LLM request:", error);
-        }
-      }
-
-      const serverSideActionsInput: ActionInput[] = serverSideActions.map((action) => ({
-        name: action.name,
-        description: action.description,
-        jsonSchema: JSON.stringify(actionParametersToJsonSchema(action.parameters)),
-        additionalConfig: action.additionalConfig,
-      }));
-
-      const actionInputs = flattenToolCallsNoDuplicates([
-        ...serverSideActionsInput,
-        ...clientSideActionsInput.filter(
-          // Filter remote actions from CopilotKit core loop
-          (action) => action.available !== ActionInputAvailability.remote,
-        ),
-      ]);
-
-      await this.onBeforeRequest?.({
-        threadId,
-        runId,
-        inputMessages,
-        properties: graphqlContext.properties,
-        url,
-      });
-
-      const result = await serviceAdapter.process({
-        messages: inputMessages,
-        actions: actionInputs,
-        threadId,
-        runId,
-        eventSource,
-        forwardedParameters,
-        extensions,
-        agentSession,
-        agentStates,
-      });
-
-      // for backwards compatibility, we deal with the case that no threadId is provided
-      // by the frontend, by using the threadId from the response
-      const nonEmptyThreadId = threadId ?? result.threadId;
+  handleServiceAdapter(serviceAdapter: CopilotServiceAdapter) {
+    this.runtimeArgs.agents = Promise.resolve(this.runtimeArgs.agents ?? {}).then(
+      async (agents) => {
+        let agentsList = agents;
+        const isAgentsListEmpty = !Object.keys(agents).length;
+        const hasServiceAdapter = Boolean(serviceAdapter);
+        const illegalServiceAdapterNames = ["EmptyAdapter"];
+        const serviceAdapterCanBeUsedForAgent = !illegalServiceAdapterNames.includes(
+          serviceAdapter.name,
+        );
 
-      outputMessagesPromise
-        .then((outputMessages) => {
-          this.onAfterRequest?.({
-            threadId: nonEmptyThreadId,
-            runId: result.runId,
-            inputMessages,
-            outputMessages,
-            properties: graphqlContext.properties,
-            url,
+        if (isAgentsListEmpty && (!hasServiceAdapter || !serviceAdapterCanBeUsedForAgent)) {
+          throw new CopilotKitMisuseError({
+            message:
+              "No default agent provided. Please provide a default agent in the runtime config.",
           });
-        })
-        .catch((_error) => {});
-
-      // After getting the response, log it if logging is enabled
-      if (this.observability?.enabled && publicApiKey) {
-        try {
-          outputMessagesPromise
-            .then((outputMessages) => {
-              const responseData: LLMResponseData = {
-                threadId: result.threadId,
-                runId: result.runId,
-                model: forwardedParameters?.model,
-                // Use collected chunks for progressive mode or outputMessages for regular mode
-                output: this.observability.progressive ? streamedChunks : outputMessages,
-                latency: Date.now() - requestStartTime,
-                timestamp: Date.now(),
-                provider: this.detectProvider(serviceAdapter),
-                // Indicate this is the final response
-                isFinalResponse: true,
-              };
-
-              try {
-                this.observability.hooks.handleResponse(responseData);
-              } catch (logError) {
-                console.error("Error logging LLM response:", logError);
-              }
-            })
-            .catch((error) => {
-              console.error("Failed to get output messages for logging:", error);
-            });
-        } catch (error) {
-          console.error("Error setting up logging for LLM response:", error);
         }
-      }
 
-      // Add progressive logging if enabled
-      if (this.observability?.enabled && this.observability.progressive && publicApiKey) {
-        // Keep reference to original stream function
-        const originalStream = eventSource.stream.bind(eventSource);
-
-        // Wrap the stream function to intercept events
-        eventSource.stream = async (callback) => {
-          await originalStream(async (eventStream$) => {
-            // Create subscription to capture streaming events
-            eventStream$.subscribe({
-              next: (event) => {
-                // Only log content chunks
-                if (event.type === RuntimeEventTypes.TextMessageContent) {
-                  // Store the chunk
-                  streamedChunks.push(event.content);
-
-                  // Log each chunk separately for progressive mode
-                  try {
-                    const progressiveData: LLMResponseData = {
-                      threadId: threadId || "",
-                      runId,
-                      model: forwardedParameters?.model,
-                      output: event.content,
-                      latency: Date.now() - requestStartTime,
-                      timestamp: Date.now(),
-                      provider: this.detectProvider(serviceAdapter),
-                      isProgressiveChunk: true,
-                    };
-
-                    // Use Promise to handle async logger without awaiting
-                    Promise.resolve()
-                      .then(() => {
-                        this.observability.hooks.handleResponse(progressiveData);
-                      })
-                      .catch((error) => {
-                        console.error("Error in progressive logging:", error);
-                      });
-                  } catch (error) {
-                    console.error("Error preparing progressive log data:", error);
-                  }
-                }
-              },
-            });
-
-            // Call the original callback with the event stream
-            await callback(eventStream$);
+        if (isAgentsListEmpty) {
+          agentsList.default = new BuiltInAgent({
+            model: `${serviceAdapter.provider}/${serviceAdapter.model}`,
           });
-        };
-      }
-
-      console.log("Request processed. result: ", result);
-      return {
-        threadId: nonEmptyThreadId,
-        runId: result.runId,
-        eventSource,
-        serverSideActions,
-        actionInputsWithoutAgents: actionInputs.filter(
-          (action) =>
-            // TODO-AGENTS: do not exclude ALL server side actions
-            !serverSideActions.find((serverSideAction) => serverSideAction.name == action.name),
-          // !isRemoteAgentAction(
-          //   serverSideActions.find((serverSideAction) => serverSideAction.name == action.name),
-          // ),
-        ),
-        extensions: result.extensions,
-      };
-    } catch (error) {
-      console.log("Error in processRuntimeRequest", error);
-      // Log error if logging is enabled
-      if (this.observability?.enabled && publicApiKey) {
-        try {
-          const errorData: LLMErrorData = {
-            threadId,
-            runId,
-            model: forwardedParameters?.model,
-            error: error instanceof Error ? error : String(error),
-            timestamp: Date.now(),
-            latency: Date.now() - requestStartTime,
-            provider: this.detectProvider(serviceAdapter),
-          };
-
-          await this.observability.hooks.handleError(errorData);
-        } catch (logError) {
-          console.error("Error logging LLM error:", logError);
         }
-      }
 
-      let structuredError: CopilotKitError;
-
-      if (error instanceof CopilotKitError) {
-        structuredError = error;
-      } else {
-        // Convert non-CopilotKitErrors to structured errors, but preserve already structured ones
-        structuredError = ensureStructuredError(error, (err) =>
-          this.convertStreamingErrorToStructured(err),
-        );
-      }
-
-      // Track the error
-      await this.error(
-        "error",
-        {
-          threadId,
-          runId,
-          source: "runtime",
-          request: {
-            operation: "processRuntimeRequest",
-            method: "POST",
-            url: url,
-            startTime: requestStartTime,
-          },
-          response: {
-            endTime: Date.now(),
-            latency: Date.now() - requestStartTime,
-          },
-          agent: agentSession ? { name: agentSession.agentName } : undefined,
-          technical: {
-            environment: process.env.NODE_ENV,
-            stackTrace: error instanceof Error ? error.stack : undefined,
-          },
-        },
-        structuredError,
-        publicApiKey,
-      );
-
-      throw structuredError;
-    }
-  }
-
-  async getAllAgents(graphqlContext: GraphQLContext): Promise<(AgentWithEndpoint | Agent)[]> {
-    const agentsWithEndpoints = await this.discoverAgentsFromEndpoints(graphqlContext);
-    const aguiAgents = this.discoverAgentsFromAgui();
-
-    this.availableAgents = [...agentsWithEndpoints, ...aguiAgents].map((a) => ({
-      name: a.name,
-      id: a.id,
-    }));
-
-    return [...agentsWithEndpoints, ...aguiAgents];
-  }
-
-  async discoverAgentsFromEndpoints(graphqlContext: GraphQLContext): Promise<AgentWithEndpoint[]> {
-    const agents: Promise<AgentWithEndpoint[]> = this.remoteEndpointDefinitions.reduce(
-      async (acc: Promise<Agent[]>, endpoint) => {
-        const agents = await acc;
-        if (endpoint.type === EndpointType.LangGraphPlatform) {
-          const propertyHeaders = graphqlContext.properties.authorization
-            ? { authorization: `Bearer ${graphqlContext.properties.authorization}` }
-            : null;
-
-          const client = new LangGraphClient({
-            apiUrl: endpoint.deploymentUrl,
-            apiKey: endpoint.langsmithApiKey,
-            defaultHeaders: { ...propertyHeaders },
-          });
-          let data: Array<{ assistant_id: string; graph_id: string }> | { detail: string } = [];
-          try {
-            data = await client.assistants.search();
-
-            if (data && "detail" in data && (data.detail as string).toLowerCase() === "not found") {
-              throw new CopilotKitAgentDiscoveryError({ availableAgents: this.availableAgents });
-            }
-          } catch (e) {
-            throw new CopilotKitMisuseError({
-              message: `
-              Failed to find or contact remote endpoint at url ${endpoint.deploymentUrl}.
-              Make sure the API is running and that it's indeed a LangGraph platform url.
-              
-              See more: https://docs.copilotkit.ai/troubleshooting/common-issues`,
-            });
-          }
-          const endpointAgents = data.map((entry) => ({
-            name: entry.graph_id,
-            id: entry.assistant_id,
-            description: "",
-            endpoint,
-          }));
-          return [...agents, ...endpointAgents];
+        const actions = this.params?.actions;
+        if (actions) {
+          const mcpTools = await this.getToolsFromMCP();
+          agentsList = this.assignToolsToAgents(agents, [
+            ...this.getToolsFromActions(actions),
+            ...mcpTools,
+          ]);
         }
 
-        interface InfoResponse {
-          agents?: Array<{
-            name: string;
-            description: string;
-          }>;
-        }
-        const cpkEndpoint = endpoint as CopilotKitEndpoint;
-        const fetchUrl = `${endpoint.url}/info`;
-        try {
-          const response = await fetchWithRetry(fetchUrl, {
-            method: "POST",
-            headers: createHeaders(cpkEndpoint.onBeforeRequest, graphqlContext),
-            body: JSON.stringify({ properties: graphqlContext.properties }),
-          });
-          if (!response.ok) {
-            if (response.status === 404) {
-              throw new CopilotKitApiDiscoveryError({ url: fetchUrl });
-            }
-            throw new ResolvedCopilotKitError({
-              status: response.status,
-              url: fetchUrl,
-              isRemoteEndpoint: true,
-            });
-          }
-
-          const data: InfoResponse = await response.json();
-          const endpointAgents = (data?.agents ?? []).map((agent) => ({
-            name: agent.name,
-            description: agent.description ?? "" ?? "",
-            id: randomId(), // Required by Agent type
-            endpoint,
-          }));
-          return [...agents, ...endpointAgents];
-        } catch (error) {
-          if (error instanceof CopilotKitError) {
-            throw error;
-          }
-          throw new CopilotKitLowLevelError({ error: error as Error, url: fetchUrl });
-        }
+        return agentsList;
       },
-      Promise.resolve([]),
     );
-
-    return agents;
   }
 
-  discoverAgentsFromAgui(): Agent[] {
-    return Object.entries(this.agents ?? []).map(([key, agent]: [string, AbstractAgent]) => ({
-      name: (agent as any).agentName ?? key,
-      id: agent.agentId ?? key,
-      description: agent.description ?? "",
-    }));
-  }
-
-  async loadAgentState(
-    graphqlContext: GraphQLContext,
-    threadId: string,
-    agentName: string,
-  ): Promise<LoadAgentStateResponse> {
-    const agents = await this.getAllAgents(graphqlContext);
-
-    const agent = agents.find((agent) => agent.name === agentName);
-    if (!agent) {
-      throw new Error("Agent not found");
-    }
-
-    if (
-      "endpoint" in agent &&
-      (agent.endpoint.type === EndpointType.CopilotKit || !("type" in agent.endpoint))
-    ) {
-      const cpkEndpoint = agent.endpoint as CopilotKitEndpoint;
-      const fetchUrl = `${cpkEndpoint.url}/agents/state`;
-      try {
-        const response = await fetchWithRetry(fetchUrl, {
-          method: "POST",
-          headers: createHeaders(cpkEndpoint.onBeforeRequest, graphqlContext),
-          body: JSON.stringify({
-            properties: graphqlContext.properties,
-            threadId,
-            name: agentName,
-          }),
-        });
-        if (!response.ok) {
-          if (response.status === 404) {
-            throw new CopilotKitApiDiscoveryError({ url: fetchUrl });
-          }
-
-          // Extract semantic error information from response body
-          let errorMessage = `HTTP ${response.status} error`;
-          try {
-            const errorBody = await response.text();
-            const parsedError = JSON.parse(errorBody);
-            if (parsedError.error && typeof parsedError.error === "string") {
-              errorMessage = parsedError.error;
-            }
-          } catch {
-            // If parsing fails, fall back to generic message
-          }
-
-          throw new ResolvedCopilotKitError({
-            status: response.status,
-            url: fetchUrl,
-            isRemoteEndpoint: true,
-            message: errorMessage,
-          });
-        }
-
-        const data: LoadAgentStateResponse = await response.json();
-
-        return {
-          ...data,
-          state: JSON.stringify(data.state),
-          messages: JSON.stringify(data.messages),
-        };
-      } catch (error) {
-        if (error instanceof CopilotKitError) {
-          throw error;
-        }
-        throw new CopilotKitLowLevelError({ error, url: fetchUrl });
-      }
-    }
-
-    const propertyHeaders = graphqlContext.properties.authorization
-      ? { authorization: `Bearer ${graphqlContext.properties.authorization}` }
-      : null;
+  // Receive this.params.action and turn it into the AbstractAgent tools
+  private getToolsFromActions(
+    actions: ActionsConfiguration<any>,
+  ): BuiltInAgentConfiguration["tools"] {
+    // Resolve actions to an array (handle function case)
+    const actionsArray =
+      typeof actions === "function" ? actions({ properties: {}, url: undefined }) : actions;
 
-    let state: any = {};
-    try {
-      let client: LangGraphClient | null;
-      if ("endpoint" in agent && agent.endpoint.type === EndpointType.LangGraphPlatform) {
-        client = new LangGraphClient({
-          apiUrl: agent.endpoint.deploymentUrl,
-          apiKey: agent.endpoint.langsmithApiKey,
-          defaultHeaders: { ...propertyHeaders },
-        });
-      } else {
-        const aguiAgent = graphqlContext._copilotkit.runtime.agents[agent.name] as LangGraphAgent;
-        if (!aguiAgent) {
-          throw new Error(`Agent: ${agent.name} could not be resolved`);
-        }
-        // @ts-expect-error -- both clients are the same
-        client = aguiAgent.client ?? null;
-      }
-
-      state = client ? ((await client.threads.getState(threadId)).values as any) : {};
-    } catch (error) {
-      // All errors from agent state loading are user configuration issues
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      const errorStatus = error?.response?.status || error?.status;
-
-      if (errorStatus === 404) {
-        state = {};
-      } else {
-        // Log user configuration errors at debug level to reduce noise
-        console.debug(`Agent '${agentName}' configuration issue: ${errorMessage}`);
-
-        // Throw a configuration error - all agent state loading failures are user setup issues
-        throw new ResolvedCopilotKitError({
-          status: 400,
-          message: `Agent '${agentName}' failed to execute: ${errorMessage}`,
-          code: CopilotKitErrorCode.CONFIGURATION_ERROR,
-        });
-      }
-    }
+    // Convert each Action to a ToolDefinition
+    return actionsArray.map((action) => {
+      // Convert JSON schema to Zod schema
+      const zodSchema = getZodParameters(action.parameters || []);
 
-    if (Object.keys(state).length === 0) {
       return {
-        threadId: threadId || "",
-        threadExists: false,
-        state: JSON.stringify({}),
-        messages: JSON.stringify([]),
-      };
-    } else {
-      const { messages, ...stateWithoutMessages } = state;
-      const copilotkitMessages = langchainMessagesToCopilotKit(messages);
-      return {
-        threadId: threadId || "",
-        threadExists: true,
-        state: JSON.stringify(stateWithoutMessages),
-        messages: JSON.stringify(copilotkitMessages),
+        name: action.name,
+        description: action.description || "",
+        parameters: zodSchema,
+        execute: () => Promise.resolve(),
       };
-    }
-
-    throw new Error(`Agent: ${agent.name} could not be resolved`);
+    });
   }
 
-  private async processAgentRequest(
-    request: CopilotRuntimeRequest,
-  ): Promise<CopilotRuntimeResponse> {
-    const {
-      messages: rawMessages,
-      outputMessagesPromise,
-      graphqlContext,
-      agentSession,
-      threadId: threadIdFromRequest,
-      metaEvents,
-      publicApiKey,
-      forwardedParameters,
-      context,
-    } = request;
-    const { agentName, nodeName } = agentSession;
-
-    // Track request start time for observability
-    const requestStartTime = Date.now();
-    // For storing streamed chunks if progressive logging is enabled
-    const streamedChunks: any[] = [];
-
-    // for backwards compatibility, deal with the case when no threadId is provided
-    const threadId = threadIdFromRequest ?? agentSession.threadId;
-
-    // Track agent request start
-    await this.error(
-      "agent_state",
-      {
-        threadId,
-        source: "agent",
-        request: {
-          operation: "processAgentRequest",
-          method: "POST",
-          startTime: requestStartTime,
-        },
-        agent: {
-          name: agentName,
-          nodeName: nodeName,
-        },
-        messages: {
-          input: rawMessages,
-          messageCount: rawMessages.length,
-        },
-        technical: {
-          environment: process.env.NODE_ENV,
-        },
-      },
-      undefined,
-      publicApiKey,
-    );
+  private assignToolsToAgents(
+    agents: Record<string, AbstractAgent>,
+    tools: BuiltInAgentConfiguration["tools"],
+  ): Record<string, AbstractAgent> {
+    if (!tools?.length) {
+      return agents;
+    }
 
-    const serverSideActions = await this.getServerSideActions(request);
+    const enrichedAgents: Record<string, AbstractAgent> = { ...agents };
 
-    const messages = convertGqlInputToMessages(rawMessages);
+    for (const [agentId, agent] of Object.entries(enrichedAgents)) {
+      const existingConfig = (Reflect.get(agent, "config") ?? {}) as BuiltInAgentConfiguration;
+      const existingTools = existingConfig.tools ?? [];
 
-    const currentAgent = serverSideActions.find(
-      (action) => action.name === agentName && isRemoteAgentAction(action),
-    ) as RemoteAgentAction;
+      const updatedConfig: BuiltInAgentConfiguration = {
+        ...existingConfig,
+        tools: [...existingTools, ...tools],
+      };
 
-    if (!currentAgent) {
-      throw new CopilotKitAgentDiscoveryError({ agentName, availableAgents: this.availableAgents });
+      Reflect.set(agent, "config", updatedConfig);
+      enrichedAgents[agentId] = agent;
     }
 
-    // Filter actions to include:
-    // 1. Regular (non-agent) actions
-    // 2. Other agents' actions (but prevent self-calls to avoid infinite loops)
-    const availableActionsForCurrentAgent: ActionInput[] = serverSideActions
-      .filter(
-        (action) =>
-          // Case 1: Keep all regular (non-agent) actions
-          !isRemoteAgentAction(action) ||
-          // Case 2: For agent actions, keep all except self (prevent infinite loops)
-          (isRemoteAgentAction(action) && action.name !== agentName) /* prevent self-calls */,
-      )
-      .map((action) => ({
-        name: action.name,
-        description: action.description,
-        jsonSchema: JSON.stringify(actionParametersToJsonSchema(action.parameters)),
-      }));
-
-    const allAvailableActions = flattenToolCallsNoDuplicates([
-      ...availableActionsForCurrentAgent,
-      ...request.actions,
-    ]);
+    return enrichedAgents;
+  }
 
-    // Log agent request if observability is enabled
-    if (this.observability?.enabled && publicApiKey) {
-      try {
-        const requestData: LLMRequestData = {
-          threadId,
-          runId: undefined,
-          model: forwardedParameters?.model,
-          messages,
-          actions: allAvailableActions,
-          forwardedParameters,
-          timestamp: requestStartTime,
-          provider: "agent",
-          agentName, // Add agent-specific context
-          nodeName,
-        };
-
-        await this.observability.hooks.handleRequest(requestData);
-      } catch (error) {
-        console.error("Error logging agent request:", error);
-      }
-    }
+  private createOnBeforeRequestHandler(
+    params?: CopilotRuntimeConstructorParams<T> & PartialBy<CopilotRuntimeOptions, "agents">,
+  ) {
+    return async (hookParams: BeforeRequestMiddlewareFnParameters[0]) => {
+      const { request } = hookParams;
+
+      // Capture telemetry for copilot request creation
+      const publicApiKey = request.headers.get("x-copilotcloud-public-api-key");
+      const body = (await readBody(request)) as RunAgentInput;
+      const forwardedProps = body.forwardedProps as
+        | {
+            cloud?: { guardrails?: unknown };
+            metadata?: { requestType?: string };
+          }
+        | undefined;
 
-    await this.onBeforeRequest?.({
-      threadId,
-      runId: undefined,
-      inputMessages: messages,
-      properties: graphqlContext.properties,
-    });
+      // Get cloud base URL from environment or default
+      const cloudBaseUrl = process.env.COPILOT_CLOUD_BASE_URL || "https://api.cloud.copilotkit.ai";
 
-    try {
-      const eventSource = new RuntimeEventSource({
-        errorHandler: async (error, context) => {
-          await this.error("error", context, error, publicApiKey);
-        },
-        errorContext: {
-          threadId,
-          source: "agent",
-          request: {
-            operation: "processAgentRequest",
-            method: "POST",
-            startTime: requestStartTime,
-          },
-          agent: {
-            name: agentName,
-            nodeName: nodeName,
-          },
-          technical: {
-            environment: process.env.NODE_ENV,
-          },
-        },
-      });
-      const stream = await currentAgent.remoteAgentHandler({
-        name: agentName,
-        threadId,
-        nodeName,
-        metaEvents,
-        actionInputsWithoutAgents: allAvailableActions,
+      telemetry.capture("oss.runtime.copilot_request_created", {
+        "cloud.guardrails.enabled": forwardedProps?.cloud?.guardrails !== undefined,
+        requestType: forwardedProps?.metadata?.requestType ?? "unknown",
+        "cloud.api_key_provided": !!publicApiKey,
+        ...(publicApiKey ? { "cloud.public_api_key": publicApiKey } : {}),
+        "cloud.base_url": cloudBaseUrl,
       });
 
-      // Add progressive observability if enabled
-      if (this.observability?.enabled && this.observability.progressive && publicApiKey) {
-        // Wrap the stream function to intercept events for observability without changing core logic
-        const originalStream = eventSource.stream.bind(eventSource);
-
-        eventSource.stream = async (callback) => {
-          await originalStream(async (eventStream$) => {
-            // Create subscription to capture streaming events
-            eventStream$.subscribe({
-              next: (event) => {
-                // Only log content chunks
-                if (event.type === RuntimeEventTypes.TextMessageContent) {
-                  // Store the chunk
-                  streamedChunks.push(event.content);
-
-                  // Log each chunk separately for progressive mode
-                  try {
-                    const progressiveData: LLMResponseData = {
-                      threadId: threadId || "",
-                      runId: undefined,
-                      model: forwardedParameters?.model,
-                      output: event.content,
-                      latency: Date.now() - requestStartTime,
-                      timestamp: Date.now(),
-                      provider: "agent",
-                      isProgressiveChunk: true,
-                      agentName,
-                      nodeName,
-                    };
-
-                    // Use Promise to handle async logger without awaiting
-                    Promise.resolve()
-                      .then(() => {
-                        this.observability.hooks.handleResponse(progressiveData);
-                      })
-                      .catch((error) => {
-                        console.error("Error in progressive agent logging:", error);
-                      });
-                  } catch (error) {
-                    console.error("Error preparing progressive agent log data:", error);
-                  }
-                }
-              },
-            });
-
-            // Call the original callback with the event stream
-            await callback(eventStream$);
-          });
-        };
-      }
-
-      eventSource.stream(async (eventStream$) => {
-        from(stream).subscribe({
-          next: (event) => eventStream$.next(event),
-          error: async (err) => {
-            // Log error with observability if enabled
-            if (this.observability?.enabled && publicApiKey) {
-              try {
-                const errorData: LLMErrorData = {
-                  threadId,
-                  runId: undefined,
-                  model: forwardedParameters?.model,
-                  error: err instanceof Error ? err : String(err),
-                  timestamp: Date.now(),
-                  latency: Date.now() - requestStartTime,
-                  provider: "agent",
-                  agentName,
-                  nodeName,
-                };
-
-                this.observability.hooks.handleError(errorData);
-              } catch (logError) {
-                console.error("Error logging agent error:", logError);
-              }
+      // TODO: get public api key and run with expected data
+      // if (this.observability?.enabled && this.params.publicApiKey) {
+      //   this.logObservabilityBeforeRequest()
+      // }
+
+      // TODO: replace hooksParams top argument type with BeforeRequestMiddlewareParameters when exported
+      params?.beforeRequestMiddleware?.(hookParams);
+
+      if (params?.middleware?.onBeforeRequest) {
+        const { request, runtime, path } = hookParams;
+        const gqlMessages = (aguiToGQL(body.messages) as Message[]).reduce(
+          (acc, msg) => {
+            if ("role" in msg && msg.role === "user") {
+              acc.inputMessages.push(msg);
+            } else {
+              acc.outputMessages.push(msg);
             }
-
-            // Preserve structured CopilotKit errors, only convert unstructured errors
-            const structuredError = ensureStructuredError(err, (error) =>
-              this.convertStreamingErrorToStructured(error),
-            );
-
-            // Track streaming errors
-            await this.error(
-              "error",
-              {
-                threadId,
-                source: "agent",
-                request: {
-                  operation: "processAgentRequest",
-                  method: "POST",
-                  startTime: requestStartTime,
-                },
-                response: {
-                  endTime: Date.now(),
-                  latency: Date.now() - requestStartTime,
-                },
-                agent: {
-                  name: agentName,
-                  nodeName: nodeName,
-                },
-                technical: {
-                  environment: process.env.NODE_ENV,
-                  stackTrace: err instanceof Error ? err.stack : undefined,
-                },
-              },
-              structuredError,
-              publicApiKey,
-            );
-
-            eventStream$.error(structuredError);
-            eventStream$.complete();
+            return acc;
           },
-          complete: () => eventStream$.complete(),
-        });
-      });
-
-      // Log final agent response when outputs are available
-      if (this.observability?.enabled && publicApiKey) {
-        outputMessagesPromise
-          .then((outputMessages) => {
-            const responseData: LLMResponseData = {
-              threadId,
-              runId: undefined,
-              model: forwardedParameters?.model,
-              // Use collected chunks for progressive mode or outputMessages for regular mode
-              output: this.observability.progressive ? streamedChunks : outputMessages,
-              latency: Date.now() - requestStartTime,
-              timestamp: Date.now(),
-              provider: "agent",
-              isFinalResponse: true,
-              agentName,
-              nodeName,
-            };
-
-            try {
-              this.observability.hooks.handleResponse(responseData);
-            } catch (logError) {
-              console.error("Error logging agent response:", logError);
-            }
-          })
-          .catch((error) => {
-            console.error("Failed to get output messages for agent logging:", error);
-          });
+          { inputMessages: [] as Message[], outputMessages: [] as Message[] },
+        );
+        const { inputMessages, outputMessages } = gqlMessages;
+        params.middleware.onBeforeRequest({
+          threadId: body.threadId,
+          runId: body.runId,
+          inputMessages,
+          properties: body.forwardedProps,
+          url: request.url,
+        } satisfies OnBeforeRequestOptions);
       }
+    };
+  }
 
-      outputMessagesPromise
-        .then((outputMessages) => {
-          this.onAfterRequest?.({
-            threadId,
-            runId: undefined,
-            inputMessages: messages,
-            outputMessages,
-            properties: graphqlContext.properties,
-          });
-        })
-        .catch((_error) => {});
-
-      return {
-        threadId,
-        runId: undefined,
-        eventSource,
-        serverSideActions,
-        actionInputsWithoutAgents: allAvailableActions,
-      };
-    } catch (error) {
-      // Log error with observability if enabled
-      if (this.observability?.enabled && publicApiKey) {
-        try {
-          const errorData: LLMErrorData = {
-            threadId,
-            runId: undefined,
-            model: forwardedParameters?.model,
-            error: error instanceof Error ? error : String(error),
-            timestamp: Date.now(),
-            latency: Date.now() - requestStartTime,
-            provider: "agent",
-            agentName,
-            nodeName,
-          };
-
-          await this.observability.hooks.handleError(errorData);
-        } catch (logError) {
-          console.error("Error logging agent error:", logError);
-        }
+  private createOnAfterRequestHandler(
+    params?: CopilotRuntimeConstructorParams<T> & PartialBy<CopilotRuntimeOptions, "agents">,
+  ) {
+    return async (hookParams: AfterRequestMiddlewareFnParameters[0]) => {
+      // TODO: get public api key and run with expected data
+      // if (this.observability?.enabled && publicApiKey) {
+      //   this.logObservabilityAfterRequest()
+      // }
+
+      // TODO: replace hooksParams top argument type with AfterRequestMiddlewareParameters when exported
+      params?.afterRequestMiddleware?.(hookParams);
+
+      if (params?.middleware?.onAfterRequest) {
+        // TODO: provide old expected params here when available
+        // @ts-expect-error -- missing arguments.
+        params.middleware.onAfterRequest({});
       }
-
-      // Ensure error is structured
-      const structuredError = ensureStructuredError(error, (err) =>
-        this.convertStreamingErrorToStructured(err),
-      );
-
-      // Track the agent error
-      await this.error(
-        "error",
-        {
-          threadId,
-          source: "agent",
-          request: {
-            operation: "processAgentRequest",
-            method: "POST",
-            startTime: requestStartTime,
-          },
-          response: {
-            endTime: Date.now(),
-            latency: Date.now() - requestStartTime,
-          },
-          agent: {
-            name: agentName,
-            nodeName: nodeName,
-          },
-          technical: {
-            environment: process.env.NODE_ENV,
-            stackTrace: error instanceof Error ? error.stack : undefined,
-          },
-        },
-        structuredError,
-        publicApiKey,
-      );
-
-      console.error("Error getting response:", error);
-      throw structuredError;
-    }
+    };
   }
 
-  private async getServerSideActions(request: CopilotRuntimeRequest): Promise<Action<any>[]> {
-    const { graphqlContext, messages: rawMessages, agentStates, url } = request;
+  // Observability Methods
 
-    // --- Standard Action Fetching (unchanged) ---
-    const inputMessages = convertGqlInputToMessages(rawMessages);
-    const langserveFunctions: Action<any>[] = [];
-    for (const chainPromise of this.langserve) {
-      try {
-        const chain = await chainPromise;
-        langserveFunctions.push(chain);
-      } catch (error) {
-        console.error("Error loading langserve chain:", error);
-      }
+  /**
+   * Log LLM request if observability is enabled
+   */
+  private async logObservabilityBeforeRequest(requestData: LLMRequestData): Promise<void> {
+    try {
+      await this.observability.hooks.handleRequest(requestData);
+    } catch (error) {
+      console.error("Error logging LLM request:", error);
     }
+  }
 
-    const remoteEndpointDefinitions = this.remoteEndpointDefinitions.map(
-      (endpoint) => ({ ...endpoint, type: resolveEndpointType(endpoint) }) as EndpointDefinition,
-    );
-
-    const remoteActions = await setupRemoteActions({
-      remoteEndpointDefinitions,
-      graphqlContext,
-      messages: inputMessages,
-      agentStates,
-      frontendUrl: url,
-      agents: this.agents,
-      metaEvents: request.metaEvents,
-      nodeName: request.agentSession?.nodeName,
-      context: request.context,
-    });
-
-    const configuredActions =
-      typeof this.actions === "function"
-        ? this.actions({ properties: graphqlContext.properties, url })
-        : this.actions;
-    // --- Standard Action Fetching (unchanged) ---
-
-    // +++ Dynamic MCP Action Fetching +++
-    const requestSpecificMCPActions: Action<any>[] = [];
-    if (this.createMCPClientImpl) {
-      // 1. Determine effective MCP endpoints for this request
-      const baseEndpoints = this.mcpServersConfig || [];
-      // Assuming frontend passes config via properties.mcpServers
-      const requestEndpoints = (graphqlContext.properties?.mcpServers ||
-        graphqlContext.properties?.mcpEndpoints ||
-        []) as MCPEndpointConfig[];
-
-      // Merge and deduplicate endpoints based on URL
-      const effectiveEndpointsMap = new Map<string, MCPEndpointConfig>();
-
-      // First add base endpoints (from runtime configuration)
-      [...baseEndpoints].forEach((ep) => {
-        if (ep && ep.endpoint) {
-          effectiveEndpointsMap.set(ep.endpoint, ep);
-        }
-      });
-
-      // Then add request endpoints (from frontend), which will override duplicates
-      [...requestEndpoints].forEach((ep) => {
-        if (ep && ep.endpoint) {
-          effectiveEndpointsMap.set(ep.endpoint, ep);
-        }
-      });
-
-      const effectiveEndpoints = Array.from(effectiveEndpointsMap.values());
-
-      // 2. Fetch/Cache actions for effective endpoints
-      for (const config of effectiveEndpoints) {
-        const endpointUrl = config.endpoint;
-        let actionsForEndpoint: Action<any>[] | undefined = this.mcpActionCache.get(endpointUrl);
+  /**
+   * Log final LLM response after request completes
+   */
+  private logObservabilityAfterRequest(
+    outputMessagesPromise: Promise<Message[]>,
+    baseData: {
+      threadId: string;
+      runId?: string;
+      model?: string;
+      provider?: string;
+      agentName?: string;
+      nodeName?: string;
+    },
+    streamedChunks: any[],
+    requestStartTime: number,
+    publicApiKey?: string,
+  ): void {
+    try {
+      outputMessagesPromise
+        .then((outputMessages) => {
+          const responseData: LLMResponseData = {
+            threadId: baseData.threadId,
+            runId: baseData.runId,
+            model: baseData.model,
+            // Use collected chunks for progressive mode or outputMessages for regular mode
+            output: this.observability.progressive ? streamedChunks : outputMessages,
+            latency: Date.now() - requestStartTime,
+            timestamp: Date.now(),
+            provider: baseData.provider,
+            isFinalResponse: true,
+            agentName: baseData.agentName,
+            nodeName: baseData.nodeName,
+          };
 
-        if (!actionsForEndpoint) {
-          // Not cached, fetch now
-          let client: MCPClient | null = null;
           try {
-            client = await this.createMCPClientImpl(config);
-            const tools = await client.tools();
-            actionsForEndpoint = convertMCPToolsToActions(tools, endpointUrl);
-            this.mcpActionCache.set(endpointUrl, actionsForEndpoint); // Store in cache
-          } catch (error) {
-            console.error(
-              `MCP: Failed to fetch tools from endpoint ${endpointUrl}. Skipping. Error:`,
-              error,
-            );
-            actionsForEndpoint = []; // Assign empty array on error to prevent re-fetching constantly
-            this.mcpActionCache.set(endpointUrl, actionsForEndpoint); // Cache the failure (empty array)
+            this.observability.hooks.handleResponse(responseData);
+          } catch (logError) {
+            console.error("Error logging LLM response:", logError);
           }
-        }
-        requestSpecificMCPActions.push(...(actionsForEndpoint || []));
-      }
+        })
+        .catch((error) => {
+          console.error("Failed to get output messages for logging:", error);
+        });
+    } catch (error) {
+      console.error("Error setting up logging for LLM response:", error);
     }
-    // --- Dynamic MCP Action Fetching ---
-
-    // Combine all action sources, including the dynamically fetched MCP actions
-    return [
-      ...configuredActions,
-      ...langserveFunctions,
-      ...remoteActions,
-      ...requestSpecificMCPActions,
-    ];
   }
 
-  // Add helper method to detect provider
-  private detectProvider(serviceAdapter: CopilotServiceAdapter): string | undefined {
-    const adapterName = serviceAdapter.constructor.name;
-    if (adapterName.includes("OpenAI")) return "openai";
-    if (adapterName.includes("Anthropic")) return "anthropic";
-    if (adapterName.includes("Google")) return "google";
-    if (adapterName.includes("Groq")) return "groq";
-    if (adapterName.includes("LangChain")) return "langchain";
-    return undefined;
-  }
-
-  private convertStreamingErrorToStructured(error: any): CopilotKitError {
-    // Determine a more helpful error message based on context
-    let helpfulMessage = generateHelpfulErrorMessage(error, "agent streaming connection");
+  // Resolve MCP tools to BuiltInAgent tool definitions
+  // Optionally accepts request-scoped properties to merge request-provided mcpServers
+  private async getToolsFromMCP(options?: {
+    properties?: Record<string, unknown>;
+  }): Promise<BuiltInAgentConfiguration["tools"]> {
+    const runtimeMcpServers = (this.params?.mcpServers ?? []) as MCPEndpointConfig[];
+    const createMCPClient = this.params?.createMCPClient as CreateMCPClientFunction | undefined;
+
+    // If no runtime config and no request overrides, nothing to do
+    const requestMcpServers = ((
+      options?.properties as { mcpServers?: MCPEndpointConfig[] } | undefined
+    )?.mcpServers ??
+      (options?.properties as { mcpEndpoints?: MCPEndpointConfig[] } | undefined)?.mcpEndpoints ??
+      []) as MCPEndpointConfig[];
+
+    const hasAnyServers =
+      (runtimeMcpServers?.length ?? 0) > 0 || (requestMcpServers?.length ?? 0) > 0;
+    if (!hasAnyServers) {
+      return [];
+    }
 
-    // For network-related errors, use CopilotKitLowLevelError to preserve the original error
-    if (
-      error?.message?.includes("fetch failed") ||
-      error?.message?.includes("ECONNREFUSED") ||
-      error?.message?.includes("ENOTFOUND") ||
-      error?.message?.includes("ETIMEDOUT") ||
-      error?.message?.includes("terminated") ||
-      error?.cause?.code === "UND_ERR_SOCKET" ||
-      error?.message?.includes("other side closed") ||
-      error?.code === "UND_ERR_SOCKET"
-    ) {
-      return new CopilotKitLowLevelError({
-        error: error instanceof Error ? error : new Error(String(error)),
-        url: "agent streaming connection",
-        message: helpfulMessage,
+    if (!createMCPClient) {
+      // Mirror legacy behavior: when servers are provided without a factory, treat as misconfiguration
+      throw new CopilotKitMisuseError({
+        message:
+          "MCP Integration Error: `mcpServers` were provided, but the `createMCPClient` function was not passed to the CopilotRuntime constructor. Please provide an implementation for `createMCPClient`.",
       });
     }
 
-    // For all other errors, preserve the raw error in a basic CopilotKitError
-    return new CopilotKitError({
-      message: helpfulMessage,
-      code: CopilotKitErrorCode.UNKNOWN,
-    });
-  }
-
-  private async error(
-    type: CopilotErrorEvent["type"],
-    context: CopilotRequestContext,
-    error?: any,
-    publicApiKey?: string,
-  ): Promise<void> {
-    if (!this.onError) return;
-
-    // Just check if publicApiKey is defined (regardless of validity)
-    if (!publicApiKey) {
-      if (!this.hasWarnedAboutError) {
-        console.warn(
-          "CopilotKit: onError handler provided but requires publicApiKey to be defined for error handling to work.",
-        );
-        this.hasWarnedAboutError = true;
+    // Merge and dedupe endpoints by URL; request-level overrides take precedence
+    const effectiveEndpoints = (() => {
+      const byUrl = new Map<string, MCPEndpointConfig>();
+      for (const ep of runtimeMcpServers) {
+        if (ep?.endpoint) byUrl.set(ep.endpoint, ep);
+      }
+      for (const ep of requestMcpServers) {
+        if (ep?.endpoint) byUrl.set(ep.endpoint, ep);
+      }
+      return Array.from(byUrl.values());
+    })();
+
+    const allTools: BuiltInAgentConfiguration["tools"] = [];
+
+    for (const config of effectiveEndpoints) {
+      const endpointUrl = config.endpoint;
+      // Return cached tool definitions when available
+      const cached = this.mcpToolsCache.get(endpointUrl);
+      if (cached) {
+        allTools.push(...cached);
+        continue;
       }
-      return;
-    }
 
-    try {
-      const errorEvent: CopilotErrorEvent = {
-        type,
-        timestamp: Date.now(),
-        context,
-        ...(error && { error }),
-      };
+      try {
+        const client = await createMCPClient(config);
+        const toolsMap = await client.tools();
+
+        const toolDefs: BuiltInAgentConfiguration["tools"] = Object.entries(toolsMap).map(
+          ([toolName, tool]: [string, MCPTool]) => {
+            const params: Parameter[] = extractParametersFromSchema(tool);
+            const zodSchema = getZodParameters(params);
+            return {
+              name: toolName,
+              description: tool.description || `MCP tool: ${toolName} (from ${endpointUrl})`,
+              parameters: zodSchema,
+              execute: () => Promise.resolve(),
+            };
+          },
+        );
 
-      await this.onError(errorEvent);
-    } catch (errorHandlerError) {
-      // Don't let error handler errors break the main flow
-      console.error("Error in onError handler:", errorHandlerError);
+        // Cache per endpoint and add to aggregate
+        this.mcpToolsCache.set(endpointUrl, toolDefs);
+        allTools.push(...toolDefs);
+      } catch (error) {
+        console.error(
+          `MCP: Failed to fetch tools from endpoint ${endpointUrl}. Skipping. Error:`,
+          error,
+        );
+        // Cache empty to prevent repeated attempts within lifecycle
+        this.mcpToolsCache.set(endpointUrl, []);
+      }
     }
-  }
-
-  /**
-   * Public method to handle GraphQL validation errors
-   * This allows the GraphQL resolver to send validation errors through the error system
-   */
-  public async errorGraphQLError(
-    error: { message: string; code: string; type: string },
-    context: {
-      operation: string;
-      cloudConfigPresent: boolean;
-      guardrailsEnabled: boolean;
-    },
-  ): Promise<void> {
-    if (!this.onError) return;
 
-    try {
-      await this.onError({
-        type: "error",
-        timestamp: Date.now(),
-        context: {
-          source: "runtime",
-          request: {
-            operation: context.operation,
-            startTime: Date.now(),
-          },
-          technical: {
-            environment: process.env.NODE_ENV,
-          },
-          metadata: {
-            errorType: "GraphQLValidationError",
-            cloudConfigPresent: context.cloudConfigPresent,
-            guardrailsEnabled: context.guardrailsEnabled,
-          },
-        },
-        error,
-      });
-    } catch (errorHandlerError) {
-      // Don't let error handler errors break the main flow
-      console.error("Error in onError handler:", errorHandlerError);
+    // Dedupe tools by name while preserving last-in wins (request overrides)
+    const dedupedByName = new Map<string, (typeof allTools)[number]>();
+    for (const tool of allTools) {
+      dedupedByName.set(tool.name, tool);
     }
-  }
-}
 
-export function flattenToolCallsNoDuplicates(toolsByPriority: ActionInput[]): ActionInput[] {
-  let allTools: ActionInput[] = [];
-  const allToolNames: string[] = [];
-  for (const tool of toolsByPriority) {
-    if (!allToolNames.includes(tool.name)) {
-      allTools.push(tool);
-      allToolNames.push(tool.name);
-    }
+    return Array.from(dedupedByName.values());
   }
-  return allTools;
 }
 
 // The two functions below are "factory functions", meant to create the action objects that adhere to the expected interfaces