Apply changes from vibe-project/vibe-java-server@93c55d5