Apply changes from vibe-project/vibe-protocol@6f99642