fix: Skip conditionalLockAgent locking path for bot agents#40635
Merged
dionisio-bot[bot] merged 6 commits intoMay 25, 2026
Conversation
Agent-Logs-Url: https://github.com/RocketChat/Rocket.Chat/sessions/81aad858-43f4-4eb1-88c8-72e52fbf9acd Co-authored-by: KevLehman <11577696+KevLehman@users.noreply.github.com>
Copilot created this pull request from a session on behalf of
KevLehman
May 20, 2026 22:53
View session
Contributor
|
Looks like this PR is ready to merge! 🎉 |
🦋 Changeset detectedLatest commit: 485835c The changes in this PR will be included in the next version bump. This PR includes changesets to release 3 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
conditionalLockAgent locking path for bot agentsconditionalLockAgent locking path for bot agents
Agent-Logs-Url: https://github.com/RocketChat/Rocket.Chat/sessions/309dd860-511d-4071-98ce-59ad731d784c Co-authored-by: KevLehman <11577696+KevLehman@users.noreply.github.com>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## develop #40635 +/- ##
========================================
Coverage 69.64% 69.65%
========================================
Files 3338 3338
Lines 123246 123247 +1
Branches 21946 22003 +57
========================================
+ Hits 85838 85844 +6
+ Misses 34047 34044 -3
+ Partials 3361 3359 -2
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
KevLehman
approved these changes
May 22, 2026
ricardogarim
requested changes
May 22, 2026
nazabucciarelli
approved these changes
May 22, 2026
KevLehman
approved these changes
May 25, 2026
KevLehman
added a commit
that referenced
this pull request
Jun 1, 2026
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: KevLehman <11577696+KevLehman@users.noreply.github.com> Co-authored-by: Kevin Aleman <kaleman960@gmail.com>
Member
|
/backport 8.2.5 |
dionisio-bot Bot
pushed a commit
that referenced
this pull request
Jun 2, 2026
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: KevLehman <11577696+KevLehman@users.noreply.github.com> Co-authored-by: Kevin Aleman <kaleman960@gmail.com>
Contributor
|
Pull request #40769 added to Project: "Patch 8.2.5" |
Member
|
/backport 8.3.5 |
dionisio-bot Bot
pushed a commit
that referenced
this pull request
Jun 2, 2026
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: KevLehman <11577696+KevLehman@users.noreply.github.com> Co-authored-by: Kevin Aleman <kaleman960@gmail.com>
Contributor
|
Pull request #40770 added to Project: "Patch 8.3.5" |
Member
|
/backport 8.4.3 |
dionisio-bot Bot
pushed a commit
that referenced
this pull request
Jun 2, 2026
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: KevLehman <11577696+KevLehman@users.noreply.github.com> Co-authored-by: Kevin Aleman <kaleman960@gmail.com>
Contributor
|
Pull request #40771 added to Project: "Patch 8.4.3" |
ggazzo
pushed a commit
that referenced
this pull request
Jun 4, 2026
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: KevLehman <11577696+KevLehman@users.noreply.github.com> Co-authored-by: Kevin Aleman <kaleman960@gmail.com>
Merged
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
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.
hasRoleAsyncinconditionalLockAgent.spec.ts!shouldLockand bot-agent checks into a singleifcondition inconditionalLockAgent.tshttps://rocketchat.atlassian.net/browse/SUP-1046