Merge remote-tracking branch 'origin/main' into adamj/docker-hub-to-oci

Author: domdomegg

.vscode/launch.json

@@ -18,10 +18,10 @@
             "type": "go",
             "request": "launch",
             "mode": "auto",
-            "program": "${workspaceFolder}/tools/publisher/main.go",
+            "program": "${workspaceFolder}/cmd/publisher/main.go",
             "args": [
                 "-registry-url=http://localhost:8080",
-                "-mcp-file=${workspaceFolder}/tools/publisher/server.json",
+                "-mcp-file=${workspaceFolder}/cmd/publisher/server.json",
             ],
         }
     ]

Makefile

@@ -10,7 +10,7 @@ build: ## Build the registry application
 	go build -o bin/registry ./cmd/registry
 
 publisher: ## Build the publisher tool
-	cd tools/publisher && ./build.sh
+	cd cmd/publisher && ./build.sh
 
 # Test targets
 test-unit: ## Run unit tests with coverage
@@ -64,7 +64,7 @@ dev-local: ## Run registry locally
 clean: ## Clean build artifacts and coverage files
 	rm -rf bin
 	rm -f coverage.out coverage.html
-	cd tools/publisher && rm -f publisher
+	cd cmd/publisher && rm -f publisher
 
 
 .DEFAULT_GOAL := help

README.md

@@ -103,10 +103,10 @@ To publish a server, we've built a simple CLI. You can use it with:
 make publisher
 
 # Use it!
-./tools/publisher/bin/mcp-publisher --help
+./cmd/publisher/bin/mcp-publisher --help
 ```
 
-See [the publisher README](./tools/publisher/README.md) for more details.
+See [the publisher README](./cmd/publisher/README.md) for more details.
 
 #### Other commands
 
@@ -127,6 +127,7 @@ For Claude and other AI tools: Always prefer make targets over custom commands w
 
 ```
 ├── cmd/                     # Application entry points
+│   └── publisher/           # Server publishing tool
 ├── data/                    # Seed data
 ├── deploy/                  # Deployment configuration (Pulumi)
 ├── docs/                    # Technical documentation
@@ -147,7 +148,6 @@ For Claude and other AI tools: Always prefer make targets over custom commands w
 ├── scripts/                 # Development and testing scripts
 ├── tests/                   # Integration tests
 └── tools/                   # CLI tools and utilities
-    ├── publisher/           # Server publishing tool
     └── validate-*.sh        # Schema validation tools
 ```