- add default loging to fallback invoker

jknack · jknack · commit f722ce8c0665 · 2026-03-30T17:49:20.000-03:00
diff --git a/modules/jooby-apt/src/main/java/io/jooby/internal/apt/McpRouter.java b/modules/jooby-apt/src/main/java/io/jooby/internal/apt/McpRouter.java
@@ -114,6 +114,7 @@ private String findTargetMethodName(String ref) {
   @Override
   public String toSourceCode(boolean kt) throws IOException {
     var generateTypeName = getTargetType().getSimpleName().toString();
+    var targetClassName = getTargetType().toString();
     var mcpClassName = getGeneratedType().substring(getGeneratedType().lastIndexOf('.') + 1);
     var packageName = getPackageName();
 
@@ -280,17 +281,36 @@ public String toSourceCode(boolean kt) throws IOException {
 
       String lambda;
       if (completionGroups.containsKey(ref)) {
-        var handlerName = findTargetMethodName(ref) + "CompletionHandler";
+        var targetMethod = findTargetMethodName(ref);
+        var handlerName = targetMethod + "CompletionHandler";
         var operationId = "completions/" + ref;
+
+        String operationArg =
+            kt
+                ? "io.jooby.mcp.McpOperation("
+                    + string(operationId)
+                    + ", "
+                    + string(targetClassName)
+                    + ", "
+                    + string(targetMethod)
+                    + ")"
+                : "new io.jooby.mcp.McpOperation("
+                    + string(operationId)
+                    + ", "
+                    + string(targetClassName)
+                    + ", "
+                    + string(targetMethod)
+                    + ")";
+
         lambda =
             kt
                 ? "{ exchange, req -> invoker.invoke("
-                    + string(operationId)
+                    + operationArg
                     + ") { this."
                     + handlerName
                     + "(exchange, exchange.transportContext(), req) } }"
                 : "(exchange, req) -> invoker.invoke("
-                    + string(operationId)
+                    + operationArg
                     + ", () -> this."
                     + handlerName
                     + "(exchange, exchange.transportContext(), req))";
@@ -377,17 +397,36 @@ public String toSourceCode(boolean kt) throws IOException {
 
       String lambda;
       if (completionGroups.containsKey(ref)) {
-        var handlerName = findTargetMethodName(ref) + "CompletionHandler";
+        var targetMethod = findTargetMethodName(ref);
+        var handlerName = targetMethod + "CompletionHandler";
         var operationId = "completions/" + ref;
+
+        var operationArg =
+            kt
+                ? "io.jooby.mcp.McpOperation("
+                    + string(operationId)
+                    + ", "
+                    + string(targetClassName)
+                    + ", "
+                    + string(targetMethod)
+                    + ")"
+                : "new io.jooby.mcp.McpOperation("
+                    + string(operationId)
+                    + ", "
+                    + string(targetClassName)
+                    + ", "
+                    + string(targetMethod)
+                    + ")";
+
         lambda =
             kt
                 ? "{ ctx, req -> invoker.invoke("
-                    + string(operationId)
+                    + operationArg
                     + ") { this."
                     + handlerName
                     + "(null, ctx, req) } }"
                 : "(ctx, req) -> invoker.invoke("
-                    + string(operationId)
+                    + operationArg
                     + ", () -> this."
                     + handlerName
                     + "(null, ctx, req))";
@@ -530,31 +569,47 @@ public String toSourceCode(boolean kt) throws IOException {
                       .orElse("")
                   : "";
         }
-        if (mcpName == null || mcpName.isEmpty()) mcpName = methodName;
-        String operationId = mcpType + "/" + mcpName;
+        if (mcpName.isEmpty()) mcpName = methodName;
+        var operationId = mcpType + "/" + mcpName;
+
+        var operationArg =
+            kt
+                ? "io.jooby.mcp.McpOperation("
+                    + string(operationId)
+                    + ", "
+                    + string(targetClassName)
+                    + ", "
+                    + string(methodName)
+                    + ")"
+                : "new io.jooby.mcp.McpOperation("
+                    + string(operationId)
+                    + ", "
+                    + string(targetClassName)
+                    + ", "
+                    + string(methodName)
+                    + ")";
 
-        // --- Lambda Router Definition ---
-        String lambda =
+        var lambda =
             kt
                 ? (isStateless
                     ? "{ ctx, req -> invoker.invoke("
-                        + string(operationId)
+                        + operationArg
                         + ") { this."
                         + methodName
                         + "(null, ctx, req) } }"
                     : "{ exchange, req -> invoker.invoke("
-                        + string(operationId)
+                        + operationArg
                         + ") { this."
                         + methodName
                         + "(exchange, exchange.transportContext(), req) } }")
                 : (isStateless
                     ? "(ctx, req) -> invoker.invoke("
-                        + string(operationId)
+                        + operationArg
                         + ", () -> this."
                         + methodName
                         + "(null, ctx, req))"
                     : "(exchange, req) -> invoker.invoke("
-                        + string(operationId)
+                        + operationArg
                         + ", () -> this."
                         + methodName
                         + "(exchange, exchange.transportContext(), req))");
diff --git a/modules/jooby-apt/src/test/java/tests/i3830/Issue3830.java b/modules/jooby-apt/src/test/java/tests/i3830/Issue3830.java
@@ -64,17 +64,17 @@ public String serverKey() {
                           public java.util.List<io.modelcontextprotocol.server.McpServerFeatures.SyncCompletionSpecification> completions(io.jooby.Jooby app) {
                             var invoker = app.require(io.jooby.mcp.McpInvoker.class);
                             var completions = new java.util.ArrayList<io.modelcontextprotocol.server.McpServerFeatures.SyncCompletionSpecification>();
-                            completions.add(new io.modelcontextprotocol.server.McpServerFeatures.SyncCompletionSpecification(new io.modelcontextprotocol.spec.McpSchema.PromptReference("review_code"), (exchange, req) -> invoker.invoke("completions/review_code", () -> this.reviewCodeCompletionHandler(exchange, exchange.transportContext(), req))));
-                            completions.add(new io.modelcontextprotocol.server.McpServerFeatures.SyncCompletionSpecification(new io.modelcontextprotocol.spec.McpSchema.ResourceReference("file:///users/{id}/{name}/profile"), (exchange, req) -> invoker.invoke("completions/file:///users/{id}/{name}/profile", () -> this.getUserProfileCompletionHandler(exchange, exchange.transportContext(), req))));
+                            completions.add(new io.modelcontextprotocol.server.McpServerFeatures.SyncCompletionSpecification(new io.modelcontextprotocol.spec.McpSchema.PromptReference("review_code"), (exchange, req) -> invoker.invoke(new io.jooby.mcp.McpOperation("completions/review_code", "tests.i3830.ExampleServer", "reviewCode"), () -> this.reviewCodeCompletionHandler(exchange, exchange.transportContext(), req))));
+                            completions.add(new io.modelcontextprotocol.server.McpServerFeatures.SyncCompletionSpecification(new io.modelcontextprotocol.spec.McpSchema.ResourceReference("file:///users/{id}/{name}/profile"), (exchange, req) -> invoker.invoke(new io.jooby.mcp.McpOperation("completions/file:///users/{id}/{name}/profile", "tests.i3830.ExampleServer", "getUserProfile"), () -> this.getUserProfileCompletionHandler(exchange, exchange.transportContext(), req))));
                             return completions;
                           }
 
                           @Override
                           public java.util.List<io.modelcontextprotocol.server.McpStatelessServerFeatures.SyncCompletionSpecification> statelessCompletions(io.jooby.Jooby app) {
                             var invoker = app.require(io.jooby.mcp.McpInvoker.class);
                             var completions = new java.util.ArrayList<io.modelcontextprotocol.server.McpStatelessServerFeatures.SyncCompletionSpecification>();
-                            completions.add(new io.modelcontextprotocol.server.McpStatelessServerFeatures.SyncCompletionSpecification(new io.modelcontextprotocol.spec.McpSchema.PromptReference("review_code"), (ctx, req) -> invoker.invoke("completions/review_code", () -> this.reviewCodeCompletionHandler(null, ctx, req))));
-                            completions.add(new io.modelcontextprotocol.server.McpStatelessServerFeatures.SyncCompletionSpecification(new io.modelcontextprotocol.spec.McpSchema.ResourceReference("file:///users/{id}/{name}/profile"), (ctx, req) -> invoker.invoke("completions/file:///users/{id}/{name}/profile", () -> this.getUserProfileCompletionHandler(null, ctx, req))));
+                            completions.add(new io.modelcontextprotocol.server.McpStatelessServerFeatures.SyncCompletionSpecification(new io.modelcontextprotocol.spec.McpSchema.PromptReference("review_code"), (ctx, req) -> invoker.invoke(new io.jooby.mcp.McpOperation("completions/review_code", "tests.i3830.ExampleServer", "reviewCode"), () -> this.reviewCodeCompletionHandler(null, ctx, req))));
+                            completions.add(new io.modelcontextprotocol.server.McpStatelessServerFeatures.SyncCompletionSpecification(new io.modelcontextprotocol.spec.McpSchema.ResourceReference("file:///users/{id}/{name}/profile"), (ctx, req) -> invoker.invoke(new io.jooby.mcp.McpOperation("completions/file:///users/{id}/{name}/profile", "tests.i3830.ExampleServer", "getUserProfile"), () -> this.getUserProfileCompletionHandler(null, ctx, req))));
                             return completions;
                           }
 
@@ -84,10 +84,10 @@ public void install(io.jooby.Jooby app, io.modelcontextprotocol.server.McpSyncSe
                             var invoker = app.require(io.jooby.mcp.McpInvoker.class);
                             var schemaGenerator = app.require(com.github.victools.jsonschema.generator.SchemaGenerator.class);
 
-                            server.addTool(new io.modelcontextprotocol.server.McpServerFeatures.SyncToolSpecification(addToolSpec(schemaGenerator), (exchange, req) -> invoker.invoke("tools/calculator", () -> this.add(exchange, exchange.transportContext(), req))));
-                            server.addPrompt(new io.modelcontextprotocol.server.McpServerFeatures.SyncPromptSpecification(reviewCodePromptSpec(), (exchange, req) -> invoker.invoke("prompts/review_code", () -> this.reviewCode(exchange, exchange.transportContext(), req))));
-                            server.addResource(new io.modelcontextprotocol.server.McpServerFeatures.SyncResourceSpecification(getLogsResourceSpec(), (exchange, req) -> invoker.invoke("resources/file:///logs/app.log", () -> this.getLogs(exchange, exchange.transportContext(), req))));
-                            server.addResourceTemplate(new io.modelcontextprotocol.server.McpServerFeatures.SyncResourceTemplateSpecification(getUserProfileResourceTemplateSpec(), (exchange, req) -> invoker.invoke("resources/file:///users/{id}/{name}/profile", () -> this.getUserProfile(exchange, exchange.transportContext(), req))));
+                            server.addTool(new io.modelcontextprotocol.server.McpServerFeatures.SyncToolSpecification(addToolSpec(schemaGenerator), (exchange, req) -> invoker.invoke(new io.jooby.mcp.McpOperation("tools/calculator", "tests.i3830.ExampleServer", "add"), () -> this.add(exchange, exchange.transportContext(), req))));
+                            server.addPrompt(new io.modelcontextprotocol.server.McpServerFeatures.SyncPromptSpecification(reviewCodePromptSpec(), (exchange, req) -> invoker.invoke(new io.jooby.mcp.McpOperation("prompts/review_code", "tests.i3830.ExampleServer", "reviewCode"), () -> this.reviewCode(exchange, exchange.transportContext(), req))));
+                            server.addResource(new io.modelcontextprotocol.server.McpServerFeatures.SyncResourceSpecification(getLogsResourceSpec(), (exchange, req) -> invoker.invoke(new io.jooby.mcp.McpOperation("resources/file:///logs/app.log", "tests.i3830.ExampleServer", "getLogs"), () -> this.getLogs(exchange, exchange.transportContext(), req))));
+                            server.addResourceTemplate(new io.modelcontextprotocol.server.McpServerFeatures.SyncResourceTemplateSpecification(getUserProfileResourceTemplateSpec(), (exchange, req) -> invoker.invoke(new io.jooby.mcp.McpOperation("resources/file:///users/{id}/{name}/profile", "tests.i3830.ExampleServer", "getUserProfile"), () -> this.getUserProfile(exchange, exchange.transportContext(), req))));
                           }
 
                           @Override
@@ -96,10 +96,10 @@ public void install(io.jooby.Jooby app, io.modelcontextprotocol.server.McpStatel
                             var invoker = app.require(io.jooby.mcp.McpInvoker.class);
                             var schemaGenerator = app.require(com.github.victools.jsonschema.generator.SchemaGenerator.class);
 
-                            server.addTool(new io.modelcontextprotocol.server.McpStatelessServerFeatures.SyncToolSpecification(addToolSpec(schemaGenerator), (ctx, req) -> invoker.invoke("tools/calculator", () -> this.add(null, ctx, req))));
-                            server.addPrompt(new io.modelcontextprotocol.server.McpStatelessServerFeatures.SyncPromptSpecification(reviewCodePromptSpec(), (ctx, req) -> invoker.invoke("prompts/review_code", () -> this.reviewCode(null, ctx, req))));
-                            server.addResource(new io.modelcontextprotocol.server.McpStatelessServerFeatures.SyncResourceSpecification(getLogsResourceSpec(), (ctx, req) -> invoker.invoke("resources/file:///logs/app.log", () -> this.getLogs(null, ctx, req))));
-                            server.addResourceTemplate(new io.modelcontextprotocol.server.McpStatelessServerFeatures.SyncResourceTemplateSpecification(getUserProfileResourceTemplateSpec(), (ctx, req) -> invoker.invoke("resources/file:///users/{id}/{name}/profile", () -> this.getUserProfile(null, ctx, req))));
+                            server.addTool(new io.modelcontextprotocol.server.McpStatelessServerFeatures.SyncToolSpecification(addToolSpec(schemaGenerator), (ctx, req) -> invoker.invoke(new io.jooby.mcp.McpOperation("tools/calculator", "tests.i3830.ExampleServer", "add"), () -> this.add(null, ctx, req))));
+                            server.addPrompt(new io.modelcontextprotocol.server.McpStatelessServerFeatures.SyncPromptSpecification(reviewCodePromptSpec(), (ctx, req) -> invoker.invoke(new io.jooby.mcp.McpOperation("prompts/review_code", "tests.i3830.ExampleServer", "reviewCode"), () -> this.reviewCode(null, ctx, req))));
+                            server.addResource(new io.modelcontextprotocol.server.McpStatelessServerFeatures.SyncResourceSpecification(getLogsResourceSpec(), (ctx, req) -> invoker.invoke(new io.jooby.mcp.McpOperation("resources/file:///logs/app.log", "tests.i3830.ExampleServer", "getLogs"), () -> this.getLogs(null, ctx, req))));
+                            server.addResourceTemplate(new io.modelcontextprotocol.server.McpStatelessServerFeatures.SyncResourceTemplateSpecification(getUserProfileResourceTemplateSpec(), (ctx, req) -> invoker.invoke(new io.jooby.mcp.McpOperation("resources/file:///users/{id}/{name}/profile", "tests.i3830.ExampleServer", "getUserProfile"), () -> this.getUserProfile(null, ctx, req))));
                           }
 
                           private io.modelcontextprotocol.spec.McpSchema.Tool addToolSpec(com.github.victools.jsonschema.generator.SchemaGenerator schemaGenerator) {
diff --git a/modules/jooby-mcp/src/main/java/io/jooby/internal/mcp/DefaultMcpInvoker.java b/modules/jooby-mcp/src/main/java/io/jooby/internal/mcp/DefaultMcpInvoker.java
@@ -5,10 +5,14 @@
  */
 package io.jooby.internal.mcp;
 
+import org.slf4j.LoggerFactory;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
 import io.jooby.Jooby;
 import io.jooby.SneakyThrows;
 import io.jooby.StatusCode;
 import io.jooby.mcp.McpInvoker;
+import io.jooby.mcp.McpOperation;
 import io.modelcontextprotocol.spec.McpError;
 import io.modelcontextprotocol.spec.McpSchema;
 
@@ -21,19 +25,25 @@ public DefaultMcpInvoker(Jooby application) {
 
   @SuppressWarnings("unchecked")
   @Override
-  public <R> R invoke(String operationId, SneakyThrows.Supplier<R> action) {
+  public @NonNull <R> R invoke(McpOperation operation, SneakyThrows.Supplier<R> action) {
     try {
       return action.get();
     } catch (McpError mcpError) {
       throw mcpError;
     } catch (Throwable cause) {
-      if (operationId.startsWith("tools/")) {
+      var log = LoggerFactory.getLogger(operation.className());
+      if (operation.id().startsWith("tools/")) {
         // Tool error
         var errorMessage = cause.getMessage() != null ? cause.getMessage() : cause.toString();
         return (R)
             McpSchema.CallToolResult.builder().addTextContent(errorMessage).isError(true).build();
       }
       var statusCode = application.getRouter().errorCode(cause);
+      if (statusCode.value() >= 500) {
+        log.error("execution of {} resulted in exception", operation.id(), cause);
+      } else {
+        log.debug("execution of {} resulted in exception", operation.id(), cause);
+      }
       var mcpErrorCode = toMcpErrorCode(statusCode);
       throw new McpError(
           new McpSchema.JSONRPCResponse.JSONRPCError(mcpErrorCode, cause.getMessage(), null));
diff --git a/modules/jooby-mcp/src/main/java/io/jooby/mcp/McpInspectorModule.java b/modules/jooby-mcp/src/main/java/io/jooby/mcp/McpInspectorModule.java
@@ -171,12 +171,13 @@ private McpServerConfig resolveMcpServerConfig(Jooby app) {
                   new StartupException("MCP server named '%s' not found".formatted(defaultServer)));
     }
 
-    return srvConfigs.get(0);
+    return srvConfigs.getFirst();
   }
 
   private String buildConfigJson(McpServerConfig config, String location) {
     var endpoint = resolveEndpoint(config);
-    var transport = config.getTransport();
+    var transport =
+        config.isSseTransport() ? McpModule.Transport.SSE : McpModule.Transport.STREAMABLE_HTTP;
     return """
     {
       "defaultEnvironment": {
diff --git a/modules/jooby-mcp/src/main/java/io/jooby/mcp/McpInvoker.java b/modules/jooby-mcp/src/main/java/io/jooby/mcp/McpInvoker.java
@@ -50,15 +50,13 @@ public interface McpInvoker {
   /**
    * Executes the given MCP operation.
    *
-   * @param operationId The identifier of the operation being executed. Typically formatted as
-   *     {@code [type]/[name]} (e.g., {@code "tools/add_numbers"}, {@code "prompts/greeting"}, or
-   *     {@code "resources/file://config"}).
+   * @param operation The operation being executed.
    * @param action The actual execution of the operation, or the next invoker in the chain. Must be
    *     invoked via {@link SneakyThrows.Supplier#get()} to proceed.
    * @param <R> The return type of the operation.
    * @return The result of the operation.
    */
-  <R> R invoke(String operationId, SneakyThrows.Supplier<R> action);
+  <R> R invoke(McpOperation operation, SneakyThrows.Supplier<R> action);
 
   /**
    * Chains this invoker with another one. This invoker runs first, and its "action" becomes calling
@@ -76,8 +74,8 @@ default McpInvoker then(McpInvoker next) {
     }
     return new McpInvoker() {
       @Override
-      public <R> R invoke(String operationId, SneakyThrows.Supplier<R> action) {
-        return McpInvoker.this.invoke(operationId, () -> next.invoke(operationId, action));
+      public <R> R invoke(McpOperation operation, SneakyThrows.Supplier<R> action) {
+        return McpInvoker.this.invoke(operation, () -> next.invoke(operation, action));
       }
     };
   }
diff --git a/modules/jooby-mcp/src/main/java/io/jooby/mcp/McpModule.java b/modules/jooby-mcp/src/main/java/io/jooby/mcp/McpModule.java
diff --git a/modules/jooby-mcp/src/main/java/io/jooby/mcp/McpOperation.java b/modules/jooby-mcp/src/main/java/io/jooby/mcp/McpOperation.java

Original file line number	Diff line number	Diff line change
`@@ -171,12 +171,13 @@ private McpServerConfig resolveMcpServerConfig(Jooby app) {`
`171`	`171`	`new StartupException("MCP server named '%s' not found".formatted(defaultServer)));`
`172`	`172`	`}`
`173`	`173`
`174`		`- return srvConfigs.get(0);`
	`174`	`+ return srvConfigs.getFirst();`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`private String buildConfigJson(McpServerConfig config, String location) {`
`178`	`178`	`var endpoint = resolveEndpoint(config);`
`179`		`- var transport = config.getTransport();`
	`179`	`+ var transport =`
	`180`	`+ config.isSseTransport() ? McpModule.Transport.SSE : McpModule.Transport.STREAMABLE_HTTP;`
`180`	`181`	`return """`
`181`	`182`	`{`
`182`	`183`	`"defaultEnvironment": {`