Rename build-time component types for consistent server.component naming.

Align ComponentProcessor, ComponentProvider, CompletionResult, and GeneratedComponentProvider with updated docs and error messages.

Author: codeboyzhou

docs/components.md

@@ -146,39 +146,40 @@ public class MyPrompts {
 
 Completions provide auto-complete suggestions for resource URIs and prompt arguments.
 
-Handlers must **return** `McpCompleteCompletion` and take **exactly one** parameter of type `McpSchema.CompleteRequest.CompleteArgument` (the argument being completed has `name()` and `value()` from the MCP request).
+Handlers must **return** `CompletionResult` and take **exactly one** parameter of type `McpSchema.CompleteRequest.CompleteArgument` (the argument being completed has `name()` and `value()` from the MCP request).
 
 ### Resource Completions
 
 ```java
 import com.github.thought2code.mcp.annotated.annotation.McpResourceCompletion;
-import com.github.thought2code.mcp.annotated.server.component.completion.McpCompleteCompletion;
+import com.github.thought2code.mcp.annotated.server.component.completion.CompletionResult;
 import io.modelcontextprotocol.spec.McpSchema;
+
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.stream.Collectors;
 
 public class MyCompletions {
-  @McpResourceCompletion(uri = "file://")
-  public McpCompleteCompletion completeFileUri(McpSchema.CompleteRequest.CompleteArgument argument) {
-    String prefix = argument.value() != null ? argument.value() : "";
-    try {
-      List<String> paths =
-          Files.list(Paths.get(prefix.isEmpty() ? "." : prefix))
-              .map(Path::toString)
-              .limit(50)
-              .collect(Collectors.toList());
-      return McpCompleteCompletion.builder()
-          .values(paths)
-          .total(paths.size())
-          .hasMore(false)
-          .build();
-    } catch (Exception e) {
-      return McpCompleteCompletion.empty();
+    @McpResourceCompletion(uri = "file://")
+    public CompletionResult completeFileUri(McpSchema.CompleteRequest.CompleteArgument argument) {
+        String prefix = argument.value() != null ? argument.value() : "";
+        try {
+            List<String> paths =
+                    Files.list(Paths.get(prefix.isEmpty() ? "." : prefix))
+                            .map(Path::toString)
+                            .limit(50)
+                            .collect(Collectors.toList());
+            return CompletionResult.builder()
+                    .values(paths)
+                    .total(paths.size())
+                    .hasMore(false)
+                    .build();
+        } catch (Exception e) {
+            return CompletionResult.empty();
+        }
     }
-  }
 }
 ```
 
@@ -188,22 +189,23 @@ public class MyCompletions {
 
 ```java
 import com.github.thought2code.mcp.annotated.annotation.McpPromptCompletion;
-import com.github.thought2code.mcp.annotated.server.component.completion.McpCompleteCompletion;
+import com.github.thought2code.mcp.annotated.server.component.completion.CompletionResult;
 import io.modelcontextprotocol.spec.McpSchema;
+
 import java.util.List;
 
 public class MyPromptCompletions {
-  @McpPromptCompletion(name = "generateCode")
-  public McpCompleteCompletion completeGenerateCode(McpSchema.CompleteRequest.CompleteArgument argument) {
-    if (!"language".equals(argument.name())) {
-      return McpCompleteCompletion.empty();
+    @McpPromptCompletion(name = "generateCode")
+    public CompletionResult completeGenerateCode(McpSchema.CompleteRequest.CompleteArgument argument) {
+        if (!"language".equals(argument.name())) {
+            return CompletionResult.empty();
+        }
+        return CompletionResult.builder()
+                .values(List.of("Java", "Python", "JavaScript", "Go", "Rust"))
+                .total(5)
+                .hasMore(false)
+                .build();
     }
-    return McpCompleteCompletion.builder()
-        .values(List.of("Java", "Python", "JavaScript", "Go", "Rust"))
-        .total(5)
-        .hasMore(false)
-        .build();
-  }
 }
 ```
 

llms-full.txt

@@ -219,13 +219,13 @@ Prompt components are used to define reusable prompt templates.
 
 Completions provide auto-complete suggestions for resource URIs and prompt arguments.
 
-Handlers must **return** `McpCompleteCompletion` and take **exactly one** parameter of type `McpSchema.CompleteRequest.CompleteArgument` (`name()` and `value()` identify the argument being completed).
+Handlers must **return** `CompletionResult` and take **exactly one** parameter of type `McpSchema.CompleteRequest.CompleteArgument` (`name()` and `value()` identify the argument being completed).
 
 #### Resource Completions
 
 ```java
 import com.github.thought2code.mcp.annotated.annotation.McpResourceCompletion;
-import com.github.thought2code.mcp.annotated.server.component.McpCompleteCompletion;
+import com.github.thought2code.mcp.annotated.server.component.completion.CompletionResult;
 import io.modelcontextprotocol.spec.McpSchema;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -234,21 +234,21 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @McpResourceCompletion(uri = "file://")
-public McpCompleteCompletion completeFileUri(McpSchema.CompleteRequest.CompleteArgument argument) {
+public CompletionResult completeFileUri(McpSchema.CompleteRequest.CompleteArgument argument) {
   String prefix = argument.value() != null ? argument.value() : "";
   try {
     List<String> paths =
         Files.list(Paths.get(prefix.isEmpty() ? "." : prefix))
             .map(Path::toString)
             .limit(50)
             .collect(Collectors.toList());
-    return McpCompleteCompletion.builder()
+    return CompletionResult.builder()
         .values(paths)
         .total(paths.size())
         .hasMore(false)
         .build();
   } catch (Exception e) {
-    return McpCompleteCompletion.empty();
+    return CompletionResult.empty();
   }
 }
 ```
@@ -259,16 +259,16 @@ public McpCompleteCompletion completeFileUri(McpSchema.CompleteRequest.CompleteA
 
 ```java
 import com.github.thought2code.mcp.annotated.annotation.McpPromptCompletion;
-import com.github.thought2code.mcp.annotated.server.component.McpCompleteCompletion;
+import com.github.thought2code.mcp.annotated.server.component.completion.CompletionResult;
 import io.modelcontextprotocol.spec.McpSchema;
 import java.util.List;
 
 @McpPromptCompletion(name = "generateCode")
-public McpCompleteCompletion completeGenerateCode(McpSchema.CompleteRequest.CompleteArgument argument) {
+public CompletionResult completeGenerateCode(McpSchema.CompleteRequest.CompleteArgument argument) {
   if (!"language".equals(argument.name())) {
-    return McpCompleteCompletion.empty();
+    return CompletionResult.empty();
   }
-  return McpCompleteCompletion.builder()
+  return CompletionResult.builder()
       .values(List.of("Java", "Python", "JavaScript", "Go", "Rust"))
       .total(5)
       .hasMore(false)

src/main/java/com/github/thought2code/mcp/annotated/annotation/McpPromptCompletion.java

@@ -1,6 +1,6 @@
 package com.github.thought2code.mcp.annotated.annotation;
 
-import com.github.thought2code.mcp.annotated.server.component.completion.McpCompleteCompletion;
+import com.github.thought2code.mcp.annotated.server.component.completion.CompletionResult;
 import com.github.thought2code.mcp.annotated.util.StringHelper;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -17,7 +17,7 @@
  * <p>Methods annotated with {@code @McpPromptCompletion} must:
  *
  * <ul>
- *   <li>Return {@link McpCompleteCompletion}
+ *   <li>Return {@link CompletionResult}
  *   <li>Accept exactly one parameter of type {@code McpSchema.CompleteRequest.CompleteArgument}
  *   <li>Be properly configured with a prompt name
  * </ul>

src/main/java/com/github/thought2code/mcp/annotated/annotation/McpResourceCompletion.java

@@ -1,6 +1,6 @@
 package com.github.thought2code.mcp.annotated.annotation;
 
-import com.github.thought2code.mcp.annotated.server.component.completion.McpCompleteCompletion;
+import com.github.thought2code.mcp.annotated.server.component.completion.CompletionResult;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -16,7 +16,7 @@
  * <p>Methods annotated with {@code @McpResourceCompletion} must:
  *
  * <ul>
- *   <li>Return {@link McpCompleteCompletion}
+ *   <li>Return {@link CompletionResult}
  *   <li>Accept exactly one parameter of type {@code McpSchema.CompleteRequest.CompleteArgument}
  *   <li>Be properly configured with a resource URI
  * </ul>

src/main/java/com/github/thought2code/mcp/annotated/server/McpServerBase.java

@@ -115,9 +115,9 @@ public McpSchema.ServerCapabilities defineCapabilities() {
   /**
    * Registers all MCP server components with the specified synchronous server.
    *
-   * <p>This method creates and registers the three main types of MCP components: resources,
-   * prompts, and tools. Each component type is handled by its respective registration class which
-   * scans for annotated methods and registers them with the server.
+   * <p>This method creates and registers MCP components: resources, prompts, tools, and
+   * completions. Each component type is handled by its respective registration class which loads
+   * build-time generated definitions and registers them with the server.
    *
    * @param server the synchronous server instance to register components with
    */
@@ -135,9 +135,9 @@ public void registerComponents(McpSyncServer server) {
   /**
    * Registers all MCP server components with the specified asynchronous server.
    *
-   * <p>This method creates and registers the three main types of MCP components: resources,
-   * prompts, and tools. Each component type is handled by its respective registration class which
-   * scans for annotated methods and registers them with the server.
+   * <p>This method creates and registers MCP components: resources, prompts, tools, and
+   * completions. Each component type is handled by its respective registration class which loads
+   * build-time generated definitions and registers them with the server.
    *
    * @param server the asynchronous server instance to register components with
    */

…ated/compiler/McpToolModelProcessor.java …server/component/ComponentProcessor.javasrc/main/java/com/github/thought2code/mcp/annotated/compiler/McpToolModelProcessor.java renamed to src/main/java/com/github/thought2code/mcp/annotated/server/component/ComponentProcessor.java src/main/java/com/github/thought2code/mcp/annotated/compiler/McpToolModelProcessor.java renamed to src/main/java/com/github/thought2code/mcp/annotated/server/component/ComponentProcessor.java

@@ -1,4 +1,4 @@
-package com.github.thought2code.mcp.annotated.compiler;
+package com.github.thought2code.mcp.annotated.server.component;
 
 import com.github.thought2code.mcp.annotated.annotation.McpJsonSchemaDefinition;
 import com.github.thought2code.mcp.annotated.annotation.McpJsonSchemaProperty;
@@ -9,7 +9,7 @@
 import com.github.thought2code.mcp.annotated.annotation.McpResourceCompletion;
 import com.github.thought2code.mcp.annotated.annotation.McpTool;
 import com.github.thought2code.mcp.annotated.annotation.McpToolParam;
-import com.github.thought2code.mcp.annotated.server.component.completion.McpCompleteCompletion;
+import com.github.thought2code.mcp.annotated.server.component.completion.CompletionResult;
 import com.github.thought2code.mcp.annotated.util.StringHelper;
 import java.io.IOException;
 import java.io.Writer;
@@ -44,8 +44,11 @@
 import javax.tools.StandardLocation;
 
 /**
- * Annotation processor that compiles {@code @McpTool} runtime reflection metadata into static model
- * classes.
+ * Annotation processor that compiles MCP component annotations into static model classes at build
+ * time.
+ *
+ * <p>Handles {@code @McpTool}, {@code @McpPrompt}, {@code @McpResource},
+ * {@code @McpPromptCompletion}, and {@code @McpResourceCompletion}.
  */
 @SupportedSourceVersion(SourceVersion.RELEASE_17)
 @SupportedAnnotationTypes({
@@ -55,11 +58,11 @@
   "com.github.thought2code.mcp.annotated.annotation.McpPromptCompletion",
   "com.github.thought2code.mcp.annotated.annotation.McpResourceCompletion"
 })
-public final class McpToolModelProcessor extends AbstractProcessor {
+public final class ComponentProcessor extends AbstractProcessor {
 
   private static final String GENERATED_PACKAGE = "com.github.thought2code.mcp.annotated.generated";
   private static final String PROVIDER_INTERFACE =
-      "com.github.thought2code.mcp.annotated.server.component.spi.ComponentModelProvider";
+      "com.github.thought2code.mcp.annotated.server.component.ComponentProvider";
   private static final String PROVIDER_SERVICE_FILE = "META-INF/services/" + PROVIDER_INTERFACE;
 
   private final List<ExecutableElement> tools = new ArrayList<>();
@@ -104,7 +107,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
       generated = true;
     } catch (IOException e) {
       messager.printMessage(
-          Diagnostic.Kind.ERROR, "Failed to generate MCP tool model: " + e.getMessage());
+          Diagnostic.Kind.ERROR, "Failed to generate MCP component model: " + e.getMessage());
     }
     return false;
   }
@@ -305,9 +308,9 @@ private boolean validateNoDuplicateCompletionReferences() {
 
   private boolean validateCompletionSignature(ExecutableElement method) {
     String returnType = erasedType(method.getReturnType());
-    if (!McpCompleteCompletion.class.getName().equals(returnType)) {
+    if (!CompletionResult.class.getName().equals(returnType)) {
       messager.printMessage(
-          Diagnostic.Kind.ERROR, "Completion method must return McpCompleteCompletion", method);
+          Diagnostic.Kind.ERROR, "Completion method must return CompletionResult", method);
       return false;
     }
     if (method.getParameters().size() != 1) {
@@ -339,7 +342,7 @@ private void writeProvider() throws IOException {
     List<ExecutableElement> sortedCompletions =
         completions.stream().sorted(Comparator.comparing(this::sourceMethod)).toList();
     String className =
-        "GeneratedMcpModelProvider_"
+        "GeneratedComponentProvider_"
             + Integer.toHexString(
                 modelHash(sortedTools, sortedPrompts, sortedResources, sortedCompletions));
     String qualifiedName = GENERATED_PACKAGE + "." + className;
@@ -360,21 +363,21 @@ private void writeProvider() throws IOException {
       writer.write(
           "import com.github.thought2code.mcp.annotated.server.component.resource.ResourceInvoker;\n");
       writer.write(
-          "import com.github.thought2code.mcp.annotated.server.component.spi.ComponentModelProvider;\n");
+          "import com.github.thought2code.mcp.annotated.server.component.ComponentProvider;\n");
       writer.write(
           "import com.github.thought2code.mcp.annotated.server.component.tool.ToolDefinition;\n");
       writer.write(
           "import com.github.thought2code.mcp.annotated.server.component.tool.ToolInvoker;\n");
       writer.write("import com.github.thought2code.mcp.annotated.enums.McpServerError;\n");
-      writer.write("import com.github.thought2code.mcp.annotated.reflect.Invocation;\n");
+      writer.write("import com.github.thought2code.mcp.annotated.server.component.Invocation;\n");
       writer.write("import com.github.thought2code.mcp.annotated.util.TypeConverter;\n");
       writer.write("import io.modelcontextprotocol.spec.McpSchema;\n");
       writer.write("import java.util.ArrayList;\n");
       writer.write("import java.util.HashMap;\n");
       writer.write("import java.util.LinkedHashMap;\n");
       writer.write("import java.util.List;\n");
       writer.write("import java.util.Map;\n\n");
-      writer.write("public final class " + className + " implements ComponentModelProvider {\n\n");
+      writer.write("public final class " + className + " implements ComponentProvider {\n\n");
 
       writer.write("  @Override\n");
       writer.write("  public List<ToolDefinition> tools() {\n");

…omponent/spi/ComponentModelProvider.java …/server/component/ComponentProvider.javasrc/main/java/com/github/thought2code/mcp/annotated/server/component/spi/ComponentModelProvider.java renamed to src/main/java/com/github/thought2code/mcp/annotated/server/component/ComponentProvider.java src/main/java/com/github/thought2code/mcp/annotated/server/component/spi/ComponentModelProvider.java renamed to src/main/java/com/github/thought2code/mcp/annotated/server/component/ComponentProvider.java

@@ -1,4 +1,4 @@
-package com.github.thought2code.mcp.annotated.server.component.spi;
+package com.github.thought2code.mcp.annotated.server.component;
 
 import com.github.thought2code.mcp.annotated.server.component.completion.CompletionDefinition;
 import com.github.thought2code.mcp.annotated.server.component.prompt.PromptDefinition;
@@ -9,9 +9,10 @@
 /**
  * Service-provider entry point for build-time generated MCP models.
  *
- * <p>The initial build-time pipeline generates {@code @McpTool} metadata and invocation bindings.
+ * <p>The build-time pipeline generates metadata and invocation bindings for tools, prompts,
+ * resources, and completions.
  */
-public interface ComponentModelProvider {
+public interface ComponentProvider {
   /**
    * Returns all component MCP tool definitions generated at build time.
    *

…de/mcp/annotated/reflect/Invocation.java …notated/server/component/Invocation.javasrc/main/java/com/github/thought2code/mcp/annotated/reflect/Invocation.java renamed to src/main/java/com/github/thought2code/mcp/annotated/server/component/Invocation.java src/main/java/com/github/thought2code/mcp/annotated/reflect/Invocation.java renamed to src/main/java/com/github/thought2code/mcp/annotated/server/component/Invocation.java

@@ -1,4 +1,4 @@
-package com.github.thought2code.mcp.annotated.reflect;
+package com.github.thought2code.mcp.annotated.server.component;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -9,7 +9,7 @@
  */
 public record Invocation(@NotNull Object result, boolean isError) {
   /**
-   * Returns a new instance of {@code Builder} for creating a new {@code InvocationResult}.
+   * Returns a new instance of {@code Builder} for creating a new {@code Invocation}.
    *
    * @return a new instance of {@code Builder}
    */
@@ -27,8 +27,7 @@ public String asText() {
   }
 
   /**
-   * This class implements the builder pattern for creating a new instance of {@code
-   * InvocationResult}.
+   * This class implements the builder pattern for creating a new instance of {@code Invocation}.
    *
    * @author codeboyzhou
    */
@@ -63,9 +62,9 @@ public Builder isError(boolean isError) {
     }
 
     /**
-     * Builds a new instance of {@code InvocationResult} with the configured values.
+     * Builds a new instance of {@code Invocation} with the configured values.
      *
-     * @return a new instance of {@code InvocationResult}
+     * @return a new instance of {@code Invocation}
      */
     public Invocation build() {
       return new Invocation(result, isError);

src/main/java/com/github/thought2code/mcp/annotated/server/component/completion/CompletionInvoker.java

@@ -1,7 +1,7 @@
 package com.github.thought2code.mcp.annotated.server.component.completion;
 
 import com.github.thought2code.mcp.annotated.McpApplicationContext;
-import com.github.thought2code.mcp.annotated.reflect.Invocation;
+import com.github.thought2code.mcp.annotated.server.component.Invocation;
 import io.modelcontextprotocol.spec.McpSchema;
 
 /** Strongly-typed invocation contract generated at build time for one completion method. */