a90ffe6264
# Pull Request Template ## Description Add account setting and store_accessor for `captain_force_legacy_auto_resolve`. Enterprise job now skips LLM evaluation when this flag is true and falls back to legacy time-based resolution. Add spec to cover the fallback. ## Type of change We recently rolled out Captain deciding if a conversation is resolved or not. While it is an improvement for majority of customers, some still prefer the old way of auto-resolving based on inactivity. This PR adds a check. ## How Has This Been Tested? Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration. legacy_auto_resolve = true <img width="1282" height="848" alt="CleanShot 2026-03-13 at 19 55 55@2x" src="https://github.com/user-attachments/assets/dfdcc5d5-6d21-462b-87a6-a5e1b1290a8b" /> legacy_auto_resolve = false <img width="1268" height="864" alt="CleanShot 2026-03-13 at 20 00 50@2x" src="https://github.com/user-attachments/assets/f4719ec6-922a-4c3b-bc45-7b29eaced565" /> ## Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my code - [x] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [x] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [x] Any dependent changes have been merged and published in downstream modules
79 lines
2.8 KiB
Ruby
79 lines
2.8 KiB
Ruby
require 'rails_helper'
|
|
|
|
RSpec.describe Captain::Tools::ResolveConversationTool do
|
|
let(:account) { create(:account) }
|
|
let(:assistant) { create(:captain_assistant, account: account) }
|
|
let(:inbox) { create(:inbox, account: account) }
|
|
let(:conversation) { create(:conversation, account: account, inbox: inbox, status: :open) }
|
|
let(:tool) { described_class.new(assistant) }
|
|
let(:tool_context) { Struct.new(:state).new({ conversation: { id: conversation.id } }) }
|
|
|
|
before do
|
|
Current.executed_by = assistant
|
|
end
|
|
|
|
after do
|
|
Current.reset
|
|
end
|
|
|
|
describe 'resolving a conversation' do
|
|
it 'marks resolved and enqueues an activity message with the reason' do
|
|
tool.perform(tool_context, reason: 'Possible spam')
|
|
|
|
expect(conversation.reload).to be_resolved
|
|
expect(Conversations::ActivityMessageJob).to have_been_enqueued.with(
|
|
conversation,
|
|
hash_including(
|
|
content: I18n.t('conversations.activity.captain.resolved_by_tool', user_name: assistant.name, reason: 'Possible spam')
|
|
)
|
|
)
|
|
end
|
|
|
|
it 'creates a conversation_resolved reporting event' do
|
|
create(:captain_inbox, captain_assistant: assistant, inbox: inbox)
|
|
|
|
expect do
|
|
perform_enqueued_jobs do
|
|
tool.perform(tool_context, reason: 'Possible spam')
|
|
end
|
|
end.to change { ReportingEvent.where(conversation_id: conversation.id, name: 'conversation_resolved').count }.by(1)
|
|
end
|
|
end
|
|
|
|
describe 'when auto-resolve is disabled for the account' do
|
|
before { account.update!(captain_auto_resolve_mode: 'disabled') }
|
|
|
|
it 'does not resolve and returns a disabled message' do
|
|
result = tool.perform(tool_context, reason: 'Possible spam')
|
|
|
|
expect(result).to eq('Auto-resolve is disabled for this account')
|
|
expect(conversation.reload).not_to be_resolved
|
|
end
|
|
end
|
|
|
|
describe 'when auto-resolve is disabled via legacy settings key' do
|
|
before { account.update!(settings: account.settings.merge('captain_disable_auto_resolve' => true)) }
|
|
|
|
it 'does not resolve and returns a disabled message' do
|
|
result = tool.perform(tool_context, reason: 'Possible spam')
|
|
|
|
expect(result).to eq('Auto-resolve is disabled for this account')
|
|
expect(conversation.reload).not_to be_resolved
|
|
end
|
|
end
|
|
|
|
describe 'resolving an already resolved conversation' do
|
|
let(:conversation) { create(:conversation, account: account, inbox: inbox, status: :resolved) }
|
|
|
|
it 'does not re-resolve and returns an already resolved message' do
|
|
queue_adapter = ActiveJob::Base.queue_adapter
|
|
queue_adapter.enqueued_jobs.clear
|
|
|
|
result = tool.perform(tool_context, reason: 'Possible spam')
|
|
|
|
expect(result).to include('already resolved')
|
|
expect(Conversations::ActivityMessageJob).not_to have_been_enqueued
|
|
end
|
|
end
|
|
end
|