Skip to content

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

Closed
riderx wants to merge 3 commits into
mainfrom
cursor/fix-pr-2932-conflicts-efd9
Closed

fix(cli): resolve merge conflicts for PR #2932#2944
riderx wants to merge 3 commits into
mainfrom
cursor/fix-pr-2932-conflicts-efd9

Conversation

@riderx

@riderx riderx commented Aug 8, 2026

Copy link
Copy Markdown
Member

Summary (AI generated)

Motivation (AI generated)

PR #2932 conflicted again with main after the overlapping PostHog fingerprint / expected-upload-abort work in #2934.

Business Impact (AI generated)

Unblocks shipping the CLI error-tracking noise fix so "not logged in" no longer mints a new issue per occurrence.

Test Plan (AI generated)

Generated with AI

Open in Web Open in Cursor 

View with [code]smith Autofix with [code]smith
Need help on this PR? Tag @codesmith-bot with what you need. Autofix is disabled.

Review in cubic

posthog-eu Bot and others added 2 commits August 8, 2026 00:35
Closes the two follow-ups #2885 flagged but left open:

- `findSavedKey` now throws a `CliUserError` (which `shouldCapturePosthogException` already skips) instead of a bare `Error`, and drops the interpolated package-manager runner so one "not logged in" condition renders as one value.
- The exception fingerprint no longer includes the top stack frame's function/filename. Bundles are minified, so that symbol changes per build and per call site, splitting one bug into a fresh issue every occurrence. It now keys only on the stable command path, error kind, error name and exit status.

Generated-By: PostHog Code
Task-Id: 88765fab-4def-4a9f-bf9c-52c6cc144a2b
Keep both CliUserError skip assertions: the not-logged-in findSavedKey
message from this PR and the interactive-cancel messages from #2941.

Co-authored-by: Martin DONADIEU <martindonadieu@gmail.com>
@coderabbitai

coderabbitai Bot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro

Run ID: c541da46-80c7-4671-b89d-cbcc05c62717

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Comment @coderabbitai help to get the list of available commands.

Keep main's install-path fingerprint comments and both CliUserError skip
assertions (not-logged-in from this PR, duplicate-version from #2934).

Co-authored-by: Martin DONADIEU <martindonadieu@gmail.com>
@codspeed-hq

codspeed-hq Bot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

Merging this PR will not alter performance

✅ 43 untouched benchmarks
⏩ 2 skipped benchmarks1


Comparing cursor/fix-pr-2932-conflicts-efd9 (aa83930) with main (2d78f79)

Open in CodSpeed

Footnotes

  1. 2 benchmarks were skipped, so the baseline results were used instead. If they were deleted from the codebase, click here and archive them to remove them from the performance reports.

@riderx riderx closed this Aug 8, 2026
@sonarqubecloud

sonarqubecloud Bot commented Aug 8, 2026

Copy link
Copy Markdown

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants