chore: back-merge main → develop after #319 promote - #320

Bugbot Analysis Progress (6s elapsed)

✅ Gathered PR context (2s)
✅ Completed bug detection (4s)
✅ Posted analysis results (1s)

Final Result: Bugbot completed review - no issues found! ✅

Request ID: serverGenReqId_2a1524f5-7b03-431e-bd6c-d1d0dbd0cdbe