Fix/on mcp configuration always called

apps/mesh/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/mesh",
-  "version": "2.59.2",
+  "version": "2.64.1",
   "description": "MCP Mesh - Self-hostable MCP Gateway for managing AI connections and tools",
   "author": "Deco team",
   "license": "MIT",

apps/mesh/src/api/routes/decopilot/routes.ts

@@ -11,8 +11,8 @@ import { Hono } from "hono";
 import { HTTPException } from "hono/http-exception";
 
 import type { MeshContext } from "@/core/mesh-context";
+import { createVirtualClientFrom } from "@/mcp-clients/virtual-mcp";
 import { generatePrefixedId } from "@/shared/utils/generate-id";
-
 import { Metadata } from "@/web/components/chat/types";
 import {
   DECOPILOT_BASE_PROMPT,
@@ -24,7 +24,6 @@ import { ensureOrganization, toolsFromMCP } from "./helpers";
 import { createModelProviderFromProxy } from "./model-provider";
 import { StreamRequestSchema } from "./schemas";
 import { generateTitleInBackground } from "./title-generator";
-import { createVirtualClientFrom } from "@/mcp-clients/virtual-mcp";
 
 // ============================================================================
 // Request Validation
@@ -38,7 +37,18 @@ async function validateRequest(
 
   const parseResult = StreamRequestSchema.safeParse(rawPayload);
   if (!parseResult.success) {
-    throw new HTTPException(400, { message: "Invalid request body" });
+    // Log detalhes do erro de validação para debug
+    console.error("[Decopilot] ❌ Request validation failed:");
+    console.error(
+      "Validation errors:",
+      JSON.stringify(parseResult.error.format(), null, 2),
+    );
+    console.error("Raw payload:", JSON.stringify(rawPayload, null, 2));
+
+    throw new HTTPException(400, {
+      message: "Invalid request body",
+      cause: parseResult.error.format(),
+    });
   }
 
   return {
@@ -72,9 +82,8 @@ app.post("/:org/decopilot/stream", async (c) => {
     const threadId = thread_id ?? memoryConfig?.threadId;
 
     // Create virtual MCP client and model provider in parallel
-    // For virtual MCPs (agents), we need to use storage.virtualMcps.findById which handles null
     const [virtualMcp, modelClient] = await Promise.all([
-      ctx.storage.virtualMcps.findById(agent.id ?? null, organization.id),
+      ctx.storage.virtualMcps.findById(agent.id, organization.id),
       ctx.createMCPProxy(model.connectionId),
     ]);
 
@@ -85,7 +94,7 @@ app.post("/:org/decopilot/stream", async (c) => {
     const mcpClient = await createVirtualClientFrom(
       virtualMcp,
       ctx,
-      "code_execution",
+      agent.mode,
     );
 
     // 2. Extract tools from virtual MCP client and create model provider
@@ -177,7 +186,7 @@ app.post("/:org/decopilot/stream", async (c) => {
       messageMetadata: ({ part }): Metadata => {
         if (part.type === "start") {
           return {
-            agent: { id: agent.id ?? null },
+            agent: { id: agent.id ?? null, mode: agent.mode },
             model: { id: model.id, connectionId: model.connectionId },
             created_at: new Date(),
             thread_id: memory.thread.id,

apps/mesh/src/api/routes/decopilot/schemas.ts

@@ -58,7 +58,12 @@ export const StreamRequestSchema = z.object({
         .optional(),
     })
     .loose(),
-  agent: z.object({ id: z.string() }).loose(),
+  agent: z
+    .object({
+      id: z.string(),
+      mode: z.enum(["passthrough", "smart_tool_selection", "code_execution"]),
+    })
+    .loose(),
   stream: z.boolean().optional(),
   temperature: z.number().default(0.5),
   thread_id: z.string().optional(),

apps/mesh/src/api/routes/proxy.ts

@@ -221,6 +221,12 @@ export function toServerClient(client: MCPProxyClient): ServerClient {
   };
 }
 
+const DEFAULT_SERVER_CAPABILITIES = {
+  tools: {},
+  resources: {},
+  prompts: {},
+};
+
 async function createMCPProxyDoNotUseDirectly(
   connectionIdOrConnection: string | ConnectionEntity,
   ctx: MeshContext,
@@ -558,6 +564,11 @@ async function createMCPProxyDoNotUseDirectly(
     params: GetPromptRequest["params"],
   ): Promise<GetPromptResult> => client.getPrompt(params);
 
+  // We are currently exposing the underlying client with tools/resources/prompts capabilities
+  // This way we have an uniform API the frontend can leverage from.
+  // Frontend connects to mesh. It's garatee that all mcps have the necessary capabilities. The UI works consistently.
+  const getServerCapabilities = () => DEFAULT_SERVER_CAPABILITIES;
+
   return {
     callTool: (params: CallToolRequest["params"]) =>
       executeToolCall({
@@ -570,7 +581,7 @@ async function createMCPProxyDoNotUseDirectly(
     listResourceTemplates,
     listPrompts,
     getPrompt,
-    getServerCapabilities: () => client.getServerCapabilities(),
+    getServerCapabilities,
     getInstructions: () => client.getInstructions(),
     close: () => client.close(),
     callStreamableTool,
@@ -653,16 +664,7 @@ app.all("/:connectionId", async (c) => {
       await server.connect(transport);
 
       // Handle request and cleanup
-      try {
-        return await transport.handleRequest(c.req.raw);
-      } finally {
-        // Close the transport
-        try {
-          await transport.close?.();
-        } catch {
-          // Ignore close errors - transport may already be closed
-        }
-      }
+      return await transport.handleRequest(c.req.raw);
     } catch (error) {
       // Check if this is an auth error - if so, return appropriate 401
       // Note: This only applies to HTTP connections

apps/mesh/src/api/routes/virtual-mcp.ts

@@ -14,7 +14,7 @@
  * - Supports exclusion strategy for inverse tool selection
  */
 
-import { createServerFromClient } from "@decocms/mesh-sdk";
+import { createServerFromClient, getDecopilotId } from "@decocms/mesh-sdk";
 import { WebStandardStreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js";
 import { Hono } from "hono";
 import type { MeshContext } from "../../core/mesh-context";
@@ -62,8 +62,18 @@ export async function handleVirtualMcpRequest(
             .then((org) => org?.id)
         : null;
 
+    const virtualId = virtualMcpId
+      ? virtualMcpId
+      : organizationId
+        ? getDecopilotId(organizationId)
+        : null;
+
+    if (!virtualId) {
+      return c.json({ error: "Agent ID or organization ID is required" }, 400);
+    }
+
     const virtualMcp = await ctx.storage.virtualMcps.findById(
-      virtualMcpId ?? null,
+      virtualId,
       organizationId ?? undefined,
     );
 
@@ -85,6 +95,7 @@ export async function handleVirtualMcpRequest(
     }
 
     // Set connection context (Virtual MCPs are now connections)
+    // Note: virtualMcp.id can be null for Decopilot agent, but connectionId should be set for routing
     ctx.connectionId = virtualMcp.id ?? undefined;
 
     // Set organization context
@@ -130,7 +141,6 @@ export async function handleVirtualMcpRequest(
     // Connect server to transport
     await server.connect(transport);
 
-    // Handle the incoming MCP message
     return await transport.handleRequest(c.req.raw);
   } catch (error) {
     const err = error as Error;

apps/mesh/src/mcp-clients/virtual-mcp/passthrough-client.ts

@@ -371,6 +371,6 @@ export class PassthroughClient extends Client {
    * Get server instructions from virtual MCP metadata
    */
   override getInstructions(): string | undefined {
-    return this.options.virtualMcp.metadata?.instructions;
+    return this.options.virtualMcp.metadata?.instructions ?? undefined;
   }
 }

apps/mesh/src/storage/connection.ts

@@ -102,23 +102,10 @@ export class ConnectionStorage implements ConnectionStoragePort {
     organizationId?: string,
   ): Promise<ConnectionEntity | null> {
     // Handle Decopilot ID - return Decopilot connection entity
-    if (isDecopilot(id)) {
-      if (!organizationId) {
-        // Extract orgId from decopilot_{orgId} pattern
-        const orgIdMatch = id.match(/^decopilot_(.+)$/);
-        if (!orgIdMatch) {
-          throw new Error(
-            `Invalid Decopilot ID format: ${id}. Expected decopilot_{orgId}`,
-          );
-        }
-        organizationId = orgIdMatch[1];
-      }
-      if (!organizationId) {
-        throw new Error(
-          `Organization ID is required for Decopilot connection: ${id}`,
-        );
-      }
-      return getWellKnownDecopilotConnection(organizationId);
+    const decopilotOrgId = isDecopilot(id);
+    if (decopilotOrgId) {
+      const resolvedOrgId = organizationId ?? decopilotOrgId;
+      return getWellKnownDecopilotConnection(resolvedOrgId);
     }
 
     let query = this.db

apps/mesh/src/storage/ports.ts

@@ -129,7 +129,7 @@ export interface VirtualMCPStoragePort {
     data: VirtualMCPCreateData,
   ): Promise<VirtualMCPEntity>;
   findById(
-    id: string | null,
+    id: string,
     organizationId?: string,
   ): Promise<VirtualMCPEntity | null>;
   list(organizationId: string): Promise<VirtualMCPEntity[]>;

apps/mesh/src/storage/virtual.ts

@@ -118,23 +118,13 @@ export class VirtualMCPStorage implements VirtualMCPStoragePort {
   }
 
   async findById(
-    id: string | null,
+    id: string,
     organizationId?: string,
   ): Promise<VirtualMCPEntity | null> {
     // Handle Decopilot ID - return Decopilot agent with all org connections
-    if (id && isDecopilot(id)) {
-      // Extract orgId from decopilot_{orgId} pattern or use provided organizationId
-      const orgIdMatch = id.match(/^decopilot_(.+)$/);
-      let resolvedOrgId: string;
-      if (organizationId) {
-        resolvedOrgId = organizationId;
-      } else if (orgIdMatch && orgIdMatch[1]) {
-        resolvedOrgId = orgIdMatch[1];
-      } else {
-        throw new Error(
-          `Invalid Decopilot ID format: ${id}. Expected decopilot_{orgId} or provide organizationId`,
-        );
-      }
+    const decopilotOrgId = isDecopilot(id);
+    if (decopilotOrgId) {
+      const resolvedOrgId = organizationId ?? decopilotOrgId;
 
       // Get all active connections for the organization
       const connections = await this.db
@@ -157,35 +147,6 @@ export class VirtualMCPStorage implements VirtualMCPStoragePort {
       };
     }
 
-    // Handle null ID - treat as Decopilot for backward compatibility
-    if (!id) {
-      if (!organizationId) {
-        throw new Error(
-          "organizationId is required when id is null (Decopilot agent)",
-        );
-      }
-
-      // Get all active connections for the organization
-      const connections = await this.db
-        .selectFrom("connections")
-        .selectAll()
-        .where("organization_id", "=", organizationId)
-        .where("status", "!=", "inactive")
-        .where("status", "!=", "error")
-        .execute();
-
-      // Return Decopilot agent with connections populated
-      return {
-        ...getWellKnownDecopilotVirtualMCP(organizationId),
-        connections: connections.map((c) => ({
-          connection_id: c.id,
-          selected_tools: null, // null = all tools
-          selected_resources: null, // null = all resources
-          selected_prompts: null, // null = all prompts
-        })),
-      };
-    }
-
     // Normal database lookup for string IDs
     return this.findByIdInternal(this.db, id);
   }
@@ -422,6 +383,8 @@ export class VirtualMCPStorage implements VirtualMCPStoragePort {
     const status: "active" | "inactive" =
       row.status === "active" ? "active" : "inactive";
 
+    const metadata = this.parseJson<{ instructions?: string }>(row.metadata);
+
     return {
       id: row.id,
       organization_id: row.organization_id,
@@ -433,7 +396,10 @@ export class VirtualMCPStorage implements VirtualMCPStoragePort {
       updated_at: updatedAt,
       created_by: row.created_by,
       updated_by: undefined, // connections table doesn't have updated_by
-      metadata: this.parseJson<{ instructions?: string }>(row.metadata),
+      metadata: {
+        ...metadata,
+        instructions: metadata?.instructions ?? null,
+      },
       connections: aggregationRows.map((agg) => ({
         connection_id: agg.child_connection_id,
         selected_tools: this.parseJson<string[]>(agg.selected_tools),