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

This commit only merges another branch into the PR branch, so cubic completed this check without running an AI review. cubic will review your next non-merge commit.