Skip to content

edit_prediction: Add Mercury accept/reject tracking#48306

Merged
probably-neb merged 3 commits intozed-industries:mainfrom
claserken:mercury-feedback-tracking
Feb 4, 2026
Merged

edit_prediction: Add Mercury accept/reject tracking#48306
probably-neb merged 3 commits intozed-industries:mainfrom
claserken:mercury-feedback-tracking

Conversation

@claserken
Copy link
Contributor

@claserken claserken commented Feb 4, 2026

Summary

Adds accept/reject tracking for Mercury edit predictions.

Changes

Sends events to https://api-feedback.inceptionlabs.ai/feedback when:

Accept — user presses Tab
Reject — user presses Escape
Ignore — prediction dismissed implicitly (typing, cursor move, etc.)

Added discard_explicit method to the delegate trait to distinguish explicit vs implicit dismissal. Updated reject_prediction and reject_current_prediction methods with an explicit bool parameter to thread this through to the Mercury feedback logic. Other providers are unaffected—they use the default implementation.

Feedback is fire-and-forget in a background thread, only sent for predictions that were shown.

Data Collected

  • Request ID (returned from Inception API)
  • User action (either accept/reject/ignore)
  • Client Zed version (to track updates made to Zed client which could potentially affect nextedit implementation)

Release Notes:

  • N/A

@cla-bot
Copy link

cla-bot bot commented Feb 4, 2026

Thank you for your pull request and welcome to our community. We could not parse the GitHub identity of the following contributors: Kenan Hasanaliyev.
This is most likely caused by a git client misconfiguration; please make sure to:

  1. check if your git client is configured with an email to sign commits git config --list | grep email
  2. If not, set it up using git config --global user.email email@example.com
  3. Make sure that the git commit email is configured in your GitHub account settings, see https://github.com/settings/emails

@zed-community-bot zed-community-bot bot added the first contribution the author's first pull request to Zed. NOTE: the label application is automated via github actions label Feb 4, 2026
@claserken claserken changed the title add mercury accept/reject tracking Add Mercury Accept/Reject Tracking Feb 4, 2026
@claserken claserken force-pushed the mercury-feedback-tracking branch from 7760b89 to 70cc3c3 Compare February 4, 2026 01:35
@cla-bot
Copy link

cla-bot bot commented Feb 4, 2026

We require contributors to sign our Contributor License Agreement, and we don't have @claserken on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'.

@claserken
Copy link
Contributor Author

@cla-bot check

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Feb 4, 2026
@cla-bot
Copy link

cla-bot bot commented Feb 4, 2026

The cla-bot has been summoned, and re-checked this pull request!

@claserken claserken force-pushed the mercury-feedback-tracking branch from 70cc3c3 to 374c118 Compare February 4, 2026 01:43
@claserken claserken marked this pull request as ready for review February 4, 2026 01:48
@SomeoneToIgnore SomeoneToIgnore added the area:ai Improvement related to Agent Panel, Edit Prediction, Copilot, or other AI features label Feb 4, 2026
@MrSubidubi MrSubidubi changed the title Add Mercury Accept/Reject Tracking edit_prediction: Add Mercury accept/reject tracking Feb 4, 2026
@probably-neb probably-neb force-pushed the mercury-feedback-tracking branch from 374c118 to fd6d463 Compare February 4, 2026 20:40
@probably-neb probably-neb merged commit e39c190 into zed-industries:main Feb 4, 2026
27 checks passed
@probably-neb
Copy link
Collaborator

/cherry-pick preview
/cherry-pick stable

github-actions bot pushed a commit that referenced this pull request Feb 4, 2026
### Summary
Adds accept/reject tracking for Mercury edit predictions.

### Changes
Sends events to https://api-feedback.inceptionlabs.ai/feedback when:

Accept — user presses Tab
Reject — user presses Escape
Ignore — prediction dismissed implicitly (typing, cursor move, etc.)

Added `discard_explicit` method to the delegate trait to distinguish
explicit vs implicit dismissal. Updated `reject_prediction` and
`reject_current_prediction` methods with an `explicit` bool parameter to
thread this through to the Mercury feedback logic. Other providers are
unaffected—they use the default implementation.

Feedback is fire-and-forget in a background thread, only sent for
predictions that were shown.

### Data Collected
- Request ID (returned from Inception API)
- User action (either accept/reject/ignore)
- Client Zed version (to track updates made to Zed client which could
potentially affect nextedit implementation)


Release Notes:

- N/A

---------

Co-authored-by: Ben Kunkle <ben@zed.dev>
github-actions bot pushed a commit that referenced this pull request Feb 4, 2026
### Summary
Adds accept/reject tracking for Mercury edit predictions.

### Changes
Sends events to https://api-feedback.inceptionlabs.ai/feedback when:

Accept — user presses Tab
Reject — user presses Escape
Ignore — prediction dismissed implicitly (typing, cursor move, etc.)

Added `discard_explicit` method to the delegate trait to distinguish
explicit vs implicit dismissal. Updated `reject_prediction` and
`reject_current_prediction` methods with an `explicit` bool parameter to
thread this through to the Mercury feedback logic. Other providers are
unaffected—they use the default implementation.

Feedback is fire-and-forget in a background thread, only sent for
predictions that were shown.

### Data Collected
- Request ID (returned from Inception API)
- User action (either accept/reject/ignore)
- Client Zed version (to track updates made to Zed client which could
potentially affect nextedit implementation)


Release Notes:

- N/A

---------

Co-authored-by: Ben Kunkle <ben@zed.dev>
zed-zippy bot added a commit that referenced this pull request Feb 4, 2026
…pick to preview) (#48402)

Cherry-pick of #48306 to preview

----
### Summary
Adds accept/reject tracking for Mercury edit predictions.

### Changes
Sends events to https://api-feedback.inceptionlabs.ai/feedback when:

Accept — user presses Tab
Reject — user presses Escape
Ignore — prediction dismissed implicitly (typing, cursor move, etc.)

Added `discard_explicit` method to the delegate trait to distinguish
explicit vs implicit dismissal. Updated `reject_prediction` and
`reject_current_prediction` methods with an `explicit` bool parameter to
thread this through to the Mercury feedback logic. Other providers are
unaffected—they use the default implementation.

Feedback is fire-and-forget in a background thread, only sent for
predictions that were shown.

### Data Collected
- Request ID (returned from Inception API)
- User action (either accept/reject/ignore)
- Client Zed version (to track updates made to Zed client which could
potentially affect nextedit implementation)


Release Notes:

- N/A

---------

Co-authored-by: Ben Kunkle <ben@zed.dev>

Co-authored-by: Kenan Hasanaliyev <claserken@gmail.com>
Co-authored-by: Ben Kunkle <ben@zed.dev>
zed-zippy bot added a commit that referenced this pull request Feb 4, 2026
…pick to stable) (#48403)

Cherry-pick of #48306 to stable

----
### Summary
Adds accept/reject tracking for Mercury edit predictions.

### Changes
Sends events to https://api-feedback.inceptionlabs.ai/feedback when:

Accept — user presses Tab
Reject — user presses Escape
Ignore — prediction dismissed implicitly (typing, cursor move, etc.)

Added `discard_explicit` method to the delegate trait to distinguish
explicit vs implicit dismissal. Updated `reject_prediction` and
`reject_current_prediction` methods with an `explicit` bool parameter to
thread this through to the Mercury feedback logic. Other providers are
unaffected—they use the default implementation.

Feedback is fire-and-forget in a background thread, only sent for
predictions that were shown.

### Data Collected
- Request ID (returned from Inception API)
- User action (either accept/reject/ignore)
- Client Zed version (to track updates made to Zed client which could
potentially affect nextedit implementation)


Release Notes:

- N/A

---------

Co-authored-by: Ben Kunkle <ben@zed.dev>

Co-authored-by: Kenan Hasanaliyev <claserken@gmail.com>
Co-authored-by: Ben Kunkle <ben@zed.dev>
adb-sh pushed a commit to adb-sh/zed that referenced this pull request Feb 5, 2026
…8306)

### Summary
Adds accept/reject tracking for Mercury edit predictions.

### Changes
Sends events to https://api-feedback.inceptionlabs.ai/feedback when:

Accept — user presses Tab
Reject — user presses Escape
Ignore — prediction dismissed implicitly (typing, cursor move, etc.)

Added `discard_explicit` method to the delegate trait to distinguish
explicit vs implicit dismissal. Updated `reject_prediction` and
`reject_current_prediction` methods with an `explicit` bool parameter to
thread this through to the Mercury feedback logic. Other providers are
unaffected—they use the default implementation.

Feedback is fire-and-forget in a background thread, only sent for
predictions that were shown.

### Data Collected
- Request ID (returned from Inception API)
- User action (either accept/reject/ignore)
- Client Zed version (to track updates made to Zed client which could
potentially affect nextedit implementation)


Release Notes:

- N/A

---------

Co-authored-by: Ben Kunkle <ben@zed.dev>
rtfeldman pushed a commit that referenced this pull request Feb 5, 2026
### Summary
Adds accept/reject tracking for Mercury edit predictions.

### Changes
Sends events to https://api-feedback.inceptionlabs.ai/feedback when:

Accept — user presses Tab
Reject — user presses Escape
Ignore — prediction dismissed implicitly (typing, cursor move, etc.)

Added `discard_explicit` method to the delegate trait to distinguish
explicit vs implicit dismissal. Updated `reject_prediction` and
`reject_current_prediction` methods with an `explicit` bool parameter to
thread this through to the Mercury feedback logic. Other providers are
unaffected—they use the default implementation.

Feedback is fire-and-forget in a background thread, only sent for
predictions that were shown.

### Data Collected
- Request ID (returned from Inception API)
- User action (either accept/reject/ignore)
- Client Zed version (to track updates made to Zed client which could
potentially affect nextedit implementation)


Release Notes:

- N/A

---------

Co-authored-by: Ben Kunkle <ben@zed.dev>
naaiyy added a commit to Glass-HQ/Glass that referenced this pull request Feb 16, 2026
Key changes:
- Semantic highlighting support (zed-industries#46356) - major new editor feature
- Edit predictions via Ollama (zed-industries#48233) - local AI edit predictions
- Side-by-side diff: staging/unstaging/restoring on LHS, hunk controls, gutter highlights
- Branch diff fix when committing/changing branches (zed-industries#48388)
- Settings UI: AI tool permissions page (zed-industries#48277)
- Version bump to v0.224 (kept our v0.0.1)
- Close toasts on middle mouse click (zed-industries#48208)
- DAP settings made optional (zed-industries#43647)
- REPL quality of life improvements (zed-industries#47533)
- Mercury accept/reject tracking (zed-industries#48306)
- Toolbar menu and EP menu telemetry (zed-industries#48225, zed-industries#48229)
- lsp::Symbol now includes container_name (zed-industries#46822)
- Nushell/Elvish/Rc always_allow patterns (zed-industries#48395)
- Agent terminal security rules expanded (zed-industries#48399)

Conflict resolution:
- collab/rpc.rs, collab_ui, collab editor_tests: deleted (collab removed)
- vim (yank, replace, test): deleted (vim removed)
- util/shell.rs: deleted (extracted to Obsydian-HQ/gpui)
- GPUI (app.rs, windows/platform.rs, platform_scheduler.rs): deleted (Obsydian)
- editor/items.rs: merged imports (added ExcerptId, ExcerptRange, kept SearchWithinRange)
- lsp_store.rs: added SemanticTokensData import, removed GlobalLogStore/LanguageServerKind
- proto.rs: added SemanticTokens to entity_messages, removed JoinProject/LeaveProject
- lsp_button.rs: kept empty server UI, added is_via_ssh check from upstream
- edit_prediction_button.rs: kept TitleBarItemView import
- vscode_import.rs: added semantic_token_rules, removed helix_mode (not in our struct)
- zed/Cargo.toml: kept v0.0.1

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:ai Improvement related to Agent Panel, Edit Prediction, Copilot, or other AI features cla-signed The user has signed the Contributor License Agreement first contribution the author's first pull request to Zed. NOTE: the label application is automated via github actions

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants