Merge branch 'main' into feat/add-kion-mcp

Author: JAORMX

.github/workflows/build-and-publish.yml

@@ -25,7 +25,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: 'go.mod'
           cache: true
@@ -44,7 +44,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: 'go.mod'
           cache: true
@@ -83,26 +83,29 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: 'go.mod'
           cache: true
 
       - name: Build registry-builder
         run: go build -o registry-builder ./cmd/registry-builder
 
-      - name: Build registry.json
+      - name: Build registry files (both formats)
         run: |
           mkdir -p dist
-          ./registry-builder build -v
+          ./registry-builder build --format all -v
           cp build/registry.json dist/registry.json
+          cp build/official-registry.json dist/official-registry.json
           CONTAINER_COUNT=$(jq '.servers | length' dist/registry.json)
           REMOTE_COUNT=$(jq '.remote_servers | length // 0' dist/registry.json)
           TOTAL_COUNT=$((CONTAINER_COUNT + REMOTE_COUNT))
           echo "Registry built successfully with $TOTAL_COUNT entries ($CONTAINER_COUNT container-based, $REMOTE_COUNT remote)"
+          echo "Both ToolHive and official MCP formats generated"
 
-      - name: Validate JSON
+      - name: Validate JSON files
         run: |
+          echo "Validating ToolHive format..."
           # Validate JSON structure
           jq empty dist/registry.json
           echo "✅ Valid JSON"
@@ -119,6 +122,35 @@ jobs:
           
           jq -e '."$schema"' dist/registry.json > /dev/null
           echo "✅ Has schema field"
+          
+          echo ""
+          echo "Validating Official MCP format..."
+          # Validate official registry JSON structure
+          jq empty dist/official-registry.json
+          echo "✅ Valid JSON"
+          
+          # Check required fields for official format
+          jq -e '.version' dist/official-registry.json > /dev/null
+          echo "✅ Has version field"
+          
+          jq -e '.meta.last_updated' dist/official-registry.json > /dev/null
+          echo "✅ Has meta.last_updated field"
+          
+          jq -e '.data.servers' dist/official-registry.json > /dev/null
+          echo "✅ Has data.servers field"
+          
+          # Check that servers have the flattened structure with _meta
+          SERVER_COUNT=$(jq '.data.servers | length' dist/official-registry.json)
+          if [ "$SERVER_COUNT" -gt 0 ]; then
+            jq -e '.data.servers[0].name' dist/official-registry.json > /dev/null
+            echo "✅ Servers have name field"
+            
+            jq -e '.data.servers[0]._meta.publisher' dist/official-registry.json > /dev/null
+            echo "✅ Servers have _meta.publisher field"
+            
+            jq -e '.data.servers[0]._meta."io.modelcontextprotocol.registry"' dist/official-registry.json > /dev/null
+            echo "✅ Servers have registry extensions"
+          fi
 
       - name: Generate metadata
         id: metadata
@@ -175,11 +207,15 @@ jobs:
           cd dist
           sha256sum registry.json > registry.json.sha256
           md5sum registry.json > registry.json.md5
+          sha256sum official-registry.json > official-registry.json.sha256
+          md5sum official-registry.json > official-registry.json.md5
 
       - name: Create tarball
         run: |
           cd dist
-          tar -czf registry-${{ steps.metadata.outputs.version }}.tar.gz registry.json registry.json.sha256 registry.json.md5
+          tar -czf registry-${{ steps.metadata.outputs.version }}.tar.gz \
+            registry.json registry.json.sha256 registry.json.md5 \
+            official-registry.json official-registry.json.sha256 official-registry.json.md5
           tar -tzf registry-${{ steps.metadata.outputs.version }}.tar.gz
 
       - name: Check if release exists
@@ -251,16 +287,22 @@ jobs:
             
             ### 📥 Download Options
             
-            - **registry.json** - The complete registry file
-            - **registry-${{ steps.metadata.outputs.version }}.tar.gz** - Archive with checksums
+            **Individual Files:**
+            - **registry.json** - ToolHive format registry file
+            - **official-registry.json** - Official MCP format registry file
+            
+            **Archives:**
+            - **registry-${{ steps.metadata.outputs.version }}.tar.gz** - Complete archive with both formats and checksums
             
             ### 🔗 Direct URLs
             
-            Latest registry is always available at:
-            - `https://github.com/stacklok/toolhive-registry/releases/latest/download/registry.json`
+            **ToolHive Format:**
+            - Latest: `https://github.com/stacklok/toolhive-registry/releases/latest/download/registry.json`
+            - This version: `https://github.com/stacklok/toolhive-registry/releases/download/v${{ steps.metadata.outputs.version }}/registry.json`
             
-            This specific version:
-            - `https://github.com/stacklok/toolhive-registry/releases/download/v${{ steps.metadata.outputs.version }}/registry.json`
+            **Official MCP Format:**
+            - Latest: `https://github.com/stacklok/toolhive-registry/releases/latest/download/official-registry.json`
+            - This version: `https://github.com/stacklok/toolhive-registry/releases/download/v${{ steps.metadata.outputs.version }}/official-registry.json`
             
             ### 📝 Recent Changes
             
@@ -272,6 +314,9 @@ jobs:
             dist/registry.json
             dist/registry.json.sha256
             dist/registry.json.md5
+            dist/official-registry.json
+            dist/official-registry.json.sha256
+            dist/official-registry.json.md5
             dist/registry-${{ steps.metadata.outputs.version }}.tar.gz
           makeLatest: true
           artifactErrorsFailBuild: true
@@ -285,13 +330,19 @@ jobs:
           gh release delete-asset "v${{ steps.metadata.outputs.version }}" registry.json --yes || true
           gh release delete-asset "v${{ steps.metadata.outputs.version }}" registry.json.sha256 --yes || true
           gh release delete-asset "v${{ steps.metadata.outputs.version }}" registry.json.md5 --yes || true
+          gh release delete-asset "v${{ steps.metadata.outputs.version }}" official-registry.json --yes || true
+          gh release delete-asset "v${{ steps.metadata.outputs.version }}" official-registry.json.sha256 --yes || true
+          gh release delete-asset "v${{ steps.metadata.outputs.version }}" official-registry.json.md5 --yes || true
           gh release delete-asset "v${{ steps.metadata.outputs.version }}" "registry-${{ steps.metadata.outputs.version }}.tar.gz" --yes || true
           
           # Upload new assets
           gh release upload "v${{ steps.metadata.outputs.version }}" \
             dist/registry.json \
             dist/registry.json.sha256 \
             dist/registry.json.md5 \
+            dist/official-registry.json \
+            dist/official-registry.json.sha256 \
+            dist/official-registry.json.md5 \
             "dist/registry-${{ steps.metadata.outputs.version }}.tar.gz" \
             --clobber
           
@@ -308,7 +359,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: 'go.mod'
           cache: true

.github/workflows/update-metadata.yml

@@ -27,7 +27,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: 'go.mod'
           cache: true

.github/workflows/update-tools.yml

@@ -125,7 +125,7 @@ jobs:
           ref: ${{ github.head_ref || github.ref }}
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: 'go.mod'
           cache: true
@@ -295,7 +295,7 @@ jobs:
           ref: ${{ github.head_ref || github.ref }}
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: 'go.mod'
           cache: true

Taskfile.yml

@@ -152,16 +152,41 @@ tasks:
       - ./{{.BUILD_DIR}}/registry-builder list -v
 
   build:registry:
-    desc: Build the registry JSON from YAML files
+    desc: Build registry files in both ToolHive and official MCP formats
     deps: [build:registry-builder]
     cmds:
-      - echo "🏗️ Building registry.json..."
-      - ./{{.BUILD_DIR}}/registry-builder build -v
+      - echo "🏗️ Building registry files (both formats)..."
+      - ./{{.BUILD_DIR}}/registry-builder build --format all -v
     sources:
       - "{{.REGISTRY_DIR}}/**/*.yaml"
       - "{{.REGISTRY_DIR}}/**/*.yml"
     generates:
       - "{{.BUILD_DIR}}/registry.json"
+      - "{{.BUILD_DIR}}/official-registry.json"
+
+  build:registry:toolhive:
+    desc: Build registry in ToolHive format only
+    deps: [build:registry-builder]
+    cmds:
+      - echo "🏗️ Building ToolHive registry.json..."
+      - ./{{.BUILD_DIR}}/registry-builder build --format toolhive -v
+    sources:
+      - "{{.REGISTRY_DIR}}/**/*.yaml"
+      - "{{.REGISTRY_DIR}}/**/*.yml"
+    generates:
+      - "{{.BUILD_DIR}}/registry.json"
+
+  build:registry:official:
+    desc: Build registry in official MCP format only
+    deps: [build:registry-builder]
+    cmds:
+      - echo "🏗️ Building official MCP registry..."
+      - ./{{.BUILD_DIR}}/registry-builder build --format official-mcp-registry -v
+    sources:
+      - "{{.REGISTRY_DIR}}/**/*.yaml"
+      - "{{.REGISTRY_DIR}}/**/*.yml"
+    generates:
+      - "{{.BUILD_DIR}}/official-registry.json"
 
   test:
     desc: Run tests
@@ -212,7 +237,9 @@ tasks:
       - task: validate
       - task: build:registry
       - echo "✨ Full cycle complete!"
-      - 'echo "Registry JSON available at: {{.BUILD_DIR}}/registry.json"'
+      - 'echo "Registry files available at:"'
+      - 'echo "  - ToolHive format: {{.BUILD_DIR}}/registry.json"'
+      - 'echo "  - Official MCP format: {{.BUILD_DIR}}/official-registry.json"'
 
   quick-start:
     desc: Quick start for new users
@@ -225,7 +252,7 @@ tasks:
       - 'echo "  1. Review imported entries in {{.REGISTRY_DIR}}/"'
       - echo "  2. Add new entries by creating directories with spec.yaml files"
       - echo "  3. Run 'task validate' to check your changes"
-      - echo "  4. Run 'task build:registry' to generate the final JSON"
+      - echo "  4. Run 'task build:registry' to generate registry files (both formats)"
 
   version:
     desc: Show version information

cmd/registry-builder/main.go

@@ -14,6 +14,12 @@ import (
 	"github.com/stacklok/toolhive-registry/pkg/types"
 )
 
+const (
+	RegistryToolHiveFormat      = "toolhive"
+	RegistryOfficialMCPRegistry = "official-mcp-registry"
+	RegistryAllFormats          = "all"
+)
+
 var (
 	// Version information (set during build)
 	version = "dev"
@@ -80,7 +86,8 @@ func init() {
 
 	// Build command flags
 	buildCmd.Flags().StringVarP(&outputDir, "output-dir", "o", "build", "Output directory for built registry files")
-	buildCmd.Flags().StringVarP(&outputFormat, "format", "f", "toolhive", "Output format (toolhive, mcp-registry, all)")
+	buildCmd.Flags().StringVarP(&outputFormat, "format", "f", "toolhive",
+		fmt.Sprintf("Output format (%s, %s, %s)", RegistryToolHiveFormat, RegistryOfficialMCPRegistry, RegistryAllFormats))
 
 	// Add commands
 	rootCmd.AddCommand(buildCmd)
@@ -150,34 +157,52 @@ func runBuild(_ *cobra.Command, _ []string) error {
 
 func determineFormats(format string) []string {
 	switch strings.ToLower(format) {
-	case "all":
+	case RegistryAllFormats:
 		// Return all supported formats
-		// For now, just toolhive, but will expand to include mcp-registry
-		return []string{"toolhive"}
-	case "mcp-registry", "mcp":
-		// Future: Upstream MCP Registry format
-		fmt.Println("Note: MCP Registry format support is planned for a future release")
-		fmt.Println("This will generate output compatible with https://github.com/modelcontextprotocol/registry")
-		return []string{}
-	case "toolhive":
-		fallthrough
+		return []string{RegistryToolHiveFormat, RegistryOfficialMCPRegistry}
+	case RegistryOfficialMCPRegistry:
+		return []string{RegistryOfficialMCPRegistry}
+	case RegistryToolHiveFormat:
+		return []string{RegistryToolHiveFormat}
 	default:
-		return []string{"toolhive"}
+		return []string{RegistryToolHiveFormat}
 	}
 }
 
 func buildFormat(loader *registry.Loader, format string, outputDir string) error {
 	switch format {
-	case "toolhive":
+	case RegistryToolHiveFormat:
 		return buildToolhiveFormat(loader, outputDir)
-	case "mcp-registry":
-		// Future implementation
-		return fmt.Errorf("MCP Registry format not yet implemented")
+	case RegistryOfficialMCPRegistry:
+		return buildOfficialMCPRegistryFormat(loader, outputDir)
 	default:
 		return fmt.Errorf("unknown format: %s", format)
 	}
 }
 
+func buildOfficialMCPRegistryFormat(loader *registry.Loader, outputDir string) error {
+	// Create official MCP Registry builder
+	r := registry.NewOfficialRegistry(loader)
+
+	// Ensure output directory exists
+	if err := os.MkdirAll(outputDir, 0750); err != nil {
+		return fmt.Errorf("failed to create output directory: %w", err)
+	}
+
+	// TODO: Add validation step
+
+	// Write JSON output
+	outputPath := filepath.Join(outputDir, "official-registry.json")
+	if err := r.WriteJSON(outputPath); err != nil {
+		return fmt.Errorf("failed to write output: %w", err)
+	}
+
+	if verbose {
+		log.Printf("Written Official MCP Registry format to %s", outputPath)
+	}
+	return nil
+}
+
 func buildToolhiveFormat(loader *registry.Loader, outputDir string) error {
 	// Create builder
 	builder := registry.NewBuilder(loader)
@@ -205,14 +230,6 @@ func buildToolhiveFormat(loader *registry.Loader, outputDir string) error {
 	return nil
 }
 
-// Future: buildMCPRegistryFormat function will be added here
-// func buildMCPRegistryFormat(loader *registry.Loader, outputDir string) error {
-//     // Implementation for upstream MCP Registry format
-//     // This will create output compatible with the MCP Registry service:
-//     // https://github.com/modelcontextprotocol/registry
-//     // The format will evolve as the upstream standard evolves
-// }
-
 func runValidate(_ *cobra.Command, _ []string) error {
 	if verbose {
 		log.Printf("Validating registry entries in %s", registryPath)
@@ -327,15 +344,15 @@ func displayEntry(entry *types.RegistryEntry, verbose bool) {
 func getEntryStatus(entry *types.RegistryEntry) string {
 	status := entry.GetStatus()
 	if status == "" {
-		status = "Active"
+		status = types.StatusActive
 	}
 	return status
 }
 
 func getEntryTier(entry *types.RegistryEntry) string {
 	tier := entry.GetTier()
 	if tier == "" {
-		tier = "Community"
+		tier = types.TierCommunity
 	}
 	return tier
 }