Integrate Gemini PR 54 onto current main#58

aaditagrawal merged 6 commits intomainaaditagrawal/t3code:mainfrom

codex/pr-54-followup-fixesaaditagrawal/t3code:codex/pr-54-followup-fixesCopy head branch name to clipboard