Fix leftover conflict markers from rebase onto main. Align as_str() with main's semantics (general-purpose model names), add separate s3_prefix() for S3 storage paths, and fix to_db_string() to preserve per-variant database values. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>