Skip to content

fix: Skip conditionalLockAgent locking path for bot agents#40635

Merged
dionisio-bot[bot] merged 6 commits into
developfrom
copilot/conditional-lock-skip-bot-agents
May 25, 2026
Merged

fix: Skip conditionalLockAgent locking path for bot agents#40635
dionisio-bot[bot] merged 6 commits into
developfrom
copilot/conditional-lock-skip-bot-agents

Conversation

Copilot AI commented May 20, 2026

Copy link
Copy Markdown
Contributor
  • Fix wrong proxyquire stub path for hasRoleAsync in conditionalLockAgent.spec.ts
  • Combine !shouldLock and bot-agent checks into a single if condition in conditionalLockAgent.ts

https://rocketchat.atlassian.net/browse/SUP-1046

@dionisio-bot

dionisio-bot Bot commented May 20, 2026

Copy link
Copy Markdown
Contributor

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

@changeset-bot

changeset-bot Bot commented May 20, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 485835c

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 3 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch

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

@KevLehman KevLehman changed the title Skip conditionalLockAgent locking path for bot agents fix: Skip conditionalLockAgent locking path for bot agents May 20, 2026
Copilot AI requested a review from KevLehman May 20, 2026 23:25
@codecov

codecov Bot commented May 20, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 69.65%. Comparing base (bd62af9) to head (485835c).

Additional details and impacted files

Impacted file tree graph

@@           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     
Flag Coverage Δ
e2e 59.13% <ø> (-0.01%) ⬇️
e2e-api 46.02% <ø> (-0.81%) ⬇️
unit 70.48% <100.00%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@KevLehman KevLehman marked this pull request as ready for review May 22, 2026 16:54
@KevLehman KevLehman requested review from a team as code owners May 22, 2026 16:54
@KevLehman KevLehman added the stat: QA assured Means it has been tested and approved by a company insider label May 22, 2026
@KevLehman KevLehman added this to the 8.6.0 milestone May 22, 2026
Comment thread apps/meteor/app/livechat/server/lib/conditionalLockAgent.ts
Copilot AI requested a review from KevLehman May 22, 2026 17:54
@KevLehman KevLehman requested a review from ricardogarim May 22, 2026 17:59
@alfredodelfabro alfredodelfabro removed community stat: QA assured Means it has been tested and approved by a company insider labels May 25, 2026
@alfredodelfabro alfredodelfabro added stat: QA assured Means it has been tested and approved by a company insider and removed community labels May 25, 2026
@dionisio-bot dionisio-bot Bot added this pull request to the merge queue May 25, 2026
Merged via the queue into develop with commit 3ef5705 May 25, 2026
81 of 83 checks passed
@dionisio-bot dionisio-bot Bot deleted the copilot/conditional-lock-skip-bot-agents branch May 25, 2026 16:03
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>
@alfredodelfabro

Copy link
Copy Markdown
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>
@dionisio-bot

dionisio-bot Bot commented Jun 2, 2026

Copy link
Copy Markdown
Contributor

Pull request #40769 added to Project: "Patch 8.2.5"

@alfredodelfabro

Copy link
Copy Markdown
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>
@dionisio-bot

dionisio-bot Bot commented Jun 2, 2026

Copy link
Copy Markdown
Contributor

Pull request #40770 added to Project: "Patch 8.3.5"

@alfredodelfabro

Copy link
Copy Markdown
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>
@dionisio-bot

dionisio-bot Bot commented Jun 2, 2026

Copy link
Copy Markdown
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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

stat: QA assured Means it has been tested and approved by a company insider

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants