fix: always clean up pre events W-20002028#828
Merged
Conversation
cristiand391
commented
Jan 22, 2026
| }); | ||
|
|
||
| it.only('automatically commits moved files and leaves other changes alone', async () => { | ||
| it('automatically commits moved files and leaves other changes alone', async () => { |
Member
Author
There was a problem hiding this comment.
this was added a while ago, after removing it got a few failures that are fixed here (separate PR for easier review):
#829
* test: fix removeSourceTracking UTs * test: fix pathIsInFolder UTs * chore: getNonSequential handle empty pkgDir * test: platform-specific test * chore: bump sdr
soridalac
approved these changes
Jan 23, 2026
soridalac
approved these changes
Jan 23, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
While working on supporting
ignoreConflictsin the deploy/retrieve tools for the dx mcp here we found some issues:salesforcecli/mcp#321
Unlike CLI, the mcp is a long running process and a new
SourceTrackinginstance gets created on each tool call.STL handles events by attaching listeners to a global singleton (sfdx-core's
Lifecycle), in an mcp process all deploy/retrieve tool calls would listen to the events (or not) depending on if the first call did setignoreConflicts.We now clean the pre events inside
maybeSubscribeLifecycleEvents(always called when instantiatingSourceTracking) so ensure each instance is clean.Each instance can subscribe to the pre events by setting
ignoreConflicts.What issues does this PR fix or reference?
@W-20002028@