-
-
-
- {{
- enabled
- ? t(
- 'ASSIGNMENT_POLICY.AGENT_ASSIGNMENT_POLICY.INDEX.CARD.ACTIVE'
- )
- : t(
- 'ASSIGNMENT_POLICY.AGENT_ASSIGNMENT_POLICY.INDEX.CARD.INACTIVE'
- )
- }}
-
-
+
+
-import { ref, onMounted } from 'vue';
+import { ref, computed, onMounted } from 'vue';
import { useI18n } from 'vue-i18n';
import Input from 'dashboard/components-next/input/Input.vue';
import DurationInput from 'dashboard/components-next/input/DurationInput.vue';
@@ -15,6 +15,9 @@ const fairDistributionLimit = defineModel('fairDistributionLimit', {
},
});
+// The model value is in seconds (for the backend/DB)
+// DurationInput works in minutes internally
+// We need to convert between seconds and minutes
const fairDistributionWindow = defineModel('fairDistributionWindow', {
type: Number,
default: 3600,
@@ -25,6 +28,17 @@ const fairDistributionWindow = defineModel('fairDistributionWindow', {
const windowUnit = ref(DURATION_UNITS.MINUTES);
+// Convert seconds to minutes for DurationInput
+const windowInMinutes = computed({
+ get() {
+ return Math.floor((fairDistributionWindow.value || 0) / 60);
+ },
+ set(minutes) {
+ fairDistributionWindow.value = minutes * 60;
+ },
+});
+
+// Detect unit based on minutes (converted from seconds)
const detectUnit = minutes => {
const m = Number(minutes) || 0;
if (m === 0) return DURATION_UNITS.MINUTES;
@@ -34,7 +48,7 @@ const detectUnit = minutes => {
};
onMounted(() => {
- windowUnit.value = detectUnit(fairDistributionWindow.value);
+ windowUnit.value = detectUnit(windowInMinutes.value);
});
@@ -73,9 +87,9 @@ onMounted(() => {
-
diff --git a/app/services/auto_assignment/assignment_service.rb b/app/services/auto_assignment/assignment_service.rb
index 59e7b5a7b..5d75c515f 100644
--- a/app/services/auto_assignment/assignment_service.rb
+++ b/app/services/auto_assignment/assignment_service.rb
@@ -3,6 +3,7 @@ class AutoAssignment::AssignmentService
def perform_bulk_assignment(limit: 100)
return 0 unless inbox.auto_assignment_v2_enabled?
+ return 0 unless inbox.enable_auto_assignment?
assigned_count = 0
@@ -32,7 +33,9 @@ class AutoAssignment::AssignmentService
def unassigned_conversations(limit)
scope = inbox.conversations.unassigned.open
- scope = if assignment_config['conversation_priority'].to_s == 'longest_waiting'
+ # Apply conversation priority using assignment policy if available
+ policy = inbox.assignment_policy
+ scope = if policy&.longest_waiting?
scope.reorder(last_activity_at: :asc, created_at: :asc)
else
scope.reorder(created_at: :asc)
@@ -81,10 +84,6 @@ class AutoAssignment::AssignmentService
def round_robin_selector
@round_robin_selector ||= AutoAssignment::RoundRobinSelector.new(inbox: inbox)
end
-
- def assignment_config
- @assignment_config ||= inbox.auto_assignment_config || {}
- end
end
AutoAssignment::AssignmentService.prepend_mod_with('AutoAssignment::AssignmentService')
diff --git a/app/services/auto_assignment/rate_limiter.rb b/app/services/auto_assignment/rate_limiter.rb
index d22f1f9b7..da8daac9c 100644
--- a/app/services/auto_assignment/rate_limiter.rb
+++ b/app/services/auto_assignment/rate_limiter.rb
@@ -8,8 +8,6 @@ class AutoAssignment::RateLimiter
end
def track_assignment(conversation)
- return unless enabled?
-
assignment_key = build_assignment_key(conversation.id)
Redis::Alfred.set(assignment_key, conversation.id.to_s, ex: window)
end
@@ -24,11 +22,11 @@ class AutoAssignment::RateLimiter
private
def enabled?
- limit.present? && limit.positive?
+ config.present? && limit.positive?
end
def limit
- config&.fair_distribution_limit&.to_i || Math
+ config&.fair_distribution_limit.present? ? config.fair_distribution_limit.to_i : Float::INFINITY
end
def window
diff --git a/config/features.yml b/config/features.yml
index e03690d74..d8378d61c 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -241,3 +241,7 @@
display_name: Required Conversation Attributes
enabled: false
premium: true
+- name: advanced_assignment
+ display_name: Advanced Assignment
+ enabled: false
+ premium: true
diff --git a/enterprise/app/models/enterprise/account.rb b/enterprise/app/models/enterprise/account.rb
index 0bf93c98b..92038b298 100644
--- a/enterprise/app/models/enterprise/account.rb
+++ b/enterprise/app/models/enterprise/account.rb
@@ -3,6 +3,12 @@ module Enterprise::Account
# this is a temporary method since current administrate doesn't support virtual attributes
def manually_managed_features; end
+ # Auto-sync advanced_assignment with assignment_v2 when features are bulk-updated via admin UI
+ def selected_feature_flags=(features)
+ super
+ sync_assignment_features
+ end
+
def mark_for_deletion(reason = 'manual_deletion')
reason = reason.to_s == 'manual_deletion' ? 'manual_deletion' : 'inactivity'
@@ -31,4 +37,21 @@ module Enterprise::Account
def saml_enabled?
saml_settings&.saml_enabled? || false
end
+
+ private
+
+ def sync_assignment_features
+ if feature_enabled?('assignment_v2')
+ # Enable advanced_assignment for Business/Enterprise plans
+ send('feature_advanced_assignment=', true) if business_or_enterprise_plan?
+ else
+ # Disable advanced_assignment when assignment_v2 is disabled
+ send('feature_advanced_assignment=', false)
+ end
+ end
+
+ def business_or_enterprise_plan?
+ plan_name = custom_attributes['plan_name']
+ %w[Business Enterprise].include?(plan_name)
+ end
end
diff --git a/enterprise/app/services/enterprise/auto_assignment/assignment_service.rb b/enterprise/app/services/enterprise/auto_assignment/assignment_service.rb
index 4f3da08ee..46422f9bc 100644
--- a/enterprise/app/services/enterprise/auto_assignment/assignment_service.rb
+++ b/enterprise/app/services/enterprise/auto_assignment/assignment_service.rb
@@ -19,7 +19,8 @@ module Enterprise::AutoAssignment::AssignmentService
agents = filter_agents_by_capacity(agents) if capacity_filtering_enabled?
return nil if agents.empty?
- selector = policy&.balanced? ? balanced_selector : round_robin_selector
+ # Use balanced selector only if advanced_assignment feature is enabled
+ selector = policy&.balanced? && account.feature_enabled?('advanced_assignment') ? balanced_selector : round_robin_selector
selector.select_agent(agents)
end
@@ -31,7 +32,7 @@ module Enterprise::AutoAssignment::AssignmentService
end
def capacity_filtering_enabled?
- account.feature_enabled?('assignment_v2') &&
+ account.feature_enabled?('advanced_assignment') &&
account.account_users.joins(:agent_capacity_policy).exists?
end
diff --git a/enterprise/app/services/enterprise/billing/handle_stripe_event_service.rb b/enterprise/app/services/enterprise/billing/handle_stripe_event_service.rb
index a5f03cddf..52a28844f 100644
--- a/enterprise/app/services/enterprise/billing/handle_stripe_event_service.rb
+++ b/enterprise/app/services/enterprise/billing/handle_stripe_event_service.rb
@@ -22,7 +22,7 @@ class Enterprise::Billing::HandleStripeEventService
].freeze
# Additional features available starting with the Business plan
- BUSINESS_PLAN_FEATURES = %w[sla custom_roles csat_review_notes conversation_required_attributes].freeze
+ BUSINESS_PLAN_FEATURES = %w[sla custom_roles csat_review_notes conversation_required_attributes advanced_assignment].freeze
# Additional features available only in the Enterprise plan
ENTERPRISE_PLAN_FEATURES = %w[audit_logs disable_branding saml].freeze
diff --git a/spec/enterprise/services/enterprise/auto_assignment/assignment_service_spec.rb b/spec/enterprise/services/enterprise/auto_assignment/assignment_service_spec.rb
index 432f397be..ba1a3eec0 100644
--- a/spec/enterprise/services/enterprise/auto_assignment/assignment_service_spec.rb
+++ b/spec/enterprise/services/enterprise/auto_assignment/assignment_service_spec.rb
@@ -16,8 +16,9 @@ RSpec.describe Enterprise::AutoAssignment::AssignmentService, type: :service do
# Link inbox to assignment policy
create(:inbox_assignment_policy, inbox: inbox, assignment_policy: assignment_policy)
- allow(account).to receive(:feature_enabled?).and_return(false)
- allow(account).to receive(:feature_enabled?).with('assignment_v2').and_return(true)
+ # Enable assignment_v2 (base) and advanced_assignment (premium) features
+ account.enable_features('assignment_v2')
+ account.save!
# Set agents as online
OnlineStatusTracker.update_presence(account.id, 'User', agent1.id)
diff --git a/spec/enterprise/services/enterprise/auto_assignment/capacity_service_spec.rb b/spec/enterprise/services/enterprise/auto_assignment/capacity_service_spec.rb
index 98d7c2172..c34eaad64 100644
--- a/spec/enterprise/services/enterprise/auto_assignment/capacity_service_spec.rb
+++ b/spec/enterprise/services/enterprise/auto_assignment/capacity_service_spec.rb
@@ -52,8 +52,9 @@ RSpec.describe Enterprise::AutoAssignment::CapacityService, type: :service do
agent_at_capacity.id.to_s => 'online'
})
- # Enable assignment_v2 feature
- allow(account).to receive(:feature_enabled?).with('assignment_v2').and_return(true)
+ # Enable assignment_v2 (base) and advanced_assignment (premium) features
+ account.enable_features('assignment_v2', 'advanced_assignment')
+ account.save!
# Create existing assignments for agent_at_capacity (at limit)
3.times do
diff --git a/spec/jobs/auto_assignment/periodic_assignment_job_spec.rb b/spec/jobs/auto_assignment/periodic_assignment_job_spec.rb
index 4b06decd0..e281f79f4 100644
--- a/spec/jobs/auto_assignment/periodic_assignment_job_spec.rb
+++ b/spec/jobs/auto_assignment/periodic_assignment_job_spec.rb
@@ -14,13 +14,13 @@ RSpec.describe AutoAssignment::PeriodicAssignmentJob, type: :job do
describe '#perform' do
context 'when account has assignment_v2 feature enabled' do
before do
- allow(account).to receive(:feature_enabled?).with('assignment_v2').and_return(true)
+ account.enable_features('assignment_v2')
+ account.save!
allow(Account).to receive(:find_in_batches).and_yield([account])
end
- context 'when inbox has auto_assignment_v2 enabled' do
+ context 'when inbox has assignment policy or auto assignment enabled' do
before do
- allow(inbox).to receive(:auto_assignment_v2_enabled?).and_return(true)
inbox_relation = instance_double(ActiveRecord::Relation)
allow(account).to receive(:inboxes).and_return(inbox_relation)
allow(inbox_relation).to receive(:joins).with(:assignment_policy).and_return(inbox_relation)
@@ -41,8 +41,8 @@ RSpec.describe AutoAssignment::PeriodicAssignmentJob, type: :job do
policy2 = create(:assignment_policy, account: account2)
create(:inbox_assignment_policy, inbox: inbox2, assignment_policy: policy2)
- allow(account2).to receive(:feature_enabled?).with('assignment_v2').and_return(true)
- allow(inbox2).to receive(:auto_assignment_v2_enabled?).and_return(true)
+ account2.enable_features('assignment_v2')
+ account2.save!
inbox_relation2 = instance_double(ActiveRecord::Relation)
allow(account2).to receive(:inboxes).and_return(inbox_relation2)
@@ -58,9 +58,10 @@ RSpec.describe AutoAssignment::PeriodicAssignmentJob, type: :job do
end
end
- context 'when inbox does not have auto_assignment_v2 enabled' do
+ context 'when inbox does not have assignment policy or auto assignment enabled' do
before do
- allow(inbox).to receive(:auto_assignment_v2_enabled?).and_return(false)
+ inbox.update!(enable_auto_assignment: false)
+ InboxAssignmentPolicy.where(inbox: inbox).destroy_all
end
it 'does not queue assignment job' do
@@ -73,7 +74,6 @@ RSpec.describe AutoAssignment::PeriodicAssignmentJob, type: :job do
context 'when account does not have assignment_v2 feature enabled' do
before do
- allow(account).to receive(:feature_enabled?).with('assignment_v2').and_return(false)
allow(Account).to receive(:find_in_batches).and_yield([account])
end
@@ -90,11 +90,11 @@ RSpec.describe AutoAssignment::PeriodicAssignmentJob, type: :job do
# Create multiple accounts
5.times do |_i|
acc = create(:account)
+ acc.enable_features('assignment_v2')
+ acc.save!
inb = create(:inbox, account: acc, enable_auto_assignment: true)
policy = create(:assignment_policy, account: acc)
create(:inbox_assignment_policy, inbox: inb, assignment_policy: policy)
- allow(acc).to receive(:feature_enabled?).with('assignment_v2').and_return(true)
- allow(inb).to receive(:auto_assignment_v2_enabled?).and_return(true)
inbox_relation = instance_double(ActiveRecord::Relation)
allow(acc).to receive(:inboxes).and_return(inbox_relation)
diff --git a/spec/services/auto_assignment/assignment_service_spec.rb b/spec/services/auto_assignment/assignment_service_spec.rb
index 535277714..2139e5e78 100644
--- a/spec/services/auto_assignment/assignment_service_spec.rb
+++ b/spec/services/auto_assignment/assignment_service_spec.rb
@@ -10,8 +10,9 @@ RSpec.describe AutoAssignment::AssignmentService do
let(:conversation) { create(:conversation, inbox: inbox, assignee: nil) }
before do
- # Enable assignment_v2 feature for the account
- allow(account).to receive(:feature_enabled?).with('assignment_v2').and_return(true)
+ # Enable assignment_v2 feature for the account (basic assignment features)
+ account.enable_features('assignment_v2')
+ account.save!
# Link inbox to assignment policy
create(:inbox_assignment_policy, inbox: inbox, assignment_policy: assignment_policy)
create(:inbox_member, inbox: inbox, user: agent)
diff --git a/spec/services/auto_assignment/rate_limiter_spec.rb b/spec/services/auto_assignment/rate_limiter_spec.rb
index 48a5367e3..d5c3de047 100644
--- a/spec/services/auto_assignment/rate_limiter_spec.rb
+++ b/spec/services/auto_assignment/rate_limiter_spec.rb
@@ -59,8 +59,9 @@ RSpec.describe AutoAssignment::RateLimiter do
allow(inbox).to receive(:assignment_policy).and_return(nil)
end
- it 'does not track the assignment' do
- expect(Redis::Alfred).not_to receive(:set)
+ it 'still tracks the assignment with default window' do
+ expected_key = format(Redis::RedisKeys::ASSIGNMENT_KEY, inbox_id: inbox.id, agent_id: agent.id, conversation_id: conversation.id)
+ expect(Redis::Alfred).to receive(:set).with(expected_key, conversation.id.to_s, ex: 24.hours.to_i)
rate_limiter.track_assignment(conversation)
end
end
From 00ed074d72029919b3b6c475baca93c8f7fe3aa5 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan
Date: Wed, 11 Feb 2026 21:21:36 +0530
Subject: [PATCH 010/155] fix: disable email transcript for free plans (#13509)
- Block email transcript functionality for accounts without a paid plan
to prevent SES abuse.
---
.../api/v1/accounts/conversations_controller.rb | 1 +
app/controllers/api/v1/widget/conversations_controller.rb | 4 +++-
app/models/concerns/account_email_rate_limitable.rb | 4 ++++
app/services/action_service.rb | 2 ++
.../app/models/enterprise/account/plan_usage_and_limits.rb | 7 +++++++
5 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/app/controllers/api/v1/accounts/conversations_controller.rb b/app/controllers/api/v1/accounts/conversations_controller.rb
index b3151c8fa..7c21844f5 100644
--- a/app/controllers/api/v1/accounts/conversations_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations_controller.rb
@@ -70,6 +70,7 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
def transcript
render json: { error: 'email param missing' }, status: :unprocessable_entity and return if params[:email].blank?
+ return render_payment_required('Email transcript is not available on your plan') unless @conversation.account.email_transcript_enabled?
return head :too_many_requests unless @conversation.account.within_email_rate_limit?
ConversationReplyMailer.with(account: @conversation.account).conversation_transcript(@conversation, params[:email])&.deliver_later
diff --git a/app/controllers/api/v1/widget/conversations_controller.rb b/app/controllers/api/v1/widget/conversations_controller.rb
index 96c15fde2..00e718614 100644
--- a/app/controllers/api/v1/widget/conversations_controller.rb
+++ b/app/controllers/api/v1/widget/conversations_controller.rb
@@ -35,7 +35,9 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
end
def transcript
- return head :too_many_requests unless conversation.present? && conversation.account.within_email_rate_limit?
+ return head :too_many_requests if conversation.blank?
+ return head :payment_required unless conversation.account.email_transcript_enabled?
+ return head :too_many_requests unless conversation.account.within_email_rate_limit?
send_transcript_email
head :ok
diff --git a/app/models/concerns/account_email_rate_limitable.rb b/app/models/concerns/account_email_rate_limitable.rb
index e967408fc..806906fe0 100644
--- a/app/models/concerns/account_email_rate_limitable.rb
+++ b/app/models/concerns/account_email_rate_limitable.rb
@@ -12,6 +12,10 @@ module AccountEmailRateLimitable
Redis::Alfred.get(email_count_cache_key).to_i
end
+ def email_transcript_enabled?
+ true
+ end
+
def within_email_rate_limit?
return true if emails_sent_today < email_rate_limit
diff --git a/app/services/action_service.rb b/app/services/action_service.rb
index b4900aad8..f6972cd35 100644
--- a/app/services/action_service.rb
+++ b/app/services/action_service.rb
@@ -75,6 +75,8 @@ class ActionService
end
def send_email_transcript(emails)
+ return unless @account.email_transcript_enabled?
+
emails = emails[0].gsub(/\s+/, '').split(',')
emails.each do |email|
diff --git a/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb b/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb
index ee0803469..705097030 100644
--- a/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb
+++ b/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb
@@ -32,6 +32,13 @@ module Enterprise::Account::PlanUsageAndLimits # rubocop:disable Metrics/ModuleL
save
end
+ def email_transcript_enabled?
+ default_plan = InstallationConfig.find_by(name: 'CHATWOOT_CLOUD_PLANS')&.value&.first
+ return true if default_plan.blank?
+
+ plan_name.present? && plan_name != default_plan['name']
+ end
+
def email_rate_limit
account_limit || plan_email_limit || global_limit || default_limit
end
From b2cb3717e5db222a80ace89c0d5b41eeceff22be Mon Sep 17 00:00:00 2001
From: Sojan Jose
Date: Wed, 11 Feb 2026 07:57:00 -0800
Subject: [PATCH 011/155] fix: Replace default Rails error pages with custom
designs (#13514)
## Summary
- Replace generic Rails 404, 422, and 500 error pages with
custom-designed pages
- Each page features a prominent gradient error code, clean typography,
and a "Back to home" CTA
- Full dark mode support via `prefers-color-scheme` media query
- Mobile responsive design
- No external dependencies (self-contained static HTML, works even when
Rails is down)
- No logo/branding to ensure compatibility with custom-branded
self-hosted instances
---
## Before (default Rails 404)
---
## After
### Light mode
| 404 | 422 | 500 |
|-----|-----|-----|
| 
| 
| 
|
---
### Dark mode
| 404 | 422 | 500 |
|-----|-----|-----|
| 
| 
| 
|
---
## Test plan
Easier way to verify:
- [ ] Visit `/404.html` directly to verify the 404 page
- [ ] Visit `/422.html` directly to verify the 422 page
- [ ] Visit `/500.html` directly to verify the 500 page
Full verification:
- [ ] Visit a non-existent route in production mode to verify the 404
page
- [ ] Trigger a 422 error (e.g., invalid CSRF token) to verify the 422
page
- [ ] Trigger a 500 error to verify the 500 page
- [ ] Toggle system dark mode and verify all pages render correctly
- [ ] Test on mobile viewport widths
---
public/404.html | 155 +++++++++++++++++++++++++++++-----------------
public/422.html | 160 +++++++++++++++++++++++++++++++-----------------
public/500.html | 154 +++++++++++++++++++++++++++++-----------------
3 files changed, 299 insertions(+), 170 deletions(-)
diff --git a/public/404.html b/public/404.html
index b612547fc..d48579082 100644
--- a/public/404.html
+++ b/public/404.html
@@ -1,67 +1,108 @@
-
+
- The page you were looking for doesn't exist (404)
+
+ Page not found
-
-
-
-
+
+import { useI18n } from 'vue-i18n';
+
const props = defineProps({
id: {
type: String,
@@ -16,12 +18,22 @@ const props = defineProps({
type: Boolean,
default: false,
},
+ disabled: {
+ type: Boolean,
+ default: false,
+ },
+ disabledMessage: {
+ type: String,
+ default: '',
+ },
});
const emit = defineEmits(['select']);
+const { t } = useI18n();
+
const handleChange = () => {
- if (!props.isActive) {
+ if (!props.isActive && !props.disabled) {
emit('select', props.id);
}
};
@@ -29,9 +41,11 @@ const handleChange = () => {
diff --git a/app/javascript/dashboard/components-next/sidebar/Sidebar.vue b/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
index bd13eee30..c90294dc0 100644
--- a/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
+++ b/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
@@ -8,6 +8,7 @@ import { useStore } from 'vuex';
import { useI18n } from 'vue-i18n';
import { useSidebarKeyboardShortcuts } from './useSidebarKeyboardShortcuts';
import { vOnClickOutside } from '@vueuse/components';
+import { FEATURE_FLAGS } from 'dashboard/featureFlags';
import { useWindowSize, useEventListener } from '@vueuse/core';
import { emitter } from 'shared/helpers/mitt';
import { BUS_EVENTS } from 'shared/constants/busEvents';
@@ -50,6 +51,18 @@ const isRTL = useMapGetter('accounts/isRTL');
const { width: windowWidth } = useWindowSize();
const isMobile = computed(() => windowWidth.value < 768);
+const accountId = useMapGetter('getCurrentAccountId');
+const isFeatureEnabledonAccount = useMapGetter(
+ 'accounts/isFeatureEnabledonAccount'
+);
+
+const hasAdvancedAssignment = computed(() => {
+ return isFeatureEnabledonAccount.value(
+ accountId.value,
+ FEATURE_FLAGS.ADVANCED_ASSIGNMENT
+ );
+});
+
const toggleShortcutModalFn = show => {
if (show) {
emit('openKeyShortcutModal');
@@ -584,12 +597,16 @@ const menuItems = computed(() => {
icon: 'i-lucide-users',
to: accountScopedRoute('settings_teams_list'),
},
- {
- name: 'Settings Agent Assignment',
- label: t('SIDEBAR.AGENT_ASSIGNMENT'),
- icon: 'i-lucide-user-cog',
- to: accountScopedRoute('assignment_policy_index'),
- },
+ ...(hasAdvancedAssignment.value
+ ? [
+ {
+ name: 'Settings Agent Assignment',
+ label: t('SIDEBAR.AGENT_ASSIGNMENT'),
+ icon: 'i-lucide-user-cog',
+ to: accountScopedRoute('assignment_policy_index'),
+ },
+ ]
+ : []),
{
name: 'Settings Inboxes',
label: t('SIDEBAR.INBOXES'),
diff --git a/app/javascript/dashboard/featureFlags.js b/app/javascript/dashboard/featureFlags.js
index 279bc1cf6..353bed96e 100644
--- a/app/javascript/dashboard/featureFlags.js
+++ b/app/javascript/dashboard/featureFlags.js
@@ -2,6 +2,7 @@ export const FEATURE_FLAGS = {
AGENT_BOTS: 'agent_bots',
AGENT_MANAGEMENT: 'agent_management',
ASSIGNMENT_V2: 'assignment_v2',
+ ADVANCED_ASSIGNMENT: 'advanced_assignment',
AUTO_RESOLVE_CONVERSATIONS: 'auto_resolve_conversations',
AUTOMATIONS: 'automations',
CAMPAIGNS: 'campaigns',
@@ -56,4 +57,5 @@ export const PREMIUM_FEATURES = [
FEATURE_FLAGS.HELP_CENTER,
FEATURE_FLAGS.SAML,
FEATURE_FLAGS.CONVERSATION_REQUIRED_ATTRIBUTES,
+ FEATURE_FLAGS.ADVANCED_ASSIGNMENT,
];
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 51cae8679..f45e7b4df 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -766,6 +766,53 @@
"MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
"MAX_ASSIGNMENT_LIMIT_SUB_TEXT": "Limit the maximum number of conversations from this inbox that can be auto assigned to an agent"
},
+ "ASSIGNMENT": {
+ "TITLE": "Conversation Assignment",
+ "DESCRIPTION": "Automatically assign incoming conversations to available agents based on assignment policies",
+ "ENABLE_AUTO_ASSIGNMENT": "Enable automatic conversation assignment",
+ "DEFAULT_RULES_TITLE": "Default assignment rules",
+ "DEFAULT_RULES_DESCRIPTION": "Using the default assignment behavior for all conversations",
+ "DEFAULT_RULE_1": "Earliest created conversations first",
+ "DEFAULT_RULE_2": "Round robin distribution",
+ "CUSTOMIZE_WITH_POLICY": "Customize with assignment policy",
+ "USING_POLICY": "Using custom assignment policy for this inbox",
+ "CUSTOMIZE_POLICY": "Customize with assignment policy",
+ "DELETE_POLICY": "Delete policy",
+ "POLICY_LABEL": "Assignment policy",
+ "ASSIGNMENT_ORDER_LABEL": "Assignment Order",
+ "ASSIGNMENT_METHOD_LABEL": "Assignment Method",
+ "POLICY_STATUS": {
+ "ACTIVE": "Active",
+ "INACTIVE": "Inactive"
+ },
+ "PRIORITY": {
+ "EARLIEST_CREATED": "Earliest created",
+ "LONGEST_WAITING": "Longest waiting"
+ },
+ "METHOD": {
+ "ROUND_ROBIN": "Round robin",
+ "BALANCED": "Balanced assignment"
+ },
+ "UPGRADE_PROMPT": "Custom assignment policies are available on the Business plan",
+ "UPGRADE_TO_BUSINESS": "Upgrade to Business",
+ "DEFAULT_POLICY_LINKED": "Default policy linked",
+ "DEFAULT_POLICY_DESCRIPTION": "Link a custom assignment policy to customize how conversations are assigned to agents in this inbox.",
+ "LINK_EXISTING_POLICY": "Link existing policy",
+ "CREATE_NEW_POLICY": "Create new policy",
+ "NO_POLICIES": "No assignment policies found",
+ "VIEW_ALL_POLICIES": "View all policies",
+ "CURRENT_BEHAVIOR": "Currently using default assignment behavior:",
+ "LINK_SUCCESS": "Assignment policy linked successfully",
+ "LINK_ERROR": "Failed to link assignment policy"
+ },
+ "ASSIGNMENT_POLICY": {
+ "DELETE_CONFIRM_TITLE": "Delete assignment policy?",
+ "DELETE_CONFIRM_MESSAGE": "Are you sure you want to remove this assignment policy from this inbox? The inbox will revert to default assignment rules.",
+ "CANCEL": "Cancel",
+ "CONFIRM_DELETE": "Delete",
+ "DELETE_SUCCESS": "Assignment policy removed successfully",
+ "DELETE_ERROR": "Failed to remove assignment policy"
+ },
"FACEBOOK_REAUTHORIZE": {
"TITLE": "Reauthorize",
"SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index c4131c14a..d885cf8ce 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -694,7 +694,8 @@
"CREATE_BUTTON": "Create policy",
"API": {
"SUCCESS_MESSAGE": "Assignment policy created successfully",
- "ERROR_MESSAGE": "Failed to create assignment policy"
+ "ERROR_MESSAGE": "Failed to create assignment policy",
+ "INBOX_LINKED": "Inbox has been linked to the policy"
}
},
"EDIT": {
@@ -708,6 +709,12 @@
"CONFIRM_BUTTON_LABEL": "Continue",
"CANCEL_BUTTON_LABEL": "Cancel"
},
+ "INBOX_LINK_PROMPT": {
+ "TITLE": "Link inbox to policy",
+ "DESCRIPTION": "Would you like to link this inbox to the assignment policy?",
+ "LINK_BUTTON": "Link inbox",
+ "CANCEL_BUTTON": "Skip"
+ },
"API": {
"SUCCESS_MESSAGE": "Assignment policy updated successfully",
"ERROR_MESSAGE": "Failed to update assignment policy"
@@ -746,7 +753,9 @@
},
"BALANCED": {
"LABEL": "Balanced",
- "DESCRIPTION": "Assign conversations based on available capacity."
+ "DESCRIPTION": "Assign conversations based on available capacity.",
+ "PREMIUM_MESSAGE": "Upgrade to access balanced assignment and agent capacity management.",
+ "PREMIUM_BADGE": "Premium"
}
},
"ASSIGNMENT_PRIORITY": {
@@ -832,6 +841,20 @@
"SUCCESS_MESSAGE": "Agent removed from policy successfully",
"ERROR_MESSAGE": "Failed to remove agent from policy"
}
+ },
+ "INBOX_LIMIT_API": {
+ "ADD": {
+ "SUCCESS_MESSAGE": "Inbox limit added successfully",
+ "ERROR_MESSAGE": "Failed to add inbox limit"
+ },
+ "UPDATE": {
+ "SUCCESS_MESSAGE": "Inbox limit updated successfully",
+ "ERROR_MESSAGE": "Failed to update inbox limit"
+ },
+ "DELETE": {
+ "SUCCESS_MESSAGE": "Inbox limit deleted successfully",
+ "ERROR_MESSAGE": "Failed to delete inbox limit"
+ }
}
},
"FORM": {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/assignmentPolicy/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/assignmentPolicy/Index.vue
index ab9fcf17e..850c55676 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/assignmentPolicy/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/assignmentPolicy/Index.vue
@@ -1,54 +1,81 @@
+
+
+
+
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue
index d2ee47e48..c8dc25e0f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue
@@ -1,122 +1,321 @@
-
@@ -138,7 +337,6 @@ export default {
selected-label
:select-label="$t('FORMS.MULTISELECT.ENTER_TO_SELECT')"
:deselect-label="$t('FORMS.MULTISELECT.ENTER_TO_REMOVE')"
- @select="v$.selectedAgents.$touch"
/>
@@ -41,6 +55,7 @@ const handleChange = () => {
:checked="isActive"
:value="id"
:name="id"
+ :disabled="disabled"
type="radio"
class="h-4 w-4 border-n-slate-6 text-n-brand focus:ring-n-brand focus:ring-offset-0"
@change="handleChange"
@@ -49,11 +64,23 @@ const handleChange = () => {
diff --git a/app/javascript/dashboard/components-next/AssignmentPolicy/components/story/BaseInfo.story.vue b/app/javascript/dashboard/components-next/AssignmentPolicy/components/story/BaseInfo.story.vue
index a3bfe9bee..86334a3ce 100644
--- a/app/javascript/dashboard/components-next/AssignmentPolicy/components/story/BaseInfo.story.vue
+++ b/app/javascript/dashboard/components-next/AssignmentPolicy/components/story/BaseInfo.story.vue
@@ -6,7 +6,6 @@ const policyName = ref('Round Robin Policy');
const description = ref(
'Distributes conversations evenly among available agents'
);
-const enabled = ref(true);
@@ -19,13 +18,10 @@ const enabled = ref(true);
-
- {{ label }} -
+
+
+ {{ label }} +
+ + {{ + t( + 'ASSIGNMENT_POLICY.AGENT_ASSIGNMENT_POLICY.FORM.ASSIGNMENT_ORDER.BALANCED.PREMIUM_BADGE' + ) + }} + +- {{ description }} + {{ disabled && disabledMessage ? disabledMessage : description }}
- The change you wanted was rejected (422)
+
+ Request rejected
-
-
-
-
- The page you were looking for doesn't exist.
-You may have mistyped the address or the page may have moved.
-If you are the application owner check the logs for more information.
+
+
diff --git a/public/422.html b/public/422.html
index a21f82b3b..2d7ed0bb7 100644
--- a/public/422.html
+++ b/public/422.html
@@ -1,67 +1,113 @@
-
+
- 404
+ Page not found
+The page you're looking for doesn't exist or has been moved.
+ + + Back to home + + +If you think this is a mistake, please reach out to support.
- We're sorry, but something went wrong (500)
+
+ Something went wrong
-
-
-
-
- The change you wanted was rejected.
-Maybe you tried to change something you didn't have access to.
-If you are the application owner check the logs for more information.
+
+
diff --git a/public/500.html b/public/500.html
index 061abc587..1339c166b 100644
--- a/public/500.html
+++ b/public/500.html
@@ -1,66 +1,108 @@
-
+
- 422
+ Request rejected
+Your request couldn't be processed due to a security verification failure or invalid data.
+ + + Back to home + + +If this keeps happening, try clearing your cookies and refreshing.
-
Date: Wed, 11 Feb 2026 11:02:38 -0800
Subject: [PATCH 012/155] fix(mailbox): handle malformed sender address headers
(#13486)
## How to reproduce
When an inbound email has malformed sender headers (for example `From:
McDonald `), mailbox
processing can raise `Mail::Field::IncompleteParseError` while resolving
sender data in `MailPresenter`.
## What changed
This PR hardens sender parsing in `MailPresenter` with a small, readable
implementation:
- Added/used a safe parser (`parse_mail_address`) that rescues
`Mail::Field::ParseError` and `Mail::Field::IncompleteParseError`.
- `sender_name` now uses the same safe parser path.
- `original_sender` now resolves candidates in order via a compact
`filter_map` flow:
- `Reply-To`
- `X-Original-Sender`
- `From`
- All three candidates are parsed as email addresses before use
(including `X-Original-Sender`), and invalid values are ignored.
- `notification_email_from_chatwoot?` now compares sender addresses
case-insensitively (`casecmp?`) to avoid case-only mismatches.
## Test coverage
Added focused presenter specs for:
- malformed `From` header returns nil sender values and does not
classify as notification sender
- malformed `Reply-To` falls back to valid `From`
- valid `X-Original-Sender` is used when present
- invalid `X-Original-Sender` falls back to valid `From`
- mixed-case sender address still matches configured
`MAILER_SENDER_EMAIL`
## How this was tested
Ran:
- `bundle exec rspec spec/presenters/mail_presenter_spec.rb`
- `bundle exec rubocop app/presenters/mail_presenter.rb
spec/presenters/mail_presenter_spec.rb`
Sentry issue:
[CHATWOOT-B9Y](https://chatwoot-p3.sentry.io/issues/7005483640/)
---
app/presenters/mail_presenter.rb | 23 +++++---
spec/presenters/mail_presenter_spec.rb | 80 ++++++++++++++++++++++++++
2 files changed, 96 insertions(+), 7 deletions(-)
diff --git a/app/presenters/mail_presenter.rb b/app/presenters/mail_presenter.rb
index 08e370cd8..62cb0ed9a 100644
--- a/app/presenters/mail_presenter.rb
+++ b/app/presenters/mail_presenter.rb
@@ -130,11 +130,15 @@ class MailPresenter < SimpleDelegator
end
def sender_name
- Mail::Address.new((@mail[:reply_to] || @mail[:from]).value).name
+ parse_mail_address((@mail[:reply_to] || @mail[:from]).value)&.name
end
def original_sender
- from_email_address(@mail[:reply_to].try(:value)) || @mail['X-Original-Sender'].try(:value) || from_email_address(from.first)
+ [
+ @mail[:reply_to]&.value,
+ @mail['X-Original-Sender']&.value,
+ @mail[:from]&.value
+ ].filter_map { |email| parse_mail_address(email)&.address }.first
end
def headers_data
@@ -147,10 +151,6 @@ class MailPresenter < SimpleDelegator
headers.presence
end
- def from_email_address(email)
- Mail::Address.new(email).address
- end
-
def email_forwarded_for
@mail['X-Forwarded-For'].try(:value)
end
@@ -175,11 +175,20 @@ class MailPresenter < SimpleDelegator
def notification_email_from_chatwoot?
# notification emails are send via mailer sender email address. so it should match
- original_sender == Mail::Address.new(ENV.fetch('MAILER_SENDER_EMAIL', 'Chatwoot ')).address
+ configured_sender = Mail::Address.new(ENV.fetch('MAILER_SENDER_EMAIL', 'Chatwoot ')).address
+ original_sender.to_s.casecmp?(configured_sender)
end
private
+ def parse_mail_address(email)
+ return if email.blank?
+
+ Mail::Address.new(email)
+ rescue Mail::Field::ParseError, Mail::Field::IncompleteParseError
+ nil
+ end
+
def auto_submitted?
@mail['Auto-Submitted'].present? && @mail['Auto-Submitted'].value != 'no'
end
diff --git a/spec/presenters/mail_presenter_spec.rb b/spec/presenters/mail_presenter_spec.rb
index bbe51c52d..f5ed27537 100644
--- a/spec/presenters/mail_presenter_spec.rb
+++ b/spec/presenters/mail_presenter_spec.rb
@@ -178,5 +178,85 @@ RSpec.describe MailPresenter do
expect(decorated_mail.serialized_data[:auto_reply]).to be_falsey
end
end
+
+ describe 'malformed sender headers' do
+ let(:mail_with_malformed_from) do
+ Mail.new do
+ header['From'] = 'Kevin McDonald '
+ subject :header
+ body 'Hi'
+ end
+ end
+
+ let(:mail_with_malformed_reply_to) do
+ Mail.new do
+ from 'Sender '
+ to 'Inbox '
+ subject :header
+ body 'Hi'
+ header['Reply-To'] = 'Reply User '
+ to 'Inbox '
+ subject :header
+ body 'Hi'
+ header['Reply-To'] = 'Reply User '
+ to 'Inbox '
+ subject :header
+ body 'Hi'
+ header['Reply-To'] = 'Reply User '
+ to 'Inbox '
+ subject :header
+ body 'Hi'
+ end
+
+ with_modified_env MAILER_SENDER_EMAIL: 'Chatwoot ' do
+ presenter = described_class.new(mail_with_uppercase_sender)
+ expect(presenter.notification_email_from_chatwoot?).to be(true)
+ end
+ end
+ end
end
end
From c7193c791770ff8afedb573ff0476e1c87f25ebc Mon Sep 17 00:00:00 2001
From: Sojan Jose
Date: Wed, 11 Feb 2026 17:05:44 -0800
Subject: [PATCH 013/155] fix(slack): handle archived channel errors in
SendOnSlackJob (#13520)
When a Slack-integrated channel is archived, posting from Chatwoot
raises `Slack::Web::Api::Errors::IsArchived` in `SendOnSlackJob`, which
retries and can end up in dead jobs. This can be reproduced by archiving
the connected Slack channel for a valid hook and creating outgoing
messages. This change adds `IsArchived` to the existing handled Slack
API rescue path in
`Integrations::Slack::SendOnSlackService#send_message`, so
archived-channel failures now follow the same flow as related Slack
failures (`prompt_reauthorization!` + `disable`) instead of bubbling and
retrying repeatedly. I tested this by running `bundle exec rubocop
lib/integrations/slack/send_on_slack_service.rb` (with `rbenv`
initialized), and it passes with no offenses.
Sentry issue: https://chatwoot-p3.sentry.io/issues/7150427066/
---
lib/integrations/slack/send_on_slack_service.rb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/integrations/slack/send_on_slack_service.rb b/lib/integrations/slack/send_on_slack_service.rb
index 4e959c469..de6d20ed0 100644
--- a/lib/integrations/slack/send_on_slack_service.rb
+++ b/lib/integrations/slack/send_on_slack_service.rb
@@ -102,7 +102,8 @@ class Integrations::Slack::SendOnSlackService < Base::SendOnChannelService
def send_message
post_message if message_content.present?
upload_files if message.attachments.any?
- rescue Slack::Web::Api::Errors::AccountInactive, Slack::Web::Api::Errors::MissingScope, Slack::Web::Api::Errors::InvalidAuth,
+ rescue Slack::Web::Api::Errors::IsArchived, Slack::Web::Api::Errors::AccountInactive, Slack::Web::Api::Errors::MissingScope,
+ Slack::Web::Api::Errors::InvalidAuth,
Slack::Web::Api::Errors::ChannelNotFound, Slack::Web::Api::Errors::NotInChannel => e
Rails.logger.error e
hook.prompt_reauthorization!
From 2c2f0547f7232fcc5c4e470b72560e79535aaa47 Mon Sep 17 00:00:00 2001
From: Shivam Mishra
Date: Thu, 12 Feb 2026 10:07:56 +0530
Subject: [PATCH 014/155] fix: Captain not responding to campaign conversations
(#13489)
Co-authored-by: Aakash Bakhle <48802744+aakashb95@users.noreply.github.com>
---
.../hook_execution_service.rb | 5 +-
.../conversation/response_builder_job.rb | 4 ++
.../hook_execution_service.rb | 4 ++
enterprise/lib/captain/tools/handoff_tool.rb | 4 ++
.../hook_execution_service_spec.rb | 71 +++++++++++++++++++
.../hook_execution_service_spec.rb | 34 +++++++++
6 files changed, 121 insertions(+), 1 deletion(-)
diff --git a/app/services/message_templates/hook_execution_service.rb b/app/services/message_templates/hook_execution_service.rb
index 6205c8f3c..93f0447f3 100644
--- a/app/services/message_templates/hook_execution_service.rb
+++ b/app/services/message_templates/hook_execution_service.rb
@@ -2,7 +2,6 @@ class MessageTemplates::HookExecutionService
pattr_initialize [:message!]
def perform
- return if conversation.campaign.present?
return if conversation.last_incoming_message.blank?
return if message.auto_reply_email?
@@ -21,6 +20,7 @@ class MessageTemplates::HookExecutionService
end
def should_send_out_of_office_message?
+ return false if conversation.campaign.present?
# should not send if its a tweet message
return false if conversation.tweet?
# should not send for outbound messages
@@ -37,6 +37,7 @@ class MessageTemplates::HookExecutionService
end
def should_send_greeting?
+ return false if conversation.campaign.present?
# should not send if its a tweet message
return false if conversation.tweet?
@@ -49,6 +50,8 @@ class MessageTemplates::HookExecutionService
# TODO: we should be able to reduce this logic once we have a toggle for email collect messages
def should_send_email_collect?
+ return false if conversation.campaign.present?
+
!contact_has_email? && inbox.web_widget? && !email_collect_was_sent?
end
diff --git a/enterprise/app/jobs/captain/conversation/response_builder_job.rb b/enterprise/app/jobs/captain/conversation/response_builder_job.rb
index 0f5e82e7f..297e78181 100644
--- a/enterprise/app/jobs/captain/conversation/response_builder_job.rb
+++ b/enterprise/app/jobs/captain/conversation/response_builder_job.rb
@@ -93,6 +93,10 @@ class Captain::Conversation::ResponseBuilderJob < ApplicationJob
end
def send_out_of_office_message_if_applicable
+ # Campaign conversations should never receive OOO templates — the campaign itself
+ # serves as the initial outreach, and OOO would be confusing in that context.
+ return if @conversation.campaign.present?
+
::MessageTemplates::Template::OutOfOffice.perform_if_applicable(@conversation)
end
diff --git a/enterprise/app/services/enterprise/message_templates/hook_execution_service.rb b/enterprise/app/services/enterprise/message_templates/hook_execution_service.rb
index 5c9a8a184..56dbc7245 100644
--- a/enterprise/app/services/enterprise/message_templates/hook_execution_service.rb
+++ b/enterprise/app/services/enterprise/message_templates/hook_execution_service.rb
@@ -68,6 +68,10 @@ module Enterprise::MessageTemplates::HookExecutionService
end
def send_out_of_office_message_after_handoff
+ # Campaign conversations should never receive OOO templates — the campaign itself
+ # serves as the initial outreach, and OOO would be confusing in that context.
+ return if conversation.campaign.present?
+
::MessageTemplates::Template::OutOfOffice.perform_if_applicable(conversation)
end
diff --git a/enterprise/lib/captain/tools/handoff_tool.rb b/enterprise/lib/captain/tools/handoff_tool.rb
index 797f248ff..d126840be 100644
--- a/enterprise/lib/captain/tools/handoff_tool.rb
+++ b/enterprise/lib/captain/tools/handoff_tool.rb
@@ -42,6 +42,10 @@ class Captain::Tools::HandoffTool < Captain::Tools::BasePublicTool
end
def send_out_of_office_message_if_applicable(conversation)
+ # Campaign conversations should never receive OOO templates — the campaign itself
+ # serves as the initial outreach, and OOO would be confusing in that context.
+ return if conversation.campaign.present?
+
::MessageTemplates::Template::OutOfOffice.perform_if_applicable(conversation)
end
diff --git a/spec/enterprise/services/enterprise/message_templates/hook_execution_service_spec.rb b/spec/enterprise/services/enterprise/message_templates/hook_execution_service_spec.rb
index 9074baa57..151e9101a 100644
--- a/spec/enterprise/services/enterprise/message_templates/hook_execution_service_spec.rb
+++ b/spec/enterprise/services/enterprise/message_templates/hook_execution_service_spec.rb
@@ -238,6 +238,77 @@ RSpec.describe MessageTemplates::HookExecutionService do
end
end
+ context 'when conversation has a campaign' do
+ let(:campaign) { create(:campaign, account: account) }
+ let(:campaign_conversation) { create(:conversation, inbox: inbox, account: account, contact: contact, status: :pending, campaign: campaign) }
+
+ it 'schedules captain response job for incoming messages on pending campaign conversations' do
+ expect(Captain::Conversation::ResponseBuilderJob).to receive(:perform_later).with(campaign_conversation, assistant)
+
+ create(:message, conversation: campaign_conversation, message_type: :incoming)
+ end
+
+ it 'does not send greeting template on campaign conversations' do
+ inbox.update!(greeting_enabled: true, greeting_message: 'Hello! How can we help you?', enable_email_collect: false)
+
+ greeting_service = instance_double(MessageTemplates::Template::Greeting)
+ allow(MessageTemplates::Template::Greeting).to receive(:new).and_return(greeting_service)
+ allow(greeting_service).to receive(:perform).and_return(true)
+
+ create(:message, conversation: campaign_conversation, message_type: :incoming)
+
+ expect(MessageTemplates::Template::Greeting).not_to have_received(:new)
+ end
+
+ it 'does not send out of office template on campaign conversations' do
+ inbox.update!(working_hours_enabled: true, out_of_office_message: 'We are currently closed')
+ inbox.working_hours.find_by(day_of_week: Time.current.in_time_zone(inbox.timezone).wday).update!(
+ closed_all_day: true,
+ open_all_day: false
+ )
+
+ out_of_office_service = instance_double(MessageTemplates::Template::OutOfOffice)
+ allow(MessageTemplates::Template::OutOfOffice).to receive(:new).and_return(out_of_office_service)
+ allow(out_of_office_service).to receive(:perform).and_return(true)
+
+ create(:message, conversation: campaign_conversation, message_type: :incoming)
+
+ expect(MessageTemplates::Template::OutOfOffice).not_to have_received(:new)
+ end
+
+ it 'does not send email collect template on campaign conversations' do
+ contact.update!(email: nil)
+ inbox.update!(enable_email_collect: true)
+
+ email_collect_service = instance_double(MessageTemplates::Template::EmailCollect)
+ allow(MessageTemplates::Template::EmailCollect).to receive(:new).and_return(email_collect_service)
+ allow(email_collect_service).to receive(:perform).and_return(true)
+
+ create(:message, conversation: campaign_conversation, message_type: :incoming)
+
+ expect(MessageTemplates::Template::EmailCollect).not_to have_received(:new)
+ end
+
+ it 'does not send out of office template after handoff on campaign conversations when quota is exceeded' do
+ account.update!(
+ limits: { 'captain_responses' => 100 },
+ custom_attributes: account.custom_attributes.merge('captain_responses_usage' => 100)
+ )
+ inbox.update!(
+ working_hours_enabled: true,
+ out_of_office_message: 'We are currently closed'
+ )
+ inbox.working_hours.find_by(day_of_week: Time.current.in_time_zone(inbox.timezone).wday).update!(
+ closed_all_day: true,
+ open_all_day: false
+ )
+
+ expect do
+ create(:message, conversation: campaign_conversation, message_type: :incoming)
+ end.not_to(change { campaign_conversation.messages.template.count })
+ end
+ end
+
context 'when Captain quota is exceeded and handoff happens' do
before do
account.update!(
diff --git a/spec/services/message_templates/hook_execution_service_spec.rb b/spec/services/message_templates/hook_execution_service_spec.rb
index 13a820f17..fb9437111 100644
--- a/spec/services/message_templates/hook_execution_service_spec.rb
+++ b/spec/services/message_templates/hook_execution_service_spec.rb
@@ -111,6 +111,40 @@ describe MessageTemplates::HookExecutionService do
end
end
+ context 'when conversation has a campaign' do
+ let(:campaign) { create(:campaign) }
+
+ it 'does not call ::MessageTemplates::Template::Greeting on campaign conversations' do
+ contact = create(:contact, email: nil)
+ conversation = create(:conversation, contact: contact, campaign: campaign)
+ conversation.inbox.update(greeting_enabled: true, greeting_message: 'Hi, this is a greeting message', enable_email_collect: false)
+
+ greeting_service = double
+ allow(MessageTemplates::Template::Greeting).to receive(:new).and_return(greeting_service)
+ allow(greeting_service).to receive(:perform).and_return(true)
+
+ create(:message, conversation: conversation)
+
+ expect(MessageTemplates::Template::Greeting).not_to have_received(:new)
+ end
+
+ it 'does not call ::MessageTemplates::Template::OutOfOffice on campaign conversations' do
+ contact = create(:contact)
+ conversation = create(:conversation, contact: contact, campaign: campaign)
+
+ conversation.inbox.update(working_hours_enabled: true, out_of_office_message: 'We are out of office')
+ conversation.inbox.working_hours.today.update!(closed_all_day: true)
+
+ out_of_office_service = double
+ allow(MessageTemplates::Template::OutOfOffice).to receive(:new).and_return(out_of_office_service)
+ allow(out_of_office_service).to receive(:perform).and_return(true)
+
+ create(:message, conversation: conversation)
+
+ expect(MessageTemplates::Template::OutOfOffice).not_to have_received(:new)
+ end
+ end
+
context 'when message is an auto reply email' do
it 'does not call any template hooks' do
contact = create(:contact)
From 4d362da9f0e54172ada5d955f16af0be0cb4a32e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Pedro=20Baza=20Garcia=20Rodrigues?=
<142340792+joao-baza@users.noreply.github.com>
Date: Fri, 13 Feb 2026 04:15:40 -0400
Subject: [PATCH 015/155] fix: Prevent user enumeration on password reset
endpoint (#13528)
## Description
The current password reset endpoint returns different HTTP status codes
and messages depending on whether the email exists in the system (200
for existing emails, 404 for non-existing ones). This allows attackers
to enumerate valid email addresses via the password reset form.
## Changes
### `app/controllers/devise_overrides/passwords_controller.rb`
- Removed the `if/else` branch that returned different responses based
on email existence
- Now always returns a generic `200 OK` response with the same message
regardless of whether the email exists
- Uses safe navigation operator (`&.`) to send reset instructions only
if the user exists
### `config/locales/en.yml`
- Consolidated `reset_password_success` and `reset_password_failure`
into a single generic `reset_password` key
- New message does not reveal whether the email exists in the system
## Security Impact
- **Before**: An attacker could determine if an email was registered by
observing the HTTP status code (200 vs 404) and response message
- **After**: All requests receive the same 200 response with a generic
message, preventing user enumeration
This follows [OWASP guidelines for authentication error
messages](https://cheatsheetseries.owasp.org/cheatsheets/Authentication_Cheat_Sheet.html#authentication-responses).
Fixes #13527
---
app/controllers/devise_overrides/passwords_controller.rb | 8 ++------
config/locales/en.yml | 3 +--
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/app/controllers/devise_overrides/passwords_controller.rb b/app/controllers/devise_overrides/passwords_controller.rb
index 00976c3cd..c69541f6f 100644
--- a/app/controllers/devise_overrides/passwords_controller.rb
+++ b/app/controllers/devise_overrides/passwords_controller.rb
@@ -6,12 +6,8 @@ class DeviseOverrides::PasswordsController < Devise::PasswordsController
def create
@user = User.from_email(params[:email])
- if @user
- @user.send_reset_password_instructions
- build_response(I18n.t('messages.reset_password_success'), 200)
- else
- build_response(I18n.t('messages.reset_password_failure'), 404)
- end
+ @user&.send_reset_password_instructions
+ build_response(I18n.t('messages.reset_password'), 200)
end
def update
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f8d5b119e..07d9b0e2f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -41,8 +41,7 @@ en:
invalid_email: 'Please enter a valid email address'
authentication_failed: 'Authentication failed. Please check your credentials and try again.'
messages:
- reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
- reset_password_failure: Uh ho! We could not find any user with the specified email.
+ reset_password: Request for password reset is successful. A email with instructions will be sent to your email if it exists.
reset_password_saml_user: This account uses SAML authentication. Password reset is not available. Please contact your administrator.
login_saml_user: This account uses SAML authentication. Please sign in through your organization's SAML provider.
saml_not_available: SAML authentication is not available in this installation.
From 6b7180d051a1338d66cd8f5f9939b6cb1076c0eb Mon Sep 17 00:00:00 2001
From: Sojan Jose
Date: Fri, 13 Feb 2026 14:06:12 -0800
Subject: [PATCH 016/155] fix(twilio): prevent dead jobs on missing channel
lookup (#13522)
## Why
We observed `Webhooks::TwilioEventsJob` failures ending up in Sidekiq
dead jobs when Twilio callback payloads could not be mapped to a
`Channel::TwilioSms` record. In this scenario, channel lookup raised
`ActiveRecord::RecordNotFound`, which caused retries and eventual dead
jobs instead of a graceful drop.
Related Sentry issue/search:
-
https://chatwoot-p3.sentry.io/issues/?project=6382945&query=Webhooks%3A%3ATwilioEventsJob%20ActiveRecord%3A%3ARecordNotFound
## What changed
This PR keeps the existing lookup flow but makes it non-raising:
- `app/services/twilio/incoming_message_service.rb`
- `find_by!` -> `find_by` for account SID + phone lookup
- Added warning log when channel lookup misses
- `app/services/twilio/delivery_status_service.rb`
- `find_by!` -> `find_by` for account SID + phone lookup
- Added warning log when channel lookup misses
## Reproduction
Configure a Twilio webhook callback that reaches Chatwoot but does not
match an existing Twilio channel lookup path. Before this change, the
job raises `RecordNotFound` and can end up in dead jobs after retries.
After this change, the job logs the miss and exits safely.
## Testing
- `bundle exec rspec
spec/services/twilio/incoming_message_service_spec.rb
spec/services/twilio/delivery_status_service_spec.rb`
- `bundle exec rubocop app/services/twilio/incoming_message_service.rb
app/services/twilio/delivery_status_service.rb`
---
app/services/twilio/delivery_status_service.rb | 14 +++++++++++++-
app/services/twilio/incoming_message_service.rb | 15 +++++++++++++--
2 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/app/services/twilio/delivery_status_service.rb b/app/services/twilio/delivery_status_service.rb
index bf8422fcd..bed390aa5 100644
--- a/app/services/twilio/delivery_status_service.rb
+++ b/app/services/twilio/delivery_status_service.rb
@@ -47,8 +47,10 @@ class Twilio::DeliveryStatusService
@twilio_channel ||= if params[:MessagingServiceSid].present?
::Channel::TwilioSms.find_by(messaging_service_sid: params[:MessagingServiceSid])
elsif params[:AccountSid].present? && params[:From].present?
- ::Channel::TwilioSms.find_by!(account_sid: params[:AccountSid], phone_number: params[:From])
+ ::Channel::TwilioSms.find_by(account_sid: params[:AccountSid], phone_number: params[:From])
end
+ log_channel_not_found if @twilio_channel.blank?
+ @twilio_channel
end
def message
@@ -56,4 +58,14 @@ class Twilio::DeliveryStatusService
@message ||= twilio_channel.inbox.messages.find_by(source_id: params[:MessageSid])
end
+
+ def log_channel_not_found
+ Rails.logger.warn(
+ '[TWILIO] Delivery status channel lookup failed ' \
+ "account_sid=#{params[:AccountSid]} " \
+ "from=#{params[:From]} " \
+ "messaging_service_sid=#{params[:MessagingServiceSid]} " \
+ "message_sid=#{params[:MessageSid]}"
+ )
+ end
end
diff --git a/app/services/twilio/incoming_message_service.rb b/app/services/twilio/incoming_message_service.rb
index 5d695ebb2..d67b6d515 100644
--- a/app/services/twilio/incoming_message_service.rb
+++ b/app/services/twilio/incoming_message_service.rb
@@ -26,12 +26,23 @@ class Twilio::IncomingMessageService
def twilio_channel
@twilio_channel ||= ::Channel::TwilioSms.find_by(messaging_service_sid: params[:MessagingServiceSid]) if params[:MessagingServiceSid].present?
if params[:AccountSid].present? && params[:To].present?
- @twilio_channel ||= ::Channel::TwilioSms.find_by!(account_sid: params[:AccountSid],
- phone_number: params[:To])
+ @twilio_channel ||= ::Channel::TwilioSms.find_by(account_sid: params[:AccountSid],
+ phone_number: params[:To])
end
+ log_channel_not_found if @twilio_channel.blank?
@twilio_channel
end
+ def log_channel_not_found
+ Rails.logger.warn(
+ '[TWILIO] Incoming message channel lookup failed ' \
+ "account_sid=#{params[:AccountSid]} " \
+ "to=#{params[:To]} " \
+ "messaging_service_sid=#{params[:MessagingServiceSid]} " \
+ "sms_sid=#{params[:SmsSid]}"
+ )
+ end
+
def inbox
@inbox ||= twilio_channel.inbox
end
From fd5ac2a8a3a048b2ec062c0f75d2ecd68faaecb2 Mon Sep 17 00:00:00 2001
From: Sojan Jose
Date: Fri, 13 Feb 2026 16:47:25 -0800
Subject: [PATCH 017/155] fix: apply installation branding replacement in
tooltip copy (#13538)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## Summary
Fix hardcoded `Chatwoot` branding in two UI tooltips using the existing
`useBranding` flow so self-hosted/white-label deployments no longer show
the wrong brand text.
## Changes
- LabelSuggestion tooltip now uses:
- `replaceInstallationName($t('LABEL_MGMT.SUGGESTIONS.POWERED_BY'))`
- Message avatar tooltip (native app/external echo) now uses:
- `replaceInstallationName(t('CONVERSATION.NATIVE_APP_ADVISORY'))`
## Why
This follows the existing branding pattern already used in the product
and keeps behavior consistent across deployments.
## Notes
- No change to message logic or API behavior.
- `AGENTS.md` updated with a branding guidance note.
## Fixes
- Fixes https://github.com/chatwoot/chatwoot/issues/13306
- Fixes https://github.com/chatwoot/chatwoot/issues/13466
## Testing
---
AGENTS.md | 9 +++++++++
.../dashboard/components-next/message/Message.vue | 4 +++-
.../conversation/conversation/LabelSuggestion.vue | 8 ++++++--
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/AGENTS.md b/AGENTS.md
index 3b1bcb024..301633d7f 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -4,6 +4,11 @@
- **Setup**: `bundle install && pnpm install`
- **Run Dev**: `pnpm dev` or `overmind start -f ./Procfile.dev`
+- **Seed Local Test Data**: `bundle exec rails db:seed` (quickly populates minimal data for standard feature verification)
+- **Seed Search Test Data**: `bundle exec rails search:setup_test_data` (bulk fixture generation for search/performance/manual load scenarios)
+- **Seed Account Sample Data (richer test data)**: `Seeders::AccountSeeder` is available as an internal utility and is exposed through Super Admin `Accounts#seed`, but can be used directly in dev workflows too:
+ - UI path: Super Admin → Accounts → Seed (enqueues `Internal::SeedAccountJob`).
+ - CLI path: `bundle exec rails runner "Internal::SeedAccountJob.perform_now(Account.find())"` (or call `Seeders::AccountSeeder.new(account: Account.find()).perform!` directly).
- **Lint JS/Vue**: `pnpm eslint` / `pnpm eslint:fix`
- **Lint Ruby**: `bundle exec rubocop -a`
- **Test JS**: `pnpm test` or `pnpm test:watch`
@@ -93,3 +98,7 @@ Practical checklist for any change impacting core logic or public APIs
- When renaming/moving shared code, mirror the change in `enterprise/` to prevent drift.
- Tests: Add Enterprise-specific specs under `spec/enterprise`, mirroring OSS spec layout where applicable.
- When modifying existing OSS features for Enterprise-only behavior, add an Enterprise module (via `prepend_mod_with`/`include_mod_with`) instead of editing OSS files directly—especially for policies, controllers, and services. For Enterprise-exclusive features, place code directly under `enterprise/`.
+
+## Branding / White-labeling note
+
+- For user-facing strings that currently contain "Chatwoot" but should adapt to branded/self-hosted installs, prefer applying `replaceInstallationName` from `shared/composables/useBranding` in the UI layer (for example tooltip and suggestion labels) instead of adding hardcoded brand-specific copy.
diff --git a/app/javascript/dashboard/components-next/message/Message.vue b/app/javascript/dashboard/components-next/message/Message.vue
index 0f6ab85a8..78888d1e0 100644
--- a/app/javascript/dashboard/components-next/message/Message.vue
+++ b/app/javascript/dashboard/components-next/message/Message.vue
@@ -43,6 +43,7 @@ import VoiceCallBubble from './bubbles/VoiceCall.vue';
import MessageError from './MessageError.vue';
import ContextMenu from 'dashboard/modules/conversations/components/MessageContextMenu.vue';
+import { useBranding } from 'shared/composables/useBranding';
/**
* @typedef {Object} Attachment
@@ -143,6 +144,7 @@ const { t } = useI18n();
const route = useRoute();
const inboxGetter = useMapGetter('inboxes/getInbox');
const inbox = computed(() => inboxGetter.value(props.inboxId) || {});
+const { replaceInstallationName } = useBranding();
/**
* Computes the message variant based on props
@@ -472,7 +474,7 @@ const avatarInfo = computed(() => {
const avatarTooltip = computed(() => {
if (props.contentAttributes?.externalEcho) {
- return t('CONVERSATION.NATIVE_APP_ADVISORY');
+ return replaceInstallationName(t('CONVERSATION.NATIVE_APP_ADVISORY'));
}
if (avatarInfo.value.name === '') return '';
return `${t('CONVERSATION.SENT_BY')} ${avatarInfo.value.name}`;
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversation/LabelSuggestion.vue b/app/javascript/dashboard/components/widgets/conversation/conversation/LabelSuggestion.vue
index 9075eb4ed..0c8a4fb57 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversation/LabelSuggestion.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversation/LabelSuggestion.vue
@@ -2,6 +2,7 @@
// components
import NextButton from 'dashboard/components-next/button/Button.vue';
import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
+import { useBranding } from 'shared/composables/useBranding';
// composables
import { useCaptain } from 'dashboard/composables/useCaptain';
@@ -34,8 +35,9 @@ export default {
},
setup() {
const { captainTasksEnabled } = useCaptain();
+ const { replaceInstallationName } = useBranding();
- return { captainTasksEnabled };
+ return { captainTasksEnabled, replaceInstallationName };
},
data() {
return {
@@ -228,7 +230,9 @@ export default {
Date: Mon, 16 Feb 2026 14:39:20 +0530
Subject: [PATCH 018/155] fix: Enforce team boundaries to prevent cross-team
assignments (#13353)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## Description
Fixes a critical bug where conversations assigned to a team could be
auto-assigned to agents outside that team when all team members were at
capacity.
## Type of change
- [ ] Bug fix (non-breaking change which fixes an issue)
## Checklist:
- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my code
- [ ] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---
> [!NOTE]
> **Medium Risk**
> Changes core assignment selection for both legacy and v2 flows;
misconfiguration of `allow_auto_assign` or team membership could cause
conversations to remain unassigned.
>
> **Overview**
> Prevents auto-assignment from crossing team boundaries by filtering
eligible agents to the conversation’s `team` members (and requiring
`team.allow_auto_assign`) in both the legacy `AutoAssignmentHandler`
path and the v2 `AutoAssignment::AssignmentService` (including the
Enterprise override).
>
> Adds test coverage to ensure team-scoped conversations only assign to
team members, and are skipped when team auto-assign is disabled or no
team members are available; also updates the conversations controller
spec setup to include team membership.
>
> Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
67ed2bda0cd8ffd56c7e0253b86369dead2e6155. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).
---
.../concerns/auto_assignment_handler.rb | 10 +++-
.../auto_assignment/assignment_service.rb | 19 ++++++--
.../auto_assignment/assignment_service.rb | 7 ++-
.../accounts/conversations_controller_spec.rb | 1 +
.../assignment_service_spec.rb | 47 +++++++++++++++++++
5 files changed, 78 insertions(+), 6 deletions(-)
diff --git a/app/models/concerns/auto_assignment_handler.rb b/app/models/concerns/auto_assignment_handler.rb
index a1198200a..dca154842 100644
--- a/app/models/concerns/auto_assignment_handler.rb
+++ b/app/models/concerns/auto_assignment_handler.rb
@@ -19,10 +19,18 @@ module AutoAssignmentHandler
AutoAssignment::AssignmentJob.perform_later(inbox_id: inbox.id)
else
# Use legacy assignment system
- AutoAssignment::AgentAssignmentService.new(conversation: self, allowed_agent_ids: inbox.member_ids_with_assignment_capacity).perform
+ # If conversation has a team, only consider team members for assignment
+ allowed_agent_ids = team_id.present? ? team_member_ids_with_capacity : inbox.member_ids_with_assignment_capacity
+ AutoAssignment::AgentAssignmentService.new(conversation: self, allowed_agent_ids: allowed_agent_ids).perform
end
end
+ def team_member_ids_with_capacity
+ return [] if team.blank? || team.allow_auto_assign.blank?
+
+ inbox.member_ids_with_assignment_capacity & team.members.ids
+ end
+
def should_run_auto_assignment?
return false unless inbox.enable_auto_assignment?
diff --git a/app/services/auto_assignment/assignment_service.rb b/app/services/auto_assignment/assignment_service.rb
index 5d75c515f..89eff9d1c 100644
--- a/app/services/auto_assignment/assignment_service.rb
+++ b/app/services/auto_assignment/assignment_service.rb
@@ -19,7 +19,7 @@ class AutoAssignment::AssignmentService
def perform_for_conversation(conversation)
return false unless assignable?(conversation)
- agent = find_available_agent
+ agent = find_available_agent(conversation)
return false unless agent
assign_conversation(conversation, agent)
@@ -44,13 +44,26 @@ class AutoAssignment::AssignmentService
scope.limit(limit)
end
- def find_available_agent
- agents = filter_agents_by_rate_limit(inbox.available_agents)
+ def find_available_agent(conversation = nil)
+ agents = filter_agents_by_team(inbox.available_agents, conversation)
+ return nil if agents.nil?
+
+ agents = filter_agents_by_rate_limit(agents)
return nil if agents.empty?
round_robin_selector.select_agent(agents)
end
+ def filter_agents_by_team(agents, conversation)
+ return agents if conversation&.team_id.blank?
+
+ team = conversation.team
+ return nil if team.blank? || team.allow_auto_assign.blank?
+
+ team_member_ids = team.members.ids
+ agents.where(user_id: team_member_ids)
+ end
+
def filter_agents_by_rate_limit(agents)
agents.select do |agent_member|
rate_limiter = build_rate_limiter(agent_member.user)
diff --git a/enterprise/app/services/enterprise/auto_assignment/assignment_service.rb b/enterprise/app/services/enterprise/auto_assignment/assignment_service.rb
index 46422f9bc..66cdc31e5 100644
--- a/enterprise/app/services/enterprise/auto_assignment/assignment_service.rb
+++ b/enterprise/app/services/enterprise/auto_assignment/assignment_service.rb
@@ -14,8 +14,11 @@ module Enterprise::AutoAssignment::AssignmentService
end
# Extend agent finding to add capacity checks
- def find_available_agent
- agents = filter_agents_by_rate_limit(inbox.available_agents)
+ def find_available_agent(conversation = nil)
+ agents = filter_agents_by_team(inbox.available_agents, conversation)
+ return nil if agents.nil?
+
+ agents = filter_agents_by_rate_limit(agents)
agents = filter_agents_by_capacity(agents) if capacity_filtering_enabled?
return nil if agents.empty?
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index 3c380c155..bc7b4097f 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -330,6 +330,7 @@ RSpec.describe 'Conversations API', type: :request do
context 'when it is an authenticated user who has access to the inbox' do
before do
create(:inbox_member, user: agent, inbox: inbox)
+ create(:team_member, user: agent, team: team)
end
it 'creates a new conversation' do
diff --git a/spec/services/auto_assignment/assignment_service_spec.rb b/spec/services/auto_assignment/assignment_service_spec.rb
index 2139e5e78..36a8c7816 100644
--- a/spec/services/auto_assignment/assignment_service_spec.rb
+++ b/spec/services/auto_assignment/assignment_service_spec.rb
@@ -307,5 +307,52 @@ RSpec.describe AutoAssignment::AssignmentService do
end
end
end
+
+ context 'with team assignments' do
+ let(:team) { create(:team, account: account, allow_auto_assign: true) }
+ let(:team_member) { create(:user, account: account, role: :agent, availability: :online) }
+ let(:rate_limiter) { instance_double(AutoAssignment::RateLimiter) }
+
+ before do
+ create(:team_member, team: team, user: team_member)
+ create(:inbox_member, inbox: inbox, user: team_member)
+
+ allow(OnlineStatusTracker).to receive(:get_available_users).and_return({ team_member.id.to_s => 'online' })
+
+ allow(AutoAssignment::RateLimiter).to receive(:new).and_return(rate_limiter)
+ allow(rate_limiter).to receive(:within_limit?).and_return(true)
+ allow(rate_limiter).to receive(:track_assignment)
+
+ round_robin_selector = instance_double(AutoAssignment::RoundRobinSelector)
+ allow(AutoAssignment::RoundRobinSelector).to receive(:new).and_return(round_robin_selector)
+ allow(round_robin_selector).to receive(:select_agent).and_return(team_member)
+ end
+
+ it 'assigns conversation with team to team member' do
+ conversation_with_team = create(:conversation, inbox: inbox, team: team, assignee: nil)
+
+ service.perform_bulk_assignment(limit: 1)
+
+ expect(conversation_with_team.reload.assignee).to eq(team_member)
+ end
+
+ it 'skips assignment when team has allow_auto_assign false' do
+ team.update!(allow_auto_assign: false)
+ conversation_with_team = create(:conversation, inbox: inbox, team: team, assignee: nil)
+
+ service.perform_bulk_assignment(limit: 1)
+
+ expect(conversation_with_team.reload.assignee).to be_nil
+ end
+
+ it 'skips assignment when no team members are available' do
+ allow(OnlineStatusTracker).to receive(:get_available_users).and_return({})
+ conversation_with_team = create(:conversation, inbox: inbox, team: team, assignee: nil)
+
+ service.perform_bulk_assignment(limit: 1)
+
+ expect(conversation_with_team.reload.assignee).to be_nil
+ end
+ end
end
end
From 9cd7c4ef89a7922b345923777586d87a1bdc5423 Mon Sep 17 00:00:00 2001
From: Tanmay Deep Sharma <32020192+tds-1@users.noreply.github.com>
Date: Mon, 16 Feb 2026 14:47:33 +0530
Subject: [PATCH 019/155] fix: Enhance notification emails with message details
and handle failed messages (#13273)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## Description
Handle messages with null content properly in UI and email notifications
## Type of change
- [ ] Bug fix (non-breaking change which fixes an issue)
## Relevant Screenshots:
## Checklist:
- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my code
- [ ] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---
> [!NOTE]
> **Medium Risk**
> Touches notification email templates and message rendering conditions;
mistakes could lead to missing content/attachments in emails or
incorrect UI visibility, but changes are localized and non-auth/security
related.
>
> **Overview**
> Agent notification emails for *assigned* and *participating* new
messages now include the actual message details (sender name, rendered
text when present, and attachment links) and gracefully fall back when
content is unavailable.
>
> To support this, the mailer now passes `@message` into Liquid via
`MessageDrop` (adding `attachments` URLs), and the dashboard message UI
now renders failed/external-error messages even when `content` is `null`
while tightening retry eligibility to require content or attachments
(and still within 1 day).
>
> Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
475c8cedda54eb5e806990f977faf8098d0b27d8. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).
---------
Co-authored-by: Muhsin Keloth
---
.../dashboard/components-next/message/Message.vue | 6 +++++-
.../dashboard/components-next/message/MessageError.vue | 9 +++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/app/javascript/dashboard/components-next/message/Message.vue b/app/javascript/dashboard/components-next/message/Message.vue
index 78888d1e0..66234984c 100644
--- a/app/javascript/dashboard/components-next/message/Message.vue
+++ b/app/javascript/dashboard/components-next/message/Message.vue
@@ -391,13 +391,17 @@ const shouldRenderMessage = computed(() => {
const isUnsupported = props.contentAttributes?.isUnsupported;
const isAnIntegrationMessage =
props.contentType === CONTENT_TYPES.INTEGRATIONS;
+ const isFailedMessage = props.status === MESSAGE_STATUS.FAILED;
+ const hasExternalError = !!props.contentAttributes?.externalError;
return (
hasAttachments ||
props.content ||
isEmailContentType ||
isUnsupported ||
- isAnIntegrationMessage
+ isAnIntegrationMessage ||
+ isFailedMessage ||
+ hasExternalError
);
});
diff --git a/app/javascript/dashboard/components-next/message/MessageError.vue b/app/javascript/dashboard/components-next/message/MessageError.vue
index cd17c1e3f..fe508c805 100644
--- a/app/javascript/dashboard/components-next/message/MessageError.vue
+++ b/app/javascript/dashboard/components-next/message/MessageError.vue
@@ -12,11 +12,16 @@ defineProps({
const emit = defineEmits(['retry']);
-const { orientation, status, createdAt } = useMessageContext();
+const { orientation, status, createdAt, content, attachments } =
+ useMessageContext();
const { t } = useI18n();
-const canRetry = computed(() => !hasOneDayPassed(createdAt.value));
+const canRetry = computed(() => {
+ const hasContent = content.value !== null;
+ const hasAttachments = attachments.value && attachments.value.length > 0;
+ return !hasOneDayPassed(createdAt.value) && (hasContent || hasAttachments);
+});
From 61eaa098ae5524e492a5abd70d1349f2c2078b82 Mon Sep 17 00:00:00 2001
From: Sojan Jose
Date: Mon, 16 Feb 2026 23:55:13 -0800
Subject: [PATCH 020/155] fix(messages): reduce audio transcription 400 retry
noise (#13487)
## Summary
This PR reduces duplicate failure noise for audio transcription jobs
that fail with permanent HTTP 400 responses, and fixes a file-format
edge case causing intermittent 400s.
Sentry issue: [CHATWOOT-99E /
6660541334](https://chatwoot-p3.sentry.io/issues/6660541334/)
## Confirmed root cause
For some attachments, the stored filename had no extension (example:
`speech`, content type `audio/mpeg`).
When the temporary transcription upload file was created without an
extension, OpenAI returned:
`Unrecognized file format` (HTTP 400).
## Scope of changes
1. `Messages::AudioTranscriptionJob`
- Keeps `discard_on Faraday::BadRequestError` to avoid retry storms on
permanent request errors.
- Adds explicit Rails warning logs for discarded jobs with
attachment/job/status context.
2. `Messages::AudioTranscriptionService`
- Keeps guaranteed temp file cleanup via `ensure`.
- Ensures temp upload files include an extension when the original
filename has none, derived from blob `content_type`.
- This addresses intermittent failures like extensionless `audio/mpeg`
files.
## Reproduction
Enable audio transcription for an account and process an audio
attachment whose stored filename has no extension (for example `speech`)
but valid audio content type (`audio/mpeg`).
Before this fix, OpenAI transcription could return HTTP 400
`Unrecognized file format` for that attachment while similar attachments
with extensions succeeded.
## Testing
Ran:
`bundle exec rubocop
enterprise/app/jobs/messages/audio_transcription_job.rb
enterprise/app/services/messages/audio_transcription_service.rb`
Result: both modified files pass lint with no offenses.
---
.../jobs/messages/audio_transcription_job.rb | 9 ++++++
.../messages/audio_transcription_service.rb | 30 +++++++++++++++----
.../audio_transcription_service_spec.rb | 24 +++++++++++++--
3 files changed, 55 insertions(+), 8 deletions(-)
diff --git a/enterprise/app/jobs/messages/audio_transcription_job.rb b/enterprise/app/jobs/messages/audio_transcription_job.rb
index ce35405c8..5daf1e160 100644
--- a/enterprise/app/jobs/messages/audio_transcription_job.rb
+++ b/enterprise/app/jobs/messages/audio_transcription_job.rb
@@ -1,6 +1,15 @@
class Messages::AudioTranscriptionJob < ApplicationJob
queue_as :low
+ discard_on Faraday::BadRequestError do |job, error|
+ log_context = {
+ attachment_id: job.arguments.first,
+ job_id: job.job_id,
+ status_code: error.response&.dig(:status)
+ }
+
+ Rails.logger.warn("Discarding audio transcription job due to bad request: #{log_context}")
+ end
retry_on ActiveStorage::FileNotFoundError, wait: 2.seconds, attempts: 3
def perform(attachment_id)
diff --git a/enterprise/app/services/messages/audio_transcription_service.rb b/enterprise/app/services/messages/audio_transcription_service.rb
index 1676dd862..4aa156f47 100644
--- a/enterprise/app/services/messages/audio_transcription_service.rb
+++ b/enterprise/app/services/messages/audio_transcription_service.rb
@@ -31,12 +31,20 @@ class Messages::AudioTranscriptionService< Llm::LegacyBaseOpenAiService
end
def fetch_audio_file
+ blob = attachment.file.blob
temp_dir = Rails.root.join('tmp/uploads/audio-transcriptions')
FileUtils.mkdir_p(temp_dir)
- temp_file_path = File.join(temp_dir, "#{attachment.file.blob.key}-#{attachment.file.filename}")
+ temp_file_name = "#{blob.key}-#{blob.filename}"
+
+ if blob.filename.extension_without_delimiter.blank?
+ extension = extension_from_content_type(blob.content_type)
+ temp_file_name = "#{temp_file_name}.#{extension}" if extension.present?
+ end
+
+ temp_file_path = File.join(temp_dir, temp_file_name)
File.open(temp_file_path, 'wb') do |file|
- attachment.file.blob.open do |blob_file|
+ blob.open do |blob_file|
IO.copy_stream(blob_file, file)
end
end
@@ -49,13 +57,12 @@ class Messages::AudioTranscriptionService< Llm::LegacyBaseOpenAiService
return transcribed_text if transcribed_text.present?
temp_file_path = fetch_audio_file
-
transcribed_text = nil
File.open(temp_file_path, 'rb') do |file|
response = @client.audio.transcribe(
parameters: {
- model: 'whisper-1',
+ model: WHISPER_MODEL,
file: file,
temperature: 0.4
}
@@ -63,10 +70,10 @@ class Messages::AudioTranscriptionService< Llm::LegacyBaseOpenAiService
transcribed_text = response['text']
end
- FileUtils.rm_f(temp_file_path)
-
update_transcription(transcribed_text)
transcribed_text
+ ensure
+ FileUtils.rm_f(temp_file_path) if temp_file_path.present?
end
def instrumentation_params(file_path)
@@ -90,4 +97,15 @@ class Messages::AudioTranscriptionService< Llm::LegacyBaseOpenAiService
message.reindex
end
+
+ def extension_from_content_type(content_type)
+ subtype = content_type.to_s.downcase.split(';').first.to_s.split('/').last.to_s
+ return if subtype.blank?
+
+ {
+ 'x-m4a' => 'm4a',
+ 'x-wav' => 'wav',
+ 'x-mp3' => 'mp3'
+ }.fetch(subtype, subtype)
+ end
end
diff --git a/spec/enterprise/services/messages/audio_transcription_service_spec.rb b/spec/enterprise/services/messages/audio_transcription_service_spec.rb
index 41a4cae83..7ece2540a 100644
--- a/spec/enterprise/services/messages/audio_transcription_service_spec.rb
+++ b/spec/enterprise/services/messages/audio_transcription_service_spec.rb
@@ -8,8 +8,8 @@ RSpec.describe Messages::AudioTranscriptionService, type: :service do
before do
# Create required installation configs
- create(:installation_config, name: 'CAPTAIN_OPEN_AI_API_KEY', value: 'test-api-key')
- create(:installation_config, name: 'CAPTAIN_OPEN_AI_MODEL', value: 'gpt-4o-mini')
+ InstallationConfig.find_or_create_by!(name: 'CAPTAIN_OPEN_AI_API_KEY') { |config| config.value = 'test-api-key' }
+ InstallationConfig.find_or_create_by!(name: 'CAPTAIN_OPEN_AI_MODEL') { |config| config.value = 'gpt-4o-mini' }
# Mock usage limits for transcription to be available
allow(account).to receive(:usage_limits).and_return({ captain: { responses: { current_available: 100 } } })
@@ -64,4 +64,24 @@ RSpec.describe Messages::AudioTranscriptionService, type: :service do
end
end
end
+
+ describe '#fetch_audio_file' do
+ let(:service) { described_class.new(attachment) }
+
+ before do
+ attachment.file.attach(
+ io: File.open(Rails.public_path.join('audio/widget/ding.mp3')),
+ filename: 'speech',
+ content_type: 'audio/mpeg'
+ )
+ end
+
+ it 'adds extension from content type when filename has no extension' do
+ temp_file_path = service.send(:fetch_audio_file)
+
+ expect(File.extname(temp_file_path)).to eq('.mpeg')
+ ensure
+ FileUtils.rm_f(temp_file_path) if temp_file_path.present?
+ end
+ end
end
From 101eca300339e804d28da508ed1216237faa81d3 Mon Sep 17 00:00:00 2001
From: Aakash Bakhle <48802744+aakashb95@users.noreply.github.com>
Date: Tue, 17 Feb 2026 13:26:56 +0530
Subject: [PATCH 021/155] feat: add captain editor events (#13524)
## Description
Adds missing analytics instrumentation for the editor AI funnel so we
can measure end-to-end usage and outcome quality.
### What was added
- Captain: Editor AI menu opened
- Captain: Generation failed
- Captain: AI-assisted message sent
### Behavior covered
- Tracks AI button click + menu open from both entry points:
- top panel sparkle button
- inline editor copilot button
- Tracks generation failures (initial + follow-up stages).
- Tracks whether accepted AI content was sent as-is or edited before
send.
### Notes
- Applies to editor Captain accept/send flow
(rewrite/summarize/reply_suggestion + follow-ups).
- Does not change Copilot sidebar flow instrumentation.
## Type of change
- [x] Bug fix (non-breaking change which fixes an issue)
- [x] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality not to work as expected)
- [ ] This change requires a documentation update
## How Has This Been Tested?
### Manual verification steps
1. Open a conversation with Captain tasks enabled.
2. Click AI button in top panel and inline editor.
3. Confirm analytics events fire for:
- AI menu opened
4. Run an AI action and force a failure scenario (or empty response
path) and confirm generation-failed event.
5. Accept AI output, then:
- send without changes -> editedBeforeSend: false
- edit then send -> editedBeforeSend: true
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [ ] 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
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---
.../components/widgets/WootWriter/Editor.vue | 15 +-
.../widgets/WootWriter/ReplyTopPanel.vue | 15 +-
.../widgets/conversation/ReplyBox.vue | 106 +++++++++--
.../composables/captain/constants.js | 12 ++
.../dashboard/composables/useCaptain.js | 36 +++-
.../dashboard/composables/useCopilotReply.js | 171 ++++++++++++++----
.../helper/AnalyticsHelper/events.js | 5 +
7 files changed, 304 insertions(+), 56 deletions(-)
create mode 100644 app/javascript/dashboard/composables/captain/constants.js
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
index 4e0722c25..a323d4095 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
@@ -28,7 +28,10 @@ import { useAlert } from 'dashboard/composables';
import { vOnClickOutside } from '@vueuse/components';
import { BUS_EVENTS } from 'shared/constants/busEvents';
-import { CONVERSATION_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
+import {
+ CONVERSATION_EVENTS,
+ CAPTAIN_EVENTS,
+} from 'dashboard/helper/AnalyticsHelper/events';
import { MESSAGE_EDITOR_IMAGE_RESIZES } from 'dashboard/constants/editor';
import {
@@ -86,6 +89,7 @@ const props = defineProps({
// are triggered except when this flag is true
allowSignature: { type: Boolean, default: false },
channelType: { type: String, default: '' },
+ conversationId: { type: Number, default: null },
medium: { type: String, default: '' },
showImageResizeToolbar: { type: Boolean, default: false }, // A kill switch to show or hide the image toolbar
focusOnMount: { type: Boolean, default: true },
@@ -396,7 +400,14 @@ function openFileBrowser() {
}
function handleCopilotClick() {
- showSelectionMenu.value = !showSelectionMenu.value;
+ const isOpening = !showSelectionMenu.value;
+ if (isOpening) {
+ useTrack(CAPTAIN_EVENTS.EDITOR_AI_MENU_OPENED, {
+ conversationId: props.conversationId,
+ entryPoint: 'inline',
+ });
+ }
+ showSelectionMenu.value = isOpening;
}
function handleClickOutside(event) {
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyTopPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyTopPanel.vue
index 0912cc698..09939f5d2 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/ReplyTopPanel.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyTopPanel.vue
@@ -2,8 +2,10 @@
import { ref } from 'vue';
import { useKeyboardEvents } from 'dashboard/composables/useKeyboardEvents';
import { useCaptain } from 'dashboard/composables/useCaptain';
+import { useTrack } from 'dashboard/composables';
import { vOnClickOutside } from '@vueuse/components';
import { REPLY_EDITOR_MODES, CHAR_LENGTH_WARNING } from './constants';
+import { CAPTAIN_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
import NextButton from 'dashboard/components-next/button/Button.vue';
import EditorModeToggle from './EditorModeToggle.vue';
import CopilotMenuBar from './CopilotMenuBar.vue';
@@ -31,6 +33,10 @@ export default {
type: Boolean,
default: false,
},
+ conversationId: {
+ type: Number,
+ default: null,
+ },
isMessageLengthReachingThreshold: {
type: Boolean,
default: () => false,
@@ -69,7 +75,14 @@ export default {
};
const toggleCopilotMenu = () => {
- showCopilotMenu.value = !showCopilotMenu.value;
+ const isOpening = !showCopilotMenu.value;
+ if (isOpening) {
+ useTrack(CAPTAIN_EVENTS.EDITOR_AI_MENU_OPENED, {
+ conversationId: props.conversationId,
+ entryPoint: 'top_panel',
+ });
+ }
+ showCopilotMenu.value = isOpening;
};
const handleClickOutside = () => {
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index e9d2f6d08..ee63aa711 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -41,7 +41,10 @@ import {
truncatePreviewText,
appendQuotedTextToMessage,
} from 'dashboard/helper/quotedEmailHelper';
-import { CONVERSATION_EVENTS } from '../../../helper/AnalyticsHelper/events';
+import {
+ CONVERSATION_EVENTS,
+ CAPTAIN_EVENTS,
+} from '../../../helper/AnalyticsHelper/events';
import fileUploadMixin from 'dashboard/mixins/fileUploadMixin';
import {
appendSignature,
@@ -136,6 +139,7 @@ export default {
newConversationModalActive: false,
showArticleSearchPopover: false,
hasRecordedAudio: false,
+ copilotAcceptedMessages: {},
};
},
computed: {
@@ -508,6 +512,24 @@ export default {
emitter.off(CMD_AI_ASSIST, this.executeCopilotAction);
},
methods: {
+ getDraftKey(
+ conversationId = this.conversationIdByRoute,
+ replyType = this.replyType
+ ) {
+ return `draft-${conversationId}-${replyType}`;
+ },
+ getCopilotAcceptedMessage(replyType = this.replyType) {
+ const key = this.getDraftKey(this.conversationIdByRoute, replyType);
+ return this.copilotAcceptedMessages[key] || '';
+ },
+ setCopilotAcceptedMessage(message, replyType = this.replyType) {
+ const key = this.getDraftKey(this.conversationIdByRoute, replyType);
+ this.copilotAcceptedMessages[key] = trimContent(message || '');
+ },
+ clearCopilotAcceptedMessage(replyType = this.replyType) {
+ const key = this.getDraftKey(this.conversationIdByRoute, replyType);
+ delete this.copilotAcceptedMessages[key];
+ },
handleInsert(article) {
const { url, title } = article;
// Removing empty lines from the title
@@ -559,7 +581,7 @@ export default {
},
saveDraft(conversationId, replyType) {
if (this.message || this.message === '') {
- const key = `draft-${conversationId}-${replyType}`;
+ const key = this.getDraftKey(conversationId, replyType);
const draftToSave = trimContent(this.message || '');
this.$store.dispatch('draftMessages/set', {
@@ -574,7 +596,7 @@ export default {
},
getFromDraft() {
if (this.conversationIdByRoute) {
- const key = `draft-${this.conversationIdByRoute}-${this.replyType}`;
+ const key = this.getDraftKey();
const messageFromStore =
this.$store.getters['draftMessages/get'](key) || '';
@@ -597,7 +619,7 @@ export default {
},
removeFromDraft() {
if (this.conversationIdByRoute) {
- const key = `draft-${this.conversationIdByRoute}-${this.replyType}`;
+ const key = this.getDraftKey();
this.$store.dispatch('draftMessages/delete', { key });
}
},
@@ -708,6 +730,7 @@ export default {
return;
}
if (!this.showMentions) {
+ const copilotAcceptedMessage = this.getCopilotAcceptedMessage();
const isOnWhatsApp =
this.isATwilioWhatsAppChannel ||
this.isAWhatsAppCloudChannel ||
@@ -717,10 +740,17 @@ export default {
// This can create duplicate messages in Chatwoot. To prevent this issue, we'll handle text and attachments as separate messages.
const isOnInstagram = this.isAnInstagramChannel;
if ((isOnWhatsApp || isOnInstagram) && !this.isPrivate) {
- this.sendMessageAsMultipleMessages(this.message);
+ this.sendMessageAsMultipleMessages(
+ this.message,
+ copilotAcceptedMessage
+ );
} else {
const messagePayload = this.getMessagePayload(this.message);
- this.sendMessage(messagePayload);
+ this.sendMessage(
+ messagePayload,
+ this.message,
+ copilotAcceptedMessage
+ );
}
if (!this.isPrivate) {
@@ -732,13 +762,53 @@ export default {
this.$emit('update:popOutReplyBox', false);
}
},
- sendMessageAsMultipleMessages(message) {
+ sendMessageAsMultipleMessages(message, copilotAcceptedMessage = '') {
const messages = this.getMultipleMessagesPayload(message);
messages.forEach(messagePayload => {
- this.sendMessage(messagePayload);
+ this.sendMessage(
+ messagePayload,
+ messagePayload.message || '',
+ copilotAcceptedMessage
+ );
});
},
- sendMessageAnalyticsData(isPrivate) {
+ sendMessageAnalyticsData(
+ isPrivate,
+ { editorMessage = '', copilotAcceptedMessage = '' } = {}
+ ) {
+ const normalizeForComparison = message => {
+ let normalizedMessage = message || '';
+
+ if (this.sendWithSignature && this.messageSignature && !isPrivate) {
+ const effectiveChannelType = getEffectiveChannelType(
+ this.channelType,
+ this.inbox?.medium || ''
+ );
+ normalizedMessage = removeSignature(
+ normalizedMessage,
+ this.messageSignature,
+ effectiveChannelType
+ );
+ }
+
+ return trimContent(normalizedMessage);
+ };
+
+ const normalizedAcceptedMessage = normalizeForComparison(
+ copilotAcceptedMessage
+ );
+ const normalizedEditorMessage = normalizeForComparison(editorMessage);
+
+ if (normalizedAcceptedMessage && normalizedEditorMessage) {
+ useTrack(CAPTAIN_EVENTS.AI_ASSISTED_MESSAGE_SENT, {
+ conversationId: this.conversationIdByRoute,
+ channelType: this.channelType,
+ editedBeforeSend:
+ normalizedAcceptedMessage !== normalizedEditorMessage,
+ isPrivate,
+ });
+ }
+
// Analytics data for message signature is enabled or not in channels
return isPrivate
? useTrack(CONVERSATION_EVENTS.SENT_PRIVATE_NOTE)
@@ -772,7 +842,11 @@ export default {
this.confirmOnSendReply();
}
},
- async sendMessage(messagePayload) {
+ async sendMessage(
+ messagePayload,
+ editorMessage = '',
+ copilotAcceptedMessage = ''
+ ) {
try {
await this.$store.dispatch(
'createPendingMessageAndSend',
@@ -781,7 +855,10 @@ export default {
emitter.emit(BUS_EVENTS.SCROLL_TO_MESSAGE);
emitter.emit(BUS_EVENTS.MESSAGE_SENT);
this.removeFromDraft();
- this.sendMessageAnalyticsData(messagePayload.private);
+ this.sendMessageAnalyticsData(messagePayload.private, {
+ editorMessage,
+ copilotAcceptedMessage,
+ });
} catch (error) {
const errorMessage =
error?.response?.data?.error || this.$t('CONVERSATION.MESSAGE_ERROR');
@@ -855,6 +932,7 @@ export default {
},
clearMessage() {
this.message = '';
+ this.clearCopilotAcceptedMessage();
if (this.sendWithSignature && !this.isPrivate) {
// if signature is enabled, append it to the message
const effectiveChannelType = getEffectiveChannelType(
@@ -1119,7 +1197,9 @@ export default {
this.$emit('update:popOutReplyBox', !this.popOutReplyBox);
},
onSubmitCopilotReply() {
- this.message = this.copilot.accept();
+ const acceptedMessage = this.copilot.accept();
+ this.message = acceptedMessage;
+ this.setCopilotAcceptedMessage(acceptedMessage);
},
},
};
@@ -1130,6 +1210,7 @@ export default {
{
- if (error.name === 'AbortError' || error.name === 'CanceledError') {
+ if (
+ error.name === CAPTAIN_ERROR_TYPES.ABORT_ERROR ||
+ error.name === CAPTAIN_ERROR_TYPES.CANCELED_ERROR
+ ) {
return;
}
const errorMessage =
@@ -78,6 +82,24 @@ export function useCaptain() {
useAlert(errorMessage);
};
+ /**
+ * Classifies API error types for downstream analytics.
+ * @param {Error} error
+ * @returns {string}
+ */
+ const getErrorType = error => {
+ if (
+ error.name === CAPTAIN_ERROR_TYPES.ABORT_ERROR ||
+ error.name === CAPTAIN_ERROR_TYPES.CANCELED_ERROR
+ ) {
+ return CAPTAIN_ERROR_TYPES.ABORTED;
+ }
+ if (error.response?.status) {
+ return `${CAPTAIN_ERROR_TYPES.HTTP_PREFIX}${error.response.status}`;
+ }
+ return CAPTAIN_ERROR_TYPES.API_ERROR;
+ };
+
// === Task Methods ===
/**
* Rewrites content with a specific operation.
@@ -103,7 +125,7 @@ export function useCaptain() {
return { message: generatedMessage, followUpContext };
} catch (error) {
handleAPIError(error);
- return { message: '' };
+ return { message: '', errorType: getErrorType(error) };
}
};
@@ -125,7 +147,7 @@ export function useCaptain() {
return { message: generatedMessage, followUpContext };
} catch (error) {
handleAPIError(error);
- return { message: '' };
+ return { message: '', errorType: getErrorType(error) };
}
};
@@ -147,7 +169,7 @@ export function useCaptain() {
return { message: generatedMessage, followUpContext };
} catch (error) {
handleAPIError(error);
- return { message: '' };
+ return { message: '', errorType: getErrorType(error) };
}
};
@@ -171,7 +193,11 @@ export function useCaptain() {
return { message: generatedMessage, followUpContext: updatedContext };
} catch (error) {
handleAPIError(error);
- return { message: '', followUpContext };
+ return {
+ message: '',
+ followUpContext,
+ errorType: getErrorType(error),
+ };
}
};
diff --git a/app/javascript/dashboard/composables/useCopilotReply.js b/app/javascript/dashboard/composables/useCopilotReply.js
index 492bcb43e..42f506b16 100644
--- a/app/javascript/dashboard/composables/useCopilotReply.js
+++ b/app/javascript/dashboard/composables/useCopilotReply.js
@@ -3,6 +3,10 @@ import { useCaptain } from 'dashboard/composables/useCaptain';
import { useUISettings } from 'dashboard/composables/useUISettings';
import { useTrack } from 'dashboard/composables';
import { CAPTAIN_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
+import {
+ CAPTAIN_ERROR_TYPES,
+ CAPTAIN_GENERATION_FAILURE_REASONS,
+} from 'dashboard/composables/captain/constants';
// Actions that map to REWRITE events (with operation attribute)
const REWRITE_ACTIONS = [
@@ -52,6 +56,20 @@ function buildPayload(action, conversationId, followUpCount = undefined) {
return payload;
}
+function trackGenerationFailure({
+ action,
+ conversationId,
+ followUpCount = undefined,
+ stage,
+ reason,
+}) {
+ useTrack(CAPTAIN_EVENTS.GENERATION_FAILED, {
+ ...buildPayload(action, conversationId, followUpCount),
+ stage,
+ reason,
+ });
+}
+
/**
* Composable for managing Copilot reply generation state and actions.
* Extracts copilot-related logic from ReplyBox for cleaner code organization.
@@ -146,7 +164,8 @@ export function useCopilotReply() {
// Reset without tracking dismiss (starting new action)
reset(false);
- abortController.value = new AbortController();
+ const requestController = new AbortController();
+ abortController.value = requestController;
isGenerating.value = true;
isContentReady.value = false;
currentAction.value = action;
@@ -154,28 +173,66 @@ export function useCopilotReply() {
trackedConversationId.value = conversationId.value;
try {
- const { message: content, followUpContext: newContext } =
- await processEvent(action, data, {
- signal: abortController.value.signal,
- });
+ const {
+ message: content,
+ followUpContext: newContext,
+ errorType,
+ } = await processEvent(action, data, {
+ signal: requestController.signal,
+ });
- if (!abortController.value?.signal.aborted) {
- generatedContent.value = content;
- followUpContext.value = newContext;
- if (content) {
- showEditor.value = true;
- // Track "Used" event on successful generation
- const eventKey = `${getEventPrefix(action)}_USED`;
- useTrack(
- CAPTAIN_EVENTS[eventKey],
- buildPayload(action, trackedConversationId.value)
- );
+ if (requestController.signal.aborted) return;
+ if (errorType === CAPTAIN_ERROR_TYPES.ABORTED) {
+ if (abortController.value === requestController) {
+ isGenerating.value = false;
}
- isGenerating.value = false;
+ return;
}
- } catch {
- if (!abortController.value?.signal.aborted) {
- isGenerating.value = false;
+
+ generatedContent.value = content;
+ followUpContext.value = newContext;
+ if (content) {
+ showEditor.value = true;
+ // Track "Used" event on successful generation
+ const eventKey = `${getEventPrefix(action)}_USED`;
+ useTrack(
+ CAPTAIN_EVENTS[eventKey],
+ buildPayload(action, trackedConversationId.value)
+ );
+ } else if (errorType && errorType !== CAPTAIN_ERROR_TYPES.ABORTED) {
+ trackGenerationFailure({
+ action,
+ conversationId: trackedConversationId.value,
+ stage: 'initial',
+ reason: errorType,
+ });
+ } else {
+ trackGenerationFailure({
+ action,
+ conversationId: trackedConversationId.value,
+ stage: 'initial',
+ reason: CAPTAIN_GENERATION_FAILURE_REASONS.EMPTY_RESPONSE,
+ });
+ }
+ isGenerating.value = false;
+ } catch (error) {
+ if (
+ requestController.signal.aborted ||
+ error?.name === CAPTAIN_ERROR_TYPES.ABORT_ERROR ||
+ error?.name === CAPTAIN_ERROR_TYPES.CANCELED_ERROR
+ ) {
+ return;
+ }
+ trackGenerationFailure({
+ action,
+ conversationId: trackedConversationId.value,
+ stage: 'initial',
+ reason: error?.name || CAPTAIN_GENERATION_FAILURE_REASONS.EXCEPTION,
+ });
+ isGenerating.value = false;
+ } finally {
+ if (abortController.value === requestController) {
+ abortController.value = null;
}
}
}
@@ -187,7 +244,8 @@ export function useCopilotReply() {
async function sendFollowUp(message) {
if (!followUpContext.value || !message.trim()) return;
- abortController.value = new AbortController();
+ const requestController = new AbortController();
+ abortController.value = requestController;
isGenerating.value = true;
isContentReady.value = false;
@@ -198,24 +256,65 @@ export function useCopilotReply() {
followUpCount.value += 1;
try {
- const { message: content, followUpContext: updatedContext } =
- await followUp({
- followUpContext: followUpContext.value,
- message,
- signal: abortController.value.signal,
- });
+ const {
+ message: content,
+ followUpContext: updatedContext,
+ errorType,
+ } = await followUp({
+ followUpContext: followUpContext.value,
+ message,
+ signal: requestController.signal,
+ });
- if (!abortController.value?.signal.aborted) {
- if (content) {
- generatedContent.value = content;
- followUpContext.value = updatedContext;
- showEditor.value = true;
+ if (requestController.signal.aborted) return;
+ if (errorType === CAPTAIN_ERROR_TYPES.ABORTED) {
+ if (abortController.value === requestController) {
+ isGenerating.value = false;
}
- isGenerating.value = false;
+ return;
}
- } catch {
- if (!abortController.value?.signal.aborted) {
- isGenerating.value = false;
+
+ if (content) {
+ generatedContent.value = content;
+ followUpContext.value = updatedContext;
+ showEditor.value = true;
+ } else if (errorType && errorType !== CAPTAIN_ERROR_TYPES.ABORTED) {
+ trackGenerationFailure({
+ action: currentAction.value,
+ conversationId: trackedConversationId.value,
+ followUpCount: followUpCount.value,
+ stage: 'follow_up',
+ reason: errorType,
+ });
+ } else {
+ trackGenerationFailure({
+ action: currentAction.value,
+ conversationId: trackedConversationId.value,
+ followUpCount: followUpCount.value,
+ stage: 'follow_up',
+ reason: CAPTAIN_GENERATION_FAILURE_REASONS.EMPTY_RESPONSE,
+ });
+ }
+ isGenerating.value = false;
+ } catch (error) {
+ if (
+ requestController.signal.aborted ||
+ error?.name === CAPTAIN_ERROR_TYPES.ABORT_ERROR ||
+ error?.name === CAPTAIN_ERROR_TYPES.CANCELED_ERROR
+ ) {
+ return;
+ }
+ trackGenerationFailure({
+ action: currentAction.value,
+ conversationId: trackedConversationId.value,
+ followUpCount: followUpCount.value,
+ stage: 'follow_up',
+ reason: error?.name || CAPTAIN_GENERATION_FAILURE_REASONS.EXCEPTION,
+ });
+ isGenerating.value = false;
+ } finally {
+ if (abortController.value === requestController) {
+ abortController.value = null;
}
}
}
diff --git a/app/javascript/dashboard/helper/AnalyticsHelper/events.js b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
index 0b6e85d77..c9fefb129 100644
--- a/app/javascript/dashboard/helper/AnalyticsHelper/events.js
+++ b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
@@ -85,6 +85,11 @@ export const PORTALS_EVENTS = Object.freeze({
});
export const CAPTAIN_EVENTS = Object.freeze({
+ // Editor funnel events
+ EDITOR_AI_MENU_OPENED: 'Captain: Editor AI menu opened',
+ GENERATION_FAILED: 'Captain: Generation failed',
+ AI_ASSISTED_MESSAGE_SENT: 'Captain: AI-assisted message sent',
+
// Rewrite events (with operation attribute in payload)
REWRITE_USED: 'Captain: Rewrite used',
REWRITE_APPLIED: 'Captain: Rewrite applied',
From 38743836987a218aeec0ee2599df1151bc0e2de6 Mon Sep 17 00:00:00 2001
From: Aakash Bakhle <48802744+aakashb95@users.noreply.github.com>
Date: Tue, 17 Feb 2026 13:28:26 +0530
Subject: [PATCH 022/155] feat: insrument captain v2 (#13439)
# Pull Request Template
## Description
Instruments captain v2
## Type of change
- [x] New feature (non-breaking change which adds functionality)
## 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.
Local testing:
## 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
---------
Co-authored-by: Shivam Mishra
---
Gemfile | 2 +-
Gemfile.lock | 16 ++---
.../captain/assistant/agent_runner_service.rb | 61 +++++++++++++++++++
.../assistant/agent_runner_service_spec.rb | 55 +++++++++++++++++
4 files changed, 125 insertions(+), 9 deletions(-)
diff --git a/Gemfile b/Gemfile
index 2023c32b1..e6c5a5250 100644
--- a/Gemfile
+++ b/Gemfile
@@ -191,7 +191,7 @@ gem 'reverse_markdown'
gem 'iso-639'
gem 'ruby-openai'
-gem 'ai-agents', '>= 0.7.0'
+gem 'ai-agents'
# TODO: Move this gem as a dependency of ai-agents
gem 'ruby_llm', '>= 1.8.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index db9b59c66..cc1f9e253 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -126,8 +126,8 @@ GEM
jbuilder (~> 2)
rails (>= 4.2, < 7.2)
selectize-rails (~> 0.6)
- ai-agents (0.7.0)
- ruby_llm (~> 1.8.2)
+ ai-agents (0.9.0)
+ ruby_llm (~> 1.9.1)
annotaterb (4.20.0)
activerecord (>= 6.0.0)
activesupport (>= 6.0.0)
@@ -314,7 +314,7 @@ GEM
faraday-net_http_persistent (2.1.0)
faraday (~> 2.5)
net-http-persistent (~> 4.0)
- faraday-retry (2.2.1)
+ faraday-retry (2.4.0)
faraday (~> 2.0)
faraday_middleware-aws-sigv4 (1.0.1)
aws-sigv4 (~> 1.0)
@@ -540,7 +540,7 @@ GEM
net-imap
net-pop
net-smtp
- marcel (1.0.4)
+ marcel (1.1.0)
maxminddb (0.1.22)
meta_request (0.8.5)
rack-contrib (>= 1.1, < 3)
@@ -559,7 +559,7 @@ GEM
multi_json (1.15.0)
multi_xml (0.8.0)
bigdecimal (>= 3.1, < 5)
- multipart-post (2.3.0)
+ multipart-post (2.4.1)
mutex_m (0.3.0)
neighbor (0.2.3)
activerecord (>= 5.2)
@@ -825,7 +825,7 @@ GEM
ruby2ruby (2.5.0)
ruby_parser (~> 3.1)
sexp_processor (~> 4.6)
- ruby_llm (1.8.2)
+ ruby_llm (1.9.2)
base64
event_stream_parser (~> 1)
faraday (>= 1.10.0)
@@ -1004,7 +1004,7 @@ GEM
working_hours (1.4.1)
activesupport (>= 3.2)
tzinfo
- zeitwerk (2.6.17)
+ zeitwerk (2.7.4)
PLATFORMS
arm64-darwin-20
@@ -1024,7 +1024,7 @@ DEPENDENCIES
administrate (>= 0.20.1)
administrate-field-active_storage (>= 1.0.3)
administrate-field-belongs_to_search (>= 0.9.0)
- ai-agents (>= 0.7.0)
+ ai-agents
annotaterb
attr_extras
audited (~> 5.4, >= 5.4.1)
diff --git a/enterprise/app/services/captain/assistant/agent_runner_service.rb b/enterprise/app/services/captain/assistant/agent_runner_service.rb
index 9c4e56841..a40e096e6 100644
--- a/enterprise/app/services/captain/assistant/agent_runner_service.rb
+++ b/enterprise/app/services/captain/assistant/agent_runner_service.rb
@@ -1,6 +1,9 @@
require 'agents'
+require 'agents/instrumentation'
class Captain::Assistant::AgentRunnerService
+ include Integrations::LlmInstrumentationConstants
+
CONVERSATION_STATE_ATTRIBUTES = %i[
id display_id inbox_id contact_id status priority
label_list custom_attributes additional_attributes
@@ -22,7 +25,9 @@ class Captain::Assistant::AgentRunnerService
context = build_context(message_history)
message_to_process = extract_last_user_message(message_history)
runner = Agents::Runner.with_agents(*agents)
+ runner = add_usage_metadata_callback(runner)
runner = add_callbacks_to_runner(runner) if @callbacks.any?
+ install_instrumentation(runner)
result = runner.run(message_to_process, context: context, max_turns: 100)
process_agent_result(result)
@@ -50,6 +55,7 @@ class Captain::Assistant::AgentRunnerService
end
{
+ session_id: "#{@assistant.account_id}_#{@conversation&.display_id}",
conversation_history: conversation_history,
state: build_state
}
@@ -124,6 +130,31 @@ class Captain::Assistant::AgentRunnerService
[assistant_agent] + scenario_agents
end
+ def install_instrumentation(runner)
+ return unless ChatwootApp.otel_enabled?
+
+ Agents::Instrumentation.install(
+ runner,
+ tracer: OpentelemetryConfig.tracer,
+ trace_name: 'llm.captain_v2',
+ span_attributes: {
+ ATTR_LANGFUSE_TAGS => ['captain_v2'].to_json
+ },
+ attribute_provider: ->(context_wrapper) { dynamic_trace_attributes(context_wrapper) }
+ )
+ end
+
+ def dynamic_trace_attributes(context_wrapper)
+ state = context_wrapper&.context&.dig(:state) || {}
+ conversation = state[:conversation] || {}
+ {
+ ATTR_LANGFUSE_USER_ID => state[:account_id],
+ format(ATTR_LANGFUSE_METADATA, 'assistant_id') => state[:assistant_id],
+ format(ATTR_LANGFUSE_METADATA, 'conversation_id') => conversation[:id],
+ format(ATTR_LANGFUSE_METADATA, 'conversation_display_id') => conversation[:display_id]
+ }.compact.transform_values(&:to_s)
+ end
+
def add_callbacks_to_runner(runner)
runner = add_agent_thinking_callback(runner) if @callbacks[:on_agent_thinking]
runner = add_tool_start_callback(runner) if @callbacks[:on_tool_start]
@@ -132,6 +163,36 @@ class Captain::Assistant::AgentRunnerService
runner
end
+ def add_usage_metadata_callback(runner)
+ return runner unless ChatwootApp.otel_enabled?
+
+ handoff_tool_name = Captain::Tools::HandoffTool.new(@assistant).name
+
+ runner.on_tool_complete do |tool_name, _tool_result, context_wrapper|
+ track_handoff_usage(tool_name, handoff_tool_name, context_wrapper)
+ end
+
+ runner.on_run_complete do |_agent_name, _result, context_wrapper|
+ write_credits_used_metadata(context_wrapper)
+ end
+ runner
+ end
+
+ def track_handoff_usage(tool_name, handoff_tool_name, context_wrapper)
+ return unless context_wrapper&.context
+ return unless tool_name.to_s == handoff_tool_name
+
+ context_wrapper.context[:captain_v2_handoff_tool_called] = true
+ end
+
+ def write_credits_used_metadata(context_wrapper)
+ root_span = context_wrapper&.context&.dig(:__otel_tracing, :root_span)
+ return unless root_span
+
+ credits_used = !context_wrapper.context[:captain_v2_handoff_tool_called]
+ root_span.set_attribute(format(ATTR_LANGFUSE_METADATA, 'credits_used'), credits_used)
+ end
+
def add_agent_thinking_callback(runner)
runner.on_agent_thinking do |*args|
@callbacks[:on_agent_thinking].call(*args)
diff --git a/spec/enterprise/services/captain/assistant/agent_runner_service_spec.rb b/spec/enterprise/services/captain/assistant/agent_runner_service_spec.rb
index 2c05860e2..04fa0f967 100644
--- a/spec/enterprise/services/captain/assistant/agent_runner_service_spec.rb
+++ b/spec/enterprise/services/captain/assistant/agent_runner_service_spec.rb
@@ -75,6 +75,7 @@ RSpec.describe Captain::Assistant::AgentRunnerService do
it 'runs agent with extracted user message and context' do
expected_context = {
+ session_id: "#{account.id}_#{conversation.display_id}",
conversation_history: [
{ role: :user, content: 'Hello there', agent_name: nil },
{ role: :assistant, content: 'Hi! How can I help you?', agent_name: 'Assistant' },
@@ -306,6 +307,60 @@ RSpec.describe Captain::Assistant::AgentRunnerService do
end
end
+ describe '#add_usage_metadata_callback' do
+ it 'sets credits_used=false when handoff tool is used' do
+ service = described_class.new(assistant: assistant, conversation: conversation)
+ runner = instance_double(Agents::AgentRunner)
+ tool_complete_callback = nil
+ run_complete_callback = nil
+ span_class = Class.new do
+ def set_attribute(*); end
+ end
+ root_span = instance_double(span_class)
+ context_wrapper = Struct.new(:context).new({ __otel_tracing: { root_span: root_span } })
+
+ allow(ChatwootApp).to receive(:otel_enabled?).and_return(true)
+ allow(runner).to receive(:on_tool_complete) do |&block|
+ tool_complete_callback = block
+ runner
+ end
+ allow(runner).to receive(:on_run_complete) do |&block|
+ run_complete_callback = block
+ runner
+ end
+
+ service.send(:add_usage_metadata_callback, runner)
+
+ tool_complete_callback.call(Captain::Tools::HandoffTool.new(assistant).name, 'ok', context_wrapper)
+
+ expect(root_span).to receive(:set_attribute).with('langfuse.trace.metadata.credits_used', false)
+ run_complete_callback.call('assistant', nil, context_wrapper)
+ end
+
+ it 'sets credits_used=true when handoff tool is not used' do
+ service = described_class.new(assistant: assistant, conversation: conversation)
+ runner = instance_double(Agents::AgentRunner)
+ run_complete_callback = nil
+ span_class = Class.new do
+ def set_attribute(*); end
+ end
+ root_span = instance_double(span_class)
+ context_wrapper = Struct.new(:context).new({ __otel_tracing: { root_span: root_span } })
+
+ allow(ChatwootApp).to receive(:otel_enabled?).and_return(true)
+ allow(runner).to receive(:on_tool_complete).and_return(runner)
+ allow(runner).to receive(:on_run_complete) do |&block|
+ run_complete_callback = block
+ runner
+ end
+
+ service.send(:add_usage_metadata_callback, runner)
+
+ expect(root_span).to receive(:set_attribute).with('langfuse.trace.metadata.credits_used', true)
+ run_complete_callback.call('assistant', nil, context_wrapper)
+ end
+ end
+
describe 'constants' do
it 'defines conversation state attributes' do
expect(described_class::CONVERSATION_STATE_ATTRIBUTES).to include(
From aa7e3c2d382bd2696737b058983b3af72fa2853c Mon Sep 17 00:00:00 2001
From: Aakash Bakhle <48802744+aakashb95@users.noreply.github.com>
Date: Tue, 17 Feb 2026 13:30:04 +0530
Subject: [PATCH 023/155] feat: langfuse logging improvements (#13534)
Langfuse logging improvements
## Description
Please include a summary of the change and issue(s) fixed. Also, mention
relevant motivation, context, and any dependencies that this change
requires.
Fixes # (issue)
For reply suggestion: the errors are being stored inside output field,
but observations should be marked as errors.
For assistant: add credit_used metadata to filter handoffs from
ai-replies
For langfuse tool call: add `observation_type=tool`
## Type of change
- [x] Bug fix (non-breaking change which fixes an issue)
## 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.
before:
after:
`credit_used` to filter handoffs from AI replies that cause credit usage
set `observation_type` to `tool`
## 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
- [ ] 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
---
.../helpers/captain/chat_response_helper.rb | 23 +++++++++++++++++++
lib/captain/tool_instrumentation.rb | 9 ++++++++
lib/integrations/llm_instrumentation.rb | 3 +++
.../llm_instrumentation_constants.rb | 1 +
lib/integrations/llm_instrumentation_spans.rb | 1 +
5 files changed, 37 insertions(+)
diff --git a/enterprise/app/helpers/captain/chat_response_helper.rb b/enterprise/app/helpers/captain/chat_response_helper.rb
index e0323996f..bfb8adc11 100644
--- a/enterprise/app/helpers/captain/chat_response_helper.rb
+++ b/enterprise/app/helpers/captain/chat_response_helper.rb
@@ -1,10 +1,13 @@
module Captain::ChatResponseHelper
+ include Integrations::LlmInstrumentationConstants
+
private
def build_response(response)
Rails.logger.debug { "#{self.class.name} Assistant: #{@assistant.id}, Received response #{response}" }
parsed = parse_json_response(response.content)
+ apply_credit_usage_metadata(parsed)
persist_message(parsed, 'assistant')
parsed
@@ -19,6 +22,26 @@ module Captain::ChatResponseHelper
{ 'content' => content }
end
+ def apply_credit_usage_metadata(parsed_response)
+ return unless captain_v1_assistant?
+
+ OpenTelemetry::Trace.current_span.set_attribute(
+ format(ATTR_LANGFUSE_METADATA, 'credit_used'),
+ credit_used_for_response?(parsed_response).to_s
+ )
+ rescue StandardError => e
+ Rails.logger.warn "#{self.class.name} Assistant: #{@assistant.id}, Failed to set credit usage metadata: #{e.message}"
+ end
+
+ def credit_used_for_response?(parsed_response)
+ response = parsed_response['response']
+ response.present? && response != 'conversation_handoff'
+ end
+
+ def captain_v1_assistant?
+ feature_name == 'assistant' && !@assistant.account.feature_enabled?('captain_integration_v2')
+ end
+
def persist_thinking_message(tool_call)
return if @copilot_thread.blank?
diff --git a/lib/captain/tool_instrumentation.rb b/lib/captain/tool_instrumentation.rb
index af79a3fca..157aab829 100644
--- a/lib/captain/tool_instrumentation.rb
+++ b/lib/captain/tool_instrumentation.rb
@@ -15,6 +15,7 @@ module Captain::ToolInstrumentation
response = yield
executed = true
span.set_attribute(ATTR_LANGFUSE_OBSERVATION_OUTPUT, response[:message] || response.to_json)
+ set_tool_session_error_attributes(span, response) if response.is_a?(Hash)
end
response
rescue StandardError => e
@@ -29,6 +30,14 @@ module Captain::ToolInstrumentation
span.set_attribute(ATTR_LANGFUSE_OBSERVATION_INPUT, params[:messages].to_json)
end
+ def set_tool_session_error_attributes(span, response)
+ error = response[:error] || response['error']
+ return if error.blank?
+
+ span.set_attribute(ATTR_GEN_AI_RESPONSE_ERROR, error.to_json)
+ span.status = OpenTelemetry::Trace::Status.error(error.to_s.truncate(1000))
+ end
+
def record_generation(chat, message, model)
return unless ChatwootApp.otel_enabled?
return unless message.respond_to?(:role) && message.role.to_s == 'assistant'
diff --git a/lib/integrations/llm_instrumentation.rb b/lib/integrations/llm_instrumentation.rb
index c3baf291e..326bb901e 100644
--- a/lib/integrations/llm_instrumentation.rb
+++ b/lib/integrations/llm_instrumentation.rb
@@ -37,6 +37,7 @@ module Integrations::LlmInstrumentation
result = yield
executed = true
span.set_attribute(ATTR_LANGFUSE_OBSERVATION_OUTPUT, result.to_json)
+ set_error_attributes(span, result) if result.is_a?(Hash)
result
end
rescue StandardError => e
@@ -50,9 +51,11 @@ module Integrations::LlmInstrumentation
return yield unless ChatwootApp.otel_enabled?
tracer.in_span(format(TOOL_SPAN_NAME, tool_name)) do |span|
+ span.set_attribute(ATTR_LANGFUSE_OBSERVATION_TYPE, 'tool')
span.set_attribute(ATTR_LANGFUSE_OBSERVATION_INPUT, arguments.to_json)
result = yield
span.set_attribute(ATTR_LANGFUSE_OBSERVATION_OUTPUT, result.to_json)
+ set_error_attributes(span, result) if result.is_a?(Hash)
result
end
end
diff --git a/lib/integrations/llm_instrumentation_constants.rb b/lib/integrations/llm_instrumentation_constants.rb
index 6ce296ee9..dfe1e7704 100644
--- a/lib/integrations/llm_instrumentation_constants.rb
+++ b/lib/integrations/llm_instrumentation_constants.rb
@@ -26,6 +26,7 @@ module Integrations::LlmInstrumentationConstants
ATTR_LANGFUSE_METADATA = 'langfuse.trace.metadata.%s'
ATTR_LANGFUSE_TRACE_INPUT = 'langfuse.trace.input'
ATTR_LANGFUSE_TRACE_OUTPUT = 'langfuse.trace.output'
+ ATTR_LANGFUSE_OBSERVATION_TYPE = 'langfuse.observation.type'
ATTR_LANGFUSE_OBSERVATION_INPUT = 'langfuse.observation.input'
ATTR_LANGFUSE_OBSERVATION_OUTPUT = 'langfuse.observation.output'
end
diff --git a/lib/integrations/llm_instrumentation_spans.rb b/lib/integrations/llm_instrumentation_spans.rb
index 824b6aa4a..85ea599f8 100644
--- a/lib/integrations/llm_instrumentation_spans.rb
+++ b/lib/integrations/llm_instrumentation_spans.rb
@@ -39,6 +39,7 @@ module Integrations::LlmInstrumentationSpans
tool_name = tool_call.name.to_s
span = tracer.start_span(format(TOOL_SPAN_NAME, tool_name))
+ span.set_attribute(ATTR_LANGFUSE_OBSERVATION_TYPE, 'tool')
span.set_attribute(ATTR_LANGFUSE_OBSERVATION_INPUT, tool_call.arguments.to_json)
@pending_tool_spans ||= []
From cfe3061b5d7ca88738a5fa2df841dc4d3f61b9da Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Tue, 17 Feb 2026 13:30:55 +0530
Subject: [PATCH 024/155] feat: Allow removing labels via conversation context
menu (#13525)
# Pull Request Template
## Description
This PR adds support for removing labels from the conversation card
context menu. Assigned labels now show a checkmark, and clicking an
already-selected label will remove it.
Fixes
https://linear.app/chatwoot/issue/CW-6400/allow-removing-labels-directly-from-the-right-click-menu
https://github.com/chatwoot/chatwoot/issues/13367
## Type of change
- [x] New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
**Screencast**
https://github.com/user-attachments/assets/4e3a6080-a67d-4851-9d10-d8dbf3ceeb04
## 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
- [ ] 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
- [ ] Any dependent changes have been merged and published in downstream
modules
---
.../dashboard/components/ChatList.vue | 2 ++
.../dashboard/components/ConversationItem.vue | 2 ++
.../widgets/conversation/ConversationCard.vue | 8 ++++++-
.../conversation/contextMenu/Index.vue | 17 ++++++++++++--
.../conversation/contextMenu/menuItem.vue | 10 +++++++-
.../composables/chatlist/useBulkActions.js | 23 +++++++++++++++++++
.../i18n/locale/en/conversation.json | 4 ++++
7 files changed, 62 insertions(+), 4 deletions(-)
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 08e2057e4..3b2a66929 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -145,6 +145,7 @@ const {
isConversationSelected,
onAssignAgent,
onAssignLabels,
+ onRemoveLabels,
onAssignTeamsForBulk,
onUpdateConversations,
} = useBulkActions();
@@ -859,6 +860,7 @@ provide('deSelectConversation', deSelectConversation);
provide('assignAgent', onAssignAgent);
provide('assignTeam', onAssignTeam);
provide('assignLabels', onAssignLabels);
+provide('removeLabels', onRemoveLabels);
provide('updateConversationStatus', handleResolveConversation);
provide('toggleContextMenu', onContextMenuToggle);
provide('markAsUnread', markAsUnread);
diff --git a/app/javascript/dashboard/components/ConversationItem.vue b/app/javascript/dashboard/components/ConversationItem.vue
index a705dd067..fcd41ad45 100644
--- a/app/javascript/dashboard/components/ConversationItem.vue
+++ b/app/javascript/dashboard/components/ConversationItem.vue
@@ -10,6 +10,7 @@ export default {
'assignAgent',
'assignTeam',
'assignLabels',
+ 'removeLabels',
'updateConversationStatus',
'toggleContextMenu',
'markAsUnread',
@@ -63,6 +64,7 @@ export default {
@assign-agent="assignAgent"
@assign-team="assignTeam"
@assign-label="assignLabels"
+ @remove-label="removeLabels"
@update-conversation-status="updateConversationStatus"
@context-menu-toggle="toggleContextMenu"
@mark-as-unread="markAsUnread"
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index 5093e5c4b..9f7805b4e 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -34,6 +34,7 @@ const emit = defineEmits([
'contextMenuToggle',
'assignAgent',
'assignLabel',
+ 'removeLabel',
'assignTeam',
'markAsUnread',
'markAsRead',
@@ -203,7 +204,10 @@ const onAssignAgent = agent => {
const onAssignLabel = label => {
emit('assignLabel', [label.title], [props.chat.id]);
- closeContextMenu();
+};
+
+const onRemoveLabel = label => {
+ emit('removeLabel', [label.title], [props.chat.id]);
};
const onAssignTeam = team => {
@@ -379,11 +383,13 @@ const deleteConversation = () => {
:priority="chat.priority"
:chat-id="chat.id"
:has-unread-messages="hasUnread"
+ :conversation-labels="chat.labels"
:conversation-url="conversationPath"
:allowed-options="allowedContextMenuOptions"
@update-conversation="onUpdateConversation"
@assign-agent="onAssignAgent"
@assign-label="onAssignLabel"
+ @remove-label="onRemoveLabel"
@assign-team="onAssignTeam"
@mark-as-unread="markAsUnread"
@mark-as-read="markAsRead"
diff --git a/app/javascript/dashboard/components/widgets/conversation/contextMenu/Index.vue b/app/javascript/dashboard/components/widgets/conversation/contextMenu/Index.vue
index a6f79500a..34009935c 100644
--- a/app/javascript/dashboard/components/widgets/conversation/contextMenu/Index.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/contextMenu/Index.vue
@@ -53,6 +53,10 @@ export default {
type: String,
default: null,
},
+ conversationLabels: {
+ type: Array,
+ default: () => [],
+ },
conversationUrl: {
type: String,
default: '',
@@ -70,6 +74,7 @@ export default {
'assignAgent',
'assignTeam',
'assignLabel',
+ 'removeLabel',
'deleteConversation',
'close',
],
@@ -334,8 +339,16 @@ export default {
v-for="label in labels"
:key="label.id"
:option="generateMenuLabelConfig(label, 'label')"
- variant="label"
- @click.stop="$emit('assignLabel', label)"
+ :variant="
+ conversationLabels.includes(label.title)
+ ? 'label-assigned'
+ : 'label'
+ "
+ @click.stop="
+ conversationLabels.includes(label.title)
+ ? $emit('removeLabel', label)
+ : $emit('assignLabel', label)
+ "
/>
import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
+import Icon from 'dashboard/components-next/icon/Icon.vue';
defineProps({
option: {
@@ -22,7 +23,9 @@ defineProps({
class="flex-shrink-0"
/>
@@ -37,6 +40,11 @@ defineProps({
+
diff --git a/app/javascript/dashboard/composables/chatlist/useBulkActions.js b/app/javascript/dashboard/composables/chatlist/useBulkActions.js
index a32c4c512..45421b978 100644
--- a/app/javascript/dashboard/composables/chatlist/useBulkActions.js
+++ b/app/javascript/dashboard/composables/chatlist/useBulkActions.js
@@ -102,6 +102,28 @@ export function useBulkActions() {
}
}
+ // Only used in context menu
+ async function onRemoveLabels(labelsToRemove, conversationId = null) {
+ try {
+ await store.dispatch('bulkActions/process', {
+ type: 'Conversation',
+ ids: conversationId || selectedConversations.value,
+ labels: {
+ remove: labelsToRemove,
+ },
+ });
+
+ useAlert(
+ t('CONVERSATION.CARD_CONTEXT_MENU.API.LABEL_REMOVAL.SUCCESFUL', {
+ labelName: labelsToRemove[0],
+ conversationId,
+ })
+ );
+ } catch (err) {
+ useAlert(t('CONVERSATION.CARD_CONTEXT_MENU.API.LABEL_REMOVAL.FAILED'));
+ }
+ }
+
async function onAssignTeamsForBulk(team) {
try {
await store.dispatch('bulkActions/process', {
@@ -189,6 +211,7 @@ export function useBulkActions() {
isConversationSelected,
onAssignAgent,
onAssignLabels,
+ onRemoveLabels,
onAssignTeamsForBulk,
onUpdateConversations,
};
diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index 99e0bb072..c1c87bc0c 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -174,6 +174,10 @@
"SUCCESFUL": "Assigned label #{labelName} to conversation id {conversationId}",
"FAILED": "Couldn't assign label. Please try again."
},
+ "LABEL_REMOVAL": {
+ "SUCCESFUL": "Removed label #{labelName} from conversation id {conversationId}",
+ "FAILED": "Couldn't remove label. Please try again."
+ },
"TEAM_ASSIGNMENT": {
"SUCCESFUL": "Assigned team \"{team}\" to conversation id {conversationId}",
"FAILED": "Couldn't assign team. Please try again."
From fb2f5e1d427540729f16d5e33551b24357eaeba7 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Tue, 17 Feb 2026 13:57:44 +0530
Subject: [PATCH 025/155] fix: Persist compose form state on accidental outside
click (#13529)
---
.../NewConversation/ComposeConversation.vue | 38 +++++++++++++++++--
.../components/ComposeNewConversationForm.vue | 7 ++--
2 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/app/javascript/dashboard/components-next/NewConversation/ComposeConversation.vue b/app/javascript/dashboard/components-next/NewConversation/ComposeConversation.vue
index ee71bf51a..8e24f3d50 100644
--- a/app/javascript/dashboard/components-next/NewConversation/ComposeConversation.vue
+++ b/app/javascript/dashboard/components-next/NewConversation/ComposeConversation.vue
@@ -1,5 +1,5 @@
-
-
- We're sorry, but something went wrong.
-If you are the application owner check the logs for more information.
+
+
From d272a64ff7e66d4b04592d3ea635a3ebc04ecf6e Mon Sep 17 00:00:00 2001
From: Sojan Jose 500
+ Something went wrong
+An unexpected error occurred. Please refresh the page or try again shortly.
+ + + Back to home + + +If the problem persists, please try again in a few minutes.
+
{
+ // Skip if editor is disabled (e.g., WhatsApp 24-hour window expired)
+ if (props.isEditorDisabled) return;
+
// TODO: This is really hacky, we need to replace the file picker component with
// a custom one, where the logic and the component markup is isolated.
// Once we have the custom component, we can remove the hacky logic below.
@@ -146,7 +153,7 @@ export default {
const uploadTriggerButton = document.querySelector(
'#conversationAttachment'
);
- uploadTriggerButton.click();
+ if (uploadTriggerButton) uploadTriggerButton.click();
},
allowOnFocusedInput: true,
},
@@ -177,9 +184,11 @@ export default {
};
},
showAttachButton() {
+ if (this.isEditorDisabled) return false;
return this.showFileUpload || this.isNote;
},
showAudioRecorderButton() {
+ if (this.isEditorDisabled) return false;
if (this.isALineChannel) {
return false;
}
@@ -197,6 +206,7 @@ export default {
);
},
showAudioPlayStopButton() {
+ if (this.isEditorDisabled) return false;
return this.showAudioRecorder && this.isRecordingAudio;
},
isInstagramDM() {
@@ -236,6 +246,7 @@ export default {
}
},
showMessageSignatureButton() {
+ if (this.isEditorDisabled) return false;
return !this.isOnPrivateNote;
},
sendWithSignature() {
@@ -280,6 +291,7 @@ export default {
Date: Tue, 17 Feb 2026 15:40:50 +0530
Subject: [PATCH 028/155] fix: typo in metadata key in captain v2 (#13558)
# Pull Request Template
## Description
## Type of change
typo fix
## 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.
## 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
---
.../services/captain/assistant/agent_runner_service.rb | 4 ++--
.../captain/assistant/agent_runner_service_spec.rb | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/enterprise/app/services/captain/assistant/agent_runner_service.rb b/enterprise/app/services/captain/assistant/agent_runner_service.rb
index a40e096e6..c832da93e 100644
--- a/enterprise/app/services/captain/assistant/agent_runner_service.rb
+++ b/enterprise/app/services/captain/assistant/agent_runner_service.rb
@@ -189,8 +189,8 @@ class Captain::Assistant::AgentRunnerService
root_span = context_wrapper&.context&.dig(:__otel_tracing, :root_span)
return unless root_span
- credits_used = !context_wrapper.context[:captain_v2_handoff_tool_called]
- root_span.set_attribute(format(ATTR_LANGFUSE_METADATA, 'credits_used'), credits_used)
+ credit_used = !context_wrapper.context[:captain_v2_handoff_tool_called]
+ root_span.set_attribute(format(ATTR_LANGFUSE_METADATA, 'credit_used'), credit_used.to_s)
end
def add_agent_thinking_callback(runner)
diff --git a/spec/enterprise/services/captain/assistant/agent_runner_service_spec.rb b/spec/enterprise/services/captain/assistant/agent_runner_service_spec.rb
index 04fa0f967..bbf712622 100644
--- a/spec/enterprise/services/captain/assistant/agent_runner_service_spec.rb
+++ b/spec/enterprise/services/captain/assistant/agent_runner_service_spec.rb
@@ -308,7 +308,7 @@ RSpec.describe Captain::Assistant::AgentRunnerService do
end
describe '#add_usage_metadata_callback' do
- it 'sets credits_used=false when handoff tool is used' do
+ it 'sets credit_used=false when handoff tool is used' do
service = described_class.new(assistant: assistant, conversation: conversation)
runner = instance_double(Agents::AgentRunner)
tool_complete_callback = nil
@@ -333,11 +333,11 @@ RSpec.describe Captain::Assistant::AgentRunnerService do
tool_complete_callback.call(Captain::Tools::HandoffTool.new(assistant).name, 'ok', context_wrapper)
- expect(root_span).to receive(:set_attribute).with('langfuse.trace.metadata.credits_used', false)
+ expect(root_span).to receive(:set_attribute).with('langfuse.trace.metadata.credit_used', 'false')
run_complete_callback.call('assistant', nil, context_wrapper)
end
- it 'sets credits_used=true when handoff tool is not used' do
+ it 'sets credit_used=true when handoff tool is not used' do
service = described_class.new(assistant: assistant, conversation: conversation)
runner = instance_double(Agents::AgentRunner)
run_complete_callback = nil
@@ -356,7 +356,7 @@ RSpec.describe Captain::Assistant::AgentRunnerService do
service.send(:add_usage_metadata_callback, runner)
- expect(root_span).to receive(:set_attribute).with('langfuse.trace.metadata.credits_used', true)
+ expect(root_span).to receive(:set_attribute).with('langfuse.trace.metadata.credit_used', 'true')
run_complete_callback.call('assistant', nil, context_wrapper)
end
end
From 229f56d6e3422979ef52bcd2d9093df8aeb8303c Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Tue, 17 Feb 2026 16:40:12 +0530
Subject: [PATCH 029/155] chore: Remove `vue-multiselect` and migrate to next
components (#13506)
# Pull Request Template
## Description
This PR includes:
1. Removes multiselect usage from the Merge Contact modal (Conversation
sidebar) and replaces it with the existing component used on the Contact
Details page.
2. Replaces legacy form and multiselect elements in Add and Edit
automations flows with next components.**(Also check Macros)**
3. Replace multiselect with ComboBox in contact form country field.
4. Replace multiselect with TagInput in create/edit attribute form.
5. Replace multiselect with TagInput for agent selection in inbox
creation.
6. Replace multiselect with ComboBox in Facebook channel page selection
## Type of change
- [x] New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
**Screenshots**
1. **Merge modal**
2. **Automations**
3. **Country field**
4. **Add/Edit attribute form**
5. **Agent selection in inbox creation**
7. **Facebook channel page selection**
## 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
- [ ] Any dependent changes have been merged and published in downstream
modules
---------
Co-authored-by: Shivam Mishra
---
.../ContactListHeaderWrapper.vue | 3 +-
.../components/EmailOptions.vue | 2 +
.../components-next/combobox/ComboBox.vue | 9 +-
.../components-next/dialog/Dialog.vue | 22 +-
.../dropdown-menu/base/DropdownSection.vue | 9 +-
.../components-next/filter/ConditionRow.vue | 16 +-
.../filter/inputs/FilterSelect.vue | 27 +-
.../filter/inputs/MultiSelect.vue | 8 +-
.../filter/inputs/SingleSelect.vue | 16 +-
.../components-next/taginput/TagInput.vue | 59 ++-
.../helper/spec/tagInputHelper.spec.js | 65 +++
.../taginput/helper/tagInputHelper.js | 14 +-
.../widgets/AutomationActionInput.vue | 264 ++++-------
.../AutomationActionTeamMessageInput.vue | 58 +--
.../widgets/AutomationFileInput.vue | 2 +-
.../components/widgets/FilterInput/Index.vue | 305 -------------
.../dashboard/composables/useAutomation.js | 16 +-
.../dashboard/helper/automationHelper.js | 8 +-
.../modules/contact/ContactMergeModal.vue | 162 +++----
.../components/ContactDropdownItem.vue | 87 ----
.../contact/components/MergeContact.vue | 268 ++++--------
.../conversation/contact/ContactForm.vue | 53 ++-
.../conversation/contact/ContactInfo.vue | 13 +-
.../settings/attributes/AddAttribute.vue | 86 ++--
.../settings/attributes/EditAttribute.vue | 78 ++--
.../settings/automation/AddAutomationRule.vue | 381 +++-------------
.../automation/AutomationRuleForm.vue | 414 ++++++++++++++++++
.../automation/EditAutomationRule.vue | 401 +++--------------
.../dashboard/settings/automation/Index.vue | 43 +-
.../dashboard/settings/inbox/AddAgents.vue | 71 ++-
.../settings/inbox/channels/Facebook.vue | 44 +-
31 files changed, 1209 insertions(+), 1795 deletions(-)
delete mode 100644 app/javascript/dashboard/components/widgets/FilterInput/Index.vue
delete mode 100644 app/javascript/dashboard/modules/contact/components/ContactDropdownItem.vue
create mode 100644 app/javascript/dashboard/routes/dashboard/settings/automation/AutomationRuleForm.vue
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsHeader/ContactListHeaderWrapper.vue b/app/javascript/dashboard/components-next/Contacts/ContactsHeader/ContactListHeaderWrapper.vue
index 0b4880264..3d4b5c8a5 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsHeader/ContactListHeaderWrapper.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsHeader/ContactListHeaderWrapper.vue
@@ -68,8 +68,7 @@ const hasActiveSegments = computed(
);
const activeSegmentName = computed(() => props.activeSegment?.name);
-const openCreateNewContactDialog = async () => {
- await createNewContactDialogRef.value?.contactsFormRef.resetValidation();
+const openCreateNewContactDialog = () => {
createNewContactDialogRef.value?.dialogRef.open();
};
const openContactImportDialog = () =>
diff --git a/app/javascript/dashboard/components-next/NewConversation/components/EmailOptions.vue b/app/javascript/dashboard/components-next/NewConversation/components/EmailOptions.vue
index ac7e8d659..4e0c71adb 100644
--- a/app/javascript/dashboard/components-next/NewConversation/components/EmailOptions.vue
+++ b/app/javascript/dashboard/components-next/NewConversation/components/EmailOptions.vue
@@ -95,6 +95,7 @@ const inputClass = computed(() => {
:show-dropdown="showCcEmailsDropdown"
:is-loading="isLoading"
type="email"
+ allow-create
class="flex-1 min-h-7"
@focus="emit('updateDropdown', 'cc', true)"
@input="emit('searchCcEmails', $event)"
@@ -127,6 +128,7 @@ const inputClass = computed(() => {
:show-dropdown="showBccEmailsDropdown"
:is-loading="isLoading"
type="email"
+ allow-create
class="flex-1 min-h-7"
focus-on-mount
@focus="emit('updateDropdown', 'bcc', true)"
diff --git a/app/javascript/dashboard/components-next/combobox/ComboBox.vue b/app/javascript/dashboard/components-next/combobox/ComboBox.vue
index d50134e88..58d9e634d 100644
--- a/app/javascript/dashboard/components-next/combobox/ComboBox.vue
+++ b/app/javascript/dashboard/components-next/combobox/ComboBox.vue
@@ -56,8 +56,13 @@ const selectedLabel = computed(() => {
});
const selectOption = option => {
- selectedValue.value = option.value;
- emit('update:modelValue', option.value);
+ if (selectedValue.value === option.value) {
+ selectedValue.value = '';
+ emit('update:modelValue', '');
+ } else {
+ selectedValue.value = option.value;
+ emit('update:modelValue', option.value);
+ }
open.value = false;
search.value = '';
};
diff --git a/app/javascript/dashboard/components-next/dialog/Dialog.vue b/app/javascript/dashboard/components-next/dialog/Dialog.vue
index 78ca5206b..8a5439554 100644
--- a/app/javascript/dashboard/components-next/dialog/Dialog.vue
+++ b/app/javascript/dashboard/components-next/dialog/Dialog.vue
@@ -53,6 +53,11 @@ const props = defineProps({
default: 'lg',
validator: value => ['3xl', '2xl', 'xl', 'lg', 'md', 'sm'].includes(value),
},
+ position: {
+ type: String,
+ default: 'center',
+ validator: value => ['center', 'top'].includes(value),
+ },
});
const emit = defineEmits(['confirm', 'close']);
@@ -61,6 +66,7 @@ const { t } = useI18n();
const dialogRef = ref(null);
const dialogContentRef = ref(null);
+const isOpen = ref(false);
const maxWidthClass = computed(() => {
const classesMap = {
@@ -75,13 +81,19 @@ const maxWidthClass = computed(() => {
return classesMap[props.width] ?? 'max-w-md';
});
+const positionClass = computed(() =>
+ props.position === 'top' ? 'dialog-position-top' : ''
+);
+
const open = () => {
+ isOpen.value = true;
dialogRef.value?.showModal();
};
const close = () => {
emit('close');
dialogRef.value?.close();
+ isOpen.value = false;
};
const confirm = () => {
@@ -98,6 +110,7 @@ defineExpose({ open, close });
class="w-full transition-all duration-300 ease-in-out shadow-xl rounded-xl"
:class="[
maxWidthClass,
+ positionClass,
overflowYAuto ? 'overflow-y-auto' : 'overflow-visible',
]"
@close="close"
@@ -105,7 +118,7 @@ defineExpose({ open, close });
-
diff --git a/app/javascript/dashboard/components-next/filter/ConditionRow.vue b/app/javascript/dashboard/components-next/filter/ConditionRow.vue
index c74879a58..510ddbde3 100644
--- a/app/javascript/dashboard/components-next/filter/ConditionRow.vue
+++ b/app/javascript/dashboard/components-next/filter/ConditionRow.vue
@@ -50,12 +50,12 @@ const currentFilter = computed(() =>
);
const getOperator = (filter, selectedOperator) => {
- const operatorFromOptions = filter.filterOperators.find(
+ const operatorFromOptions = filter?.filterOperators?.find(
operator => operator.value === selectedOperator
);
if (!operatorFromOptions) {
- return filter.filterOperators[0];
+ return filter?.filterOperators?.[0];
}
return operatorFromOptions;
@@ -138,7 +138,11 @@ const validate = () => {
return !validationError.value;
};
-defineExpose({ validate });
+const resetValidation = () => {
+ showErrors.value = false;
+};
+
+defineExpose({ validate, resetValidation });
@@ -166,18 +170,20 @@ defineExpose({ validate });
{
- return props.options.find(o => o.value === selected.value) || {};
+ return props.options?.find(o => o.value === selected.value) || {};
});
const iconToRender = computed(() => {
@@ -87,18 +87,25 @@ const updateSelected = newValue => {
-
-
+
+
+ {{ option.label }}
+
+
diff --git a/app/javascript/dashboard/components-next/filter/inputs/MultiSelect.vue b/app/javascript/dashboard/components-next/filter/inputs/MultiSelect.vue
index 7f6bab135..f64c8eb76 100644
--- a/app/javascript/dashboard/components-next/filter/inputs/MultiSelect.vue
+++ b/app/javascript/dashboard/components-next/filter/inputs/MultiSelect.vue
@@ -8,7 +8,7 @@ import DropdownSection from 'next/dropdown-menu/base/DropdownSection.vue';
import DropdownBody from 'next/dropdown-menu/base/DropdownBody.vue';
import DropdownItem from 'next/dropdown-menu/base/DropdownItem.vue';
-const { options, maxChips } = defineProps({
+const { options, maxChips, dropdownMaxHeight } = defineProps({
options: {
type: Array,
required: true,
@@ -17,6 +17,10 @@ const { options, maxChips } = defineProps({
type: Number,
default: 3,
},
+ dropdownMaxHeight: {
+ type: String,
+ default: 'max-h-80',
+ },
});
const { t } = useI18n();
@@ -123,7 +127,7 @@ const toggleOption = option => {
-
+
{
const optionToSearch = Array.isArray(selected.value)
? selected.value[0]
: selected.value;
+
+ if (!optionToSearch) return null;
// extract the selected item from the options array
// this ensures that options like icon is also included
return options.find(option => option.id === optionToSearch.id);
@@ -77,7 +89,7 @@ const toggleSelected = option => {
};
if (selected.value && selected.value.id === optionToToggle.id) {
- selected.value = null;
+ if (!disableDeselect) selected.value = null;
} else {
selected.value = optionToToggle;
}
@@ -124,7 +136,7 @@ const toggleSelected = option => {
:placeholder="searchPlaceholder || t('COMBOBOX.SEARCH_PLACEHOLDER')"
/>
-
+
getValidationRules(props.type));
const v$ = useVuelidate(rules, { newTag });
@@ -74,11 +79,11 @@ const showInput = computed(() =>
const showDropdownMenu = computed(() =>
props.mode === MODE.SINGLE && tags.value.length >= 1
? false
- : props.showDropdown
+ : props.showDropdown && isFocused.value
);
-const filteredMenuItems = computed(() =>
- buildTagMenuItems({
+const filteredMenuItems = computed(() => {
+ const items = buildTagMenuItems({
mode: props.mode,
tags: tags.value,
menuItems: props.menuItems,
@@ -86,8 +91,14 @@ const filteredMenuItems = computed(() =>
isLoading: props.isLoading,
type: props.type,
isNewTagInValidType: isNewTagInValidType.value,
- })
-);
+ allowCreate: props.allowCreate,
+ skipLabelDedup: props.skipLabelDedup,
+ });
+ if (props.type !== INPUT_TYPES.TEXT) return items;
+ const query = newTag.value?.trim()?.toLowerCase();
+ if (!query) return items;
+ return items.filter(item => item.label?.toLowerCase().includes(query));
+});
const emitDataOnAdd = value => {
const matchingMenuItem = findMatchingMenuItem(props.menuItems, value);
@@ -112,10 +123,13 @@ const addTag = async () => {
return;
}
- if (
- [INPUT_TYPES.EMAIL, INPUT_TYPES.TEL].includes(props.type) ||
- props.allowCreate
- ) {
+ const isValidatedType = [INPUT_TYPES.EMAIL, INPUT_TYPES.TEL].includes(
+ props.type
+ );
+
+ if (!isValidatedType && !props.allowCreate && props.showDropdown) return;
+
+ if (isValidatedType || props.allowCreate) {
if (!(await v$.value.$validate())) return;
emitDataOnAdd(trimmedTag);
}
@@ -125,28 +139,31 @@ const addTag = async () => {
const removeTag = index => {
tags.value.splice(index, 1);
modelValue.value = tags.value;
- emit('remove');
+ emit('remove', index);
};
const handleDropdownAction = async ({
email: emailAddress,
phoneNumber,
+ label,
...rest
}) => {
if (props.mode === MODE.SINGLE && tags.value.length >= 1) return;
if (!props.showDropdown) return;
- const isEmail = props.type === 'email';
- newTag.value = isEmail ? emailAddress : phoneNumber;
+ const isEmail = props.type === INPUT_TYPES.EMAIL;
+ const tagValue = isEmail ? emailAddress : phoneNumber || label;
- if (!(await v$.value.$validate())) return;
+ if (isEmail || props.type === INPUT_TYPES.TEL) {
+ newTag.value = tagValue;
+ if (!(await v$.value.$validate())) return;
+ }
- const payload = isEmail
- ? { email: emailAddress, ...rest }
- : { phoneNumber, ...rest };
-
- emit('add', payload);
- updateValueAndFocus(emailAddress);
+ emit(
+ 'add',
+ isEmail ? { email: emailAddress, ...rest } : { phoneNumber, label, ...rest }
+ );
+ updateValueAndFocus(tagValue);
};
const handleFocus = () => {
@@ -163,7 +180,7 @@ const handleKeydown = event => {
};
const handleClickOutside = () => {
- if (tags.value.length) isFocused.value = false;
+ isFocused.value = false;
emit('onClickOutside');
};
diff --git a/app/javascript/dashboard/components-next/taginput/helper/spec/tagInputHelper.spec.js b/app/javascript/dashboard/components-next/taginput/helper/spec/tagInputHelper.spec.js
index f1886de22..24ab3339e 100644
--- a/app/javascript/dashboard/components-next/taginput/helper/spec/tagInputHelper.spec.js
+++ b/app/javascript/dashboard/components-next/taginput/helper/spec/tagInputHelper.spec.js
@@ -261,6 +261,71 @@ describe('tagInputHelper', () => {
});
expect(result).toEqual(menuItems);
});
+
+ it('does not create suggestion when allowCreate is false', () => {
+ const result = buildTagMenuItems({
+ ...baseParams,
+ type: INPUT_TYPES.EMAIL,
+ newTag: 'test@example.com',
+ allowCreate: false,
+ });
+ expect(result).toEqual([]);
+ });
+
+ it('still returns available menu items when allowCreate is false', () => {
+ const menuItems = [
+ { label: 'Agent 1', value: '1' },
+ { label: 'Agent 2', value: '2' },
+ ];
+ const result = buildTagMenuItems({
+ ...baseParams,
+ menuItems,
+ newTag: 'Agent',
+ allowCreate: false,
+ });
+ expect(result).toEqual(menuItems);
+ });
+
+ it('creates new item when allowCreate is true (default)', () => {
+ const result = buildTagMenuItems({
+ ...baseParams,
+ type: INPUT_TYPES.EMAIL,
+ newTag: 'test@example.com',
+ allowCreate: true,
+ });
+ expect(result).toHaveLength(1);
+ expect(result[0]).toMatchObject({
+ label: 'test@example.com',
+ action: 'create',
+ });
+ });
+
+ it('skips label dedup when skipLabelDedup is true', () => {
+ const menuItems = [
+ { label: 'HDMA', value: 1 },
+ { label: 'HDMA', value: 2 },
+ ];
+ const result = buildTagMenuItems({
+ ...baseParams,
+ tags: ['HDMA'],
+ menuItems,
+ skipLabelDedup: true,
+ });
+ expect(result).toEqual(menuItems);
+ });
+
+ it('filters by label when skipLabelDedup is false (default)', () => {
+ const menuItems = [
+ { label: 'HDMA', value: 1 },
+ { label: 'HDMA', value: 2 },
+ ];
+ const result = buildTagMenuItems({
+ ...baseParams,
+ tags: ['HDMA'],
+ menuItems,
+ });
+ expect(result).toEqual([]);
+ });
});
describe('canAddTag', () => {
diff --git a/app/javascript/dashboard/components-next/taginput/helper/tagInputHelper.js b/app/javascript/dashboard/components-next/taginput/helper/tagInputHelper.js
index fb0af711e..21426ca7b 100644
--- a/app/javascript/dashboard/components-next/taginput/helper/tagInputHelper.js
+++ b/app/javascript/dashboard/components-next/taginput/helper/tagInputHelper.js
@@ -84,25 +84,29 @@ export const buildTagMenuItems = ({
isLoading,
type,
isNewTagInValidType,
+ allowCreate = true,
+ skipLabelDedup = false,
}) => {
if (mode === MODE.SINGLE && tags.length >= 1) return [];
- const availableMenuItems = menuItems.filter(
- item => !tags.includes(item.label)
- );
+ const availableMenuItems = skipLabelDedup
+ ? menuItems
+ : menuItems.filter(item => !tags.includes(item.label));
// Show typed value as suggestion only if:
// 1. There's a value being typed
// 2. The value isn't already in the tags
// 3. Validation passes (email/phone) and There are no menu items available
+ // 4. allowCreate is enabled
const trimmedNewTag = newTag?.trim();
- const shouldShowTypedValue =
+ const shouldShowCreateSuggestion =
+ allowCreate &&
trimmedNewTag &&
!tags.includes(trimmedNewTag) &&
!isLoading &&
!availableMenuItems.length;
- if (shouldShowTypedValue) {
+ if (shouldShowCreateSuggestion) {
const { isValid, formattedValue } = validateAndFormatNewTag(
trimmedNewTag,
type,
diff --git a/app/javascript/dashboard/components/widgets/AutomationActionInput.vue b/app/javascript/dashboard/components/widgets/AutomationActionInput.vue
index 5f9aa8f0d..b0b30c2fa 100644
--- a/app/javascript/dashboard/components/widgets/AutomationActionInput.vue
+++ b/app/javascript/dashboard/components/widgets/AutomationActionInput.vue
@@ -3,6 +3,9 @@ import AutomationActionTeamMessageInput from './AutomationActionTeamMessageInput
import AutomationActionFileInput from './AutomationFileInput.vue';
import WootMessageEditor from 'dashboard/components/widgets/WootWriter/Editor.vue';
import NextButton from 'dashboard/components-next/button/Button.vue';
+import SingleSelect from 'dashboard/components-next/filter/inputs/SingleSelect.vue';
+import MultiSelect from 'dashboard/components-next/filter/inputs/MultiSelect.vue';
+import NextInput from 'dashboard/components-next/input/Input.vue';
export default {
components: {
@@ -10,6 +13,9 @@ export default {
AutomationActionFileInput,
WootMessageEditor,
NextButton,
+ SingleSelect,
+ MultiSelect,
+ NextInput,
},
props: {
modelValue: {
@@ -40,6 +46,10 @@ export default {
type: Boolean,
default: false,
},
+ dropdownMaxHeight: {
+ type: String,
+ default: 'max-h-80',
+ },
},
emits: ['update:modelValue', 'input', 'removeAction', 'resetAction'],
computed: {
@@ -69,11 +79,21 @@ export default {
return this.actionTypes.find(action => action.key === this.action_name)
.inputType;
},
- actionInputStyles() {
- return {
- 'has-error': this.errorMessage,
- 'is-a-macro': this.isMacro,
- };
+ actionNameAsSelectModel: {
+ get() {
+ if (!this.action_name) return null;
+ const found = this.actionTypes.find(a => a.key === this.action_name);
+ return found ? { id: found.key, name: found.label } : null;
+ },
+ set(value) {
+ this.action_name = value?.id || value;
+ },
+ },
+ actionTypesAsOptions() {
+ return this.actionTypes.map(a => ({ id: a.key, name: a.label }));
+ },
+ isVerticalLayout() {
+ return ['team_message', 'textarea'].includes(this.inputType);
},
castMessageVmodel: {
get() {
@@ -94,203 +114,89 @@ export default {
resetAction() {
this.$emit('resetAction');
},
+ onActionNameChange(value) {
+ this.actionNameAsSelectModel = value;
+ this.resetAction();
+ },
},
};
-
diff --git a/app/javascript/dashboard/components-next/dropdown-menu/base/DropdownSection.vue b/app/javascript/dashboard/components-next/dropdown-menu/base/DropdownSection.vue
index 54872c440..5fc63b85c 100644
--- a/app/javascript/dashboard/components-next/dropdown-menu/base/DropdownSection.vue
+++ b/app/javascript/dashboard/components-next/dropdown-menu/base/DropdownSection.vue
@@ -4,6 +4,10 @@ defineProps({
type: String,
default: '',
},
+ height: {
+ type: String,
+ default: 'max-h-96',
+ },
});
@@ -15,7 +19,10 @@ defineProps({
>
{{ title }}
- -
+
-
-
-
+
+
-
-
diff --git a/app/javascript/dashboard/components/widgets/AutomationActionTeamMessageInput.vue b/app/javascript/dashboard/components/widgets/AutomationActionTeamMessageInput.vue
index 275b292d0..316c9958c 100644
--- a/app/javascript/dashboard/components/widgets/AutomationActionTeamMessageInput.vue
+++ b/app/javascript/dashboard/components/widgets/AutomationActionTeamMessageInput.vue
@@ -1,8 +1,14 @@
-
-
-
-
-
+
+
+
+
-
-
- {{ $t('FORMS.MULTISELECT.NO_OPTIONS') }}
-
-
-
-
+
+
-
-
- {{ $t('FORMS.MULTISELECT.NO_OPTIONS') }}
-
-
-
-
+ + {{ errorMessage }} -
-
-
-
+
diff --git a/app/javascript/dashboard/modules/contact/components/ContactDropdownItem.vue b/app/javascript/dashboard/modules/contact/components/ContactDropdownItem.vue
deleted file mode 100644
index 29f38f11f..000000000
--- a/app/javascript/dashboard/modules/contact/components/ContactDropdownItem.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
- item.name);
+ return this.values;
},
isButtonDisabled() {
return (
this.v$.displayName.$invalid ||
this.v$.description.$invalid ||
this.uiFlags.isCreating ||
- this.isTagInputInvalid
+ this.isTagInputEmpty
);
},
keyErrorMessage() {
@@ -119,17 +120,14 @@ export default {
},
},
+ watch: {
+ attributeType() {
+ this.tagInputTouched = false;
+ this.values = [];
+ },
+ },
+
methods: {
- addTagValue(tagValue) {
- const tag = {
- name: tagValue,
- };
- this.values.push(tag);
- this.$refs.tagInput.$el.focus();
- },
- onTouch() {
- this.isTouched = true;
- },
onDisplayNameChange() {
this.attributeKey = convertToAttributeSlug(this.displayName);
},
@@ -237,27 +235,25 @@ export default {
{{ $t('ATTRIBUTES_MGMT.ADD.FORM.TYPE.ERROR') }}
-
-
+
+
-
-
diff --git a/app/javascript/dashboard/components/widgets/AutomationFileInput.vue b/app/javascript/dashboard/components/widgets/AutomationFileInput.vue
index 1eff406bf..a184c369a 100644
--- a/app/javascript/dashboard/components/widgets/AutomationFileInput.vue
+++ b/app/javascript/dashboard/components/widgets/AutomationFileInput.vue
@@ -79,7 +79,7 @@ input[type='file'] {
@apply hidden;
}
.input-wrapper {
- @apply flex h-9 bg-n-background py-1 px-2 items-center text-xs cursor-pointer rounded-sm border border-dashed border-n-strong;
+ @apply flex h-8 bg-n-background py-1 px-2 items-center text-xs cursor-pointer rounded-lg border border-dashed border-n-strong;
}
.success-icon {
@apply text-n-teal-9 mr-2;
diff --git a/app/javascript/dashboard/components/widgets/FilterInput/Index.vue b/app/javascript/dashboard/components/widgets/FilterInput/Index.vue
deleted file mode 100644
index f38bc814b..000000000
--- a/app/javascript/dashboard/components/widgets/FilterInput/Index.vue
+++ /dev/null
@@ -1,305 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/app/javascript/dashboard/composables/useAutomation.js b/app/javascript/dashboard/composables/useAutomation.js
index 09828513f..f70a5bf3b 100644
--- a/app/javascript/dashboard/composables/useAutomation.js
+++ b/app/javascript/dashboard/composables/useAutomation.js
@@ -1,4 +1,4 @@
-import { ref, computed } from 'vue';
+import { ref, reactive, computed } from 'vue';
import { useStoreGetters } from 'dashboard/composables/store';
import { useAlert } from 'dashboard/composables';
import { useI18n } from 'vue-i18n';
@@ -40,7 +40,7 @@ export function useAutomation(startValue = null) {
} = useAutomationValues();
const automation = ref(startValue);
- const automationTypes = structuredClone(AUTOMATIONS);
+ const automationTypes = reactive(structuredClone(AUTOMATIONS));
const eventName = computed(() => automation.value?.event_name);
/**
@@ -160,14 +160,24 @@ export function useAutomation(startValue = null) {
t('AUTOMATION.CONDITION.CONTACT_CUSTOM_ATTR_LABEL')
);
+ const CUSTOM_ATTR_HEADER_KEYS = new Set([
+ 'conversation_custom_attribute',
+ 'contact_custom_attribute',
+ ]);
+
[
'message_created',
'conversation_created',
'conversation_updated',
'conversation_opened',
].forEach(eventToUpdate => {
+ const standardConditions = automationTypes[
+ eventToUpdate
+ ].conditions.filter(
+ c => !c.customAttributeType && !CUSTOM_ATTR_HEADER_KEYS.has(c.key)
+ );
automationTypes[eventToUpdate].conditions = [
- ...automationTypes[eventToUpdate].conditions,
+ ...standardConditions,
...manifestedCustomAttributes,
];
});
diff --git a/app/javascript/dashboard/helper/automationHelper.js b/app/javascript/dashboard/helper/automationHelper.js
index 3e5f46f90..fa6120c16 100644
--- a/app/javascript/dashboard/helper/automationHelper.js
+++ b/app/javascript/dashboard/helper/automationHelper.js
@@ -169,19 +169,19 @@ export const getFileName = (action, files = []) => {
export const getDefaultConditions = eventName => {
if (eventName === 'message_created') {
- return DEFAULT_MESSAGE_CREATED_CONDITION;
+ return structuredClone(DEFAULT_MESSAGE_CREATED_CONDITION);
}
if (
eventName === 'conversation_opened' ||
eventName === 'conversation_resolved'
) {
- return DEFAULT_CONVERSATION_CONDITION;
+ return structuredClone(DEFAULT_CONVERSATION_CONDITION);
}
- return DEFAULT_OTHER_CONDITION;
+ return structuredClone(DEFAULT_OTHER_CONDITION);
};
export const getDefaultActions = () => {
- return DEFAULT_ACTIONS;
+ return structuredClone(DEFAULT_ACTIONS);
};
export const filterCustomAttributes = customAttributes => {
diff --git a/app/javascript/dashboard/modules/contact/ContactMergeModal.vue b/app/javascript/dashboard/modules/contact/ContactMergeModal.vue
index 6e5105883..8db16d9e5 100644
--- a/app/javascript/dashboard/modules/contact/ContactMergeModal.vue
+++ b/app/javascript/dashboard/modules/contact/ContactMergeModal.vue
@@ -1,91 +1,101 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('FORMS.MULTISELECT.NO_OPTIONS') }}
-
-
-
-
-
-
- {{ $t('FORMS.MULTISELECT.NO_OPTIONS') }}
-
-
-
-
-
-
-
- - {{ errorMessage }} -
-
-
- -
- - -
-
-
-
-
diff --git a/app/javascript/dashboard/modules/contact/components/MergeContact.vue b/app/javascript/dashboard/modules/contact/components/MergeContact.vue
index 85fda4464..29dc6b62d 100644
--- a/app/javascript/dashboard/modules/contact/components/MergeContact.vue
+++ b/app/javascript/dashboard/modules/contact/components/MergeContact.vue
@@ -1,174 +1,105 @@
-
-
-
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactForm.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactForm.vue
index 6298a3f2d..77d4b9773 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactForm.vue
@@ -11,11 +11,13 @@ import { isPhoneNumberValid } from 'shared/helpers/Validators';
import parsePhoneNumber from 'libphonenumber-js';
import NextButton from 'dashboard/components-next/button/Button.vue';
import Avatar from 'next/avatar/Avatar.vue';
+import ComboBox from 'dashboard/components-next/combobox/ComboBox.vue';
export default {
components: {
NextButton,
Avatar,
+ ComboBox,
},
props: {
contact: {
@@ -133,6 +135,12 @@ export default {
if (!name && !id) return '';
return `${name} (${id})`;
},
+ onCountryChange(value) {
+ const selected = this.countries.find(c => c.id === value);
+ this.country = selected
+ ? { id: selected.id, name: selected.name }
+ : { id: '', name: '' };
+ },
setDialCode() {
if (
this.phoneNumber !== '' &&
@@ -363,26 +371,23 @@ export default {
:label="$t('CONTACT_FORM.FORM.COMPANY_NAME.LABEL')"
:placeholder="$t('CONTACT_FORM.FORM.COMPANY_NAME.PLACEHOLDER')"
/>
-
-
- - {{ name }} - - {{ $t('MERGE_CONTACTS.DROPDOWN_ITEM.ID', { identifier }) }} - -
-- - - {{ '---' }} -
-
-
-
-
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
index d1c43b3f2..7392bea78 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
@@ -51,7 +51,6 @@ export default {
data() {
return {
showEditModal: false,
- showMergeModal: false,
showDeleteModal: false,
};
},
@@ -167,11 +166,8 @@ export default {
);
}
},
- closeMergeModal() {
- this.showMergeModal = false;
- },
openMergeModal() {
- this.showMergeModal = true;
+ this.$refs.mergeModal?.open();
},
},
};
@@ -324,12 +320,7 @@ export default {
:contact="contact"
@cancel="toggleEditModal"
/>
-
-
-
+
+
+
-