Rename compiled MCP model packages to component and drop Compiled type prefixes so compile-time registrations align with how users think about tools, prompts, resources, and completions; move McpCompleteCompletion next to the other completion types.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: codeboyzhou

docs/components.md

@@ -152,7 +152,7 @@ Handlers must **return** `McpCompleteCompletion` and take **exactly one** parame
 
 ```java
 import com.github.thought2code.mcp.annotated.annotation.McpResourceCompletion;
-import com.github.thought2code.mcp.annotated.server.component.McpCompleteCompletion;
+import com.github.thought2code.mcp.annotated.component.completion.McpCompleteCompletion;
 import io.modelcontextprotocol.spec.McpSchema;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -188,7 +188,7 @@ public class MyCompletions {
 
 ```java
 import com.github.thought2code.mcp.annotated.annotation.McpPromptCompletion;
-import com.github.thought2code.mcp.annotated.server.component.McpCompleteCompletion;
+import com.github.thought2code.mcp.annotated.component.completion.McpCompleteCompletion;
 import io.modelcontextprotocol.spec.McpSchema;
 import java.util.List;
 

src/main/java/com/github/thought2code/mcp/annotated/McpApplicationContext.java

@@ -11,12 +11,12 @@
 /**
  * Runtime context for one annotated MCP application.
  *
- * <p>In the build-time compiled architecture, this context no longer performs classpath scanning.
- * Instead, it centralizes runtime concerns that compiled invokers still need:
+ * <p>In the build-time component architecture, this context no longer performs classpath scanning.
+ * Instead, it centralizes runtime concerns that component invokers still need:
  *
  * <ul>
  *   <li>Component instance lifecycle (lazy creation with one cached instance per component class)
- *   <li>Scope filtering for compiled model definitions based on the resolved application base
+ *   <li>Scope filtering for component model definitions based on the resolved application base
  *       package
  * </ul>
  *
@@ -69,12 +69,12 @@ public Object getComponentInstance(Class<?> componentClass) {
   }
 
   /**
-   * Returns whether a compiled source method belongs to this application's base package scope.
+   * Returns whether a component source method belongs to this application's base package scope.
    *
-   * <p>This method is used while loading compiled definitions to prevent out-of-scope components
+   * <p>This method is used while loading component definitions to prevent out-of-scope components
    * from being registered (for example, fixtures from other test packages or neighboring modules).
    *
-   * @param sourceMethod compiled source method descriptor in the form {@code fqcn#method(...)}
+   * @param sourceMethod component source method descriptor in the form {@code fqcn#method(...)}
    * @return {@code true} when the source method declaring class is within the configured base
    *     package
    */
@@ -97,7 +97,7 @@ public boolean isInScope(String sourceMethod) {
   }
 
   /**
-   * Resolves the base package used for compiled-definition scope filtering.
+   * Resolves the base package used for component-definition scope filtering.
    *
    * <p>Resolution priority:
    *

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.McpCompleteCompletion;
+import com.github.thought2code.mcp.annotated.component.completion.McpCompleteCompletion;
 import com.github.thought2code.mcp.annotated.util.StringHelper;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

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.McpCompleteCompletion;
+import com.github.thought2code.mcp.annotated.component.completion.McpCompleteCompletion;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

src/main/java/com/github/thought2code/mcp/annotated/compiled/prompt/CompiledPromptDefinition.java

@@ -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.McpCompleteCompletion;
+import com.github.thought2code.mcp.annotated.component.completion.McpCompleteCompletion;
 import com.github.thought2code.mcp.annotated.util.StringHelper;
 import java.io.IOException;
 import java.io.Writer;
@@ -59,7 +59,7 @@ public final class McpToolModelProcessor 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.compiled.spi.McpCompiledModelProvider";
+      "com.github.thought2code.mcp.annotated.component.spi.ComponentModelProvider";
   private static final String PROVIDER_SERVICE_FILE = "META-INF/services/" + PROVIDER_INTERFACE;
 
   private final List<ExecutableElement> tools = new ArrayList<>();
@@ -348,23 +348,21 @@ private void writeProvider() throws IOException {
       writer.write("package " + GENERATED_PACKAGE + ";\n\n");
       writer.write("import com.github.thought2code.mcp.annotated.McpApplicationContext;\n");
       writer.write(
-          "import com.github.thought2code.mcp.annotated.compiled.completion.CompiledCompletionDefinition;\n");
+          "import com.github.thought2code.mcp.annotated.component.completion.CompletionDefinition;\n");
       writer.write(
-          "import com.github.thought2code.mcp.annotated.compiled.completion.CompiledCompletionInvoker;\n");
+          "import com.github.thought2code.mcp.annotated.component.completion.CompletionInvoker;\n");
       writer.write(
-          "import com.github.thought2code.mcp.annotated.compiled.prompt.CompiledPromptDefinition;\n");
+          "import com.github.thought2code.mcp.annotated.component.prompt.PromptDefinition;\n");
       writer.write(
-          "import com.github.thought2code.mcp.annotated.compiled.prompt.CompiledPromptInvoker;\n");
+          "import com.github.thought2code.mcp.annotated.component.prompt.PromptInvoker;\n");
       writer.write(
-          "import com.github.thought2code.mcp.annotated.compiled.resource.CompiledResourceDefinition;\n");
+          "import com.github.thought2code.mcp.annotated.component.resource.ResourceDefinition;\n");
       writer.write(
-          "import com.github.thought2code.mcp.annotated.compiled.resource.CompiledResourceInvoker;\n");
+          "import com.github.thought2code.mcp.annotated.component.resource.ResourceInvoker;\n");
       writer.write(
-          "import com.github.thought2code.mcp.annotated.compiled.spi.McpCompiledModelProvider;\n");
-      writer.write(
-          "import com.github.thought2code.mcp.annotated.compiled.tool.CompiledToolDefinition;\n");
-      writer.write(
-          "import com.github.thought2code.mcp.annotated.compiled.tool.CompiledToolInvoker;\n");
+          "import com.github.thought2code.mcp.annotated.component.spi.ComponentModelProvider;\n");
+      writer.write("import com.github.thought2code.mcp.annotated.component.tool.ToolDefinition;\n");
+      writer.write("import com.github.thought2code.mcp.annotated.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.util.TypeConverter;\n");
@@ -374,12 +372,11 @@ private void writeProvider() throws IOException {
       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 McpCompiledModelProvider {\n\n");
+      writer.write("public final class " + className + " implements ComponentModelProvider {\n\n");
 
       writer.write("  @Override\n");
-      writer.write("  public List<CompiledToolDefinition> tools() {\n");
-      writer.write("    List<CompiledToolDefinition> definitions = new ArrayList<>();\n");
+      writer.write("  public List<ToolDefinition> tools() {\n");
+      writer.write("    List<ToolDefinition> definitions = new ArrayList<>();\n");
       for (int i = 0; i < sortedTools.size(); i++) {
         ExecutableElement method = sortedTools.get(i);
         writer.write("    definitions.add(toolDefinition" + i + "());\n");
@@ -388,26 +385,26 @@ private void writeProvider() throws IOException {
       writer.write("  }\n\n");
 
       writer.write("  @Override\n");
-      writer.write("  public List<CompiledResourceDefinition> resources() {\n");
-      writer.write("    List<CompiledResourceDefinition> definitions = new ArrayList<>();\n");
+      writer.write("  public List<ResourceDefinition> resources() {\n");
+      writer.write("    List<ResourceDefinition> definitions = new ArrayList<>();\n");
       for (int i = 0; i < sortedResources.size(); i++) {
         writer.write("    definitions.add(resourceDefinition" + i + "());\n");
       }
       writer.write("    return definitions;\n");
       writer.write("  }\n\n");
 
       writer.write("  @Override\n");
-      writer.write("  public List<CompiledCompletionDefinition> completions() {\n");
-      writer.write("    List<CompiledCompletionDefinition> definitions = new ArrayList<>();\n");
+      writer.write("  public List<CompletionDefinition> completions() {\n");
+      writer.write("    List<CompletionDefinition> definitions = new ArrayList<>();\n");
       for (int i = 0; i < sortedCompletions.size(); i++) {
         writer.write("    definitions.add(completionDefinition" + i + "());\n");
       }
       writer.write("    return definitions;\n");
       writer.write("  }\n\n");
 
       writer.write("  @Override\n");
-      writer.write("  public List<CompiledPromptDefinition> prompts() {\n");
-      writer.write("    List<CompiledPromptDefinition> definitions = new ArrayList<>();\n");
+      writer.write("  public List<PromptDefinition> prompts() {\n");
+      writer.write("    List<PromptDefinition> definitions = new ArrayList<>();\n");
       for (int i = 0; i < sortedPrompts.size(); i++) {
         writer.write("    definitions.add(promptDefinition" + i + "());\n");
       }
@@ -473,7 +470,7 @@ private void writeToolDefinitionMethod(Writer writer, ExecutableElement method,
     String title = toolTitle(method);
     String description = toolDescription(method);
 
-    writer.write("  private static CompiledToolDefinition toolDefinition" + index + "() {\n");
+    writer.write("  private static ToolDefinition toolDefinition" + index + "() {\n");
     writer.write("    Map<String, Object> inputSchema = inputSchema" + index + "();\n");
     writer.write("    Map<String, Object> outputSchema = outputSchema" + index + "();\n");
     writer.write(
@@ -485,7 +482,7 @@ private void writeToolDefinitionMethod(Writer writer, ExecutableElement method,
     writer.write("        .outputSchema(outputSchema)\n");
     writer.write("        .build();\n");
     writer.write(
-        "    return new CompiledToolDefinition(\""
+        "    return new ToolDefinition(\""
             + escape(sourceMethod)
             + "\", tool, new Invoker"
             + index
@@ -578,8 +575,7 @@ private void writeInvoker(Writer writer, ExecutableElement method, int index) th
     String ownerType = owner.getQualifiedName().toString();
     boolean returnsVoid = method.getReturnType().getKind() == TypeKind.VOID;
 
-    writer.write(
-        "  private static final class Invoker" + index + " implements CompiledToolInvoker {\n");
+    writer.write("  private static final class Invoker" + index + " implements ToolInvoker {\n");
     writer.write("    @Override\n");
     writer.write(
         "    public Invocation invoke(McpApplicationContext context, Map<String, Object> arguments) {\n");
@@ -656,7 +652,7 @@ private void writePromptDefinitionMethod(Writer writer, ExecutableElement method
     String title = promptTitle(method);
     String description = promptDescription(method);
 
-    writer.write("  private static CompiledPromptDefinition promptDefinition" + index + "() {\n");
+    writer.write("  private static PromptDefinition promptDefinition" + index + "() {\n");
     writer.write("    List<McpSchema.PromptArgument> args = new ArrayList<>();\n");
     for (VariableElement parameter : method.getParameters()) {
       McpPromptParam promptParam = parameter.getAnnotation(McpPromptParam.class);
@@ -695,7 +691,7 @@ private void writePromptDefinitionMethod(Writer writer, ExecutableElement method
             + "        .arguments(args)\n"
             + "        .build();\n");
     writer.write(
-        "    return new CompiledPromptDefinition(\""
+        "    return new PromptDefinition(\""
             + escape(sourceMethod)
             + "\", prompt, \""
             + escape(description)
@@ -712,9 +708,7 @@ private void writePromptInvoker(Writer writer, ExecutableElement method, int ind
     boolean returnsVoid = method.getReturnType().getKind() == TypeKind.VOID;
 
     writer.write(
-        "  private static final class PromptInvoker"
-            + index
-            + " implements CompiledPromptInvoker {\n");
+        "  private static final class PromptInvoker" + index + " implements PromptInvoker {\n");
     writer.write("    @Override\n");
     writer.write(
         "    public Invocation invoke(McpApplicationContext context, Map<String, Object> arguments) {\n");
@@ -795,8 +789,7 @@ private void writeResourceDefinitionMethod(Writer writer, ExecutableElement meth
     String rolesLiteral = resourceRolesLiteral(method);
     double priority = resourcePriority(method);
 
-    writer.write(
-        "  private static CompiledResourceDefinition resourceDefinition" + index + "() {\n");
+    writer.write("  private static ResourceDefinition resourceDefinition" + index + "() {\n");
     writer.write(
         "    McpSchema.Resource resource = McpSchema.Resource.builder(\""
             + escape(uri)
@@ -814,7 +807,7 @@ private void writeResourceDefinitionMethod(Writer writer, ExecutableElement meth
             + ").build())\n");
     writer.write("        .build();\n");
     writer.write(
-        "    return new CompiledResourceDefinition(\""
+        "    return new ResourceDefinition(\""
             + escape(sourceMethod)
             + "\", resource, new ResourceInvoker"
             + index
@@ -829,9 +822,7 @@ private void writeResourceInvoker(Writer writer, ExecutableElement method, int i
     boolean returnsVoid = method.getReturnType().getKind() == TypeKind.VOID;
 
     writer.write(
-        "  private static final class ResourceInvoker"
-            + index
-            + " implements CompiledResourceInvoker {\n");
+        "  private static final class ResourceInvoker" + index + " implements ResourceInvoker {\n");
     writer.write("    @Override\n");
     writer.write("    public Invocation invoke(McpApplicationContext context) {\n");
     writer.write("      try {\n");
@@ -865,8 +856,7 @@ private void writeResourceInvoker(Writer writer, ExecutableElement method, int i
   private void writeCompletionDefinitionMethod(Writer writer, ExecutableElement method, int index)
       throws IOException {
     String sourceMethod = sourceMethod(method);
-    writer.write(
-        "  private static CompiledCompletionDefinition completionDefinition" + index + "() {\n");
+    writer.write("  private static CompletionDefinition completionDefinition" + index + "() {\n");
     if (method.getAnnotation(McpPromptCompletion.class) != null) {
       McpPromptCompletion annotation = method.getAnnotation(McpPromptCompletion.class);
       writer.write(
@@ -885,7 +875,7 @@ private void writeCompletionDefinitionMethod(Writer writer, ExecutableElement me
               + "\");\n");
     }
     writer.write(
-        "    return new CompiledCompletionDefinition(\""
+        "    return new CompletionDefinition(\""
             + escape(sourceMethod)
             + "\", reference, new CompletionInvoker"
             + index
@@ -901,7 +891,7 @@ private void writeCompletionInvoker(Writer writer, ExecutableElement method, int
     writer.write(
         "  private static final class CompletionInvoker"
             + index
-            + " implements CompiledCompletionInvoker {\n");
+            + " implements CompletionInvoker {\n");
     writer.write("    @Override\n");
     writer.write(
         "    public Invocation invoke(McpApplicationContext context, McpSchema.CompleteRequest.CompleteArgument argument) {\n");