Fix main shortcut routing CI regressions - #4445

Bugbot Analysis Progress (9m 1s elapsed)

✅ Gathered PR context (3s)
✅ Completed bug detection (8m 57s)
✅ Posted analysis results (1s)

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

Request ID: serverGenReqId_dc717cba-394f-40dc-9fb9-f85321cadd58