fix(cli): resolve merge conflicts for PR #2932 - #2944

Approval Agent run failed to start: Automation GitHub integration validation failed: You need to increase your hard limit. Background Agent requires at least $2 remaining until your hard limit. Manage it at https://www.cursor.com/dashboard?tab=settings.

View agent