diff --git a/Gemfile b/Gemfile
index a5068e765..c4989c538 100644
--- a/Gemfile
+++ b/Gemfile
@@ -84,6 +84,7 @@ gem 'barnes'
 gem 'devise', '>= 4.9.4'
 gem 'devise-secure_password', git: 'https://github.com/chatwoot/devise-secure_password', branch: 'chatwoot'
 gem 'devise_token_auth', '>= 1.2.3'
+gem 'rails-i18n', '~> 7.0'
 # two-factor authentication
 gem 'devise-two-factor', '>= 5.0.0'
 # authorization
diff --git a/Gemfile.lock b/Gemfile.lock
index b77e5880f..7d29e0b02 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -727,6 +727,9 @@ GEM
     rails-html-sanitizer (1.6.1)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    rails-i18n (7.0.10)
+      i18n (>= 0.7, < 2)
+      railties (>= 6.0.0, < 8)
     railties (7.1.5.2)
       actionpack (= 7.1.5.2)
       activesupport (= 7.1.5.2)
@@ -1125,6 +1128,7 @@ DEPENDENCIES
   rack-mini-profiler (>= 3.2.0)
   rack-timeout
   rails (~> 7.1)
+  rails-i18n (~> 7.0)
   redis
   redis-namespace
   responders (>= 3.1.1)
diff --git a/app/builders/account_builder.rb b/app/builders/account_builder.rb
index 532487a1b..5127ea612 100644
--- a/app/builders/account_builder.rb
+++ b/app/builders/account_builder.rb
@@ -44,7 +44,11 @@ class AccountBuilder
   end
 
   def create_account
-    @account = Account.create!(name: account_name, locale: I18n.locale)
+    @account = Account.create!(
+      name: account_name,
+      locale: I18n.locale,
+      custom_attributes: { 'onboarding_step' => 'account_details' }
+    )
     Current.account = @account
   end
 
diff --git a/app/builders/agent_builder.rb b/app/builders/agent_builder.rb
index 2fe11cae0..d2715011c 100644
--- a/app/builders/agent_builder.rb
+++ b/app/builders/agent_builder.rb
@@ -29,8 +29,9 @@ class AgentBuilder
     user = User.from_email(email)
     return user if user
 
+    @name = email.split('@').first if @name.blank?
     temp_password = "1!aA#{SecureRandom.alphanumeric(12)}"
-    User.create!(email: email, name: name, password: temp_password, password_confirmation: temp_password)
+    User.create!(email: email, name: @name, password: temp_password, password_confirmation: temp_password)
   end
 
   # Checks if the user needs confirmation.
diff --git a/app/controllers/api/v1/accounts/articles/bulk_actions_controller.rb b/app/controllers/api/v1/accounts/articles/bulk_actions_controller.rb
new file mode 100644
index 000000000..b45c16828
--- /dev/null
+++ b/app/controllers/api/v1/accounts/articles/bulk_actions_controller.rb
@@ -0,0 +1,43 @@
+class Api::V1::Accounts::Articles::BulkActionsController < Api::V1::Accounts::BaseController
+  before_action :portal
+  before_action :check_authorization
+  before_action :set_articles, only: [:update_status, :delete_articles]
+
+  def translate
+    head :not_implemented
+  end
+
+  def update_status
+    return render_could_not_create_error(I18n.t('portals.articles.no_articles_found')) if @articles.none?
+    return render_could_not_create_error(I18n.t('portals.articles.invalid_status')) unless Article.statuses.key?(params[:status])
+
+    ActiveRecord::Base.transaction do
+      @articles.find_each { |article| article.update!(status: params[:status]) }
+    end
+    head :ok
+  rescue ActiveRecord::RecordInvalid => e
+    render_could_not_create_error(e.message)
+  end
+
+  def delete_articles
+    return render_could_not_create_error(I18n.t('portals.articles.no_articles_found')) if @articles.none?
+
+    @articles.destroy_all
+    head :ok
+  end
+
+  private
+
+  def portal
+    @portal ||= Current.account.portals.find_by!(slug: params[:portal_id])
+  end
+
+  def check_authorization
+    authorize(Article, :create?)
+  end
+
+  def set_articles
+    @articles = @portal.articles.where(id: params[:ids])
+  end
+end
+Api::V1::Accounts::Articles::BulkActionsController.prepend_mod_with('Api::V1::Accounts::Articles::BulkActionsController')
diff --git a/app/controllers/api/v1/accounts/contacts_controller.rb b/app/controllers/api/v1/accounts/contacts_controller.rb
index dd5346bd6..eafda0fe2 100644
--- a/app/controllers/api/v1/accounts/contacts_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts_controller.rb
@@ -5,7 +5,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
   sort_on :phone_number, type: :string
   sort_on :last_activity_at, internal_name: :order_on_last_activity_at, type: :scope, scope_params: [:direction]
   sort_on :created_at, internal_name: :order_on_created_at, type: :scope, scope_params: [:direction]
-  sort_on :company, internal_name: :order_on_company_name, type: :scope, scope_params: [:direction]
+  sort_on :company_name, internal_name: :order_on_company_name, type: :scope, scope_params: [:direction]
   sort_on :city, internal_name: :order_on_city, type: :scope, scope_params: [:direction]
   sort_on :country, internal_name: :order_on_country_name, type: :scope, scope_params: [:direction]
 
diff --git a/app/controllers/api/v1/accounts/portals_controller.rb b/app/controllers/api/v1/accounts/portals_controller.rb
index 972b244fa..ade83d8ec 100644
--- a/app/controllers/api/v1/accounts/portals_controller.rb
+++ b/app/controllers/api/v1/accounts/portals_controller.rb
@@ -61,9 +61,8 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
   end
 
   def process_attached_logo
-    blob_id = params[:blob_id]
-    blob = ActiveStorage::Blob.find_signed(blob_id)
-    @portal.logo.attach(blob)
+    blob = ActiveStorage::Blob.find_signed(params[:blob_id].to_s)
+    @portal.logo.attach(blob) if blob
   end
 
   private
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index 7176d6e1b..dddf3dd09 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -58,6 +58,7 @@ class Api::V1::AccountsController < Api::BaseController
     @account.assign_attributes(account_params.slice(:name, :locale, :domain, :support_email))
     @account.custom_attributes.merge!(custom_attributes_params)
     @account.settings.merge!(settings_params)
+    @account.custom_attributes.delete('onboarding_step') if @account.custom_attributes['onboarding_step'] == 'account_details'
     @account.custom_attributes['onboarding_step'] = 'invite_team' if @account.custom_attributes['onboarding_step'] == 'account_update'
     @account.save!
   end
@@ -71,9 +72,10 @@ class Api::V1::AccountsController < Api::BaseController
   private
 
   def enqueue_branding_enrichment
-    return if account_params[:email].blank?
+    email = account_params[:email].presence || @user&.email
+    return if email.blank?
 
-    Account::BrandingEnrichmentJob.perform_later(@account.id, account_params[:email])
+    Account::BrandingEnrichmentJob.perform_later(@account.id, email)
     Redis::Alfred.set(format(Redis::Alfred::ACCOUNT_ONBOARDING_ENRICHMENT, account_id: @account.id), '1', ex: 30)
   rescue StandardError => e
     # Enrichment is optional — never let queue/Redis failures abort signup
@@ -109,7 +111,7 @@ class Api::V1::AccountsController < Api::BaseController
   end
 
   def custom_attributes_params
-    params.permit(:industry, :company_size, :timezone)
+    params.permit(:industry, :company_size, :timezone, :referral_source, :user_role)
   end
 
   def settings_params
diff --git a/app/controllers/api/v1/profile/mfa_controller.rb b/app/controllers/api/v1/profile/mfa_controller.rb
index dd874f222..8480b64fb 100644
--- a/app/controllers/api/v1/profile/mfa_controller.rb
+++ b/app/controllers/api/v1/profile/mfa_controller.rb
@@ -2,8 +2,8 @@ class Api::V1::Profile::MfaController < Api::BaseController
   before_action :check_mfa_feature_available
   before_action :check_mfa_enabled, only: [:destroy, :backup_codes]
   before_action :check_mfa_disabled, only: [:create, :verify]
-  before_action :validate_otp, only: [:verify, :backup_codes, :destroy]
   before_action :validate_password, only: [:destroy]
+  before_action :validate_otp, only: [:verify, :backup_codes, :destroy]
 
   def show; end
 
@@ -48,7 +48,8 @@ class Api::V1::Profile::MfaController < Api::BaseController
   def validate_otp
     authenticated = Mfa::AuthenticationService.new(
       user: current_user,
-      otp_code: mfa_params[:otp_code]
+      otp_code: mfa_params[:otp_code],
+      backup_code: mfa_params[:backup_code]
     ).authenticate
 
     return if authenticated
@@ -63,6 +64,6 @@ class Api::V1::Profile::MfaController < Api::BaseController
   end
 
   def mfa_params
-    params.permit(:otp_code, :password)
+    params.permit(:otp_code, :backup_code, :password)
   end
 end
diff --git a/app/controllers/platform/api/v1/agent_bots_controller.rb b/app/controllers/platform/api/v1/agent_bots_controller.rb
index dd70a1ba5..594bb856e 100644
--- a/app/controllers/platform/api/v1/agent_bots_controller.rb
+++ b/app/controllers/platform/api/v1/agent_bots_controller.rb
@@ -3,7 +3,7 @@ class Platform::Api::V1::AgentBotsController < PlatformController
   before_action :validate_platform_app_permissible, except: [:index, :create]
 
   def index
-    @resources = @platform_app.platform_app_permissibles.where(permissible_type: 'AgentBot').all
+    @resources = @platform_app.platform_app_permissibles.where(permissible_type: 'AgentBot').includes(:permissible)
   end
 
   def show; end
diff --git a/app/helpers/email_helper.rb b/app/helpers/email_helper.rb
index fcc8b463d..67e8d953d 100644
--- a/app/helpers/email_helper.rb
+++ b/app/helpers/email_helper.rb
@@ -7,7 +7,7 @@ module EmailHelper
   def render_email_html(content)
     return '' if content.blank?
 
-    ChatwootMarkdownRenderer.new(content).render_message.to_s
+    ChatwootMarkdownRenderer.new(content).render_message(hardbreaks: true).to_s
   end
 
   # Raise a standard error if any email address is invalid
diff --git a/app/javascript/dashboard/App.vue b/app/javascript/dashboard/App.vue
index a706e2df5..988829407 100644
--- a/app/javascript/dashboard/App.vue
+++ b/app/javascript/dashboard/App.vue
@@ -59,7 +59,6 @@ export default {
       isRTL: 'accounts/isRTL',
       currentUser: 'getCurrentUser',
       authUIFlags: 'getAuthUIFlags',
-      accountUIFlags: 'accounts/getUIFlags',
     }),
     hideOnOnboardingView() {
       return !isOnOnboardingView(this.$route);
@@ -107,8 +106,9 @@ export default {
       this.$store.dispatch('setActiveAccount', {
         accountId: this.currentAccountId,
       });
+      const account = this.getAccount(this.currentAccountId);
       const { locale, latest_chatwoot_version: latestChatwootVersion } =
-        this.getAccount(this.currentAccountId);
+        account;
       const { pubsub_token: pubsubToken } = this.currentUser || {};
       // If user locale is set, use it; otherwise use account locale
       this.setLocale(this.uiSettings?.locale || locale);
@@ -131,7 +131,7 @@ export default {
 
 <template>
   <div
-    v-if="!authUIFlags.isFetching && !accountUIFlags.isFetchingItem"
+    v-if="!authUIFlags.isFetching"
     id="app"
     class="flex flex-col w-full h-screen min-h-0 bg-n-background"
     :dir="isRTL ? 'rtl' : 'ltr'"
diff --git a/app/javascript/dashboard/api/helpCenter/articles.js b/app/javascript/dashboard/api/helpCenter/articles.js
index 727340ed5..c79aa5da7 100644
--- a/app/javascript/dashboard/api/helpCenter/articles.js
+++ b/app/javascript/dashboard/api/helpCenter/articles.js
@@ -72,6 +72,27 @@ class ArticlesAPI extends PortalsAPI {
       category_slug: categorySlug,
     });
   }
+
+  bulkTranslate({ portalSlug, articleIds, locale, categoryId, force = false }) {
+    return axios.post(
+      `${this.url}/${portalSlug}/articles/bulk_actions/translate`,
+      { ids: articleIds, locale, category_id: categoryId, force }
+    );
+  }
+
+  bulkUpdateStatus({ portalSlug, articleIds, status }) {
+    return axios.patch(
+      `${this.url}/${portalSlug}/articles/bulk_actions/update_status`,
+      { ids: articleIds, status }
+    );
+  }
+
+  bulkDelete({ portalSlug, articleIds }) {
+    return axios.delete(
+      `${this.url}/${portalSlug}/articles/bulk_actions/delete_articles`,
+      { data: { ids: articleIds } }
+    );
+  }
 }
 
 export default new ArticlesAPI();
diff --git a/app/javascript/dashboard/api/mfa.js b/app/javascript/dashboard/api/mfa.js
index c18bea3e9..38cb93810 100644
--- a/app/javascript/dashboard/api/mfa.js
+++ b/app/javascript/dashboard/api/mfa.js
@@ -14,9 +14,9 @@ class MfaAPI extends ApiClient {
     return axios.post(`${this.url}/verify`, { otp_code: otpCode });
   }
 
-  disable(password, otpCode) {
+  disable(password, { otpCode, backupCode } = {}) {
     return axios.delete(this.url, {
-      data: { password, otp_code: otpCode },
+      data: { password, otp_code: otpCode, backup_code: backupCode },
     });
   }
 
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
index 12bed151d..ba887b46f 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
@@ -51,7 +51,6 @@ const isFormInvalid = computed(() => contactsFormRef.value?.isFormInvalid);
 
 const countriesMap = computed(() => {
   return countries.reduce((acc, country) => {
-    acc[country.code] = country;
     acc[country.id] = country;
     return acc;
   }, {});
diff --git a/app/javascript/dashboard/components-next/Contacts/VoiceCallButton.vue b/app/javascript/dashboard/components-next/Contacts/VoiceCallButton.vue
index e9183ce9b..b258dc763 100644
--- a/app/javascript/dashboard/components-next/Contacts/VoiceCallButton.vue
+++ b/app/javascript/dashboard/components-next/Contacts/VoiceCallButton.vue
@@ -3,7 +3,7 @@ import { computed, ref, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 import { useMapGetter, useStore } from 'dashboard/composables/store';
-import { INBOX_TYPES } from 'dashboard/helper/inbox';
+import { isVoiceCallEnabled } from 'dashboard/helper/inbox';
 import { useAlert } from 'dashboard/composables';
 import { frontendURL, conversationUrl } from 'dashboard/helper/URLHelper';
 import { useCallsStore } from 'dashboard/stores/calls';
@@ -34,9 +34,7 @@ const inboxesList = useMapGetter('inboxes/getInboxes');
 const contactsUiFlags = useMapGetter('contacts/getUIFlags');
 
 const voiceInboxes = computed(() =>
-  (inboxesList.value || []).filter(
-    inbox => inbox.channel_type === INBOX_TYPES.VOICE
-  )
+  (inboxesList.value || []).filter(isVoiceCallEnabled)
 );
 const hasVoiceInboxes = computed(() => voiceInboxes.value.length > 0);
 
diff --git a/app/javascript/dashboard/components-next/HelpCenter/ArticleCard/ArticleCard.vue b/app/javascript/dashboard/components-next/HelpCenter/ArticleCard/ArticleCard.vue
index ce9e9db36..93ff15251 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/ArticleCard/ArticleCard.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/ArticleCard/ArticleCard.vue
@@ -9,11 +9,15 @@ import {
   ARTICLE_STATUSES,
 } from 'dashboard/helper/portalHelper';
 
+import { useMapGetter } from 'dashboard/composables/store.js';
+import { useConfig } from 'dashboard/composables/useConfig';
+import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 import Icon from 'dashboard/components-next/icon/Icon.vue';
 import CardLayout from 'dashboard/components-next/CardLayout.vue';
 import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
 import Button from 'dashboard/components-next/button/Button.vue';
 import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
+import Checkbox from 'dashboard/components-next/checkbox/Checkbox.vue';
 
 const props = defineProps({
   id: {
@@ -44,14 +48,46 @@ const props = defineProps({
     type: Number,
     required: true,
   },
+  isSelected: {
+    type: Boolean,
+    default: false,
+  },
+  selectable: {
+    type: Boolean,
+    default: false,
+  },
+  showSelectionControl: {
+    type: Boolean,
+    default: false,
+  },
 });
 
-const emit = defineEmits(['openArticle', 'articleAction']);
+const emit = defineEmits([
+  'openArticle',
+  'articleAction',
+  'toggleSelect',
+  'hover',
+]);
 
 const { t } = useI18n();
 
 const [showActionsDropdown, toggleDropdown] = useToggle();
 
+const currentAccountId = useMapGetter('getCurrentAccountId');
+const isFeatureEnabledonAccount = useMapGetter(
+  'accounts/isFeatureEnabledonAccount'
+);
+const { isEnterprise } = useConfig();
+
+const isTranslationAvailable = computed(
+  () =>
+    isEnterprise &&
+    isFeatureEnabledonAccount.value(
+      currentAccountId.value,
+      FEATURE_FLAGS.CAPTAIN_TASKS
+    )
+);
+
 const articleMenuItems = computed(() => {
   const commonItems = Object.entries(ARTICLE_MENU_ITEMS).reduce(
     (acc, [key, item]) => {
@@ -64,7 +100,9 @@ const articleMenuItems = computed(() => {
   const statusItems = (
     ARTICLE_MENU_OPTIONS[props.status] ||
     ARTICLE_MENU_OPTIONS[ARTICLE_STATUSES.PUBLISHED]
-  ).map(key => commonItems[key]);
+  )
+    .filter(key => key !== 'translate' || isTranslationAvailable.value)
+    .map(key => commonItems[key]);
 
   return [...statusItems, commonItems.delete];
 });
@@ -123,14 +161,27 @@ const handleClick = id => {
 </script>
 
 <template>
-  <CardLayout>
+  <CardLayout
+    :selectable="selectable"
+    class="relative"
+    @mouseenter="emit('hover', true)"
+    @mouseleave="emit('hover', false)"
+  >
+    <div
+      v-show="showSelectionControl"
+      class="absolute top-7 ltr:left-3 rtl:right-3"
+    >
+      <Checkbox :model-value="isSelected" @change="emit('toggleSelect', id)" />
+    </div>
     <div class="flex justify-between w-full gap-1">
-      <span
-        class="text-base cursor-pointer hover:underline underline-offset-2 hover:text-n-blue-11 text-n-slate-12 line-clamp-1"
-        @click="handleClick(id)"
-      >
-        {{ title }}
-      </span>
+      <div class="flex items-center gap-2 min-w-0">
+        <span
+          class="text-base cursor-pointer hover:underline underline-offset-2 hover:text-n-blue-11 text-n-slate-12 line-clamp-1"
+          @click="handleClick(id)"
+        >
+          {{ title }}
+        </span>
+      </div>
       <div class="flex items-center gap-2">
         <span
           class="text-xs font-medium inline-flex items-center h-6 px-2 py-0.5 rounded-md bg-n-alpha-2"
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticleEditorPage/ArticleEditor.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticleEditorPage/ArticleEditor.vue
index 22cb1441a..831312e0b 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticleEditorPage/ArticleEditor.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticleEditorPage/ArticleEditor.vue
@@ -121,7 +121,7 @@ const handleCreateArticle = event => {
           custom-text-area-class="!text-[32px] !leading-[48px] !font-medium !tracking-[0.2px]"
           custom-text-area-wrapper-class="border-0 !bg-transparent dark:!bg-transparent !py-0 !px-0"
           placeholder="Title"
-          autofocus
+          :autofocus="isNewArticle"
           @blur="handleCreateArticle"
         />
         <ArticleEditorControls
@@ -138,7 +138,7 @@ const handleCreateArticle = event => {
           t('HELP_CENTER.EDIT_ARTICLE_PAGE.EDIT_ARTICLE.EDITOR_PLACEHOLDER')
         "
         :enabled-menu-options="ARTICLE_EDITOR_MENU_OPTIONS"
-        :autofocus="false"
+        :autofocus="!isNewArticle"
       />
     </template>
   </HelpCenterLayout>
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticleList.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticleList.vue
index cc7c97000..575eaa828 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticleList.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticleList.vue
@@ -20,8 +20,14 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  selectedArticleIds: {
+    type: Set,
+    default: () => new Set(),
+  },
 });
 
+const emit = defineEmits(['translateArticle', 'toggleSelect']);
+
 const { ARTICLE_STATUS_TYPES } = wootConstants;
 
 const router = useRouter();
@@ -30,12 +36,26 @@ const store = useStore();
 const { t } = useI18n();
 
 const localArticles = ref(props.articles);
+const hoveredArticleId = ref(null);
 
 const dragEnabled = computed(() => {
-  // Enable dragging only for category articles and when there's more than one article
-  return props.isCategoryArticles && localArticles.value?.length > 1;
+  return (
+    props.isCategoryArticles &&
+    localArticles.value?.length > 1 &&
+    props.selectedArticleIds.size === 0
+  );
 });
 
+const hasBulkSelection = computed(() => props.selectedArticleIds.size > 0);
+
+const shouldShowSelectionControl = id => {
+  return hoveredArticleId.value === id || hasBulkSelection.value;
+};
+
+const handleCardHover = (isHovered, id) => {
+  hoveredArticleId.value = isHovered ? id : null;
+};
+
 const getCategoryById = useMapGetter('categories/categoryById');
 
 const openArticle = id => {
@@ -152,6 +172,10 @@ const handleArticleAction = async (action, { status, id }) => {
 };
 
 const updateArticle = ({ action, value, id }) => {
+  if (action === 'translate') {
+    emit('translateArticle', id);
+    return;
+  }
   const status = action !== 'delete' ? getArticleStatus(value) : null;
   handleArticleAction(action, { status, id });
 };
@@ -187,9 +211,14 @@ watch(
           :category="getCategory(element.category.id)"
           :views="element.views || 0"
           :updated-at="element.updatedAt"
+          :is-selected="selectedArticleIds.has(element.id)"
+          selectable
+          :show-selection-control="shouldShowSelectionControl(element.id)"
           :class="{ 'cursor-grab': dragEnabled }"
           @open-article="openArticle"
           @article-action="updateArticle"
+          @toggle-select="emit('toggleSelect', $event)"
+          @hover="isHovered => handleCardHover(isHovered, element.id)"
         />
       </li>
     </template>
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticlesPage.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticlesPage.vue
index e31d40d8a..325f6abe6 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticlesPage.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticlesPage.vue
@@ -1,9 +1,13 @@
 <script setup>
-import { computed } from 'vue';
+import { ref, computed, watch } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useMapGetter } from 'dashboard/composables/store.js';
+import { useConfig } from 'dashboard/composables/useConfig';
 import { ARTICLE_TABS, CATEGORY_ALL } from 'dashboard/helper/portalHelper';
+import { FEATURE_FLAGS } from 'dashboard/featureFlags';
+import { useAlert } from 'dashboard/composables';
+import articlesAPI from 'dashboard/api/helpCenter/articles';
 
 import HelpCenterLayout from 'dashboard/components-next/HelpCenter/HelpCenterLayout.vue';
 import ArticleList from 'dashboard/components-next/HelpCenter/Pages/ArticlePage/ArticleList.vue';
@@ -11,6 +15,10 @@ import ArticleHeaderControls from 'dashboard/components-next/HelpCenter/Pages/Ar
 import CategoryHeaderControls from 'dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryHeaderControls.vue';
 import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
 import ArticleEmptyState from 'dashboard/components-next/HelpCenter/EmptyState/Article/ArticleEmptyState.vue';
+import BulkSelectBar from 'dashboard/components-next/captain/assistant/BulkSelectBar.vue';
+import Button from 'dashboard/components-next/button/Button.vue';
+import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
+import BulkTranslateDialog from './BulkTranslateDialog.vue';
 
 const props = defineProps({
   articles: {
@@ -39,7 +47,7 @@ const props = defineProps({
   },
 });
 
-const emit = defineEmits(['pageChange', 'fetchPortal']);
+const emit = defineEmits(['pageChange', 'fetchPortal', 'refreshArticles']);
 
 const router = useRouter();
 const route = useRoute();
@@ -47,6 +55,42 @@ const { t } = useI18n();
 
 const isSwitchingPortal = useMapGetter('portals/isSwitchingPortal');
 const isFetching = useMapGetter('articles/isFetching');
+const currentAccountId = useMapGetter('getCurrentAccountId');
+const isFeatureEnabledonAccount = useMapGetter(
+  'accounts/isFeatureEnabledonAccount'
+);
+
+const selectedArticleIds = ref(new Set());
+const deleteConfirmDialogRef = ref(null);
+
+const { isEnterprise } = useConfig();
+
+const isTranslationAvailable = computed(
+  () =>
+    isEnterprise &&
+    isFeatureEnabledonAccount.value(
+      currentAccountId.value,
+      FEATURE_FLAGS.CAPTAIN_TASKS
+    )
+);
+
+const allItems = computed(() => props.articles.map(a => ({ id: a.id })));
+const visibleArticleIds = computed(() => props.articles.map(a => a.id));
+
+const selectAllLabel = computed(() => {
+  if (!visibleArticleIds.value.length) return '';
+  return t('HELP_CENTER.ARTICLES_PAGE.BULK_TRANSLATE.SELECT_ALL', {
+    count: visibleArticleIds.value.length,
+  });
+});
+
+const selectedCountLabel = computed(() =>
+  t('HELP_CENTER.ARTICLES_PAGE.BULK_TRANSLATE.SELECTED_COUNT', {
+    count: selectedArticleIds.value.size,
+  })
+);
+
+const bulkTranslateDialogRef = ref(null);
 
 const hasNoArticles = computed(
   () => !isFetching.value && !props.articles.length
@@ -128,6 +172,80 @@ const navigateToNewArticlePage = () => {
     params: { categorySlug, locale },
   });
 };
+
+const handleToggleSelect = articleId => {
+  const newSet = new Set(selectedArticleIds.value);
+  if (newSet.has(articleId)) {
+    newSet.delete(articleId);
+  } else {
+    newSet.add(articleId);
+  }
+  selectedArticleIds.value = newSet;
+};
+
+const clearSelection = () => {
+  selectedArticleIds.value = new Set();
+};
+
+const handleTranslateArticle = articleId => {
+  selectedArticleIds.value = new Set([articleId]);
+  bulkTranslateDialogRef.value?.dialogRef?.open();
+};
+
+const openTranslateDialog = () => {
+  bulkTranslateDialogRef.value?.dialogRef?.open();
+};
+
+const onBulkActionSuccess = message => {
+  useAlert(message);
+  clearSelection();
+  emit('refreshArticles');
+};
+
+const bulkUpdateStatus = async status => {
+  try {
+    await articlesAPI.bulkUpdateStatus({
+      portalSlug: route.params.portalSlug,
+      articleIds: [...selectedArticleIds.value],
+      status,
+    });
+    onBulkActionSuccess(
+      t('HELP_CENTER.ARTICLES_PAGE.BULK_ACTIONS.STATUS_SUCCESS')
+    );
+  } catch (error) {
+    useAlert(
+      error?.message || t('HELP_CENTER.ARTICLES_PAGE.BULK_ACTIONS.STATUS_ERROR')
+    );
+  }
+};
+
+const confirmBulkDelete = () => {
+  deleteConfirmDialogRef.value?.open();
+};
+
+const bulkDelete = async () => {
+  try {
+    await articlesAPI.bulkDelete({
+      portalSlug: route.params.portalSlug,
+      articleIds: [...selectedArticleIds.value],
+    });
+    deleteConfirmDialogRef.value?.close();
+    onBulkActionSuccess(
+      t('HELP_CENTER.ARTICLES_PAGE.BULK_ACTIONS.DELETE_SUCCESS')
+    );
+  } catch (error) {
+    deleteConfirmDialogRef.value?.close();
+    useAlert(
+      error?.message || t('HELP_CENTER.ARTICLES_PAGE.BULK_ACTIONS.DELETE_ERROR')
+    );
+  }
+};
+
+// Clear selection when articles change (page change, filter change)
+watch(
+  () => props.articles,
+  () => clearSelection()
+);
 </script>
 
 <template>
@@ -166,11 +284,91 @@ const navigateToNewArticlePage = () => {
       >
         <Spinner />
       </div>
-      <ArticleList
-        v-else-if="!hasNoArticles"
-        :articles="articles"
-        :is-category-articles="isCategoryArticles"
-      />
+      <template v-else-if="!hasNoArticles">
+        <div
+          v-if="selectedArticleIds.size > 0"
+          class="sticky top-0 z-[5] bg-gradient-to-b from-n-surface-1 from-90% to-transparent pt-1 pb-2"
+        >
+          <BulkSelectBar
+            v-model="selectedArticleIds"
+            :all-items="allItems"
+            :select-all-label="selectAllLabel"
+            :selected-count-label="selectedCountLabel"
+            class="py-2 ltr:!pr-3 rtl:!pl-3 justify-between"
+          >
+            <template #secondary-actions>
+              <Button
+                sm
+                ghost
+                slate
+                :label="
+                  t('HELP_CENTER.ARTICLES_PAGE.BULK_TRANSLATE.CLEAR_SELECTION')
+                "
+                class="!px-1.5"
+                @click="clearSelection"
+              />
+            </template>
+            <template #actions>
+              <div class="flex items-center gap-2 ml-auto">
+                <Button
+                  sm
+                  faded
+                  slate
+                  icon="i-lucide-check"
+                  :label="t('HELP_CENTER.ARTICLES_PAGE.BULK_ACTIONS.PUBLISH')"
+                  class="[&>span:nth-child(2)]:hidden sm:[&>span:nth-child(2)]:inline w-fit"
+                  @click="bulkUpdateStatus('published')"
+                />
+                <Button
+                  sm
+                  faded
+                  slate
+                  icon="i-lucide-pencil-line"
+                  :label="t('HELP_CENTER.ARTICLES_PAGE.BULK_ACTIONS.DRAFT')"
+                  class="[&>span:nth-child(2)]:hidden sm:[&>span:nth-child(2)]:inline w-fit"
+                  @click="bulkUpdateStatus('draft')"
+                />
+                <Button
+                  sm
+                  faded
+                  slate
+                  icon="i-lucide-archive-restore"
+                  :label="t('HELP_CENTER.ARTICLES_PAGE.BULK_ACTIONS.ARCHIVE')"
+                  class="[&>span:nth-child(2)]:hidden sm:[&>span:nth-child(2)]:inline w-fit"
+                  @click="bulkUpdateStatus('archived')"
+                />
+                <Button
+                  v-if="isTranslationAvailable"
+                  sm
+                  faded
+                  slate
+                  icon="i-lucide-languages"
+                  :label="t('HELP_CENTER.ARTICLES_PAGE.BULK_ACTIONS.TRANSLATE')"
+                  class="[&>span:nth-child(2)]:hidden sm:[&>span:nth-child(2)]:inline w-fit"
+                  @click="openTranslateDialog"
+                />
+                <Button
+                  sm
+                  faded
+                  ruby
+                  icon="i-lucide-trash"
+                  :label="t('HELP_CENTER.ARTICLES_PAGE.BULK_ACTIONS.DELETE')"
+                  class="!px-1.5 [&>span:nth-child(2)]:hidden"
+                  @click="confirmBulkDelete"
+                />
+              </div>
+            </template>
+          </BulkSelectBar>
+        </div>
+        <ArticleList
+          :articles="articles"
+          :is-category-articles="isCategoryArticles"
+          :selected-article-ids="selectedArticleIds"
+          class="relative z-0"
+          @translate-article="handleTranslateArticle"
+          @toggle-select="handleToggleSelect"
+        />
+      </template>
       <ArticleEmptyState
         v-else
         class="pt-14"
@@ -183,5 +381,31 @@ const navigateToNewArticlePage = () => {
         @click="navigateToNewArticlePage"
       />
     </template>
+    <BulkTranslateDialog
+      ref="bulkTranslateDialogRef"
+      :selected-article-ids="[...selectedArticleIds]"
+      :allowed-locales="allowedLocales"
+      @translate-started="clearSelection"
+    />
+    <Dialog
+      ref="deleteConfirmDialogRef"
+      type="alert"
+      :title="
+        t(
+          'HELP_CENTER.ARTICLES_PAGE.BULK_ACTIONS.DELETE_CONFIRM_TITLE',
+          selectedArticleIds.size
+        )
+      "
+      :description="
+        t(
+          'HELP_CENTER.ARTICLES_PAGE.BULK_ACTIONS.DELETE_CONFIRM_DESCRIPTION',
+          selectedArticleIds.size
+        )
+      "
+      :confirm-button-label="
+        t('HELP_CENTER.ARTICLES_PAGE.BULK_ACTIONS.DELETE_CONFIRM')
+      "
+      @confirm="bulkDelete"
+    />
   </HelpCenterLayout>
 </template>
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/BulkTranslateDialog.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/BulkTranslateDialog.vue
new file mode 100644
index 000000000..c2551830d
--- /dev/null
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/ArticlePage/BulkTranslateDialog.vue
@@ -0,0 +1,249 @@
+<script setup>
+import { ref, computed, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute, useRouter } from 'vue-router';
+import { useStore } from 'dashboard/composables/store';
+import { useAlert } from 'dashboard/composables';
+import categoriesAPI from 'dashboard/api/helpCenter/categories.js';
+
+import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
+import ComboBox from 'dashboard/components-next/combobox/ComboBox.vue';
+import Icon from 'dashboard/components-next/icon/Icon.vue';
+
+const props = defineProps({
+  selectedArticleIds: {
+    type: Array,
+    default: () => [],
+  },
+  allowedLocales: {
+    type: Array,
+    default: () => [],
+  },
+});
+
+const emit = defineEmits(['translateStarted']);
+
+const { t } = useI18n();
+const store = useStore();
+const route = useRoute();
+const router = useRouter();
+
+const dialogRef = ref(null);
+const isSubmitting = ref(false);
+const selectedLocale = ref('');
+const selectedCategoryId = ref('');
+const targetCategories = ref([]);
+const isFetchingCategories = ref(false);
+const duplicateArticles = ref([]);
+
+const currentLocale = computed(() => route.params.locale);
+
+const localeOptions = computed(() => {
+  return props.allowedLocales
+    .filter(locale => locale.code !== currentLocale.value)
+    .map(locale => ({
+      value: locale.code,
+      label: `${locale.name} (${locale.code})`,
+    }));
+});
+
+const categoryOptions = computed(() => {
+  return targetCategories.value.map(category => ({
+    value: category.id,
+    label: category.name,
+  }));
+});
+
+const articleCount = computed(() => props.selectedArticleIds.length);
+
+const dialogTitle = computed(() =>
+  t('HELP_CENTER.ARTICLES_PAGE.BULK_TRANSLATE.TITLE', articleCount.value)
+);
+
+const description = computed(() =>
+  t('HELP_CENTER.ARTICLES_PAGE.BULK_TRANSLATE.DESCRIPTION', articleCount.value)
+);
+
+const hasDuplicates = computed(() => duplicateArticles.value.length > 0);
+
+const confirmLabel = computed(() => {
+  if (hasDuplicates.value) {
+    return t('HELP_CENTER.ARTICLES_PAGE.BULK_TRANSLATE.CONFIRM_OVERWRITE');
+  }
+  return t('HELP_CENTER.ARTICLES_PAGE.BULK_TRANSLATE.CONFIRM');
+});
+
+const isConfirmDisabled = computed(() => {
+  return !selectedLocale.value || isSubmitting.value;
+});
+
+const articleEditUrl = articleId => {
+  const { portalSlug, categorySlug, tab } = route.params;
+  const resolved = router.resolve({
+    name: 'portals_articles_edit',
+    params: {
+      portalSlug,
+      locale: selectedLocale.value,
+      categorySlug,
+      tab,
+      articleSlug: articleId,
+    },
+  });
+  return resolved.href;
+};
+
+const fetchCategoriesForLocale = async locale => {
+  if (!locale) {
+    targetCategories.value = [];
+    return;
+  }
+
+  isFetchingCategories.value = true;
+  try {
+    const { data } = await categoriesAPI.get({
+      portalSlug: route.params.portalSlug,
+      locale,
+    });
+    targetCategories.value = data.payload;
+  } catch {
+    targetCategories.value = [];
+  } finally {
+    isFetchingCategories.value = false;
+  }
+};
+
+watch(selectedLocale, newLocale => {
+  selectedCategoryId.value = '';
+  duplicateArticles.value = [];
+  fetchCategoriesForLocale(newLocale);
+});
+
+const resetForm = () => {
+  selectedLocale.value = '';
+  selectedCategoryId.value = '';
+  targetCategories.value = [];
+  duplicateArticles.value = [];
+};
+
+const submitTranslation = async (force = false) => {
+  isSubmitting.value = true;
+  try {
+    await store.dispatch('articles/bulkTranslate', {
+      portalSlug: route.params.portalSlug,
+      articleIds: props.selectedArticleIds,
+      locale: selectedLocale.value,
+      categoryId: selectedCategoryId.value,
+      force,
+    });
+
+    useAlert(t('HELP_CENTER.ARTICLES_PAGE.BULK_TRANSLATE.API.SUCCESS_MESSAGE'));
+    resetForm();
+    dialogRef.value?.close();
+    emit('translateStarted');
+  } catch (error) {
+    if (error.response?.status === 409) {
+      duplicateArticles.value = error.response.data.duplicate_articles;
+      return;
+    }
+    useAlert(
+      error?.message ||
+        t('HELP_CENTER.ARTICLES_PAGE.BULK_TRANSLATE.API.ERROR_MESSAGE')
+    );
+  } finally {
+    isSubmitting.value = false;
+  }
+};
+
+const onConfirm = () => {
+  if (isConfirmDisabled.value) return;
+  submitTranslation(hasDuplicates.value);
+};
+
+defineExpose({ dialogRef });
+</script>
+
+<template>
+  <Dialog
+    ref="dialogRef"
+    type="edit"
+    :title="dialogTitle"
+    :description="description"
+    :confirm-button-label="confirmLabel"
+    :disable-confirm-button="isConfirmDisabled"
+    :is-loading="isSubmitting"
+    @close="resetForm"
+    @confirm="onConfirm"
+  >
+    <div class="flex flex-col gap-6">
+      <div class="flex flex-col gap-2">
+        <span class="text-sm font-medium text-n-slate-12">
+          {{ t('HELP_CENTER.ARTICLES_PAGE.BULK_TRANSLATE.LOCALE_LABEL') }}
+        </span>
+        <ComboBox
+          v-model="selectedLocale"
+          :options="localeOptions"
+          :placeholder="
+            t('HELP_CENTER.ARTICLES_PAGE.BULK_TRANSLATE.LOCALE_PLACEHOLDER')
+          "
+          class="[&>div>button:not(.focused)]:!outline-n-slate-5 [&>div>button:not(.focused)]:dark:!outline-n-slate-5"
+        />
+      </div>
+      <div class="flex flex-col gap-2">
+        <span class="text-sm font-medium text-n-slate-12">
+          {{ t('HELP_CENTER.ARTICLES_PAGE.BULK_TRANSLATE.CATEGORY_LABEL') }}
+          <span class="text-n-slate-10 font-normal">
+            {{ t('HELP_CENTER.ARTICLES_PAGE.BULK_TRANSLATE.OPTIONAL') }}
+          </span>
+        </span>
+        <ComboBox
+          v-model="selectedCategoryId"
+          :options="categoryOptions"
+          :disabled="!selectedLocale || isFetchingCategories"
+          :placeholder="
+            t('HELP_CENTER.ARTICLES_PAGE.BULK_TRANSLATE.CATEGORY_PLACEHOLDER')
+          "
+          class="[&>div>button:not(.focused)]:!outline-n-slate-5 [&>div>button:not(.focused)]:dark:!outline-n-slate-5"
+        />
+      </div>
+      <div
+        v-if="hasDuplicates"
+        class="flex gap-3 p-3 rounded-xl bg-n-amber-2 border border-n-amber-5"
+      >
+        <Icon
+          icon="i-lucide-triangle-alert"
+          class="size-4 mt-0.5 text-n-amber-11 shrink-0"
+        />
+        <div class="flex flex-col gap-2 min-w-0">
+          <p class="text-sm text-n-amber-12 m-0">
+            {{
+              t(
+                'HELP_CENTER.ARTICLES_PAGE.BULK_TRANSLATE.DUPLICATE_WARNING',
+                duplicateArticles.length
+              )
+            }}
+          </p>
+          <div class="flex flex-col gap-1">
+            <a
+              v-for="article in duplicateArticles"
+              :key="article.id"
+              :href="articleEditUrl(article.id)"
+              target="_blank"
+              rel="noopener noreferrer"
+              class="inline-flex items-center gap-1 text-sm text-n-amber-12 underline underline-offset-2 hover:text-n-amber-11 truncate"
+            >
+              {{ article.title }}
+              <Icon icon="i-lucide-external-link" class="size-3 shrink-0" />
+            </a>
+          </div>
+          <p class="text-xs text-n-amber-11 m-0">
+            {{
+              t(
+                'HELP_CENTER.ARTICLES_PAGE.BULK_TRANSLATE.DUPLICATE_CONFIRM_HINT'
+              )
+            }}
+          </p>
+        </div>
+      </div>
+    </div>
+  </Dialog>
+</template>
diff --git a/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue b/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
index e8f484997..22c142322 100644
--- a/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
+++ b/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
@@ -8,8 +8,6 @@ import { useEventListener } from '@vueuse/core';
 import { ALLOWED_FILE_TYPES } from 'shared/constants/messages';
 import { useKeyboardEvents } from 'dashboard/composables/useKeyboardEvents';
 import FileUpload from 'vue-upload-component';
-import { INBOX_TYPES } from 'dashboard/helper/inbox';
-
 import Button from 'dashboard/components-next/button/Button.vue';
 import WhatsAppOptions from './WhatsAppOptions.vue';
 import ContentTemplateSelector from './ContentTemplateSelector.vue';
@@ -30,6 +28,7 @@ const props = defineProps({
   isDropdownActive: { type: Boolean, default: false },
   messageSignature: { type: String, default: '' },
   inboxId: { type: Number, default: null },
+  voiceEnabled: { type: Boolean, default: false },
 });
 
 const emit = defineEmits([
@@ -82,11 +81,9 @@ const isRegularMessageMode = computed(() => {
   return !props.isWhatsappInbox && !props.isTwilioWhatsAppInbox;
 });
 
-const isVoiceInbox = computed(() => props.channelType === INBOX_TYPES.VOICE);
-
 const shouldShowSignatureButton = computed(() => {
   return (
-    props.hasSelectedInbox && isRegularMessageMode.value && !isVoiceInbox.value
+    props.hasSelectedInbox && isRegularMessageMode.value && !props.voiceEnabled
   );
 });
 
@@ -111,7 +108,7 @@ watch(
   () => props.hasSelectedInbox,
   newValue => {
     nextTick(() => {
-      if (newValue && !isVoiceInbox.value) setSignature();
+      if (newValue && !props.voiceEnabled) setSignature();
     });
   },
   { immediate: true }
diff --git a/app/javascript/dashboard/components-next/NewConversation/components/ComposeNewConversationForm.vue b/app/javascript/dashboard/components-next/NewConversation/components/ComposeNewConversationForm.vue
index c4111b481..f7813332f 100644
--- a/app/javascript/dashboard/components-next/NewConversation/components/ComposeNewConversationForm.vue
+++ b/app/javascript/dashboard/components-next/NewConversation/components/ComposeNewConversationForm.vue
@@ -2,7 +2,7 @@
 import { ref, computed } from 'vue';
 import { useVuelidate } from '@vuelidate/core';
 import { required, requiredIf } from '@vuelidate/validators';
-import { INBOX_TYPES } from 'dashboard/helper/inbox';
+import { INBOX_TYPES, isVoiceCallEnabled } from 'dashboard/helper/inbox';
 import {
   appendSignature,
   removeSignature,
@@ -100,6 +100,8 @@ const inboxChannelType = computed(() => props.targetInbox?.channelType || '');
 
 const inboxMedium = computed(() => props.targetInbox?.medium || '');
 
+const voiceCallEnabled = computed(() => isVoiceCallEnabled(props.targetInbox));
+
 const effectiveChannelType = computed(() =>
   getEffectiveChannelType(inboxChannelType.value, inboxMedium.value)
 );
@@ -442,6 +444,7 @@ useKeyboardEvents({
       :is-twilio-whats-app-inbox="inboxTypes.isTwilioWhatsapp"
       :message-templates="whatsappMessageTemplates"
       :channel-type="inboxChannelType"
+      :voice-enabled="voiceCallEnabled"
       :is-loading="isCreating"
       :disable-send-button="isCreating"
       :has-selected-inbox="!!targetInbox"
diff --git a/app/javascript/dashboard/components-next/filter/contactProvider.js b/app/javascript/dashboard/components-next/filter/contactProvider.js
index a39000817..79933c138 100644
--- a/app/javascript/dashboard/components-next/filter/contactProvider.js
+++ b/app/javascript/dashboard/components-next/filter/contactProvider.js
@@ -135,6 +135,16 @@ export function useContactFilterContext() {
       filterOperators: containmentOperators.value,
       attributeModel: 'standard',
     },
+    {
+      attributeKey: CONTACT_ATTRIBUTES.COMPANY_NAME,
+      value: CONTACT_ATTRIBUTES.COMPANY_NAME,
+      attributeName: t('CONTACTS_LAYOUT.FILTER.COMPANY'),
+      label: t('CONTACTS_LAYOUT.FILTER.COMPANY'),
+      inputType: 'plainText',
+      dataType: 'text',
+      filterOperators: containmentOperators.value,
+      attributeModel: 'standard',
+    },
     {
       attributeKey: CONTACT_ATTRIBUTES.CREATED_AT,
       value: CONTACT_ATTRIBUTES.CREATED_AT,
diff --git a/app/javascript/dashboard/components-next/filter/helper/filterHelper.js b/app/javascript/dashboard/components-next/filter/helper/filterHelper.js
index 274eecb49..ba0dd24fa 100644
--- a/app/javascript/dashboard/components-next/filter/helper/filterHelper.js
+++ b/app/javascript/dashboard/components-next/filter/helper/filterHelper.js
@@ -23,6 +23,7 @@ export const CONTACT_ATTRIBUTES = {
   IDENTIFIER: 'identifier',
   COUNTRY_CODE: 'country_code',
   CITY: 'city',
+  COMPANY_NAME: 'company_name',
   CREATED_AT: 'created_at',
   LAST_ACTIVITY_AT: 'last_activity_at',
   REFERER: 'referer',
diff --git a/app/javascript/dashboard/components-next/icon/provider.js b/app/javascript/dashboard/components-next/icon/provider.js
index a5b99f84f..d7a9c93ad 100644
--- a/app/javascript/dashboard/components-next/icon/provider.js
+++ b/app/javascript/dashboard/components-next/icon/provider.js
@@ -1,4 +1,5 @@
 import { computed } from 'vue';
+import { isVoiceCallEnabled } from 'dashboard/helper/inbox';
 
 export function useChannelIcon(inbox) {
   const channelTypeIconMap = {
@@ -14,7 +15,6 @@ export function useChannelIcon(inbox) {
     'Channel::Whatsapp': 'i-woot-whatsapp',
     'Channel::Instagram': 'i-woot-instagram',
     'Channel::Tiktok': 'i-woot-tiktok',
-    'Channel::Voice': 'i-woot-voice',
   };
 
   const providerIconMap = {
@@ -38,6 +38,11 @@ export function useChannelIcon(inbox) {
       icon = 'i-woot-whatsapp';
     }
 
+    // Special case for voice-enabled inboxes (Twilio, WhatsApp, etc.)
+    if (isVoiceCallEnabled(inboxDetails)) {
+      icon = 'i-woot-voice';
+    }
+
     return icon ?? 'i-ri-global-fill';
   });
 
diff --git a/app/javascript/dashboard/components-next/icon/specs/provider.spec.js b/app/javascript/dashboard/components-next/icon/specs/provider.spec.js
index 8bccd84cc..38c001fae 100644
--- a/app/javascript/dashboard/components-next/icon/specs/provider.spec.js
+++ b/app/javascript/dashboard/components-next/icon/specs/provider.spec.js
@@ -19,8 +19,11 @@ describe('useChannelIcon', () => {
     expect(icon).toBe('i-woot-whatsapp');
   });
 
-  it('returns correct icon for Voice channel', () => {
-    const inbox = { channel_type: 'Channel::Voice' };
+  it('returns correct icon for voice-enabled Twilio channel', () => {
+    const inbox = {
+      channel_type: 'Channel::TwilioSms',
+      voice_enabled: true,
+    };
     const { value: icon } = useChannelIcon(inbox);
     expect(icon).toBe('i-woot-voice');
   });
diff --git a/app/javascript/dashboard/components-next/inline-input/InlineInput.vue b/app/javascript/dashboard/components-next/inline-input/InlineInput.vue
index d65bb4257..9a9960c97 100644
--- a/app/javascript/dashboard/components-next/inline-input/InlineInput.vue
+++ b/app/javascript/dashboard/components-next/inline-input/InlineInput.vue
@@ -30,6 +30,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  readonly: {
+    type: Boolean,
+    default: false,
+  },
   focusOnMount: {
     type: Boolean,
     default: false,
@@ -82,6 +86,7 @@ onMounted(() => {
 
 defineExpose({
   focus: () => inlineInputRef.value?.focus(),
+  blur: () => inlineInputRef.value?.blur(),
 });
 </script>
 
@@ -106,6 +111,7 @@ defineExpose({
       :type="type"
       :placeholder="placeholder"
       :disabled="disabled"
+      :readonly="readonly"
       :class="customInputClass"
       class="flex w-full reset-base text-sm h-6 !mb-0 border-0 rounded-none outline-none outline-0 bg-transparent dark:bg-transparent placeholder:text-n-slate-10 dark:placeholder:text-n-slate-10 disabled:cursor-not-allowed disabled:opacity-50 text-n-slate-12 dark:text-n-slate-12 transition-all duration-500 ease-in-out"
       @input="handleInput"
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
index e776ed913..c349468b8 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
@@ -51,6 +51,7 @@ import {
 
 import {
   appendSignature,
+  collapseSelection,
   findNodeToInsertImage,
   getContentNode,
   insertAtCursor,
@@ -66,6 +67,7 @@ import {
 import {
   hasPressedEnterAndNotCmdOrShift,
   hasPressedCommandAndEnter,
+  isEscape,
 } from 'shared/helpers/KeyboardHelpers';
 import { createTypingIndicator } from '@chatwoot/utils';
 import { checkFileSizeLimit } from 'shared/helpers/FileHelper';
@@ -515,7 +517,9 @@ function setMenubarPosition({ selection } = {}) {
 
 function checkSelection(editorState) {
   showSelectionMenu.value = false;
-  const hasSelection = editorState.selection.from !== editorState.selection.to;
+  const { selection } = editorState;
+  // Skip NodeSelection (from Esc -> selectParentNode); only text ranges count.
+  const hasSelection = !selection.empty && !selection.node;
   if (hasSelection === isTextSelected.value) return;
 
   isTextSelected.value = hasSelection;
@@ -711,12 +715,17 @@ function handleLineBreakWhenCmdAndEnterToSendEnabled(event) {
 }
 
 function onKeydown(event) {
+  if (isEscape(event)) {
+    collapseSelection(editorView);
+    return true;
+  }
   if (isEnterToSendEnabled()) {
     handleLineBreakWhenEnterToSendEnabled(event);
   }
   if (isCmdPlusEnterToSendEnabled()) {
     handleLineBreakWhenCmdAndEnterToSendEnabled(event);
   }
+  return false;
 }
 
 function createEditorView() {
@@ -744,6 +753,9 @@ function createEditorView() {
       blur: () => {
         if (props.disabled) return;
         typingIndicator.stop();
+        // PM keeps its selection on blur — clear the menu flags manually.
+        isTextSelected.value = false;
+        editorRoot.value?.classList.remove('has-selection');
         emit('blur');
       },
       paste: (view, event) => {
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/FullEditor.vue b/app/javascript/dashboard/components/widgets/WootWriter/FullEditor.vue
index 72104ff06..1e1ab9756 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/FullEditor.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/FullEditor.vue
@@ -17,6 +17,8 @@ import { toggleMark } from 'prosemirror-commands';
 import { wrapInList } from 'prosemirror-schema-list';
 import { toggleBlockType } from '@chatwoot/prosemirror-schema/src/menu/common';
 import { checkFileSizeLimit } from 'shared/helpers/FileHelper';
+import { isEscape } from 'shared/helpers/KeyboardHelpers';
+import { collapseSelection } from 'dashboard/helper/editorHelper';
 import { useAlert } from 'dashboard/composables';
 import { useUISettings } from 'dashboard/composables/useUISettings';
 import keyboardEventListenerMixins from 'shared/mixins/keyboardEventListenerMixins';
@@ -362,19 +364,33 @@ export default {
     onKeyup() {
       this.$emit('keyup');
     },
-    onKeydown() {
+    onKeydown(view, event) {
       this.$emit('keydown');
+      if (isEscape(event)) {
+        if (this.showSlashMenu) {
+          this.showSlashMenu = false;
+          this.slashSearchTerm = '';
+          this.slashMenuPosition = null;
+          return true;
+        }
+        collapseSelection(editorView);
+        return true;
+      }
+      return false;
     },
     onBlur() {
+      // ProseMirror keeps its selection on blur — clear the menu flag manually.
+      this.isTextSelected = false;
+      this.$refs.editor?.classList.remove('has-selection');
       this.$emit('blur');
     },
     onFocus() {
       this.$emit('focus');
     },
     checkSelection(editorState) {
-      const { from, to } = editorState.selection;
-      // Check if there's a selection (from and to are different)
-      const hasSelection = from !== to;
+      const { selection } = editorState;
+      // Skip NodeSelection (from Esc -> selectParentNode); only text ranges count.
+      const hasSelection = !selection.empty && !selection.node;
       // If the selection state is the same as the previous state, do nothing
       if (hasSelection === this.isTextSelected) return;
       // Update the selection state
diff --git a/app/javascript/dashboard/composables/spec/useInbox.spec.js b/app/javascript/dashboard/composables/spec/useInbox.spec.js
index 71472a35b..1c01032d1 100644
--- a/app/javascript/dashboard/composables/spec/useInbox.spec.js
+++ b/app/javascript/dashboard/composables/spec/useInbox.spec.js
@@ -47,7 +47,11 @@ const mockStore = createStore({
             11: { id: 11, channel_type: INBOX_TYPES.API },
             12: { id: 12, channel_type: INBOX_TYPES.SMS },
             13: { id: 13, channel_type: INBOX_TYPES.INSTAGRAM },
-            14: { id: 14, channel_type: INBOX_TYPES.VOICE },
+            14: {
+              id: 14,
+              channel_type: INBOX_TYPES.TWILIO,
+              voice_enabled: true,
+            },
             15: { id: 15, channel_type: INBOX_TYPES.TIKTOK },
           };
           return inboxes[id] || null;
@@ -211,11 +215,11 @@ describe('useInbox', () => {
       });
       expect(wrapper.vm.isAnInstagramChannel).toBe(true);
 
-      // Test Voice
+      // Test Voice (Twilio with voice_enabled)
       wrapper = mount(createTestComponent(14), {
         global: { plugins: [mockStore] },
       });
-      expect(wrapper.vm.isAVoiceChannel).toBe(true);
+      expect(wrapper.vm.voiceCallEnabled).toBe(true);
 
       // Test Tiktok
       wrapper = mount(createTestComponent(15), {
@@ -274,7 +278,8 @@ describe('useInbox', () => {
         'isAnEmailChannel',
         'isAnInstagramChannel',
         'isATiktokChannel',
-        'isAVoiceChannel',
+        'voiceCallEnabled',
+        'voiceCallProvider',
       ];
 
       expectedProperties.forEach(prop => {
diff --git a/app/javascript/dashboard/composables/useInbox.js b/app/javascript/dashboard/composables/useInbox.js
index 632d3556b..6e8d0a52a 100644
--- a/app/javascript/dashboard/composables/useInbox.js
+++ b/app/javascript/dashboard/composables/useInbox.js
@@ -1,7 +1,11 @@
 import { computed } from 'vue';
 import { useMapGetter } from 'dashboard/composables/store';
 import { useCamelCase } from 'dashboard/composables/useTransformKeys';
-import { INBOX_TYPES } from 'dashboard/helper/inbox';
+import {
+  INBOX_TYPES,
+  isVoiceCallEnabled,
+  getVoiceCallProvider,
+} from 'dashboard/helper/inbox';
 
 export const INBOX_FEATURES = {
   REPLY_TO: 'replyTo',
@@ -134,9 +138,9 @@ export const useInbox = (inboxId = null) => {
     return channelType.value === INBOX_TYPES.TIKTOK;
   });
 
-  const isAVoiceChannel = computed(() => {
-    return channelType.value === INBOX_TYPES.VOICE;
-  });
+  const voiceCallEnabled = computed(() => isVoiceCallEnabled(inbox.value));
+
+  const voiceCallProvider = computed(() => getVoiceCallProvider(inbox.value));
 
   return {
     inbox,
@@ -156,6 +160,7 @@ export const useInbox = (inboxId = null) => {
     isAnEmailChannel,
     isAnInstagramChannel,
     isATiktokChannel,
-    isAVoiceChannel,
+    voiceCallEnabled,
+    voiceCallProvider,
   };
 };
diff --git a/app/javascript/dashboard/constants/editor.js b/app/javascript/dashboard/constants/editor.js
index fd02461a8..378d303b4 100644
--- a/app/javascript/dashboard/constants/editor.js
+++ b/app/javascript/dashboard/constants/editor.js
@@ -109,11 +109,6 @@ export const FORMATTING = {
       'redo',
     ],
   },
-  'Channel::Voice': {
-    marks: [],
-    nodes: [],
-    menu: [],
-  },
   'Channel::Tiktok': {
     marks: [],
     nodes: [],
diff --git a/app/javascript/dashboard/featureFlags.js b/app/javascript/dashboard/featureFlags.js
index 0cc67db67..1f9632425 100644
--- a/app/javascript/dashboard/featureFlags.js
+++ b/app/javascript/dashboard/featureFlags.js
@@ -36,6 +36,7 @@ export const FEATURE_FLAGS = {
   CHATWOOT_V4: 'chatwoot_v4',
   CHANNEL_INSTAGRAM: 'channel_instagram',
   CHANNEL_TIKTOK: 'channel_tiktok',
+  CHANNEL_VOICE: 'channel_voice',
   CONTACT_CHATWOOT_SUPPORT_TEAM: 'contact_chatwoot_support_team',
   CAPTAIN_CUSTOM_TOOLS: 'custom_tools',
   CAPTAIN_V2: 'captain_integration_v2',
diff --git a/app/javascript/dashboard/helper/AnalyticsHelper/events.js b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
index 97b7931fb..6dc47cfbf 100644
--- a/app/javascript/dashboard/helper/AnalyticsHelper/events.js
+++ b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
@@ -153,3 +153,8 @@ export const YEAR_IN_REVIEW_EVENTS = Object.freeze({
   NEXT_CLICKED: 'Year in Review: Next clicked',
   SHARE_CLICKED: 'Year in Review: Share clicked',
 });
+
+export const ONBOARDING_EVENTS = Object.freeze({
+  ACCOUNT_DETAILS_VISITED: 'Onboarding: Account details visited',
+  ACCOUNT_DETAILS_COMPLETED: 'Onboarding: Account details completed',
+});
diff --git a/app/javascript/dashboard/helper/actionCable.js b/app/javascript/dashboard/helper/actionCable.js
index 991576e66..6feebb35d 100644
--- a/app/javascript/dashboard/helper/actionCable.js
+++ b/app/javascript/dashboard/helper/actionCable.js
@@ -33,6 +33,7 @@ class ActionCableConnector extends BaseActionCableConnector {
       'conversation.read': this.onConversationRead,
       'conversation.updated': this.onConversationUpdated,
       'account.cache_invalidated': this.onCacheInvalidate,
+      'account.enrichment_completed': this.onEnrichmentCompleted,
       'copilot.message.created': this.onCopilotMessageCreated,
     };
   }
@@ -194,6 +195,10 @@ class ActionCableConnector extends BaseActionCableConnector {
     this.app.$store.dispatch('copilotMessages/upsert', data);
   };
 
+  onEnrichmentCompleted = () => {
+    this.app.$store.dispatch('accounts/get', { silent: true });
+  };
+
   onCacheInvalidate = data => {
     const keys = data.cache_keys;
     this.app.$store.dispatch('labels/revalidate', { newKey: keys.label });
diff --git a/app/javascript/dashboard/helper/editorHelper.js b/app/javascript/dashboard/helper/editorHelper.js
index b3d071ccd..9839a04e0 100644
--- a/app/javascript/dashboard/helper/editorHelper.js
+++ b/app/javascript/dashboard/helper/editorHelper.js
@@ -2,6 +2,7 @@ import {
   messageSchema,
   MessageMarkdownTransformer,
   MessageMarkdownSerializer,
+  Selection,
 } from '@chatwoot/prosemirror-schema';
 import { replaceVariablesInMessage } from '@chatwoot/utils';
 import * as Sentry from '@sentry/vue';
@@ -273,6 +274,18 @@ export const scrollCursorIntoView = view => {
   }
 };
 
+/**
+ * Collapse the current selection to a cursor near its head. Used to override
+ * the default Escape -> selectParentNode behavior which would otherwise keep
+ * the text highlight visible.
+ *
+ * @param {EditorView} view - The ProseMirror EditorView
+ */
+export const collapseSelection = view => {
+  const { tr, selection } = view.state;
+  view.dispatch(tr.setSelection(Selection.near(selection.$head)));
+};
+
 /**
  * Returns a transaction that inserts a node into editor at the given position
  * Has an optional param 'content' to check if the
diff --git a/app/javascript/dashboard/helper/inbox.js b/app/javascript/dashboard/helper/inbox.js
index 401739706..4039a07d1 100644
--- a/app/javascript/dashboard/helper/inbox.js
+++ b/app/javascript/dashboard/helper/inbox.js
@@ -11,9 +11,29 @@ export const INBOX_TYPES = {
   SMS: 'Channel::Sms',
   INSTAGRAM: 'Channel::Instagram',
   TIKTOK: 'Channel::Tiktok',
-  VOICE: 'Channel::Voice',
 };
 
+// Add providers here as they gain voice capability (e.g., WhatsApp Cloud, Twilio WhatsApp)
+export const VOICE_CALL_PROVIDERS = {
+  TWILIO: 'twilio',
+};
+
+export const getVoiceCallProvider = inbox => {
+  if (!inbox) return null;
+
+  // Callers pass either snake_case (raw API) or camelCase (after camelcaseKeys) shapes.
+  const channelType = inbox.channel_type || inbox.channelType;
+  const voiceEnabled = inbox.voice_enabled || inbox.voiceEnabled;
+
+  if (channelType === INBOX_TYPES.TWILIO && voiceEnabled) {
+    return VOICE_CALL_PROVIDERS.TWILIO;
+  }
+
+  return null;
+};
+
+export const isVoiceCallEnabled = inbox => getVoiceCallProvider(inbox) !== null;
+
 export const TWILIO_CHANNEL_MEDIUM = {
   WHATSAPP: 'whatsapp',
   SMS: 'sms',
@@ -30,7 +50,6 @@ const INBOX_ICON_MAP_FILL = {
   [INBOX_TYPES.LINE]: 'i-ri-line-fill',
   [INBOX_TYPES.INSTAGRAM]: 'i-ri-instagram-fill',
   [INBOX_TYPES.TIKTOK]: 'i-ri-tiktok-fill',
-  [INBOX_TYPES.VOICE]: 'i-ri-phone-fill',
 };
 
 const DEFAULT_ICON_FILL = 'i-ri-chat-1-fill';
@@ -45,7 +64,6 @@ const INBOX_ICON_MAP_LINE = {
   [INBOX_TYPES.TELEGRAM]: 'i-woot-telegram',
   [INBOX_TYPES.LINE]: 'i-woot-line',
   [INBOX_TYPES.INSTAGRAM]: 'i-woot-instagram',
-  [INBOX_TYPES.VOICE]: 'i-woot-voice',
   [INBOX_TYPES.TIKTOK]: 'i-woot-tiktok',
 };
 
@@ -58,7 +76,6 @@ export const getInboxSource = (type, phoneNumber, inbox) => {
 
     case INBOX_TYPES.TWILIO:
     case INBOX_TYPES.WHATSAPP:
-    case INBOX_TYPES.VOICE:
       return phoneNumber || '';
 
     case INBOX_TYPES.EMAIL:
@@ -97,9 +114,6 @@ export const getReadableInboxByType = (type, phoneNumber) => {
     case INBOX_TYPES.LINE:
       return 'line';
 
-    case INBOX_TYPES.VOICE:
-      return 'voice';
-
     default:
       return 'chat';
   }
@@ -142,9 +156,6 @@ export const getInboxClassByType = (type, phoneNumber) => {
     case INBOX_TYPES.TIKTOK:
       return 'brand-tiktok';
 
-    case INBOX_TYPES.VOICE:
-      return 'phone';
-
     default:
       return 'chat';
   }
diff --git a/app/javascript/dashboard/helper/portalHelper.js b/app/javascript/dashboard/helper/portalHelper.js
index 37d09337f..33a2a822a 100644
--- a/app/javascript/dashboard/helper/portalHelper.js
+++ b/app/javascript/dashboard/helper/portalHelper.js
@@ -91,6 +91,13 @@ export const ARTICLE_MENU_ITEMS = {
     action: 'archive',
     icon: 'i-lucide-archive-restore',
   },
+  translate: {
+    label:
+      'HELP_CENTER.ARTICLES_PAGE.ARTICLE_CARD.CARD.DROPDOWN_MENU.TRANSLATE',
+    value: 'translate',
+    action: 'translate',
+    icon: 'i-lucide-languages',
+  },
   delete: {
     label: 'HELP_CENTER.ARTICLES_PAGE.ARTICLE_CARD.CARD.DROPDOWN_MENU.DELETE',
     value: 'delete',
@@ -100,9 +107,9 @@ export const ARTICLE_MENU_ITEMS = {
 };
 
 export const ARTICLE_MENU_OPTIONS = {
-  [ARTICLE_STATUSES.ARCHIVED]: ['publish', 'draft'],
-  [ARTICLE_STATUSES.DRAFT]: ['publish', 'archive'],
-  [ARTICLE_STATUSES.PUBLISHED]: ['draft', 'archive'],
+  [ARTICLE_STATUSES.ARCHIVED]: ['publish', 'draft', 'translate'],
+  [ARTICLE_STATUSES.DRAFT]: ['publish', 'archive', 'translate'],
+  [ARTICLE_STATUSES.PUBLISHED]: ['draft', 'archive', 'translate'],
 };
 
 export const ARTICLE_TABS = {
diff --git a/app/javascript/dashboard/helper/specs/editorHelper.spec.js b/app/javascript/dashboard/helper/specs/editorHelper.spec.js
index f558dd213..b06c36d42 100644
--- a/app/javascript/dashboard/helper/specs/editorHelper.spec.js
+++ b/app/javascript/dashboard/helper/specs/editorHelper.spec.js
@@ -16,6 +16,7 @@ import {
   calculateMenuPosition,
   stripUnsupportedFormatting,
   stripInlineBase64Images,
+  collapseSelection,
 } from '../editorHelper';
 import { FORMATTING } from 'dashboard/constants/editor';
 import { EditorState } from '@chatwoot/prosemirror-schema';
@@ -454,6 +455,37 @@ describe('stripInlineBase64Images', () => {
   });
 });
 
+describe('collapseSelection', () => {
+  it('collapses a text range to a cursor at its head', () => {
+    const editorView = new EditorView(document.body, {
+      state: createEditorState('Hello world'),
+    });
+
+    // Build a TextSelection via the initial selection's constructor (avoids
+    // importing prosemirror-state, which isn't a direct dep).
+    const { doc, selection } = editorView.state;
+    editorView.dispatch(
+      editorView.state.tr.setSelection(selection.constructor.create(doc, 1, 6))
+    );
+    expect(editorView.state.selection.empty).toBe(false);
+
+    collapseSelection(editorView);
+
+    expect(editorView.state.selection.empty).toBe(true);
+    expect(editorView.state.selection.head).toBe(6);
+  });
+
+  it('leaves an already-collapsed selection as a cursor', () => {
+    const editorView = new EditorView(document.body, {
+      state: createEditorState('Hi'),
+    });
+
+    collapseSelection(editorView);
+
+    expect(editorView.state.selection.empty).toBe(true);
+  });
+});
+
 describe('insertAtCursor', () => {
   it('should return undefined if editorView is not provided', () => {
     const result = insertAtCursor(undefined, schema.text('Hello'), 0);
diff --git a/app/javascript/dashboard/i18n/locale/en/automation.json b/app/javascript/dashboard/i18n/locale/en/automation.json
index e96a28b40..2c4852dc8 100644
--- a/app/javascript/dashboard/i18n/locale/en/automation.json
+++ b/app/javascript/dashboard/i18n/locale/en/automation.json
@@ -182,6 +182,7 @@
       "BROWSER_LANGUAGE": "Browser Language",
       "MAIL_SUBJECT": "Email Subject",
       "COUNTRY_NAME": "Country",
+      "COMPANY_NAME": "Company",
       "REFERER_LINK": "Referrer Link",
       "ASSIGNEE_NAME": "Assignee",
       "TEAM_NAME": "Team",
diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index 9234071d1..1c69c4b29 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -387,6 +387,7 @@
       "IDENTIFIER": "Identifier",
       "COUNTRY": "Country",
       "CITY": "City",
+      "COMPANY": "Company",
       "CREATED_AT": "Created at",
       "LAST_ACTIVITY": "Last activity",
       "REFERER_LINK": "Referer link",
diff --git a/app/javascript/dashboard/i18n/locale/en/helpCenter.json b/app/javascript/dashboard/i18n/locale/en/helpCenter.json
index ffeca222a..9ae849d25 100644
--- a/app/javascript/dashboard/i18n/locale/en/helpCenter.json
+++ b/app/javascript/dashboard/i18n/locale/en/helpCenter.json
@@ -525,6 +525,7 @@
             "PUBLISH": "Publish",
             "DRAFT": "Draft",
             "ARCHIVE": "Archive",
+            "TRANSLATE": "Translate",
             "DELETE": "Delete"
           },
           "STATUS": {
@@ -579,6 +580,41 @@
           "TITLE": "There are no articles in this category",
           "SUBTITLE": "Articles in this category will appear here"
         }
+      },
+      "BULK_TRANSLATE": {
+        "TITLE": "Translate article | Translate {count} articles",
+        "DESCRIPTION": "Translate the selected article to another language. | Translate the selected articles to another language.",
+        "LOCALE_LABEL": "Target language",
+        "LOCALE_PLACEHOLDER": "Select a language",
+        "CATEGORY_LABEL": "Target category",
+        "CATEGORY_PLACEHOLDER": "Select a category",
+        "OPTIONAL": "(optional)",
+        "CONFIRM": "Translate",
+        "SELECT_ALL": "Select all ({count})",
+        "SELECTED_COUNT": "{count} selected",
+        "CLEAR_SELECTION": "Clear selection",
+        "TRANSLATE_BUTTON": "Translate",
+        "CONFIRM_OVERWRITE": "Overwrite and translate",
+        "DUPLICATE_WARNING": "A translation already exists for this article in the selected language. | Translations already exist for {count} articles in the selected language.",
+        "DUPLICATE_CONFIRM_HINT": "Click translate again to overwrite the existing translation.",
+        "API": {
+          "SUCCESS_MESSAGE": "Translation in progress. The article will appear as a draft once ready.",
+          "ERROR_MESSAGE": "Failed to start translation. Please try again."
+        }
+      },
+      "BULK_ACTIONS": {
+        "PUBLISH": "Publish",
+        "DRAFT": "Draft",
+        "ARCHIVE": "Archive",
+        "TRANSLATE": "Translate",
+        "DELETE": "Delete",
+        "STATUS_SUCCESS": "Articles updated successfully",
+        "STATUS_ERROR": "Failed to update articles",
+        "DELETE_CONFIRM_TITLE": "Delete article | Delete {count} articles",
+        "DELETE_CONFIRM_DESCRIPTION": "This will permanently delete the selected article. This action cannot be undone. | This will permanently delete {count} selected articles. This action cannot be undone.",
+        "DELETE_CONFIRM": "Delete",
+        "DELETE_SUCCESS": "Articles deleted successfully",
+        "DELETE_ERROR": "Failed to delete articles"
       }
     },
     "CATEGORY_PAGE": {
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 6b1ff20b1..24207cef2 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -636,7 +636,17 @@
       "WIDGET_BUILDER": "Widget Builder",
       "BOT_CONFIGURATION": "Bot Configuration",
       "ACCOUNT_HEALTH": "Account Health",
-      "CSAT": "CSAT"
+      "CSAT": "CSAT",
+      "VOICE": "Voice"
+    },
+    "VOICE_CONFIGURATION": {
+      "ENABLE_VOICE": {
+        "LABEL": "Enable Voice Calling",
+        "DESCRIPTION": "Enable voice calling on this inbox. Agents will be able to make and receive phone calls."
+      },
+      "CREDENTIALS": {
+        "DESCRIPTION": "Voice calling requires Twilio API Key credentials. These are used to generate tokens for agent voice connections."
+      }
     },
     "CHANNEL_PREFERENCES": "Channel Preferences",
     "WIDGET_FEATURES": "Widget features",
diff --git a/app/javascript/dashboard/i18n/locale/en/index.js b/app/javascript/dashboard/i18n/locale/en/index.js
index 261ca85e6..31486a247 100644
--- a/app/javascript/dashboard/i18n/locale/en/index.js
+++ b/app/javascript/dashboard/i18n/locale/en/index.js
@@ -39,6 +39,7 @@ import teamsSettings from './teamsSettings.json';
 import whatsappTemplates from './whatsappTemplates.json';
 import contentTemplates from './contentTemplates.json';
 import mfa from './mfa.json';
+import onboarding from './onboarding.json';
 import yearInReview from './yearInReview.json';
 
 export default {
@@ -83,5 +84,6 @@ export default {
   ...whatsappTemplates,
   ...contentTemplates,
   ...mfa,
+  ...onboarding,
   ...yearInReview,
 };
diff --git a/app/javascript/dashboard/i18n/locale/en/mfa.json b/app/javascript/dashboard/i18n/locale/en/mfa.json
index b03917bcd..8e356aad4 100644
--- a/app/javascript/dashboard/i18n/locale/en/mfa.json
+++ b/app/javascript/dashboard/i18n/locale/en/mfa.json
@@ -51,10 +51,14 @@
     },
     "DISABLE": {
       "TITLE": "Disable Two-Factor Authentication",
-      "DESCRIPTION": "You'll need to enter your password and a verification code to disable two-factor authentication.",
+      "DESCRIPTION": "You'll need to enter your password and either a verification code from your authenticator app or a backup code to disable two-factor authentication.",
       "PASSWORD": "Password",
       "OTP_CODE": "Verification Code",
       "OTP_CODE_PLACEHOLDER": "000000",
+      "BACKUP_CODE": "Backup Code",
+      "BACKUP_CODE_PLACEHOLDER": "Enter one of your backup codes",
+      "USE_BACKUP_CODE": "Lost access to your authenticator? Use a backup code instead",
+      "USE_OTP_CODE": "Use a verification code from your authenticator app",
       "CONFIRM": "Disable 2FA",
       "CANCEL": "Cancel",
       "SUCCESS": "Two-factor authentication has been disabled",
diff --git a/app/javascript/dashboard/i18n/locale/en/onboarding.json b/app/javascript/dashboard/i18n/locale/en/onboarding.json
new file mode 100644
index 000000000..d7c960002
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/en/onboarding.json
@@ -0,0 +1,34 @@
+{
+  "ONBOARDING_NEXT": {
+    "GREETING": "Hello {name}!",
+    "SUBTITLE": "Please review the following details",
+    "YOUR_DETAILS": "Your details",
+    "COMPANY_DETAILS": "Company details",
+    "FIELDS": {
+      "EMAIL": "Email",
+      "YOUR_ROLE": "Your Role",
+      "WEBSITE": "Website",
+      "LANGUAGE": "Language",
+      "TIMEZONE": "Timezone",
+      "COMPANY_SIZE": "Company Size",
+      "INDUSTRY": "Industry",
+      "REFERRAL_SOURCE": "Where did you find us?"
+    },
+    "PLACEHOLDERS": {
+      "SELECT_ROLE": "Select your role",
+      "ENTER_WEBSITE": "www.example.com",
+      "SELECT_LANGUAGE": "Select language",
+      "SELECT_TIMEZONE": "Select timezone",
+      "SELECT_COMPANY_SIZE": "Select company size",
+      "SELECT_INDUSTRY": "Select industry",
+      "SELECT_REFERRAL_SOURCE": "Select source"
+    },
+    "EMAIL_VERIFIED": "Email verified",
+    "SETTING_UP": "Setting up your account...",
+    "CONTINUE": "Continue",
+    "SAVING": "Saving...",
+    "VALIDATION_ERROR": "Please fill in all required fields",
+    "SUCCESS": "Details saved successfully",
+    "ERROR": "Could not save details. Please try again."
+  }
+}
diff --git a/app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue b/app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue
index a8ce1220b..485306797 100644
--- a/app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchResultContactItem.vue
@@ -49,7 +49,6 @@ const navigateTo = computed(() => {
 
 const countriesMap = computed(() => {
   return countries.reduce((acc, country) => {
-    acc[country.code] = country;
     acc[country.id] = country;
     return acc;
   }, {});
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js b/app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js
index 8d67ccc68..c5ea28774 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js
+++ b/app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js
@@ -53,6 +53,14 @@ const filterTypes = [
     filterOperators: OPERATOR_TYPES_3,
     attribute_type: 'standard',
   },
+  {
+    attributeKey: 'company_name',
+    attributeI18nKey: 'COMPANY',
+    inputType: 'plain_text',
+    dataType: 'text',
+    filterOperators: OPERATOR_TYPES_3,
+    attributeModel: 'standard',
+  },
   {
     attributeKey: 'created_at',
     attributeI18nKey: 'CREATED_AT',
@@ -124,6 +132,10 @@ export const filterAttributeGroups = [
         key: 'city',
         i18nKey: 'CITY',
       },
+      {
+        key: 'company_name',
+        i18nKey: 'COMPANY',
+      },
       {
         key: 'created_at',
         i18nKey: 'CREATED_AT',
diff --git a/app/javascript/dashboard/routes/dashboard/dashboard.routes.js b/app/javascript/dashboard/routes/dashboard/dashboard.routes.js
index 1882923bd..87bae7d11 100644
--- a/app/javascript/dashboard/routes/dashboard/dashboard.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/dashboard.routes.js
@@ -12,6 +12,7 @@ import { routes as captainRoutes } from './captain/captain.routes';
 import AppContainer from './Dashboard.vue';
 import Suspended from './suspended/Index.vue';
 import NoAccounts from './noAccounts/Index.vue';
+import OnboardingAccountDetails from './onboarding/Index.vue';
 
 export default {
   routes: [
@@ -31,6 +32,14 @@ export default {
         ...campaignsRoutes.routes,
       ],
     },
+    {
+      path: frontendURL('accounts/:accountId/onboarding'),
+      name: 'onboarding_account_details',
+      meta: {
+        permissions: ['administrator', 'agent', 'custom_role'],
+      },
+      component: OnboardingAccountDetails,
+    },
     {
       path: frontendURL('accounts/:accountId/suspended'),
       name: 'account_suspended',
diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/PortalsArticlesIndexPage.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/PortalsArticlesIndexPage.vue
index 7d636de70..c0fc800e6 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/pages/PortalsArticlesIndexPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/pages/PortalsArticlesIndexPage.vue
@@ -119,6 +119,7 @@ watch(
       :is-category-articles="isCategoryArticles"
       @page-change="onPageChange"
       @fetch-portal="fetchPortalAndItsCategories"
+      @refresh-articles="fetchArticles"
     />
   </div>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/onboarding/Index.vue b/app/javascript/dashboard/routes/dashboard/onboarding/Index.vue
new file mode 100644
index 000000000..66ac0d57f
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/onboarding/Index.vue
@@ -0,0 +1,417 @@
+<script setup>
+import { ref, computed, nextTick, onMounted, onUnmounted, watch } from 'vue';
+import { useVuelidate } from '@vuelidate/core';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+import { useAlert, useTrack } from 'dashboard/composables';
+import { ONBOARDING_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
+import { useAccount } from 'dashboard/composables/useAccount';
+import { useConfig } from 'dashboard/composables/useConfig';
+import { useMapGetter, useStore } from 'dashboard/composables/store';
+import { frontendURL } from 'dashboard/helper/URLHelper';
+import Avatar from 'dashboard/components-next/avatar/Avatar.vue';
+import Icon from 'dashboard/components-next/icon/Icon.vue';
+import NextButton from 'dashboard/components-next/button/Button.vue';
+import OnboardingLayout from './OnboardingLayout.vue';
+import OnboardingSection from './OnboardingSection.vue';
+import OnboardingFormRow from './OnboardingFormRow.vue';
+import OnboardingFormSelect from './OnboardingFormSelect.vue';
+import InlineInput from 'dashboard/components-next/inline-input/InlineInput.vue';
+import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
+import {
+  COMPANY_SIZE_OPTIONS,
+  INDUSTRY_OPTIONS,
+  REFERRAL_SOURCE_OPTIONS,
+  USER_ROLE_OPTIONS,
+} from './constants';
+
+const { t } = useI18n();
+const router = useRouter();
+const store = useStore();
+const { accountId, currentAccount, updateAccount } = useAccount();
+const { enabledLanguages } = useConfig();
+const currentUser = useMapGetter('getCurrentUser');
+
+const userRole = ref('');
+const website = ref('');
+const locale = ref('');
+const timezone = ref('');
+const companySize = ref('');
+const industry = ref('');
+const referralSource = ref('');
+const isSubmitting = ref(false);
+const isEditingWebsite = ref(false);
+const websiteInput = ref(null);
+const showErrorOnFields = ref(false);
+
+const validationRules = {
+  userRole: {},
+  website: {},
+  locale: {},
+  timezone: {},
+  companySize: {},
+  industry: {},
+  referralSource: {},
+};
+
+const v$ = useVuelidate(validationRules, {
+  userRole,
+  website,
+  locale,
+  timezone,
+  companySize,
+  industry,
+  referralSource,
+});
+
+const userName = computed(() => currentUser.value?.name || '');
+const userEmail = computed(() => currentUser.value?.email || '');
+const accountName = computed(() => currentAccount.value?.name || '');
+const enrichmentTimedOut = ref(false);
+const isEnriching = computed(
+  () =>
+    !enrichmentTimedOut.value &&
+    currentAccount.value?.custom_attributes?.onboarding_step === 'enrichment'
+);
+const companyLogo = computed(() => {
+  const logos = currentAccount.value?.custom_attributes?.brand_info?.logos;
+  if (!logos?.length) return '';
+  const square = logos.find(l => l.resolution?.aspect_ratio === 1);
+  return (square || logos[0])?.url || '';
+});
+
+const languageOptions = computed(() => {
+  const langs = [...(enabledLanguages || [])];
+  return langs
+    .sort((a, b) => a.iso_639_1_code.localeCompare(b.iso_639_1_code))
+    .map(l => ({ value: l.iso_639_1_code, label: l.name }));
+});
+
+const timezoneOptions = computed(() => {
+  try {
+    return Intl.supportedValuesOf('timeZone').map(tz => ({
+      value: tz,
+      label: tz.replace(/_/g, ' '),
+    }));
+  } catch {
+    return [];
+  }
+});
+
+// Best-effort match browser language to enabled Chatwoot locales.
+// Tries exact match first (e.g. 'pt_BR'), then base language (e.g. 'pt'),
+// falls back to account locale or 'en'.
+const detectBestLocale = () => {
+  const codes = (enabledLanguages || []).map(l => l.iso_639_1_code);
+  const browserLang = navigator.language?.replace('-', '_');
+  const accountLocale = currentAccount.value?.locale || 'en';
+  if (!browserLang) return accountLocale;
+
+  if (codes.includes(browserLang)) return browserLang;
+  const base = browserLang.split('_')[0];
+  if (codes.includes(base)) return base;
+
+  return accountLocale;
+};
+
+// Snapshot of auto-populated values to detect user edits at submit time
+const initialValues = ref({});
+
+const snapshotInitialValues = () => {
+  initialValues.value = {
+    website: website.value,
+    company_size: companySize.value,
+    industry: industry.value,
+  };
+};
+
+// Idempotent: only fills empty fields, so late-arriving enrichment data
+// populates untouched fields without clobbering user edits.
+const populateFormFields = () => {
+  const account = currentAccount.value;
+  const attrs = account?.custom_attributes || {};
+  const brandInfo = attrs.brand_info;
+
+  if (!locale.value) locale.value = detectBestLocale();
+  if (!website.value) {
+    website.value = account?.domain || brandInfo?.domain || '';
+  }
+  if (!timezone.value) {
+    timezone.value =
+      attrs.timezone || Intl.DateTimeFormat().resolvedOptions().timeZone || '';
+  }
+  if (!companySize.value) companySize.value = attrs.company_size || '';
+  if (!industry.value) {
+    industry.value =
+      attrs.industry || brandInfo?.industries?.[0]?.industry || '';
+  }
+  if (!referralSource.value) referralSource.value = attrs.referral_source || '';
+
+  snapshotInitialValues();
+};
+
+let enrichmentTimer = null;
+
+const startEnrichmentTimer = () => {
+  if (enrichmentTimer) clearTimeout(enrichmentTimer);
+  enrichmentTimer = setTimeout(() => {
+    enrichmentTimedOut.value = true;
+    populateFormFields();
+  }, 30000);
+};
+
+onMounted(() => {
+  populateFormFields();
+  useTrack(ONBOARDING_EVENTS.ACCOUNT_DETAILS_VISITED);
+  if (isEnriching.value) startEnrichmentTimer();
+});
+
+onUnmounted(() => {
+  if (enrichmentTimer) clearTimeout(enrichmentTimer);
+});
+
+watch(isEnriching, newVal => {
+  if (newVal) {
+    startEnrichmentTimer();
+  } else {
+    if (enrichmentTimer) clearTimeout(enrichmentTimer);
+    populateFormFields();
+  }
+});
+
+// Re-populate when account data arrives after mount, or when brand_info
+// appears after enrichment. populateFormFields is idempotent so this is safe.
+watch(
+  () => currentAccount.value?.custom_attributes,
+  () => populateFormFields()
+);
+
+const enableWebsiteEditing = () => {
+  isEditingWebsite.value = true;
+  nextTick(() => websiteInput.value?.focus());
+};
+
+const handleWebsiteEnter = () => {
+  websiteInput.value?.blur();
+};
+
+const handleSubmit = async () => {
+  // Block submit while enrichment is still running so users can't bypass
+  // the form with empty values — the controller would otherwise clear
+  // onboarding_step and persist incomplete data.
+  if (isEnriching.value) return;
+
+  v$.value.$touch();
+  if (v$.value.$invalid) {
+    useAlert(t('ONBOARDING_NEXT.VALIDATION_ERROR'));
+    showErrorOnFields.value = true;
+    setTimeout(() => {
+      showErrorOnFields.value = false;
+    }, 600);
+    return;
+  }
+
+  isSubmitting.value = true;
+  try {
+    await updateAccount({
+      name: accountName.value,
+      locale: locale.value,
+      domain: website.value,
+      industry: industry.value,
+      company_size: companySize.value,
+      timezone: timezone.value,
+      referral_source: referralSource.value,
+      user_role: userRole.value,
+    });
+
+    const init = initialValues.value;
+    const enrichableFields = {
+      website: website.value,
+      company_size: companySize.value,
+      industry: industry.value,
+    };
+
+    useTrack(ONBOARDING_EVENTS.ACCOUNT_DETAILS_COMPLETED, {
+      has_enriched_data: Boolean(
+        currentAccount.value?.custom_attributes?.brand_info
+      ),
+      fields_changed: Object.entries(enrichableFields)
+        .filter(([key, val]) => val !== init[key])
+        .map(([key]) => key),
+      user_role: userRole.value,
+      company_size: companySize.value,
+      industry: industry.value,
+      referral_source: referralSource.value,
+    });
+
+    useAlert(t('ONBOARDING_NEXT.SUCCESS'));
+    store.commit('RESET_ONBOARDING', accountId.value);
+    router.push(frontendURL(`accounts/${accountId.value}/dashboard`));
+  } catch {
+    useAlert(t('ONBOARDING_NEXT.ERROR'));
+  } finally {
+    isSubmitting.value = false;
+  }
+};
+</script>
+
+<template>
+  <form @submit.prevent="handleSubmit">
+    <OnboardingLayout
+      :greeting="t('ONBOARDING_NEXT.GREETING', { name: userName })"
+      :subtitle="t('ONBOARDING_NEXT.SUBTITLE')"
+      :continue-label="t('ONBOARDING_NEXT.CONTINUE')"
+      :is-loading="isSubmitting"
+      :disabled="isEnriching"
+    >
+      <OnboardingSection
+        :title="t('ONBOARDING_NEXT.YOUR_DETAILS')"
+        icon="i-lucide-user"
+      >
+        <div class="flex items-center gap-2 px-3 py-3">
+          <Avatar :name="userName" :size="16" rounded-full />
+          <span class="text-sm font-medium text-n-slate-12">
+            {{ userName }}
+          </span>
+        </div>
+        <OnboardingFormRow
+          :title="t('ONBOARDING_NEXT.FIELDS.EMAIL')"
+          icon="i-lucide-mail"
+        >
+          <div class="flex items-center justify-end gap-1.5">
+            <span class="text-sm text-n-slate-12">{{ userEmail }}</span>
+            <Icon
+              v-tooltip="t('ONBOARDING_NEXT.EMAIL_VERIFIED')"
+              icon="i-lucide-circle-check"
+              class="size-4 text-n-teal-11 flex-shrink-0"
+            />
+          </div>
+        </OnboardingFormRow>
+        <OnboardingFormRow
+          :title="t('ONBOARDING_NEXT.FIELDS.YOUR_ROLE')"
+          icon="i-lucide-user"
+        >
+          <OnboardingFormSelect
+            v-model="userRole"
+            :has-error="showErrorOnFields && v$.userRole.$error"
+            :options="USER_ROLE_OPTIONS"
+            :placeholder="t('ONBOARDING_NEXT.PLACEHOLDERS.SELECT_ROLE')"
+          />
+        </OnboardingFormRow>
+      </OnboardingSection>
+
+      <OnboardingSection
+        :title="t('ONBOARDING_NEXT.COMPANY_DETAILS')"
+        icon="i-lucide-briefcase-business"
+      >
+        <div
+          v-if="isEnriching"
+          class="flex items-center justify-center gap-3 py-8"
+        >
+          <Spinner :size="16" class="text-n-blue-10" />
+          <span class="text-sm text-n-slate-11">
+            {{ t('ONBOARDING_NEXT.SETTING_UP') }}
+          </span>
+        </div>
+        <template v-else>
+          <div class="flex items-center gap-2 px-3 py-3">
+            <img
+              v-if="companyLogo"
+              :src="companyLogo"
+              :alt="accountName"
+              class="size-4 object-contain"
+            />
+            <span class="text-sm font-medium text-n-slate-12">
+              {{ accountName }}
+            </span>
+          </div>
+          <OnboardingFormRow
+            :title="t('ONBOARDING_NEXT.FIELDS.WEBSITE')"
+            icon="i-lucide-globe"
+          >
+            <div class="flex items-center justify-end gap-2">
+              <InlineInput
+                ref="websiteInput"
+                v-model="website"
+                :readonly="!isEditingWebsite"
+                :placeholder="t('ONBOARDING_NEXT.PLACEHOLDERS.ENTER_WEBSITE')"
+                :custom-input-class="[
+                  'w-auto text-end px-1 py-0.5 -my-0.5 mx-0 placeholder:text-n-slate-9 rounded',
+                  { 'animate-shake': showErrorOnFields && v$.website.$error },
+                ]"
+                @enter-press="handleWebsiteEnter"
+                @blur="isEditingWebsite = false"
+              />
+              <NextButton
+                type="button"
+                icon="i-lucide-pencil"
+                slate
+                xs
+                ghost
+                @click="enableWebsiteEditing"
+              />
+            </div>
+          </OnboardingFormRow>
+          <OnboardingFormRow
+            :title="t('ONBOARDING_NEXT.FIELDS.LANGUAGE')"
+            icon="i-lucide-languages"
+          >
+            <OnboardingFormSelect
+              v-model="locale"
+              :has-error="showErrorOnFields && v$.locale.$error"
+              :options="languageOptions"
+            />
+          </OnboardingFormRow>
+          <OnboardingFormRow
+            :title="t('ONBOARDING_NEXT.FIELDS.TIMEZONE')"
+            icon="i-lucide-clock"
+          >
+            <OnboardingFormSelect
+              v-model="timezone"
+              :has-error="showErrorOnFields && v$.timezone.$error"
+              :options="timezoneOptions"
+              :placeholder="t('ONBOARDING_NEXT.PLACEHOLDERS.SELECT_TIMEZONE')"
+            />
+          </OnboardingFormRow>
+          <OnboardingFormRow
+            :title="t('ONBOARDING_NEXT.FIELDS.INDUSTRY')"
+            icon="i-lucide-factory"
+          >
+            <OnboardingFormSelect
+              v-model="industry"
+              :has-error="showErrorOnFields && v$.industry.$error"
+              :options="INDUSTRY_OPTIONS"
+              :placeholder="t('ONBOARDING_NEXT.PLACEHOLDERS.SELECT_INDUSTRY')"
+            />
+          </OnboardingFormRow>
+          <OnboardingFormRow
+            :title="t('ONBOARDING_NEXT.FIELDS.COMPANY_SIZE')"
+            icon="i-lucide-users"
+          >
+            <OnboardingFormSelect
+              v-model="companySize"
+              :has-error="showErrorOnFields && v$.companySize.$error"
+              :options="COMPANY_SIZE_OPTIONS"
+              :placeholder="
+                t('ONBOARDING_NEXT.PLACEHOLDERS.SELECT_COMPANY_SIZE')
+              "
+            />
+          </OnboardingFormRow>
+          <OnboardingFormRow
+            :title="t('ONBOARDING_NEXT.FIELDS.REFERRAL_SOURCE')"
+            icon="i-lucide-megaphone"
+          >
+            <OnboardingFormSelect
+              v-model="referralSource"
+              :has-error="showErrorOnFields && v$.referralSource.$error"
+              :options="REFERRAL_SOURCE_OPTIONS"
+              :placeholder="
+                t('ONBOARDING_NEXT.PLACEHOLDERS.SELECT_REFERRAL_SOURCE')
+              "
+            />
+          </OnboardingFormRow>
+        </template>
+      </OnboardingSection>
+    </OnboardingLayout>
+  </form>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/onboarding/OnboardingFormRow.vue b/app/javascript/dashboard/routes/dashboard/onboarding/OnboardingFormRow.vue
new file mode 100644
index 000000000..dbe3acd93
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/onboarding/OnboardingFormRow.vue
@@ -0,0 +1,18 @@
+<script setup>
+import Icon from 'dashboard/components-next/icon/Icon.vue';
+
+defineProps({
+  title: { type: String, required: true },
+  icon: { type: String, required: true },
+});
+</script>
+
+<template>
+  <div class="grid grid-cols-2 items-center px-3 py-3 border-t border-n-weak">
+    <div class="flex items-center gap-2">
+      <Icon :icon="icon" class="size-4 text-n-slate-9 flex-shrink-0" />
+      <span class="text-n-slate-11">{{ title }}</span>
+    </div>
+    <slot />
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/onboarding/OnboardingFormSelect.vue b/app/javascript/dashboard/routes/dashboard/onboarding/OnboardingFormSelect.vue
new file mode 100644
index 000000000..a7264e55d
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/onboarding/OnboardingFormSelect.vue
@@ -0,0 +1,37 @@
+<script setup>
+import Icon from 'dashboard/components-next/icon/Icon.vue';
+
+defineProps({
+  modelValue: { type: String, default: '' },
+  options: { type: Array, default: () => [] },
+  placeholder: { type: String, default: '' },
+  hasError: { type: Boolean, default: false },
+});
+
+defineEmits(['update:modelValue']);
+</script>
+
+<template>
+  <div class="relative flex items-center justify-end">
+    <select
+      :value="modelValue"
+      class="!h-auto !w-auto !py-0 !ps-0 !pe-[17px] !m-0 !rounded-none !bg-transparent !bg-none !outline-none text-sm text-end border-0 cursor-pointer appearance-none focus:outline-none focus:ring-0"
+      :class="[
+        modelValue ? 'text-n-slate-12' : 'text-n-slate-9',
+        { 'animate-shake': hasError },
+      ]"
+      @change="$emit('update:modelValue', $event.target.value)"
+    >
+      <option v-if="placeholder" value="" disabled>
+        {{ placeholder }}
+      </option>
+      <option v-for="opt in options" :key="opt.value" :value="opt.value">
+        {{ opt.label }}
+      </option>
+    </select>
+    <Icon
+      icon="i-lucide-chevron-down"
+      class="pointer-events-none absolute end-0 top-1/2 -translate-y-1/2 text-n-slate-9"
+    />
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/onboarding/OnboardingLayout.vue b/app/javascript/dashboard/routes/dashboard/onboarding/OnboardingLayout.vue
new file mode 100644
index 000000000..63b3fa391
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/onboarding/OnboardingLayout.vue
@@ -0,0 +1,120 @@
+<script setup>
+import NextButton from 'dashboard/components-next/button/Button.vue';
+
+defineProps({
+  greeting: { type: String, required: true },
+  subtitle: { type: String, default: '' },
+  continueLabel: { type: String, default: 'Continue' },
+  isLoading: { type: Boolean, default: false },
+  disabled: { type: Boolean, default: false },
+});
+
+defineEmits(['continue']);
+</script>
+
+<template>
+  <div
+    class="relative flex text-body-main items-start justify-center w-full min-h-screen bg-n-surface-2 py-12 px-4 overflow-hidden"
+  >
+    <!-- Grid background with corner fade -->
+    <div
+      class="absolute inset-0 bg-[size:96px_96px] bg-[image:linear-gradient(to_right,rgb(var(--border-weak))_1px,transparent_1px),linear-gradient(to_bottom,rgb(var(--border-weak))_1px,transparent_1px)] [mask-image:radial-gradient(ellipse_80%_80%_at_100%_0%,black_5%,transparent_50%),radial-gradient(ellipse_80%_80%_at_0%_100%,black_5%,transparent_50%)] [mask-composite:add] [-webkit-mask-composite:source-over]"
+    />
+    <div class="relative w-full max-w-[580px]">
+      <div class="relative ps-12">
+        <!-- Timeline dotted line -->
+        <svg
+          class="absolute start-[16px] top-10 bottom-20 overflow-visible text-n-slate-5"
+          width="1"
+          height="100%"
+          preserveAspectRatio="none"
+        >
+          <line
+            x1="0"
+            y1="0"
+            x2="0"
+            y2="97%"
+            stroke="currentColor"
+            stroke-width="1"
+            stroke-dasharray="3 3"
+          />
+        </svg>
+
+        <!-- Greeting -->
+        <div class="mb-6 -ms-12 flex items-start gap-4">
+          <div
+            class="flex items-center justify-center w-8 h-8 z-10 flex-shrink-0"
+          >
+            <slot name="greeting-icon">
+              <span class="i-woot-onboarding-greeting size-4 text-n-slate-7" />
+            </slot>
+          </div>
+          <div>
+            <h1 class="text-heading-1 text-n-slate-12">
+              {{ greeting }}
+            </h1>
+            <p v-if="subtitle" class="text-sm text-n-slate-11">
+              {{ subtitle }}
+            </p>
+          </div>
+        </div>
+
+        <!-- Sections -->
+        <slot />
+      </div>
+
+      <!-- Continue button with curved connector -->
+      <div class="relative ps-12 overflow-visible">
+        <!-- Curved line (absolutely positioned, doesn't affect layout) -->
+        <svg
+          width="48"
+          height="40"
+          viewBox="0 0 47 40"
+          fill="none"
+          class="absolute start-0 top-0 overflow-visible rtl:-scale-x-100"
+        >
+          <defs>
+            <linearGradient
+              id="line-gradient"
+              x1="15"
+              y1="0"
+              x2="48"
+              y2="20"
+              gradientUnits="userSpaceOnUse"
+            >
+              <stop offset="0%" stop-color="rgb(var(--slate-5))" />
+              <stop offset="100%" stop-color="rgb(var(--blue-9))" />
+            </linearGradient>
+          </defs>
+          <path
+            d="M15.5 0 C15.5 24, 15.5 20, 48 20"
+            stroke="url(#line-gradient)"
+            stroke-width="1"
+            stroke-dasharray="3 3"
+            fill="none"
+          />
+        </svg>
+        <!-- Triangle pointer (positioned at button's leading edge, pointing inward) -->
+        <svg
+          width="6"
+          height="6"
+          viewBox="0 0 6 6"
+          fill="none"
+          class="absolute start-[42px] top-1/2 -translate-y-1/2 z-10 rtl:-scale-x-100"
+        >
+          <path d="M6 0L0 3L6 6Z" fill="rgb(var(--blue-9))" />
+        </svg>
+        <NextButton
+          type="submit"
+          blue
+          :is-loading="isLoading"
+          :disabled="disabled"
+          class="w-full justify-center"
+          @click="$emit('continue')"
+        >
+          {{ continueLabel }}
+        </NextButton>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/onboarding/OnboardingSection.vue b/app/javascript/dashboard/routes/dashboard/onboarding/OnboardingSection.vue
new file mode 100644
index 000000000..479aa4c81
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/onboarding/OnboardingSection.vue
@@ -0,0 +1,49 @@
+<script setup>
+import Icon from 'dashboard/components-next/icon/Icon.vue';
+
+defineProps({
+  title: { type: String, required: true },
+  icon: { type: String, required: true },
+});
+</script>
+
+<template>
+  <div class="mb-5">
+    <!-- Section header with icon + triangles -->
+    <div class="flex items-center gap-4 mb-3 -ms-12">
+      <div class="flex flex-col items-center z-10 flex-shrink-0">
+        <svg
+          width="6"
+          height="5"
+          viewBox="0 0 6 5"
+          fill="none"
+          class="text-n-slate-5"
+        >
+          <path d="M3 0L6 5H0L3 0Z" fill="currentColor" />
+        </svg>
+        <div
+          class="flex items-center justify-center w-8 h-8 rounded-lg bg-n-solid-1 border border-n-weak"
+        >
+          <Icon :icon="icon" class="size-4 text-n-slate-11" />
+        </div>
+        <svg
+          width="6"
+          height="5"
+          viewBox="0 0 6 5"
+          fill="none"
+          class="text-n-slate-5"
+        >
+          <path d="M3 5L0 0H6L3 5Z" fill="currentColor" />
+        </svg>
+      </div>
+      <span class="text-heading-3 text-n-slate-12">
+        {{ title }}
+      </span>
+    </div>
+
+    <!-- Card -->
+    <div class="border border-n-weak rounded-xl overflow-hidden bg-n-surface-1">
+      <slot />
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/onboarding/constants.js b/app/javascript/dashboard/routes/dashboard/onboarding/constants.js
new file mode 100644
index 000000000..b14255ccd
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/onboarding/constants.js
@@ -0,0 +1,68 @@
+export const COMPANY_SIZE_OPTIONS = [
+  { value: '1-10', label: '1 - 10' },
+  { value: '11-50', label: '11 - 50' },
+  { value: '51-200', label: '51 - 200' },
+  { value: '201-500', label: '201 - 500' },
+  { value: '500+', label: '500+' },
+];
+
+export const INDUSTRY_OPTIONS = [
+  { value: 'Aerospace & Defense', label: 'Aerospace & Defense' },
+  { value: 'Agriculture & Food', label: 'Agriculture & Food' },
+  {
+    value: 'Automotive & Transportation',
+    label: 'Automotive & Transportation',
+  },
+  { value: 'Chemicals & Materials', label: 'Chemicals & Materials' },
+  {
+    value: 'Construction & Built Environment',
+    label: 'Construction & Built Environment',
+  },
+  {
+    value: 'Consumer Packaged Goods (CPG)',
+    label: 'Consumer Packaged Goods (CPG)',
+  },
+  { value: 'Education', label: 'Education' },
+  { value: 'Entertainment', label: 'Entertainment' },
+  { value: 'Finance', label: 'Finance' },
+  { value: 'Government & Nonprofit', label: 'Government & Nonprofit' },
+  { value: 'Healthcare', label: 'Healthcare' },
+  { value: 'Hospitality & Tourism', label: 'Hospitality & Tourism' },
+  { value: 'Industrial & Energy', label: 'Industrial & Energy' },
+  { value: 'Legal & Compliance', label: 'Legal & Compliance' },
+  { value: 'Lifestyle & Leisure', label: 'Lifestyle & Leisure' },
+  { value: 'Logistics & Supply Chain', label: 'Logistics & Supply Chain' },
+  { value: 'Luxury & Fashion', label: 'Luxury & Fashion' },
+  { value: 'News & Media', label: 'News & Media' },
+  {
+    value: 'Professional Services & Agencies',
+    label: 'Professional Services & Agencies',
+  },
+  { value: 'Real Estate & PropTech', label: 'Real Estate & PropTech' },
+  { value: 'Retail & E-commerce', label: 'Retail & E-commerce' },
+  { value: 'Sports', label: 'Sports' },
+  { value: 'Technology', label: 'Technology' },
+  { value: 'Telecommunications', label: 'Telecommunications' },
+  { value: 'Other', label: 'Other' },
+];
+
+export const REFERRAL_SOURCE_OPTIONS = [
+  { value: 'google', label: 'Google' },
+  { value: 'reddit', label: 'Reddit' },
+  { value: 'twitter', label: 'Twitter/X' },
+  { value: 'linkedin', label: 'LinkedIn' },
+  { value: 'friend', label: 'Friend/Colleague' },
+  { value: 'blog', label: 'Blog/Article' },
+  { value: 'github', label: 'GitHub' },
+  { value: 'other', label: 'Other' },
+];
+
+export const USER_ROLE_OPTIONS = [
+  { value: 'founder', label: 'Founder/CEO' },
+  { value: 'product_manager', label: 'Product Manager' },
+  { value: 'engineering', label: 'Engineering' },
+  { value: 'support_lead', label: 'Support Lead' },
+  { value: 'marketing', label: 'Marketing' },
+  { value: 'sales', label: 'Sales' },
+  { value: 'other', label: 'Other' },
+];
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js b/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
index c7f4529b8..3c073ec7e 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
@@ -74,6 +74,12 @@ export const AUTOMATIONS = {
         inputType: 'plain_text',
         filterOperators: OPERATOR_TYPES_6,
       },
+      {
+        key: 'company_name',
+        name: 'COMPANY_NAME',
+        inputType: 'plain_text',
+        filterOperators: OPERATOR_TYPES_2,
+      },
       {
         key: 'labels',
         name: 'LABELS',
@@ -180,6 +186,12 @@ export const AUTOMATIONS = {
         inputType: 'plain_text',
         filterOperators: OPERATOR_TYPES_6,
       },
+      {
+        key: 'company_name',
+        name: 'COMPANY_NAME',
+        inputType: 'plain_text',
+        filterOperators: OPERATOR_TYPES_2,
+      },
       {
         key: 'referer',
         name: 'REFERER_LINK',
@@ -314,6 +326,12 @@ export const AUTOMATIONS = {
         inputType: 'plain_text',
         filterOperators: OPERATOR_TYPES_6,
       },
+      {
+        key: 'company_name',
+        name: 'COMPANY_NAME',
+        inputType: 'plain_text',
+        filterOperators: OPERATOR_TYPES_2,
+      },
       {
         key: 'assignee_id',
         name: 'ASSIGNEE_NAME',
@@ -460,6 +478,12 @@ export const AUTOMATIONS = {
         inputType: 'plain_text',
         filterOperators: OPERATOR_TYPES_6,
       },
+      {
+        key: 'company_name',
+        name: 'COMPANY_NAME',
+        inputType: 'plain_text',
+        filterOperators: OPERATOR_TYPES_2,
+      },
       {
         key: 'team_id',
         name: 'TEAM_NAME',
@@ -590,6 +614,12 @@ export const AUTOMATIONS = {
         inputType: 'plain_text',
         filterOperators: OPERATOR_TYPES_6,
       },
+      {
+        key: 'company_name',
+        name: 'COMPANY_NAME',
+        inputType: 'plain_text',
+        filterOperators: OPERATOR_TYPES_2,
+      },
       {
         key: 'team_id',
         name: 'TEAM_NAME',
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
index 838d3ac0b..884c198c4 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
@@ -145,6 +145,7 @@ const openDelete = inbox => {
               <ChannelName
                 :channel-type="inbox.channel_type"
                 :medium="inbox.medium"
+                :voice-enabled="inbox.voice_enabled"
                 class="text-body-main text-n-slate-11"
               />
             </div>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index 11eb1f6aa..a26eb0e18 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -21,6 +21,7 @@ import PreChatFormSettings from './PreChatForm/Settings.vue';
 import WeeklyAvailability from './components/WeeklyAvailability.vue';
 import GreetingsEditor from 'shared/components/GreetingsEditor.vue';
 import ConfigurationPage from './settingsPage/ConfigurationPage.vue';
+import VoiceConfigurationPage from './settingsPage/VoiceConfigurationPage.vue';
 import CustomerSatisfactionPage from './settingsPage/CustomerSatisfactionPage.vue';
 import CollaboratorsPage from './settingsPage/CollaboratorsPage.vue';
 import BotConfiguration from './components/BotConfiguration.vue';
@@ -46,6 +47,7 @@ export default {
     BotConfiguration,
     CollaboratorsPage,
     ConfigurationPage,
+    VoiceConfigurationPage,
     CustomerSatisfactionPage,
     FacebookReauthorize,
     GreetingsEditor,
@@ -169,19 +171,17 @@ export default {
         },
       ];
 
-      if (!this.isAVoiceChannel) {
-        visibleToAllChannelTabs = [
-          ...visibleToAllChannelTabs,
-          {
-            key: 'business-hours',
-            name: this.$t('INBOX_MGMT.TABS.BUSINESS_HOURS'),
-          },
-          {
-            key: 'csat',
-            name: this.$t('INBOX_MGMT.TABS.CSAT'),
-          },
-        ];
-      }
+      visibleToAllChannelTabs = [
+        ...visibleToAllChannelTabs,
+        {
+          key: 'business-hours',
+          name: this.$t('INBOX_MGMT.TABS.BUSINESS_HOURS'),
+        },
+        {
+          key: 'csat',
+          name: this.$t('INBOX_MGMT.TABS.CSAT'),
+        },
+      ];
 
       if (this.isAWebWidgetInbox) {
         visibleToAllChannelTabs = [
@@ -197,7 +197,6 @@ export default {
         this.isATwilioChannel ||
         this.isALineChannel ||
         this.isAPIInbox ||
-        this.isAVoiceChannel ||
         (this.isAnEmailChannel && !this.inbox.provider) ||
         this.shouldShowWhatsAppConfiguration ||
         this.isAWebWidgetInbox
@@ -232,6 +231,24 @@ export default {
         ];
       }
 
+      if (
+        this.isATwilioChannel &&
+        this.inbox.phone_number &&
+        this.inbox.medium === 'sms' &&
+        this.isFeatureEnabledonAccount(
+          this.accountId,
+          FEATURE_FLAGS.CHANNEL_VOICE
+        )
+      ) {
+        visibleToAllChannelTabs = [
+          ...visibleToAllChannelTabs,
+          {
+            key: 'voice-configuration',
+            name: this.$t('INBOX_MGMT.TABS.VOICE'),
+          },
+        ];
+      }
+
       return visibleToAllChannelTabs;
     },
     currentInboxId() {
@@ -812,7 +829,6 @@ export default {
             </SettingsFieldSection>
 
             <SettingsFieldSection
-              v-if="!isAVoiceChannel"
               :label="$t('INBOX_MGMT.HELP_CENTER.LABEL')"
               :help-text="$t('INBOX_MGMT.HELP_CENTER.SUB_TEXT')"
             >
@@ -1240,6 +1256,12 @@ export default {
         >
           <ConfigurationPage :inbox="inbox" />
         </div>
+        <div
+          v-if="selectedTabKey === 'voice-configuration'"
+          class="mx-6 max-w-4xl"
+        >
+          <VoiceConfigurationPage :inbox="inbox" />
+        </div>
         <div v-if="selectedTabKey === 'csat'">
           <CustomerSatisfactionPage :inbox="inbox" />
         </div>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/ChannelName.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/ChannelName.vue
index 1804e1224..711217f32 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/ChannelName.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/ChannelName.vue
@@ -12,6 +12,10 @@ const props = defineProps({
     type: String,
     default: '',
   },
+  voiceEnabled: {
+    type: Boolean,
+    default: false,
+  },
 });
 const getters = useStoreGetters();
 const { t } = useI18n();
@@ -30,7 +34,6 @@ const i18nMap = {
   'Channel::Api': 'API',
   'Channel::Instagram': 'INSTAGRAM',
   'Channel::Tiktok': 'TIKTOK',
-  'Channel::Voice': 'VOICE',
 };
 
 const twilioChannelName = () => {
@@ -45,6 +48,9 @@ const readableChannelName = computed(() => {
     return globalConfig.value.apiChannelName || t('INBOX_MGMT.CHANNELS.API');
   }
   if (props.channelType === 'Channel::TwilioSms') {
+    if (props.voiceEnabled) {
+      return t('INBOX_MGMT.CHANNELS.VOICE');
+    }
     return twilioChannelName();
   }
   return t(`INBOX_MGMT.CHANNELS.${i18nMap[props.channelType]}`);
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
index 0bfabb7b6..9cd1665bf 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
@@ -208,24 +208,6 @@ export default {
       </NextButton>
     </SettingsFieldSection>
   </div>
-  <div v-else-if="isAVoiceChannel">
-    <SettingsFieldSection
-      :label="$t('INBOX_MGMT.ADD.VOICE.CONFIGURATION.TWILIO_VOICE_URL_TITLE')"
-      :help-text="
-        $t('INBOX_MGMT.ADD.VOICE.CONFIGURATION.TWILIO_VOICE_URL_SUBTITLE')
-      "
-    >
-      <woot-code :script="inbox.voice_call_webhook_url" lang="html" />
-    </SettingsFieldSection>
-    <SettingsFieldSection
-      :label="$t('INBOX_MGMT.ADD.VOICE.CONFIGURATION.TWILIO_STATUS_URL_TITLE')"
-      :help-text="
-        $t('INBOX_MGMT.ADD.VOICE.CONFIGURATION.TWILIO_STATUS_URL_SUBTITLE')
-      "
-    >
-      <woot-code :script="inbox.voice_status_webhook_url" lang="html" />
-    </SettingsFieldSection>
-  </div>
 
   <div v-else-if="isALineChannel">
     <SettingsFieldSection
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/VoiceConfigurationPage.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/VoiceConfigurationPage.vue
new file mode 100644
index 000000000..b0fe858e5
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/VoiceConfigurationPage.vue
@@ -0,0 +1,156 @@
+<script>
+import { useAlert } from 'dashboard/composables';
+import SettingsFieldSection from 'dashboard/components-next/Settings/SettingsFieldSection.vue';
+import SettingsToggleSection from 'dashboard/components-next/Settings/SettingsToggleSection.vue';
+import NextInput from 'dashboard/components-next/input/Input.vue';
+import NextButton from 'dashboard/components-next/button/Button.vue';
+
+export default {
+  components: {
+    SettingsFieldSection,
+    SettingsToggleSection,
+    NextInput,
+    NextButton,
+  },
+  props: {
+    inbox: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    return {
+      voiceEnabled: this.inbox.voice_enabled || false,
+      apiKeySid: this.inbox.api_key_sid || '',
+      apiKeySecret: '',
+      isUpdating: false,
+    };
+  },
+  computed: {
+    isVoiceConfigured() {
+      return !!this.inbox.voice_configured;
+    },
+    hasApiKeySid() {
+      return !!this.inbox.api_key_sid;
+    },
+    hasExistingCredentials() {
+      return this.hasApiKeySid && !!this.inbox.has_api_key_secret;
+    },
+    needsCredentials() {
+      return (
+        this.voiceEnabled &&
+        !this.isVoiceConfigured &&
+        !this.hasExistingCredentials
+      );
+    },
+    needsApiKeySid() {
+      return this.needsCredentials && !this.hasApiKeySid;
+    },
+    isSubmitDisabled() {
+      if (!this.voiceEnabled) return false;
+      if (this.needsCredentials) {
+        if (this.needsApiKeySid && !this.apiKeySid) return true;
+        return !this.apiKeySecret;
+      }
+      return false;
+    },
+  },
+  watch: {
+    'inbox.voice_enabled'(val) {
+      this.voiceEnabled = val || false;
+    },
+    'inbox.api_key_sid'(val) {
+      this.apiKeySid = val || '';
+    },
+  },
+  methods: {
+    async updateVoiceSettings() {
+      this.isUpdating = true;
+      try {
+        const channelPayload = { voice_enabled: this.voiceEnabled };
+
+        if (this.needsCredentials) {
+          if (this.needsApiKeySid) {
+            channelPayload.api_key_sid = this.apiKeySid;
+          }
+          channelPayload.api_key_secret = this.apiKeySecret;
+        }
+
+        await this.$store.dispatch('inboxes/updateInbox', {
+          id: this.inbox.id,
+          formData: false,
+          channel: channelPayload,
+        });
+        this.apiKeySecret = '';
+        useAlert(this.$t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
+      } catch (error) {
+        useAlert(this.$t('INBOX_MGMT.EDIT.API.ERROR_MESSAGE'));
+      } finally {
+        this.isUpdating = false;
+      }
+    },
+  },
+};
+</script>
+
+<template>
+  <div class="flex flex-col gap-6">
+    <SettingsToggleSection
+      v-model="voiceEnabled"
+      :header="$t('INBOX_MGMT.VOICE_CONFIGURATION.ENABLE_VOICE.LABEL')"
+      :description="
+        $t('INBOX_MGMT.VOICE_CONFIGURATION.ENABLE_VOICE.DESCRIPTION')
+      "
+    />
+
+    <div v-if="voiceEnabled && needsCredentials" class="flex flex-col gap-4">
+      <p class="text-sm text-n-slate-11">
+        {{ $t('INBOX_MGMT.VOICE_CONFIGURATION.CREDENTIALS.DESCRIPTION') }}
+      </p>
+      <NextInput
+        v-if="needsApiKeySid"
+        v-model="apiKeySid"
+        :label="$t('INBOX_MGMT.ADD.VOICE.TWILIO.API_KEY_SID.LABEL')"
+        :placeholder="$t('INBOX_MGMT.ADD.VOICE.TWILIO.API_KEY_SID.PLACEHOLDER')"
+      />
+      <NextInput
+        v-model="apiKeySecret"
+        type="password"
+        :label="$t('INBOX_MGMT.ADD.VOICE.TWILIO.API_KEY_SECRET.LABEL')"
+        :placeholder="
+          $t('INBOX_MGMT.ADD.VOICE.TWILIO.API_KEY_SECRET.PLACEHOLDER')
+        "
+      />
+    </div>
+
+    <div v-if="inbox.voice_enabled && inbox.voice_call_webhook_url">
+      <SettingsFieldSection
+        :label="$t('INBOX_MGMT.ADD.VOICE.CONFIGURATION.TWILIO_VOICE_URL_TITLE')"
+        :help-text="
+          $t('INBOX_MGMT.ADD.VOICE.CONFIGURATION.TWILIO_VOICE_URL_SUBTITLE')
+        "
+      >
+        <woot-code :script="inbox.voice_call_webhook_url" lang="html" />
+      </SettingsFieldSection>
+      <SettingsFieldSection
+        :label="
+          $t('INBOX_MGMT.ADD.VOICE.CONFIGURATION.TWILIO_STATUS_URL_TITLE')
+        "
+        :help-text="
+          $t('INBOX_MGMT.ADD.VOICE.CONFIGURATION.TWILIO_STATUS_URL_SUBTITLE')
+        "
+      >
+        <woot-code :script="inbox.voice_status_webhook_url" lang="html" />
+      </SettingsFieldSection>
+    </div>
+
+    <div>
+      <NextButton
+        :disabled="isSubmitDisabled"
+        :is-loading="isUpdating"
+        :label="$t('INBOX_MGMT.SETTINGS_POPUP.UPDATE')"
+        @click="updateVoiceSettings"
+      />
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/MfaManagementActions.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/MfaManagementActions.vue
index caf9e2a6a..b49bae086 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/MfaManagementActions.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/MfaManagementActions.vue
@@ -31,6 +31,8 @@ const backupCodesDialogRef = ref(null);
 // Form values
 const disablePassword = ref('');
 const disableOtpCode = ref('');
+const disableBackupCode = ref('');
+const useBackupCodeToDisable = ref(false);
 const regenerateOtpCode = ref('');
 
 // Utility functions
@@ -54,10 +56,17 @@ const downloadBackupCodes = () => {
 const handleDisableMfa = async () => {
   emit('disableMfa', {
     password: disablePassword.value,
-    otpCode: disableOtpCode.value,
+    otpCode: useBackupCodeToDisable.value ? '' : disableOtpCode.value,
+    backupCode: useBackupCodeToDisable.value ? disableBackupCode.value : '',
   });
 };
 
+const toggleDisableMethod = () => {
+  useBackupCodeToDisable.value = !useBackupCodeToDisable.value;
+  disableOtpCode.value = '';
+  disableBackupCode.value = '';
+};
+
 const handleRegenerateBackupCodes = async () => {
   emit('regenerateBackupCodes', {
     otpCode: regenerateOtpCode.value,
@@ -68,6 +77,8 @@ const handleRegenerateBackupCodes = async () => {
 const resetDisableForm = () => {
   disablePassword.value = '';
   disableOtpCode.value = '';
+  disableBackupCode.value = '';
+  useBackupCodeToDisable.value = false;
   disableDialogRef.value?.close();
 };
 
@@ -157,12 +168,32 @@ defineExpose({
           :label="$t('MFA_SETTINGS.DISABLE.PASSWORD')"
         />
         <Input
+          v-if="!useBackupCodeToDisable"
           v-model="disableOtpCode"
           type="text"
           maxlength="6"
           :label="$t('MFA_SETTINGS.DISABLE.OTP_CODE')"
           :placeholder="$t('MFA_SETTINGS.DISABLE.OTP_CODE_PLACEHOLDER')"
         />
+        <Input
+          v-else
+          v-model="disableBackupCode"
+          type="text"
+          maxlength="8"
+          :label="$t('MFA_SETTINGS.DISABLE.BACKUP_CODE')"
+          :placeholder="$t('MFA_SETTINGS.DISABLE.BACKUP_CODE_PLACEHOLDER')"
+        />
+        <Button
+          link
+          sm
+          type="button"
+          :label="
+            useBackupCodeToDisable
+              ? $t('MFA_SETTINGS.DISABLE.USE_OTP_CODE')
+              : $t('MFA_SETTINGS.DISABLE.USE_BACKUP_CODE')
+          "
+          @click="toggleDisableMethod"
+        />
       </div>
     </Dialog>
 
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/MfaSettings.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/MfaSettings.vue
index 80dce179b..bd21dfafb 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/MfaSettings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/MfaSettings.vue
@@ -104,9 +104,9 @@ const cancelSetup = () => {
 };
 
 // Disable MFA
-const disableMfa = async ({ password, otpCode }) => {
+const disableMfa = async ({ password, otpCode, backupCode }) => {
   try {
-    await mfaAPI.disable(password, otpCode);
+    await mfaAPI.disable(password, { otpCode, backupCode });
     mfaEnabled.value = false;
     backupCodesGenerated.value = false;
     managementActionsRef.value?.resetDisableForm();
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/AgentSelector.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/AgentSelector.vue
index e1c24303f..9473d16d2 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/teams/AgentSelector.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/AgentSelector.vue
@@ -132,8 +132,10 @@ const headers = computed(() => [
     </template>
   </BaseTable>
 
-  <div class="flex items-center justify-between mt-4">
-    <p class="text-body-main text-n-slate-11">
+  <div
+    class="sticky bottom-0 py-4 px-8 -mx-8 z-20 flex items-center justify-between bg-n-surface-1 border-t border-n-weak"
+  >
+    <p class="text-body-main text-n-slate-11 mb-0">
       {{
         $t('TEAMS_SETTINGS.AGENTS.SELECTED_COUNT', {
           selected: selectedAgents.length,
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/Create/AddAgents.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/Create/AddAgents.vue
index ef1e14663..19a7a325d 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/teams/Create/AddAgents.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/Create/AddAgents.vue
@@ -88,7 +88,7 @@ export default {
 </script>
 
 <template>
-  <div class="h-full w-full p-8 col-span-6 overflow-auto">
+  <div class="h-full w-full px-8 pt-8 col-span-6 overflow-auto">
     <form class="flex flex-col gap-4 mx-0" @submit.prevent="addAgents">
       <PageHeader
         :header-title="headerTitle"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/EditAgents.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/EditAgents.vue
index 1f8bf77d2..d58ff40f8 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/EditAgents.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/EditAgents.vue
@@ -103,7 +103,7 @@ export default {
 </script>
 
 <template>
-  <div class="h-full w-full p-8 col-span-6 overflow-auto">
+  <div class="h-full w-full px-8 pt-8 col-span-6 overflow-auto">
     <form class="flex flex-col gap-4 mx-0" @submit.prevent="addAgents">
       <PageHeader
         :header-title="headerTitle"
diff --git a/app/javascript/dashboard/routes/index.js b/app/javascript/dashboard/routes/index.js
index 27465eb39..3fd2aa0e0 100644
--- a/app/javascript/dashboard/routes/index.js
+++ b/app/javascript/dashboard/routes/index.js
@@ -4,13 +4,15 @@ import { frontendURL } from '../helper/URLHelper';
 import dashboard from './dashboard/dashboard.routes';
 import store from 'dashboard/store';
 import { validateLoggedInRoutes } from '../helper/routeHelpers';
+import { isOnOnboardingView } from 'v3/helpers/RouteHelper';
 import AnalyticsHelper from '../helper/AnalyticsHelper';
 
+const ONBOARDING_STEPS = ['account_details', 'enrichment'];
 const routes = [...dashboard.routes];
 
 export const router = createRouter({ history: createWebHistory(), routes });
 
-export const validateAuthenticateRoutePermission = (to, next) => {
+export const validateAuthenticateRoutePermission = async (to, next) => {
   const { isLoggedIn, getCurrentUser: user } = store.getters;
 
   if (!isLoggedIn) {
@@ -27,8 +29,25 @@ export const validateAuthenticateRoutePermission = (to, next) => {
     return next(frontendURL('no-accounts'));
   }
 
+  const routeAccountId = Number(to.params?.accountId || accountId);
+  const userAccount = accounts.find(a => a.id === routeAccountId);
+  const isAdmin = userAccount?.role === 'administrator';
+  const isActive = userAccount?.status === 'active';
+  const needsOnboarding =
+    ONBOARDING_STEPS.includes(userAccount?.onboarding_step) &&
+    isAdmin &&
+    isActive;
+
   if (to.name === 'no_accounts' || !to.name) {
-    return next(frontendURL(`accounts/${accountId}/dashboard`));
+    const target = needsOnboarding ? 'onboarding' : 'dashboard';
+    return next(frontendURL(`accounts/${routeAccountId}/${target}`));
+  }
+
+  if (needsOnboarding && !isOnOnboardingView(to)) {
+    return next(frontendURL(`accounts/${routeAccountId}/onboarding`));
+  }
+  if (!needsOnboarding && isOnOnboardingView(to)) {
+    return next(frontendURL(`accounts/${routeAccountId}/dashboard`));
   }
 
   const nextRoute = validateLoggedInRoutes(to, store.getters.getCurrentUser);
@@ -38,15 +57,14 @@ export const validateAuthenticateRoutePermission = (to, next) => {
 export const initalizeRouter = () => {
   const userAuthentication = store.dispatch('setUser');
 
-  router.beforeEach((to, _from, next) => {
+  router.beforeEach(async (to, _from, next) => {
     AnalyticsHelper.page(to.name || '', {
       path: to.path,
       name: to.name,
     });
 
-    userAuthentication.then(() => {
-      return validateAuthenticateRoutePermission(to, next, store);
-    });
+    await userAuthentication;
+    await validateAuthenticateRoutePermission(to, next, store);
   });
 };
 
diff --git a/app/javascript/dashboard/routes/index.spec.js b/app/javascript/dashboard/routes/index.spec.js
index 7dc2e2064..c60e54418 100644
--- a/app/javascript/dashboard/routes/index.spec.js
+++ b/app/javascript/dashboard/routes/index.spec.js
@@ -12,7 +12,9 @@ vi.mock('../store', () => ({
         id: null,
         accounts: [],
       },
+      'accounts/getAccount': () => ({}),
     },
+    dispatch: vi.fn(() => Promise.resolve()),
   },
 }));
 
@@ -60,14 +62,14 @@ describe('#validateAuthenticateRoutePermission', () => {
     });
 
     describe('when route is not accessible to current user', () => {
-      it('should redirect to dashboard', () => {
+      it('should redirect to dashboard', async () => {
         const to = {
           name: 'general_settings_index',
           params: { accountId: 1 },
           meta: { permissions: ['administrator'] },
         };
 
-        validateAuthenticateRoutePermission(to, next);
+        await validateAuthenticateRoutePermission(to, next);
 
         expect(next).toHaveBeenCalledWith('/app/accounts/1/dashboard');
       });
@@ -90,14 +92,14 @@ describe('#validateAuthenticateRoutePermission', () => {
         };
       });
 
-      it('should go to the intended route', () => {
+      it('should go to the intended route', async () => {
         const to = {
           name: 'general_settings_index',
           params: { accountId: 1 },
           meta: { permissions: ['administrator'] },
         };
 
-        validateAuthenticateRoutePermission(to, next);
+        await validateAuthenticateRoutePermission(to, next);
 
         expect(next).toHaveBeenCalledWith();
       });
diff --git a/app/javascript/dashboard/store/modules/accounts.js b/app/javascript/dashboard/store/modules/accounts.js
index 44134e19d..52e7b8213 100644
--- a/app/javascript/dashboard/store/modules/accounts.js
+++ b/app/javascript/dashboard/store/modules/accounts.js
@@ -54,18 +54,19 @@ export const getters = {
 };
 
 export const actions = {
-  get: async ({ commit }) => {
-    commit(types.default.SET_ACCOUNT_UI_FLAG, { isFetchingItem: true });
+  get: async ({ commit }, { silent } = {}) => {
+    if (!silent) {
+      commit(types.default.SET_ACCOUNT_UI_FLAG, { isFetchingItem: true });
+    }
     try {
       const response = await AccountAPI.get();
       commit(types.default.ADD_ACCOUNT, response.data);
-      commit(types.default.SET_ACCOUNT_UI_FLAG, {
-        isFetchingItem: false,
-      });
-    } catch (error) {
-      commit(types.default.SET_ACCOUNT_UI_FLAG, {
-        isFetchingItem: false,
-      });
+    } catch {
+      // silent failure
+    } finally {
+      if (!silent) {
+        commit(types.default.SET_ACCOUNT_UI_FLAG, { isFetchingItem: false });
+      }
     }
   },
   update: async ({ commit }, { options, ...updateObj }) => {
diff --git a/app/javascript/dashboard/store/modules/auth.js b/app/javascript/dashboard/store/modules/auth.js
index 91338d938..d2c6bf60c 100644
--- a/app/javascript/dashboard/store/modules/auth.js
+++ b/app/javascript/dashboard/store/modules/auth.js
@@ -269,6 +269,20 @@ export const mutations = {
       accounts,
     };
   },
+  [types.RESET_ONBOARDING](_state, accountId) {
+    const accounts = _state.currentUser.accounts.map(account => {
+      if (account.id === accountId) {
+        const { onboarding_step, ...rest } = account;
+        return rest;
+      }
+      return account;
+    });
+
+    _state.currentUser = {
+      ..._state.currentUser,
+      accounts,
+    };
+  },
   [types.CLEAR_USER](_state) {
     _state.currentUser = initialState.currentUser;
   },
diff --git a/app/javascript/dashboard/store/modules/conversations/helpers/filterHelpers.js b/app/javascript/dashboard/store/modules/conversations/helpers/filterHelpers.js
index c7060bee3..63a592375 100644
--- a/app/javascript/dashboard/store/modules/conversations/helpers/filterHelpers.js
+++ b/app/javascript/dashboard/store/modules/conversations/helpers/filterHelpers.js
@@ -46,8 +46,8 @@
  * 2. Nested properties in additional_attributes (browser_language, referer, etc.)
  * 3. Nested properties in custom_attributes (conversation_type, etc.)
  */
-import jsonLogic from 'json-logic-js';
 import { coerceToDate } from '@chatwoot/utils';
+import jsonLogic from 'json-logic-js';
 
 /**
  * Gets a value from a conversation based on the attribute key
@@ -121,7 +121,8 @@ const resolveValue = candidate => {
  * @returns {Boolean} - Returns true if the values are considered equal according to filtering rules
  *
  * This function handles various equality scenarios:
- * 1. When both values are arrays: checks if all items in filterValue exist in conversationValue
+ * 1. When both values are arrays (e.g. labels): matches if any filter value exists in the conversation array
+ *    (mirrors the backend SQL `tag_id IN (...)` OR semantics)
  * 2. When filterValue is an array but conversationValue is not: checks if conversationValue is included in filterValue
  * 3. Otherwise: performs strict equality comparison
  */
@@ -131,8 +132,9 @@ const equalTo = (filterValue, conversationValue) => {
     if (filterValue === 'all') return true;
 
     if (Array.isArray(conversationValue)) {
-      // For array values like labels, check if any of the filter values exist in the array
-      return filterValue.every(val => conversationValue.includes(val));
+      // For array values like labels, match if any filter value is present.
+      // Mirrors the backend SQL `tag_id IN (...)` (OR semantics).
+      return filterValue.some(val => conversationValue.includes(val));
     }
 
     if (!Array.isArray(conversationValue)) {
diff --git a/app/javascript/dashboard/store/modules/conversations/helpers/specs/filterHelpers.spec.js b/app/javascript/dashboard/store/modules/conversations/helpers/specs/filterHelpers.spec.js
index db1017407..adcf5c96f 100644
--- a/app/javascript/dashboard/store/modules/conversations/helpers/specs/filterHelpers.spec.js
+++ b/app/javascript/dashboard/store/modules/conversations/helpers/specs/filterHelpers.spec.js
@@ -416,6 +416,40 @@ describe('filterHelpers', () => {
       expect(matchesFilters(conversation, filters)).toBe(true);
     });
 
+    // Multi-label equal_to uses OR semantics to mirror the backend SQL `tag_id IN (...)`:
+    // a conversation matches if ANY of the filter labels is on it.
+    it('should match conversation with equal_to operator when any of multiple filter labels is present', () => {
+      const conversation = { labels: ['support'] };
+      const filters = [
+        {
+          attribute_key: 'labels',
+          filter_operator: 'equal_to',
+          values: [
+            { id: 'support', name: 'Support' },
+            { id: 'urgent', name: 'Urgent' },
+          ],
+          query_operator: 'and',
+        },
+      ];
+      expect(matchesFilters(conversation, filters)).toBe(true);
+    });
+
+    it('should not match conversation with equal_to operator when none of multiple filter labels is present', () => {
+      const conversation = { labels: ['new'] };
+      const filters = [
+        {
+          attribute_key: 'labels',
+          filter_operator: 'equal_to',
+          values: [
+            { id: 'support', name: 'Support' },
+            { id: 'urgent', name: 'Urgent' },
+          ],
+          query_operator: 'and',
+        },
+      ];
+      expect(matchesFilters(conversation, filters)).toBe(false);
+    });
+
     it('should match conversation with is_present operator for labels', () => {
       const conversation = { labels: ['support', 'urgent', 'new'] };
       const filters = [
diff --git a/app/javascript/dashboard/store/modules/helpCenterArticles/actions.js b/app/javascript/dashboard/store/modules/helpCenterArticles/actions.js
index 13a2b4899..229a42a5d 100644
--- a/app/javascript/dashboard/store/modules/helpCenterArticles/actions.js
+++ b/app/javascript/dashboard/store/modules/helpCenterArticles/actions.js
@@ -166,4 +166,18 @@ export const actions = {
       throw error;
     }
   },
+
+  bulkTranslate: async (
+    _,
+    { portalSlug, articleIds, locale, categoryId, force = false }
+  ) => {
+    const { data } = await articlesAPI.bulkTranslate({
+      portalSlug,
+      articleIds,
+      locale,
+      categoryId,
+      force,
+    });
+    return data;
+  },
 };
diff --git a/app/javascript/dashboard/store/modules/specs/auth/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/auth/mutations.spec.js
index 0cacff429..b57789baa 100644
--- a/app/javascript/dashboard/store/modules/specs/auth/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/auth/mutations.spec.js
@@ -57,4 +57,46 @@ describe('#mutations', () => {
       );
     });
   });
+  describe('#RESET_ONBOARDING', () => {
+    it('removes onboarding_step from the targeted account', () => {
+      const state = {
+        currentUser: {
+          id: 1,
+          account_id: 1,
+          accounts: [
+            {
+              id: 1,
+              onboarding_step: 'account_details',
+              role: 'administrator',
+            },
+          ],
+        },
+      };
+      mutations[types.RESET_ONBOARDING](state, 1);
+      expect(state.currentUser.accounts[0]).not.toHaveProperty(
+        'onboarding_step'
+      );
+      expect(state.currentUser.accounts[0].role).toEqual('administrator');
+    });
+
+    it('targets the route account, not currentUser.account_id', () => {
+      const state = {
+        currentUser: {
+          id: 1,
+          account_id: 1,
+          accounts: [
+            { id: 1, onboarding_step: 'account_details' },
+            { id: 2, onboarding_step: 'account_details' },
+          ],
+        },
+      };
+      mutations[types.RESET_ONBOARDING](state, 2);
+      expect(state.currentUser.accounts[0].onboarding_step).toEqual(
+        'account_details'
+      );
+      expect(state.currentUser.accounts[1]).not.toHaveProperty(
+        'onboarding_step'
+      );
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index dcc64de8c..6c8d544f0 100644
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -4,6 +4,7 @@ export default {
   SET_CURRENT_USER: 'SET_CURRENT_USER',
   SET_CURRENT_USER_AVAILABILITY: 'SET_CURRENT_USER_AVAILABILITY',
   SET_CURRENT_USER_AUTO_OFFLINE: 'SET_CURRENT_USER_AUTO_OFFLINE',
+  RESET_ONBOARDING: 'RESET_ONBOARDING',
   SET_CURRENT_USER_UI_SETTINGS: 'SET_CURRENT_USER_UI_SETTINGS',
   SET_CURRENT_USER_UI_FLAGS: 'SET_CURRENT_USER_UI_FLAGS',
 
diff --git a/app/javascript/shared/mixins/inboxMixin.js b/app/javascript/shared/mixins/inboxMixin.js
index 3fe04dc11..40579125b 100644
--- a/app/javascript/shared/mixins/inboxMixin.js
+++ b/app/javascript/shared/mixins/inboxMixin.js
@@ -1,4 +1,4 @@
-import { INBOX_TYPES } from 'dashboard/helper/inbox';
+import { INBOX_TYPES, isVoiceCallEnabled } from 'dashboard/helper/inbox';
 
 export const INBOX_FEATURES = {
   REPLY_TO: 'replyTo',
@@ -59,8 +59,8 @@ export default {
     isALineChannel() {
       return this.channelType === INBOX_TYPES.LINE;
     },
-    isAVoiceChannel() {
-      return this.channelType === INBOX_TYPES.VOICE;
+    voiceCallEnabled() {
+      return isVoiceCallEnabled(this.inbox);
     },
     isAnEmailChannel() {
       return this.channelType === INBOX_TYPES.EMAIL;
diff --git a/app/javascript/widget/i18n/locale/et.json b/app/javascript/widget/i18n/locale/et.json
index c3d6ddfc1..e4a1f135f 100644
--- a/app/javascript/widget/i18n/locale/et.json
+++ b/app/javascript/widget/i18n/locale/et.json
@@ -1,153 +1,153 @@
 {
   "COMPONENTS": {
     "FILE_BUBBLE": {
-      "DOWNLOAD": "Download",
-      "UPLOADING": "Uploading..."
+      "DOWNLOAD": "Laadi alla",
+      "UPLOADING": "Üleslaadimine..."
     },
     "FORM_BUBBLE": {
-      "SUBMIT": "Submit"
+      "SUBMIT": "Saada"
     },
     "MESSAGE_BUBBLE": {
-      "RETRY": "Send message again",
-      "ERROR_MESSAGE": "Couldn't send, try again"
+      "RETRY": "Saada sõnum uuesti",
+      "ERROR_MESSAGE": "Saatmine ebaõnnestus, proovi uuesti"
     }
   },
   "THUMBNAIL": {
     "AUTHOR": {
-      "NOT_AVAILABLE": "Not available"
+      "NOT_AVAILABLE": "Pole saadaval"
     }
   },
   "TEAM_AVAILABILITY": {
-    "ONLINE": "We are online",
-    "OFFLINE": "We are away at the moment",
-    "BACK_AS_SOON_AS_POSSIBLE": "We will be back as soon as possible"
+    "ONLINE": "Oleme võrgus",
+    "OFFLINE": "Oleme hetkel eemal",
+    "BACK_AS_SOON_AS_POSSIBLE": "Oleme tagasi esimesel võimalusel"
   },
   "REPLY_TIME": {
-    "IN_A_FEW_MINUTES": "Typically replies in a few minutes",
-    "IN_A_FEW_HOURS": "Typically replies in a few hours",
-    "IN_A_DAY": "Typically replies in a day",
-    "BACK_IN_HOURS": "We will be back online in {n} hour | We will be back online in {n} hours",
-    "BACK_IN_MINUTES": "We will be back online in {time} minutes",
-    "BACK_AT_TIME": "We will be back online at {time}",
-    "BACK_ON_DAY": "We will be back online on {day}",
-    "BACK_TOMORROW": "We will be back online tomorrow",
-    "BACK_IN_SOME_TIME": "We will be back online in some time"
+    "IN_A_FEW_MINUTES": "Tavaliselt vastame mõne minuti jooksul",
+    "IN_A_FEW_HOURS": "Tavaliselt vastame mõne tunni jooksul",
+    "IN_A_DAY": "Tavaliselt vastame päeva jooksul",
+    "BACK_IN_HOURS": "Oleme tagasi {n} tunni pärast | Oleme tagasi {n} tunni pärast",
+    "BACK_IN_MINUTES": "Oleme tagasi {time} minuti pärast",
+    "BACK_AT_TIME": "Oleme tagasi kell {time}",
+    "BACK_ON_DAY": "Oleme tagasi {day}",
+    "BACK_TOMORROW": "Oleme tagasi homme",
+    "BACK_IN_SOME_TIME": "Oleme mõne aja pärast tagasi"
   },
   "DAY_NAMES": {
-    "SUNDAY": "Sunday",
-    "MONDAY": "Monday",
-    "TUESDAY": "Tuesday",
-    "WEDNESDAY": "Wednesday",
-    "THURSDAY": "Thursday",
-    "FRIDAY": "Friday",
-    "SATURDAY": "Saturday"
+    "SUNDAY": "Pühapäev",
+    "MONDAY": "Esmaspäev",
+    "TUESDAY": "Teisipäev",
+    "WEDNESDAY": "Kolmapäev",
+    "THURSDAY": "Neljapäev",
+    "FRIDAY": "Reede",
+    "SATURDAY": "Laupäev"
   },
-  "START_CONVERSATION": "Start Conversation",
-  "END_CONVERSATION": "End Conversation",
-  "CONTINUE_CONVERSATION": "Continue conversation",
-  "YOU": "You",
-  "START_NEW_CONVERSATION": "Start a new conversation",
-  "VIEW_UNREAD_MESSAGES": "You have unread messages",
+  "START_CONVERSATION": "Alusta vestlust",
+  "END_CONVERSATION": "Lõpeta vestlus",
+  "CONTINUE_CONVERSATION": "Jätka vestlust",
+  "YOU": "Sina",
+  "START_NEW_CONVERSATION": "Alusta uut vestlust",
+  "VIEW_UNREAD_MESSAGES": "Sul on lugemata sõnumeid",
   "UNREAD_VIEW": {
-    "VIEW_MESSAGES_BUTTON": "See new messages",
-    "CLOSE_MESSAGES_BUTTON": "Close",
-    "COMPANY_FROM": "from",
+    "VIEW_MESSAGES_BUTTON": "Vaata uusi sõnumeid",
+    "CLOSE_MESSAGES_BUTTON": "Sulge",
+    "COMPANY_FROM": "saatjalt",
     "BOT": "Bot"
   },
   "BUBBLE": {
-    "LABEL": "Chat with us"
+    "LABEL": "Vestle meiega"
   },
-  "POWERED_BY": "Powered by Chatwoot",
-  "EMAIL_PLACEHOLDER": "Please enter your email",
-  "CHAT_PLACEHOLDER": "Type your message",
-  "TODAY": "Today",
-  "YESTERDAY": "Yesterday",
+  "POWERED_BY": "Toetab Chatwoot",
+  "EMAIL_PLACEHOLDER": "Palun sisesta oma e-post",
+  "CHAT_PLACEHOLDER": "Kirjuta oma sõnum",
+  "TODAY": "Täna",
+  "YESTERDAY": "Eile",
   "PRE_CHAT_FORM": {
     "FIELDS": {
       "FULL_NAME": {
-        "LABEL": "Full Name",
-        "PLACEHOLDER": "Please enter your full name",
-        "REQUIRED_ERROR": "Full Name is required"
+        "LABEL": "Täisnimi",
+        "PLACEHOLDER": "Palun sisesta oma täisnimi",
+        "REQUIRED_ERROR": "Täisnimi on kohustuslik"
       },
       "EMAIL_ADDRESS": {
-        "LABEL": "Email Address",
-        "PLACEHOLDER": "Please enter your email address",
-        "REQUIRED_ERROR": "Email Address is required",
-        "VALID_ERROR": "Please enter a valid email address"
+        "LABEL": "E-posti aadress",
+        "PLACEHOLDER": "Palun sisesta oma e-posti aadress",
+        "REQUIRED_ERROR": "E-posti aadress on kohustuslik",
+        "VALID_ERROR": "Palun sisesta kehtiv e-posti aadress"
       },
       "PHONE_NUMBER": {
-        "LABEL": "Phone Number",
-        "PLACEHOLDER": "Please enter your phone number",
-        "REQUIRED_ERROR": "Phone Number is required",
-        "DIAL_CODE_VALID_ERROR": "Please select a country code",
-        "VALID_ERROR": "Please enter a valid phone number",
-        "DROPDOWN_EMPTY": "No results found",
-        "DROPDOWN_SEARCH": "Search country"
+        "LABEL": "Telefoninumber",
+        "PLACEHOLDER": "Palun sisesta oma telefoninumber",
+        "REQUIRED_ERROR": "Telefoninumber on kohustuslik",
+        "DIAL_CODE_VALID_ERROR": "Palun vali riigikood",
+        "VALID_ERROR": "Palun sisesta kehtiv telefoninumber",
+        "DROPDOWN_EMPTY": "Tulemusi ei leitud",
+        "DROPDOWN_SEARCH": "Otsi riiki"
       },
       "MESSAGE": {
-        "LABEL": "Message",
-        "PLACEHOLDER": "Please enter your message",
-        "ERROR": "Message too short"
+        "LABEL": "Sõnum",
+        "PLACEHOLDER": "Palun sisesta oma sõnum",
+        "ERROR": "Sõnum on liiga lühike"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
-    "IS_REQUIRED": "is required",
-    "REQUIRED": "Required",
-    "REGEX_ERROR": "Please provide a valid input"
+    "CAMPAIGN_HEADER": "Palun sisesta enne vestluse alustamist oma nimi ja e-post",
+    "IS_REQUIRED": "on kohustuslik",
+    "REQUIRED": "Kohustuslik",
+    "REGEX_ERROR": "Palun sisesta korrektne väärtus"
   },
-  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "FILE_SIZE_LIMIT": "Fail ületab {MAXIMUM_FILE_UPLOAD_SIZE} manuse limiidi",
   "CHAT_FORM": {
     "INVALID": {
-      "FIELD": "Invalid field"
+      "FIELD": "Vigane väli"
     }
   },
   "EMOJI": {
-    "PLACEHOLDER": "Search emojis",
-    "NOT_FOUND": "No emoji match your search",
-    "ARIA_LABEL": "Emoji picker"
+    "PLACEHOLDER": "Otsi emotikone",
+    "NOT_FOUND": "Ühtegi emotikoni ei leitud",
+    "ARIA_LABEL": "Emotikonide valija"
   },
   "CSAT": {
-    "TITLE": "Rate your conversation",
-    "SUBMITTED_TITLE": "Thank you for submitting the rating",
-    "PLACEHOLDER": "Tell us more..."
+    "TITLE": "Hinda oma vestlust",
+    "SUBMITTED_TITLE": "Täname hinnangu eest",
+    "PLACEHOLDER": "Räägi meile rohkem..."
   },
   "EMAIL_TRANSCRIPT": {
-    "BUTTON_TEXT": "Request a conversation transcript",
-    "SEND_EMAIL_SUCCESS": "The chat transcript was sent successfully",
-    "SEND_EMAIL_ERROR": "There was an error, please try again"
+    "BUTTON_TEXT": "Taotle vestluse koopiat",
+    "SEND_EMAIL_SUCCESS": "Vestluse koopia saadeti edukalt",
+    "SEND_EMAIL_ERROR": "Tekkis viga, palun proovi uuesti"
   },
   "INTEGRATIONS": {
     "DYTE": {
-      "CLICK_HERE_TO_JOIN": "Click here to join",
-      "LEAVE_THE_ROOM": "Leave the call"
+      "CLICK_HERE_TO_JOIN": "Klõpsa siia liitumiseks",
+      "LEAVE_THE_ROOM": "Lahku kõnest"
     }
   },
   "PORTAL": {
-    "POPULAR_ARTICLES": "Popular Articles",
-    "VIEW_ALL_ARTICLES": "View all articles",
-    "IFRAME_LOAD_ERROR": "There was an error loading the article, please refresh the page and try again."
+    "POPULAR_ARTICLES": "Populaarsed artiklid",
+    "VIEW_ALL_ARTICLES": "Vaata kõiki artikleid",
+    "IFRAME_LOAD_ERROR": "Artikli laadimisel tekkis viga, palun värskenda lehte ja proovi uuesti."
   },
   "ATTACHMENTS": {
     "image": {
-      "CONTENT": "Picture message"
+      "CONTENT": "Pildisõnum"
     },
     "audio": {
-      "CONTENT": "Audio message"
+      "CONTENT": "Helisõnum"
     },
     "video": {
-      "CONTENT": "Video message"
+      "CONTENT": "Videosõnum"
     },
     "file": {
-      "CONTENT": "File Attachment"
+      "CONTENT": "Faili manus"
     },
     "location": {
-      "CONTENT": "Location"
+      "CONTENT": "Asukoht"
     },
     "fallback": {
-      "CONTENT": "has shared a url"
+      "CONTENT": "jagas URL-i"
     }
   },
   "FOOTER_REPLY_TO": {
-    "REPLY_TO": "Replying to:"
+    "REPLY_TO": "Vastus sõnumile:"
   }
 }
diff --git a/app/jobs/account/contacts_export_job.rb b/app/jobs/account/contacts_export_job.rb
index 952795604..a66928a79 100644
--- a/app/jobs/account/contacts_export_job.rb
+++ b/app/jobs/account/contacts_export_job.rb
@@ -42,8 +42,13 @@ class Account::ContactsExportJob < ApplicationJob
   def attach_export_file(csv_data)
     return if csv_data.blank?
 
+    # Prepend UTF-8 BOM so that spreadsheet applications (e.g. Excel)
+    # correctly recognise the file encoding for non-ASCII characters
+    # such as Arabic, Japanese, and Chinese.
+    bom = "\xEF\xBB\xBF"
+
     @account.contacts_export.attach(
-      io: StringIO.new(csv_data),
+      io: StringIO.new("#{bom}#{csv_data}"),
       filename: "#{@account.name}_#{@account.id}_contacts.csv",
       content_type: 'text/csv'
     )
diff --git a/app/jobs/agent_bots/webhook_job.rb b/app/jobs/agent_bots/webhook_job.rb
index 4ba67c9bf..7e0041c20 100644
--- a/app/jobs/agent_bots/webhook_job.rb
+++ b/app/jobs/agent_bots/webhook_job.rb
@@ -1,6 +1,6 @@
 class AgentBots::WebhookJob < WebhookJob
   queue_as :high
-  retry_on RestClient::TooManyRequests, RestClient::InternalServerError, wait: 3.seconds, attempts: 3 do |job, error|
+  retry_on Webhooks::Trigger::RetryableError, wait: 3.seconds, attempts: 3 do |job, error|
     url, payload, webhook_type = job.arguments
     kwargs = job.arguments.last.is_a?(Hash) ? job.arguments.last : {}
     Webhooks::Trigger.new(url, payload, webhook_type || :agent_bot_webhook, secret: kwargs[:secret],
@@ -9,7 +9,7 @@ class AgentBots::WebhookJob < WebhookJob
 
   def perform(url, payload, webhook_type = :agent_bot_webhook, secret: nil, delivery_id: nil)
     super(url, payload, webhook_type, secret: secret, delivery_id: delivery_id)
-  rescue RestClient::TooManyRequests, RestClient::InternalServerError => e
+  rescue Webhooks::Trigger::RetryableError => e
     Rails.logger.warn("[AgentBots::WebhookJob] attempt #{executions} failed #{e.class.name} payload=#{payload.to_json}")
     raise
   end
diff --git a/app/jobs/avatar/avatar_from_url_job.rb b/app/jobs/avatar/avatar_from_url_job.rb
index 929e76597..49bf25803 100644
--- a/app/jobs/avatar/avatar_from_url_job.rb
+++ b/app/jobs/avatar/avatar_from_url_job.rb
@@ -9,27 +9,17 @@ class Avatar::AvatarFromUrlJob < ApplicationJob
   include UrlHelper
   queue_as :purgable
 
-  MAX_DOWNLOAD_SIZE = 15 * 1024 * 1024
+  ALLOWED_CONTENT_TYPES = Avatarable::ALLOWED_AVATAR_CONTENT_TYPES
+  MAX_DOWNLOAD_SIZE = 15.megabytes
   RATE_LIMIT_WINDOW = 1.minute
 
   def perform(avatarable, avatar_url)
-    return unless avatarable.respond_to?(:avatar)
-    return unless url_valid?(avatar_url)
+    return unless syncable_avatar?(avatarable, avatar_url)
 
-    return unless should_sync_avatar?(avatarable, avatar_url)
-
-    avatar_file = Down.download(avatar_url, max_size: MAX_DOWNLOAD_SIZE)
-    raise Down::Error, 'Invalid file' unless valid_file?(avatar_file)
-
-    avatarable.avatar.attach(
-      io: avatar_file,
-      filename: avatar_file.original_filename,
-      content_type: avatar_file.content_type
-    )
-
-  rescue Down::NotFound
-    Rails.logger.info "AvatarFromUrlJob: avatar not found at #{avatar_url}"
-  rescue Down::Error => e
+    fetch_and_attach_avatar(avatarable, avatar_url)
+  rescue SafeFetch::HttpError => e
+    log_http_error(avatar_url, e)
+  rescue SafeFetch::Error => e
     Rails.logger.error "AvatarFromUrlJob error for #{avatar_url}: #{e.class} - #{e.message}"
   ensure
     update_avatar_sync_attributes(avatarable, avatar_url)
@@ -37,6 +27,41 @@ class Avatar::AvatarFromUrlJob < ApplicationJob
 
   private
 
+  def syncable_avatar?(avatarable, avatar_url)
+    avatarable.respond_to?(:avatar) &&
+      url_valid?(avatar_url) &&
+      should_sync_avatar?(avatarable, avatar_url)
+  end
+
+  def fetch_and_attach_avatar(avatarable, avatar_url)
+    SafeFetch.fetch(
+      avatar_url,
+      max_bytes: MAX_DOWNLOAD_SIZE,
+      allowed_content_type_prefixes: [],
+      allowed_content_types: ALLOWED_CONTENT_TYPES
+    ) do |avatar_file|
+      attach_avatar(avatarable, avatar_file)
+    end
+  end
+
+  def attach_avatar(avatarable, avatar_file)
+    raise SafeFetch::FetchError, 'Invalid file' unless valid_file?(avatar_file)
+
+    avatarable.avatar.attach(
+      io: avatar_file.tempfile,
+      filename: avatar_file.original_filename,
+      content_type: avatar_file.content_type
+    )
+  end
+
+  def log_http_error(avatar_url, error)
+    if error.message.start_with?('404')
+      Rails.logger.info "AvatarFromUrlJob: avatar not found at #{avatar_url}"
+    else
+      Rails.logger.error "AvatarFromUrlJob error for #{avatar_url}: #{error.class} - #{error.message}"
+    end
+  end
+
   def should_sync_avatar?(avatarable, avatar_url)
     # Only Contacts are rate-limited and hash-gated.
     return true unless avatarable.is_a?(Contact)
diff --git a/app/jobs/data_import_job.rb b/app/jobs/data_import_job.rb
index d8bbeb992..4149ee16f 100644
--- a/app/jobs/data_import_job.rb
+++ b/app/jobs/data_import_job.rb
@@ -106,6 +106,7 @@ class DataImportJob < ApplicationJob
     raw_data = file.read
     utf8_data = raw_data.force_encoding('UTF-8')
     clean_data = utf8_data.valid_encoding? ? utf8_data : utf8_data.encode('UTF-16le', invalid: :replace, replace: '').encode('UTF-8')
+    clean_data = clean_data.delete_prefix("\xEF\xBB\xBF")
 
     CSV.new(StringIO.new(clean_data), headers: true)
   end
diff --git a/app/jobs/hook_job.rb b/app/jobs/hook_job.rb
index 6bbf8355d..deb7c81d8 100644
--- a/app/jobs/hook_job.rb
+++ b/app/jobs/hook_job.rb
@@ -23,13 +23,24 @@ class HookJob < MutexApplicationJob
   private
 
   def process_slack_integration(hook, event_name, event_data)
-    return unless ['message.created'].include?(event_name)
-
     message = event_data[:message]
-    if message.attachments.blank?
-      ::SendOnSlackJob.perform_later(message, hook)
-    else
-      ::SendOnSlackJob.set(wait: 2.seconds).perform_later(message, hook)
+
+    case event_name
+    when 'message.created'
+      if message.attachments.blank?
+        ::SendOnSlackJob.perform_later(message, hook)
+      else
+        ::SendOnSlackJob.set(wait: 2.seconds).perform_later(message, hook)
+      end
+    when 'message.updated'
+      # Only interactive bot messages store responses via content_attributes (submitted_values / submitted_email).
+      # Skip other content types to avoid unnecessary job enqueues on every message update.
+      return unless message.content_type.in?(Integrations::Slack::UpdateSlackMessageService::SUPPORTED_CONTENT_TYPES)
+      # Guard against redundant Slack updates when unrelated attributes change (e.g. status)
+      # while submitted_values is already present on the message.
+      return unless event_data[:previous_changes]&.key?('content_attributes')
+
+      ::UpdateSlackMessageJob.perform_later(message, hook)
     end
   end
 
diff --git a/app/jobs/update_slack_message_job.rb b/app/jobs/update_slack_message_job.rb
new file mode 100644
index 000000000..4b969e42b
--- /dev/null
+++ b/app/jobs/update_slack_message_job.rb
@@ -0,0 +1,11 @@
+class UpdateSlackMessageJob < MutexApplicationJob
+  queue_as :medium
+  retry_on LockAcquisitionError, wait: 1.second, attempts: 8
+
+  def perform(message, hook)
+    key = format(::Redis::Alfred::SLACK_MESSAGE_MUTEX, conversation_id: message.conversation_id, reference_id: hook.reference_id)
+    with_lock(key) do
+      Integrations::Slack::UpdateSlackMessageService.new(message: message, hook: hook).perform
+    end
+  end
+end
diff --git a/app/jobs/webhooks/whatsapp_events_job.rb b/app/jobs/webhooks/whatsapp_events_job.rb
index bf8fc5425..b0bede8b0 100644
--- a/app/jobs/webhooks/whatsapp_events_job.rb
+++ b/app/jobs/webhooks/whatsapp_events_job.rb
@@ -1,5 +1,9 @@
-class Webhooks::WhatsappEventsJob < ApplicationJob
+class Webhooks::WhatsappEventsJob < MutexApplicationJob
   queue_as :low
+  # Retry budget (19 × 2s = 38s) must exceed the 30s lock TTL set in `perform`, otherwise
+  # a webhook that arrives just after the lock is acquired can exhaust retries before the
+  # holder finishes and silently drop its message.
+  retry_on LockAcquisitionError, wait: 2.seconds, attempts: 20
 
   def perform(params = {})
     channel = find_channel_from_whatsapp_business_payload(params)
@@ -9,6 +13,20 @@ class Webhooks::WhatsappEventsJob < ApplicationJob
       return
     end
 
+    sender_id = contact_sender_id(params)
+    return process_events(channel, params) if sender_id.blank?
+
+    # Album uploads arrive as separate concurrent webhooks. Serialize per (inbox, contact)
+    # so the first webhook creates the conversation and the rest append to it.
+    # 30s TTL covers the attachment download + transaction — the default 1s expires
+    # mid-processing and lets a concurrent webhook re-acquire before the first commit.
+    key = format(::Redis::Alfred::WHATSAPP_MESSAGE_MUTEX, inbox_id: channel.inbox.id, sender_id: sender_id)
+    with_lock(key, 30.seconds) do
+      process_events(channel, params)
+    end
+  end
+
+  def process_events(channel, params)
     if message_echo_event?(params)
       handle_message_echo(channel, params)
     else
@@ -69,6 +87,16 @@ class Webhooks::WhatsappEventsJob < ApplicationJob
 
   private
 
+  # Echo payloads reverse the fields — `from` is the business number and `to` is the contact.
+  # Returns nil for status-only webhooks so they bypass the lock.
+  def contact_sender_id(params)
+    value = params.dig(:entry, 0, :changes, 0, :value) || params
+    message = (value[:messages] || value[:message_echoes])&.first
+    return if message.blank?
+
+    message[:to] || message[:from]
+  end
+
   def channel_is_inactive?(channel)
     return true if channel.blank?
     return true if channel.reauthorization_required?
diff --git a/app/listeners/hook_listener.rb b/app/listeners/hook_listener.rb
index 936d104a0..6176d53dd 100644
--- a/app/listeners/hook_listener.rb
+++ b/app/listeners/hook_listener.rb
@@ -43,7 +43,7 @@ class HookListener < BaseListener
       next if hook.inbox.present? && hook.inbox != message.inbox
       next unless supported_hook_event?(hook, event.name)
 
-      HookJob.perform_later(hook, event.name, message: message)
+      HookJob.perform_later(hook, event.name, message: message, previous_changes: event.data[:previous_changes])
     end
   end
 
@@ -59,7 +59,7 @@ class HookListener < BaseListener
     return false if hook.disabled?
 
     supported_events_map = {
-      'slack' => ['message.created'],
+      'slack' => ['message.created', 'message.updated'],
       'dialogflow' => ['message.created', 'message.updated'],
       'google_translate' => ['message.created'],
       'leadsquared' => ['contact.updated', 'conversation.created', 'conversation.resolved']
diff --git a/app/models/account.rb b/app/models/account.rb
index 181081aad..6070b57f4 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -157,6 +157,14 @@ class Account < ApplicationRecord
     ISO_639.find(account_locale)&.english_name&.downcase || 'english'
   end
 
+  def onboarding_step
+    step = custom_attributes['onboarding_step']
+    return nil if step.blank?
+
+    enrichment_key = format(Redis::Alfred::ACCOUNT_ONBOARDING_ENRICHMENT, account_id: id)
+    Redis::Alfred.exists?(enrichment_key) ? 'enrichment' : step
+  end
+
   private
 
   def notify_creation
diff --git a/app/models/agent_bot.rb b/app/models/agent_bot.rb
index 63f71615d..1649a1e2b 100644
--- a/app/models/agent_bot.rb
+++ b/app/models/agent_bot.rb
@@ -32,6 +32,7 @@ class AgentBot < ApplicationRecord
   has_many :agent_bot_inboxes, dependent: :destroy_async
   has_many :inboxes, through: :agent_bot_inboxes
   has_many :messages, as: :sender, dependent: :nullify
+  has_many :platform_app_permissibles, as: :permissible, dependent: :destroy
   has_many :assigned_conversations, class_name: 'Conversation',
                                     foreign_key: :assignee_agent_bot_id,
                                     dependent: :nullify,
diff --git a/app/models/automation_rule.rb b/app/models/automation_rule.rb
index ceac24dfb..9a437bac9 100644
--- a/app/models/automation_rule.rb
+++ b/app/models/automation_rule.rb
@@ -35,7 +35,7 @@ class AutomationRule < ApplicationRecord
   scope :active, -> { where(active: true) }
 
   def conditions_attributes
-    %w[content email country_code status message_type browser_language assignee_id team_id referer city company inbox_id
+    %w[content email country_code status message_type browser_language assignee_id team_id referer city company_name inbox_id
        mail_subject phone_number priority conversation_language labels private_note]
   end
 
diff --git a/app/models/channel/twilio_sms.rb b/app/models/channel/twilio_sms.rb
index 2f9130cbb..e288361ea 100644
--- a/app/models/channel/twilio_sms.rb
+++ b/app/models/channel/twilio_sms.rb
@@ -4,6 +4,7 @@
 #
 #  id                             :bigint           not null, primary key
 #  account_sid                    :string           not null
+#  api_key_secret                 :string
 #  api_key_sid                    :string
 #  auth_token                     :string           not null
 #  content_templates              :jsonb
@@ -11,6 +12,8 @@
 #  medium                         :integer          default("sms")
 #  messaging_service_sid          :string
 #  phone_number                   :string
+#  twiml_app_sid                  :string
+#  voice_enabled                  :boolean          default(FALSE), not null
 #  created_at                     :datetime         not null
 #  updated_at                     :datetime         not null
 #  account_id                     :integer          not null
@@ -58,8 +61,6 @@ class Channel::TwilioSms < ApplicationRecord
     client.messages.create(**params)
   end
 
-  private
-
   def client
     if api_key_sid.present?
       Twilio::REST::Client.new(api_key_sid, auth_token, account_sid)
@@ -68,6 +69,8 @@ class Channel::TwilioSms < ApplicationRecord
     end
   end
 
+  private
+
   def send_message_from
     if messaging_service_sid?
       { messaging_service_sid: messaging_service_sid }
@@ -76,3 +79,5 @@ class Channel::TwilioSms < ApplicationRecord
     end
   end
 end
+
+Channel::TwilioSms.prepend_mod_with('Channel::TwilioSms')
diff --git a/app/models/concerns/avatarable.rb b/app/models/concerns/avatarable.rb
index 94ca55037..3057f8d44 100644
--- a/app/models/concerns/avatarable.rb
+++ b/app/models/concerns/avatarable.rb
@@ -4,6 +4,8 @@ module Avatarable
   extend ActiveSupport::Concern
   include Rails.application.routes.url_helpers
 
+  ALLOWED_AVATAR_CONTENT_TYPES = %w[image/jpeg image/png image/gif image/webp].freeze
+
   included do
     has_one_attached :avatar
     validate :acceptable_avatar, if: -> { avatar.changed? }
@@ -30,7 +32,6 @@ module Avatarable
 
     errors.add(:avatar, 'is too big') if avatar.byte_size > 15.megabytes
 
-    acceptable_types = ['image/jpeg', 'image/png', 'image/gif'].freeze
-    errors.add(:avatar, 'filetype not supported') unless acceptable_types.include?(avatar.content_type)
+    errors.add(:avatar, 'filetype not supported') unless ALLOWED_AVATAR_CONTENT_TYPES.include?(avatar.content_type)
   end
 end
diff --git a/app/models/concerns/sort_handler.rb b/app/models/concerns/sort_handler.rb
index 065fa7fea..519eccc8b 100644
--- a/app/models/concerns/sort_handler.rb
+++ b/app/models/concerns/sort_handler.rb
@@ -19,7 +19,7 @@ module SortHandler
     end
 
     def sort_on_waiting_since(sort_direction = :asc)
-      order(generate_sql_query("waiting_since #{sort_direction.to_s.upcase} NULLS LAST, created_at ASC"))
+      order(generate_sql_query("(waiting_since IS NULL), waiting_since #{sort_direction.to_s.upcase}, created_at ASC"))
     end
 
     def last_messaged_conversations
diff --git a/app/models/custom_attribute_definition.rb b/app/models/custom_attribute_definition.rb
index a2775ebb7..07d0a9535 100644
--- a/app/models/custom_attribute_definition.rb
+++ b/app/models/custom_attribute_definition.rb
@@ -25,7 +25,7 @@ class CustomAttributeDefinition < ApplicationRecord
   STANDARD_ATTRIBUTES = {
     :conversation => %w[status priority assignee_id inbox_id team_id display_id campaign_id labels browser_language country_code referer created_at
                         last_activity_at],
-    :contact => %w[name email phone_number identifier country_code city created_at last_activity_at referer blocked]
+    :contact => %w[name email phone_number identifier country_code city company_name created_at last_activity_at referer blocked]
   }.freeze
 
   scope :with_attribute_model, ->(attribute_model) { attribute_model.presence && where(attribute_model: attribute_model) }
diff --git a/app/models/user.rb b/app/models/user.rb
index 443df1ef6..4aa38bbcd 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -75,6 +75,7 @@ class User < ApplicationRecord
   # work because :validatable in devise overrides this.
   # validates_uniqueness_of :email, scope: :account_id
 
+  validates :name, presence: true
   validates :email, presence: true
 
   serialize :otp_backup_codes, type: Array
diff --git a/app/services/data_import/contact_manager.rb b/app/services/data_import/contact_manager.rb
index 460a83726..7c8ac3308 100644
--- a/app/services/data_import/contact_manager.rb
+++ b/app/services/data_import/contact_manager.rb
@@ -61,7 +61,7 @@ class DataImport::ContactManager
   def update_contact_attributes(params, contact)
     contact.name = params[:name] if params[:name].present?
     contact.additional_attributes ||= {}
-    contact.additional_attributes[:company] = params[:company] if params[:company].present?
+    contact.additional_attributes[:company_name] = params[:company_name] if params[:company_name].present?
     contact.additional_attributes[:city] = params[:city] if params[:city].present?
     contact.assign_attributes(custom_attributes: contact.custom_attributes.merge(params.except(:identifier, :email, :name, :phone_number)))
   end
diff --git a/app/services/whatsapp/liquid_template_processor_service.rb b/app/services/whatsapp/liquid_template_processor_service.rb
new file mode 100644
index 000000000..6703b206c
--- /dev/null
+++ b/app/services/whatsapp/liquid_template_processor_service.rb
@@ -0,0 +1,66 @@
+class Whatsapp::LiquidTemplateProcessorService
+  LIQUID_EXPRESSION = /\{\{\s*(.+?)\s*\}\}/
+
+  module JsonEscapeFilter
+    def json_escape(input)
+      input.to_s.to_json[1..-2]
+    end
+  end
+
+  pattr_initialize [:campaign!, :contact!]
+
+  def process_template_params(template_params)
+    return template_params if template_params.blank?
+
+    template_params_copy = template_params.deep_dup
+    processed_params = template_params_copy['processed_params']
+
+    return template_params_copy if processed_params.blank?
+
+    rendered_params = render_liquid(processed_params)
+    return nil if blank_render?(processed_params, rendered_params)
+
+    template_params_copy.merge('processed_params' => rendered_params)
+  end
+
+  private
+
+  def render_liquid(processed_params)
+    raw = processed_params.to_json
+    rewritten = raw.gsub(LIQUID_EXPRESSION) { "{{ #{Regexp.last_match(1)} | json_escape }}" }
+    rendered = Liquid::Template.parse(rewritten).render!(drops, filters: [JsonEscapeFilter])
+    JSON.parse(rendered)
+  rescue Liquid::Error, JSON::ParserError
+    processed_params
+  end
+
+  def drops
+    {
+      'contact' => ContactDrop.new(contact),
+      'agent' => UserDrop.new(campaign.sender),
+      'inbox' => InboxDrop.new(campaign.inbox),
+      'account' => AccountDrop.new(campaign.account)
+    }
+  end
+
+  def blank_render?(original, rendered)
+    case original
+    when Hash then blank_render_in_hash?(original, rendered)
+    when Array then blank_render_in_array?(original, rendered)
+    when String then original.match?(LIQUID_EXPRESSION) && rendered.to_s.blank?
+    else false
+    end
+  end
+
+  def blank_render_in_hash?(original, rendered)
+    return false unless rendered.is_a?(Hash)
+
+    original.any? { |key, value| blank_render?(value, rendered[key]) }
+  end
+
+  def blank_render_in_array?(original, rendered)
+    return false unless rendered.is_a?(Array)
+
+    original.each_with_index.any? { |value, index| blank_render?(value, rendered[index]) }
+  end
+end
diff --git a/app/services/whatsapp/oneoff_campaign_service.rb b/app/services/whatsapp/oneoff_campaign_service.rb
index 5917838cb..7826f71fd 100644
--- a/app/services/whatsapp/oneoff_campaign_service.rb
+++ b/app/services/whatsapp/oneoff_campaign_service.rb
@@ -58,7 +58,10 @@ class Whatsapp::OneoffCampaignService
       return
     end
 
-    send_whatsapp_template_message(to: contact.phone_number)
+    processed_template_params = process_liquid_template_params(contact)
+    return if processed_template_params.nil?
+
+    send_whatsapp_template_message(to: contact.phone_number, template_params: processed_template_params)
   end
 
   def process_audience(audience_labels)
@@ -70,10 +73,22 @@ class Whatsapp::OneoffCampaignService
     Rails.logger.info "Campaign #{campaign.id} processing completed"
   end
 
-  def send_whatsapp_template_message(to:)
+  def process_liquid_template_params(contact)
+    liquid_processor = Whatsapp::LiquidTemplateProcessorService.new(campaign: campaign, contact: contact)
+    processed_template_params = liquid_processor.process_template_params(campaign.template_params)
+
+    Rails.logger.info "Skipping contact #{contact.name} - liquid variables resolved to blank values" if processed_template_params.nil?
+
+    processed_template_params
+  rescue StandardError => e
+    Rails.logger.error "Failed to process liquid template params for contact #{contact.name}: #{e.message}"
+    nil
+  end
+
+  def send_whatsapp_template_message(to:, template_params:)
     processor = Whatsapp::TemplateProcessorService.new(
       channel: channel,
-      template_params: campaign.template_params
+      template_params: template_params
     )
 
     name, namespace, lang_code, processed_parameters = processor.call
diff --git a/app/views/api/v1/models/_account.json.jbuilder b/app/views/api/v1/models/_account.json.jbuilder
index efeff7db5..5253e7c70 100644
--- a/app/views/api/v1/models/_account.json.jbuilder
+++ b/app/views/api/v1/models/_account.json.jbuilder
@@ -10,7 +10,9 @@ if resource.custom_attributes.present?
     json.company_size resource.custom_attributes['company_size'] if resource.custom_attributes['company_size'].present?
     json.timezone resource.custom_attributes['timezone'] if resource.custom_attributes['timezone'].present?
     json.logo resource.custom_attributes['logo'] if resource.custom_attributes['logo'].present?
-    json.onboarding_step resource.custom_attributes['onboarding_step'] if resource.custom_attributes['onboarding_step'].present?
+    json.referral_source resource.custom_attributes['referral_source'] if resource.custom_attributes['referral_source'].present?
+    json.brand_info resource.custom_attributes['brand_info'] if resource.custom_attributes['brand_info'].present?
+    json.onboarding_step resource.onboarding_step if resource.onboarding_step.present?
     json.marked_for_deletion_at resource.custom_attributes['marked_for_deletion_at'] if resource.custom_attributes['marked_for_deletion_at'].present?
     if resource.custom_attributes['marked_for_deletion_reason'].present?
       json.marked_for_deletion_reason resource.custom_attributes['marked_for_deletion_reason']
diff --git a/app/views/api/v1/models/_inbox.json.jbuilder b/app/views/api/v1/models/_inbox.json.jbuilder
index 619e6a28c..e4c19fea0 100644
--- a/app/views/api/v1/models/_inbox.json.jbuilder
+++ b/app/views/api/v1/models/_inbox.json.jbuilder
@@ -72,6 +72,7 @@ if resource.twilio?
   if Current.account_user&.administrator?
     json.auth_token resource.channel.try(:auth_token)
     json.account_sid resource.channel.try(:account_sid)
+    json.api_key_sid resource.channel.try(:api_key_sid)
   end
 end
 
@@ -131,8 +132,13 @@ if resource.whatsapp?
   json.reauthorization_required resource.channel.try(:reauthorization_required?)
 end
 
-## Voice Channel Attributes
-if resource.channel_type == 'Channel::Voice'
-  json.voice_call_webhook_url resource.channel.try(:voice_call_webhook_url)
-  json.voice_status_webhook_url resource.channel.try(:voice_status_webhook_url)
+## Voice attributes for TwilioSms
+if resource.twilio? && resource.channel.respond_to?(:voice_enabled?)
+  json.voice_enabled resource.channel.voice_enabled?
+  json.voice_configured resource.channel.try(:twiml_app_sid).present?
+  json.has_api_key_secret resource.channel.try(:api_key_secret).present?
+  if resource.channel.try(:twiml_app_sid).present?
+    json.voice_call_webhook_url resource.channel.try(:voice_call_webhook_url)
+    json.voice_status_webhook_url resource.channel.try(:voice_status_webhook_url)
+  end
 end
diff --git a/app/views/api/v1/models/_user.json.jbuilder b/app/views/api/v1/models/_user.json.jbuilder
index b6a448050..e856031c5 100644
--- a/app/views/api/v1/models/_user.json.jbuilder
+++ b/app/views/api/v1/models/_user.json.jbuilder
@@ -22,6 +22,7 @@ json.accounts do
     json.id account_user.account_id
     json.name account_user.account.name
     json.status account_user.account.status
+    json.onboarding_step account_user.account.onboarding_step
     json.active_at account_user.active_at
     json.role account_user.role
     json.permissions account_user.permissions
diff --git a/app/views/devise/mailer/_confirmation_body.html.erb b/app/views/devise/mailer/_confirmation_body.html.erb
new file mode 100644
index 000000000..b256539f3
--- /dev/null
+++ b/app/views/devise/mailer/_confirmation_body.html.erb
@@ -0,0 +1,89 @@
+<tr>
+  <td style="padding: 0 0 16px;">
+    <span style="display: inline-block; padding: 6px 10px; border-radius: 999px; background-color: #EFF6FF; color: #1D4ED8; font-size: 12px; line-height: 12px; font-weight: 700; letter-spacing: 0.08em; text-transform: uppercase;">
+      <%= eyebrow %>
+    </span>
+  </td>
+</tr>
+<tr>
+  <td style="padding: 0 0 12px;">
+    <h1 style="margin: 0; font-size: 32px; line-height: 38px; font-weight: 700; color: #0F172A;"><%= heading %></h1>
+  </td>
+</tr>
+<tr>
+  <td style="padding: 0 0 8px;">
+    <p style="margin: 0; font-size: 14px; line-height: 21px; color: #334155;">Hi <%= recipient_name %>,</p>
+  </td>
+</tr>
+<tr>
+  <td style="padding: 0 0 10px;">
+    <p style="margin: 0; font-size: 14px; line-height: 21px; color: #475569;"><%= intro_text %></p>
+  </td>
+</tr>
+<tr>
+  <td style="padding: 0 0 <%= detail_rows.any? || info_title.present? ? '16px' : '24px' %>;">
+    <p style="margin: 0; font-size: 14px; line-height: 21px; color: #475569;"><%= supporting_text %></p>
+  </td>
+</tr>
+<% if detail_rows.any? %>
+  <tr>
+    <td style="padding: 0 0 24px;">
+      <table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="width: 100%; border: 1px solid #DCE7F5; border-radius: 16px; background-color: #F8FBFF;">
+        <% detail_rows.each_with_index do |(label, value), index| %>
+          <tr>
+            <td style="padding: 16px 18px;<%= ' border-top: 1px solid #E2E8F0;' unless index.zero? %>">
+              <p style="margin: 0 0 4px; font-size: 12px; line-height: 16px; font-weight: 700; letter-spacing: 0.08em; text-transform: uppercase; color: #64748B;">
+                <%= label %>
+              </p>
+              <p style="margin: 0; font-size: 14px; line-height: 21px; font-weight: 600; color: #0F172A;"><%= value %></p>
+            </td>
+          </tr>
+        <% end %>
+      </table>
+    </td>
+  </tr>
+<% end %>
+<% if action_url.present? %>
+  <tr>
+    <td style="padding: 0 0 24px;">
+      <table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="width: 100%; margin: 0;">
+        <tr>
+          <td bgcolor="#2781F6" style="border-radius: 14px; background-color: #2781F6;">
+            <%= link_to(
+              action_text,
+              action_url,
+              style: 'display:block; width:100%; box-sizing:border-box; padding:12px 24px; font-size:14px; line-height:20px; font-weight:700; color:#FFFFFF; text-align:center; text-decoration:none;'
+            ) %>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td style="padding: 0 0 20px;">
+      <p style="margin: 0; font-size: 14px; line-height: 21px; color: #64748B;">
+        If the button does not work, open
+        <%= link_to(
+          'this secure link',
+          action_url,
+          style: 'color:#2781F6; text-decoration:none; font-weight:600;'
+        ) %>.
+      </p>
+    </td>
+  </tr>
+<% elsif info_title.present? %>
+  <tr>
+    <td style="padding: 0 0 24px;">
+      <table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="width: 100%; border: 1px solid #DBEAFE; border-radius: 16px; background-color: #EFF6FF;">
+        <tr>
+          <td style="padding: 18px;">
+            <p style="margin: 0 0 6px; font-size: 14px; line-height: 21px; font-weight: 700; color: #0F172A;">
+              <%= info_title %>
+            </p>
+            <p style="margin: 0; font-size: 14px; line-height: 21px; color: #475569;"><%= info_text %></p>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+<% end %>
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
index 4a3b450a3..619c9f5ec 100644
--- a/app/views/devise/mailer/confirmation_instructions.html.erb
+++ b/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -1,29 +1,65 @@
-<p>Hi <%= @resource.name %>,</p>
+<%
+  brand_name = global_config['BRAND_NAME'] || 'Chatwoot'
+  recipient_name = @resource.name.presence || @resource.email
+  account_user = @resource&.account_users&.first
+  inviter = account_user&.inviter
+  account_name = account_user&.account&.name
+  invited_user = inviter.present? && @resource.unconfirmed_email.blank?
 
-<% account_user = @resource&.account_users&.first %>
+  eyebrow = 'Welcome'
+  heading = 'Confirm your email to get started'
+  intro_text =
+    "Welcome to #{brand_name}. We just need to verify your email address before you can start using your account."
+  supporting_text = 'This only takes a moment.'
+  action_text = 'Confirm my account'
+  action_url = frontend_url('auth/confirmation', confirmation_token: @token)
+  info_title = nil
+  info_text = nil
+  detail_rows = []
+  detail_rows << ['New email', @resource.unconfirmed_email] if @resource.unconfirmed_email.present?
 
-<% if account_user&.inviter.present? && @resource.unconfirmed_email.blank? %>
-  <p><%= account_user.inviter.name %>, with <%= account_user.account.name %>, has invited you to try out <%= global_config['BRAND_NAME'] || 'Chatwoot' %>.</p>
-<% end %>
+  if @resource.unconfirmed_email.present?
+    eyebrow = 'Email update'
+    heading = 'Confirm your new email address'
+    intro_text = "We received a request to update the email address on your #{brand_name} account."
+    supporting_text = 'Confirm the new address below to finish the change.'
+    action_text = 'Confirm email address'
+  elsif @resource.confirmed?
+    eyebrow = 'Account ready'
+    heading = 'Your account is ready'
+    intro_text = "Your #{brand_name} account is already active."
+    supporting_text = 'Use the button below to sign in and continue where you left off.'
+    action_text = 'Open my account'
+    action_url = frontend_url('auth/sign_in')
+    detail_rows = []
+  elsif invited_user
+    eyebrow = 'Workspace invitation'
+    heading = account_name.present? ? "You're invited to join #{account_name}" : "You're invited to try #{brand_name}"
+    intro_text = if account_name.present?
+      "#{inviter.name} invited you to join the #{account_name} workspace on #{brand_name}."
+    else
+      "#{inviter.name} invited you to try #{brand_name}."
+    end
+    supporting_text = 'Create your account to start collaborating with your team.'
+    action_text = 'Accept invitation'
+    action_url = frontend_url(
+      'auth/password/edit',
+      reset_password_token: @resource.send(:set_reset_password_token)
+    )
+    detail_rows = [['Invited by', inviter.name]]
+    detail_rows << ['Workspace', account_name] if account_name.present?
+  end
+%>
 
-<% if @resource.confirmed? %>
-  <p>You can login to your <%= global_config['BRAND_NAME'] || 'Chatwoot' %> account through the link below:</p>
-<% else %>
-  <% if account_user&.inviter.blank? %>
-  <p>
-    Welcome to <%= global_config['BRAND_NAME'] || 'Chatwoot' %>! We have a suite of powerful tools ready for you to explore. Before that we quickly need to verify your email address to know it's really you.
-  </p>
-  <% end %>
-  <p>Please take a moment and click the link below and activate your account.</p>
-<% end %>
-
-
-<% if @resource.unconfirmed_email.present? %>
-  <p><%= link_to 'Confirm my account', frontend_url('auth/confirmation', confirmation_token: @token) %></p>
-<% elsif @resource.confirmed? %>
-  <p><%= link_to 'Login to my account', frontend_url('auth/sign_in') %></p>
-<% elsif account_user&.inviter.present? %>
-  <p><%= link_to 'Confirm my account', frontend_url('auth/password/edit', reset_password_token: @resource.send(:set_reset_password_token)) %></p>
-<% else %>
-  <p><%= link_to 'Confirm my account', frontend_url('auth/confirmation', confirmation_token: @token) %></p>
-<% end %>
\ No newline at end of file
+<%= render partial: 'devise/mailer/confirmation_body', locals: {
+  action_text: action_text,
+  action_url: action_url,
+  detail_rows: detail_rows,
+  eyebrow: eyebrow,
+  heading: heading,
+  info_text: info_text,
+  info_title: info_title,
+  intro_text: intro_text,
+  recipient_name: recipient_name,
+  supporting_text: supporting_text
+} %>
diff --git a/app/views/layouts/mailer/base.liquid b/app/views/layouts/mailer/base.liquid
index 5fa07e139..e6c70b3e5 100644
--- a/app/views/layouts/mailer/base.liquid
+++ b/app/views/layouts/mailer/base.liquid
@@ -7,86 +7,129 @@
     <style type="text/css">
       img {
         max-width: 100%;
+        border: none;
       }
 
       body {
         -webkit-font-smoothing: antialiased;
         -webkit-text-size-adjust: none;
-        height: 100%;
-        line-height: 1.6em;
+        line-height: 21px;
         width: 100% !important;
+        margin: 0;
+        padding: 0;
+        background-color: #F4F7FB;
       }
 
-      body {
-        background-color: #F8FAFC;
+      table {
+        border-collapse: separate;
+        mso-table-lspace: 0pt;
+        mso-table-rspace: 0pt;
+      }
+
+      a {
+        color: #2781F6;
+      }
+
+      .email-container {
+        width: 100%;
+        max-width: 640px;
+      }
+
+      .main-card {
+        width: 100%;
+        border: 1px solid #DCE7F5;
+        border-radius: 24px;
+        background-color: #FFFFFF;
+        box-shadow: 0 12px 32px rgba(15, 23, 42, 0.06);
+        overflow: hidden;
+      }
+
+      .accent-bar {
+        height: 6px;
+        background-color: #2781F6;
+        font-size: 0;
+        line-height: 0;
+      }
+
+      .content-wrap {
+        padding: 40px 36px 20px;
+      }
+
+      .footer {
+        padding: 20px 8px 0;
+        text-align: center;
+        color: #64748B;
+        font-size: 13px;
+        line-height: 21px;
+      }
+
+      .footer a {
+        color: #2781F6;
+        font-weight: 600;
+        text-decoration: none;
       }
 
       @media only screen and (max-width: 640px) {
-        body {
-          padding: 0 !important;
-        }
         h1 {
-          font-size: 22px !important;
-          font-weight: 800 !important;
-          margin: 20px 0 5px !important;
+          font-size: 28px !important;
+          line-height: 34px !important;
         }
-        h2 {
-          font-size: 18px !important;
-          font-weight: 800 !important;
-          margin: 20px 0 5px !important;
+
+        .page-wrap {
+          padding: 24px 12px 32px !important;
         }
-        h3 {
-          font-size: 16px !important;
-          font-weight: 800 !important;
-          margin: 20px 0 5px !important;
-        }
-        h4 {
-          font-weight: 800 !important;
-          margin: 20px 0 5px !important;
-        }
-        .container {
-          padding: 0 !important;
-          width: 100% !important;
-        }
-        .content {
-          padding: 0 !important;
+
+        .main-card {
+          border-radius: 20px !important;
         }
+
         .content-wrap {
-          padding: 10px !important;
+          padding: 32px 24px 18px !important;
         }
       }
     </style>
   </head>
 
-  <body itemscope itemtype="http://schema.org/EmailMessage" style="font-size: 14px; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em; background-color: #F8FAFC; margin: 0;" bgcolor="#F8FAFC">
-    <table class="body-wrap" style="width: 100%; background-color: #F8FAFC; margin: 0;" bgcolor="#F8FAFC">
+  {% assign brand_name = global_config['BRAND_NAME'] %}
+  {% if brand_name == nil %}
+    {% assign brand_name = 'Chatwoot' %}
+  {% endif %}
+  {% assign brand_url = global_config['BRAND_URL'] %}
+
+  <body itemscope itemtype="http://schema.org/EmailMessage" style="font-size: 14px; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,Helvetica,Arial,sans-serif; box-sizing: border-box; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; line-height: 21px; background-color: #F4F7FB; margin: 0; padding: 0;" bgcolor="#F4F7FB">
+    <table class="body-wrap" role="presentation" width="100%" cellpadding="0" cellspacing="0" style="width: 100%; background-color: #F4F7FB; margin: 0;" bgcolor="#F4F7FB">
       <tr style="margin: 0;">
-        <td class="container" width="600" style="display: block !important; max-width: 600px !important; clear: both !important; margin: 0 auto;" valign="top">
-          <div class="content" style="display: block; margin: 0 auto; padding: 20px; text-align:center;">
-            <table class="main" width="100%" cellpadding="0" cellspacing="0" itemprop="action" itemscope itemtype="http://schema.org/ConfirmAction" style="border-radius: 6px;  background-color: #fff; text-align:left; margin: 0; border: 1px solid #e9e9e9; border-top:3px solid #0080f8;" bgcolor="#fff">
+        <td align="center" class="page-wrap" style="padding: 32px 16px 40px;" valign="top">
+          <table class="email-container" role="presentation" width="100%" cellpadding="0" cellspacing="0" style="width: 100%; max-width: 640px; margin: 0 auto;">
+            <tr style="margin: 0;">
+              <td style="margin: 0;">
+                <table class="main-card" role="presentation" width="100%" cellpadding="0" cellspacing="0" itemprop="action" itemscope itemtype="http://schema.org/ConfirmAction" style="width: 100%; border: 1px solid #DCE7F5; border-radius: 24px; background-color: #FFFFFF; box-shadow: 0 12px 32px rgba(15, 23, 42, 0.06); overflow: hidden;" bgcolor="#FFFFFF">
+                  <tr style="margin: 0;">
+                    <td class="accent-bar" style="height: 6px; background-color: #2781F6; font-size: 0; line-height: 0;">&nbsp;</td>
+                  </tr>
+                  <tr style="margin: 0;">
+                    <td class="content-wrap" style="vertical-align: top; margin: 0; padding: 40px 36px 20px; font-family: -apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Helvetica,Arial,sans-serif;" valign="top">
+                      <table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="width: 100%; margin: 0;">
+                        {{ content_for_layout }}
+                      </table>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+            {% if brand_name != '' %}
               <tr style="margin: 0;">
-                <td class="content-wrap" style="vertical-align: top; margin: 0; padding: 20px; font-family: -apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Helvetica,Arial,sans-serif;" valign="top">
-                  <table width="100%" cellpadding="0" cellspacing="0" style="margin: 0;">
-                    {{ content_for_layout }}
-                  </table>
+                <td class="footer" style="padding: 20px 8px 0; text-align: center; color: #64748B; font-size: 13px; line-height: 21px;">
+                  This email was sent by
+                  {% if brand_url != nil and brand_url != '' %}
+                    <a href="{{ brand_url }}" style="color: #2781F6; font-weight: 600; text-decoration: none;">{{ brand_name }}</a>.
+                  {% else %}
+                    <span style="color: #0F172A; font-weight: 600;">{{ brand_name }}</span>.
+                  {% endif %}
                 </td>
               </tr>
-            </table>
-          </div>
-          <div class="footer" style="color: #93AFC8; margin: 0; padding: 0 20px 40px; text-align: center">
-            <table width="100%" style="margin: 0;">
-              <tr style="margin: 0;">
-                {% if global_config['BRAND_NAME'] != '' %}
-                  <td class="content-block" style="font-family: -apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Helvetica,Arial,sans-serif; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
-                    Powered by
-                    <a href="{{ global_config['BRAND_URL'] }}" style="vertical-align: top; color: #93AFC8; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top">
-                      {{ global_config['BRAND_NAME'] }}
-                    </a>
-                  </td>
-                {% endif %}
-              </tr>
-            </table>
-          </div>
+            {% endif %}
+          </table>
         </td>
       </tr>
     </table>
diff --git a/app/views/platform/api/v1/agent_bots/index.json.jbuilder b/app/views/platform/api/v1/agent_bots/index.json.jbuilder
index daa54aa2b..c9172d5f8 100644
--- a/app/views/platform/api/v1/agent_bots/index.json.jbuilder
+++ b/app/views/platform/api/v1/agent_bots/index.json.jbuilder
@@ -1,3 +1,6 @@
 json.array! @resources do |resource|
-  json.partial! 'platform/api/v1/models/agent_bot', formats: [:json], resource: resource.permissible
+  bot = resource.permissible
+  next if bot.nil?
+
+  json.partial! 'platform/api/v1/models/agent_bot', formats: [:json], resource: bot
 end
diff --git a/config/application.rb b/config/application.rb
index aa150794a..08f0451c1 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -37,6 +37,7 @@ module Chatwoot
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
     config.load_defaults 7.0
+    config.rails_i18n.enabled_modules = [:pluralization]
 
     config.eager_load_paths << Rails.root.join('lib')
     config.eager_load_paths << Rails.root.join('enterprise/lib')
diff --git a/config/features.yml b/config/features.yml
index 8a7074e71..f16199932 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -191,10 +191,10 @@
 - name: assignment_v2
   display_name: Assignment V2
   enabled: true
-- name: twilio_content_templates
-  display_name: Twilio Content Templates
+- name: captain_document_auto_sync
+  display_name: Captain Document Auto Sync
   enabled: false
-  deprecated: true
+  premium: true
 - name: advanced_search
   display_name: Advanced Search
   enabled: false
diff --git a/config/initializers/i18n_pluralization.rb b/config/initializers/i18n_pluralization.rb
new file mode 100644
index 000000000..c4fc3fb4b
--- /dev/null
+++ b/config/initializers/i18n_pluralization.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+other_plural_rule = ->(_count) { :other }
+
+Rails.application.config.after_initialize do
+  I18n.backend.store_translations(:zh_CN, i18n: { plural: { rule: other_plural_rule } })
+  I18n.backend.store_translations(:zh_TW, i18n: { plural: { rule: other_plural_rule } })
+end
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 7b78b466a..60596156c 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -40,6 +40,11 @@ Rails.application.reloader.to_prepare do
   if File.exist?(schedule_file) && Sidekiq.server?
     schedule = YAML.load_file(schedule_file)
 
+    # Merge enterprise-only cron entries when running an enterprise build.
+    # Mirrors the conditional-load pattern already used for enterprise initializers.
+    enterprise_schedule_file = Rails.root.join('enterprise/config/schedule.yml')
+    schedule.merge!(YAML.load_file(enterprise_schedule_file)) if ChatwootApp.enterprise? && enterprise_schedule_file.exist?
+
     # Cron entries removed from schedule.yml but possibly still in Redis
     # with source:'dynamic' (predating the source tag). load_from_hash!
     # only cleans up source:'schedule' entries, so these need explicit removal.
diff --git a/config/locales/devise.id.yml b/config/locales/devise.id.yml
index 71b9f46fb..fc6bfb26a 100644
--- a/config/locales/devise.id.yml
+++ b/config/locales/devise.id.yml
@@ -57,5 +57,4 @@ id:
       not_found: "tidak ditemukan"
       not_locked: "tidak terkunci"
       not_saved:
-        one: "%{count} kesalahan mengakibatkan %{resource} ini tidak dapat disimpan:"
         other: "%{count} kesalahan mengakibatkan %{resource} ini tidak dapat disimpan:"
diff --git a/config/locales/devise.ja.yml b/config/locales/devise.ja.yml
index 043cd8351..a5840c6fc 100644
--- a/config/locales/devise.ja.yml
+++ b/config/locales/devise.ja.yml
@@ -57,5 +57,4 @@ ja:
       not_found: "見つかりませんでした"
       not_locked: "はロックされていません"
       not_saved:
-        one: "%{count} 個のエラーが発生し、 %{resource} を保存できませんでした："
         other: "%{count} 個のエラーが発生し、 %{resource} を保存できませんでした："
diff --git a/config/locales/devise.ko.yml b/config/locales/devise.ko.yml
index 846664ec9..5afb6c1c2 100644
--- a/config/locales/devise.ko.yml
+++ b/config/locales/devise.ko.yml
@@ -57,5 +57,4 @@ ko:
       not_found: "찾을 수 없습니다"
       not_locked: "잠겨 있지 않습니다"
       not_saved:
-        one: "%{count}개의 오류로 인해 이 %{resource}을(를) 저장할 수 없습니다:"
         other: "%{count}개의 오류로 인해 이 %{resource}을(를) 저장할 수 없습니다:"
diff --git a/config/locales/devise.ms.yml b/config/locales/devise.ms.yml
index ebcfe89e3..cecd08588 100644
--- a/config/locales/devise.ms.yml
+++ b/config/locales/devise.ms.yml
@@ -57,5 +57,4 @@ ms:
       not_found: "not found"
       not_locked: "was not locked"
       not_saved:
-        one: "%{count} errors prohibited this %{resource} from being saved:"
         other: "%{count} errors prohibited this %{resource} from being saved:"
diff --git a/config/locales/devise.th.yml b/config/locales/devise.th.yml
index c9f52018d..18e1572bb 100644
--- a/config/locales/devise.th.yml
+++ b/config/locales/devise.th.yml
@@ -57,5 +57,4 @@ th:
       not_found: "not found"
       not_locked: "was not locked"
       not_saved:
-        one: "%{count} errors prohibited this %{resource} from being saved:"
         other: "%{count} errors prohibited this %{resource} from being saved:"
diff --git a/config/locales/devise.vi.yml b/config/locales/devise.vi.yml
index 947e756f3..15dca044a 100644
--- a/config/locales/devise.vi.yml
+++ b/config/locales/devise.vi.yml
@@ -57,5 +57,4 @@ vi:
       not_found: "không tìm thấy"
       not_locked: "không được khoá"
       not_saved:
-        one: "Có %{count} lỗi được tìm thấy từ %{resource}:"
         other: "Có %{count} lỗi được tìm thấy từ %{resource}:"
diff --git a/config/locales/devise.zh_CN.yml b/config/locales/devise.zh_CN.yml
index 00f239948..2bf2831a8 100644
--- a/config/locales/devise.zh_CN.yml
+++ b/config/locales/devise.zh_CN.yml
@@ -57,5 +57,4 @@ zh_CN:
       not_found: "找不到"
       not_locked: "未锁定"
       not_saved:
-        one: "%{count} 个错误禁止保存 %{resource}："
         other: "%{count} 个错误禁止保存 %{resource}："
diff --git a/config/locales/devise.zh_TW.yml b/config/locales/devise.zh_TW.yml
index c5bd49450..f892bf796 100644
--- a/config/locales/devise.zh_TW.yml
+++ b/config/locales/devise.zh_TW.yml
@@ -57,5 +57,4 @@ zh_TW:
       not_found: "找不到。"
       not_locked: "並未被鎖定。"
       not_saved:
-        one: "有 %{count} 個錯誤導致 %{resource} 不能被儲存："
         other: "有 %{count} 個錯誤導致 %{resource} 不能被儲存："
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1841db332..20eefd0a5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -379,6 +379,9 @@ en:
       limit_exceeded: 'Document limit exceeded'
       pdf_format_error: 'must be a PDF file'
       pdf_size_error: 'must be less than 10MB'
+      sync_not_supported_for_pdf: 'Sync is not supported for PDF documents'
+      sync_only_available_documents: 'Sync is only available for processed documents'
+      sync_already_in_progress: 'Document sync is already in progress'
       pdf_upload_failed: 'Failed to upload PDF to OpenAI'
       pdf_upload_success: 'PDF uploaded successfully with file_id: %{file_id}'
       pdf_processing_failed: 'Failed to process PDF document %{document_id}: %{error}'
@@ -488,6 +491,12 @@ en:
   agent_capacity_policy:
     inbox_already_assigned: 'Inbox has already been assigned to this policy'
   portals:
+    articles:
+      captain_not_available: 'Translation requires Captain to be enabled for this account'
+      locale_not_available: 'Locale not available in this portal'
+      category_not_found: 'Category not found in this portal'
+      no_articles_found: 'No articles found to process'
+      invalid_status: 'Invalid status value'
     send_instructions:
       email_required: 'Email is required'
       invalid_email_format: 'Invalid email format'
diff --git a/config/locales/id.yml b/config/locales/id.yml
index aefcff3fe..b097de83d 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -435,16 +435,12 @@ id:
     button: Buka percakapan
   time_units:
     days:
-      one: '%{count} days'
       other: '%{count} days'
     hours:
-      one: '%{count} hours'
       other: '%{count} hours'
     minutes:
-      one: '%{count} minutes'
       other: '%{count} minutes'
     seconds:
-      one: '%{count} seconds'
       other: '%{count} seconds'
   auto_assignment:
     default_policy_name: 'Default Policy'
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 5e3412378..deca85ebf 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -435,16 +435,12 @@ ja:
     button: 会話を開く
   time_units:
     days:
-      one: '%{count} 日'
       other: '%{count} 日'
     hours:
-      one: '%{count} 時間'
       other: '%{count} 時間'
     minutes:
-      one: '%{count} 分'
       other: '%{count} 分'
     seconds:
-      one: '%{count} 秒'
       other: '%{count} 秒'
   auto_assignment:
     default_policy_name: 'Default Policy'
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index c010ee2ac..153f39928 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -435,16 +435,12 @@ ko:
     button: 대화 열기
   time_units:
     days:
-      one: '%{count}일'
       other: '%{count}일'
     hours:
-      one: '%{count}시간'
       other: '%{count}시간'
     minutes:
-      one: '%{count}분'
       other: '%{count}분'
     seconds:
-      one: '%{count}초'
       other: '%{count}초'
   auto_assignment:
     default_policy_name: '기본 정책'
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 617056d7e..e1ee39aee 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -435,16 +435,12 @@ ms:
     button: Open conversation
   time_units:
     days:
-      one: '%{count} days'
       other: '%{count} days'
     hours:
-      one: '%{count} hours'
       other: '%{count} hours'
     minutes:
-      one: '%{count} minutes'
       other: '%{count} minutes'
     seconds:
-      one: '%{count} seconds'
       other: '%{count} seconds'
   auto_assignment:
     default_policy_name: 'Default Policy'
diff --git a/config/locales/th.yml b/config/locales/th.yml
index b278ec442..aeef51e95 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -435,16 +435,12 @@ th:
     button: เปิดดูการสนทนา
   time_units:
     days:
-      one: '%{count} days'
       other: '%{count} days'
     hours:
-      one: '%{count} hours'
       other: '%{count} hours'
     minutes:
-      one: '%{count} minutes'
       other: '%{count} minutes'
     seconds:
-      one: '%{count} seconds'
       other: '%{count} seconds'
   auto_assignment:
     default_policy_name: 'Default Policy'
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index c53f8de4c..1facb248f 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -435,16 +435,12 @@ vi:
     button: Mở cuộc trò chuyện
   time_units:
     days:
-      one: '%{count} days'
       other: '%{count} days'
     hours:
-      one: '%{count} hours'
       other: '%{count} hours'
     minutes:
-      one: '%{count} minutes'
       other: '%{count} minutes'
     seconds:
-      one: '%{count} seconds'
       other: '%{count} seconds'
   auto_assignment:
     default_policy_name: 'Default Policy'
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index 0f6cd069f..ab8005c5e 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -435,16 +435,12 @@ zh_CN:
     button: 重新打开会话
   time_units:
     days:
-      one: '%{count} 天'
       other: '%{count} 天'
     hours:
-      one: '%{count} 小时'
       other: '%{count} 小时'
     minutes:
-      one: '%{count} 分钟'
       other: '%{count} 分钟'
     seconds:
-      one: '%{count} 秒'
       other: '%{count} 秒'
   auto_assignment:
     default_policy_name: 'Default Policy'
diff --git a/config/locales/zh_TW.yml b/config/locales/zh_TW.yml
index 775bcf000..d7dd33efa 100644
--- a/config/locales/zh_TW.yml
+++ b/config/locales/zh_TW.yml
@@ -435,16 +435,12 @@ zh_TW:
     button: '開啟對話'
   time_units:
     days:
-      one: '%{count} 天'
       other: '%{count} 天'
     hours:
-      one: '%{count} 小時'
       other: '%{count} 小時'
     minutes:
-      one: '%{count} 分鐘'
       other: '%{count} 分鐘'
     seconds:
-      one: '%{count} 秒'
       other: '%{count} 秒'
   auto_assignment:
     default_policy_name: '預設策略'
diff --git a/config/routes.rb b/config/routes.rb
index 2461539ad..cadb204a5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -77,7 +77,9 @@ Rails.application.routes.draw do
             resources :custom_tools do
               post :test, on: :collection
             end
-            resources :documents, only: [:index, :show, :create, :destroy]
+            resources :documents, only: [:index, :show, :create, :destroy] do
+              post :sync, on: :member
+            end
             resource :tasks, only: [], controller: 'tasks' do
               post :rewrite
               post :summarize
@@ -358,6 +360,13 @@ Rails.application.routes.draw do
             resources :categories do
               post :reorder, on: :collection
             end
+            namespace :articles do
+              resource :bulk_actions, only: [] do
+                post :translate
+                patch :update_status
+                delete :delete_articles
+              end
+            end
             resources :articles do
               post :reorder, on: :collection
             end
diff --git a/db/migrate/20260326120000_add_voice_to_channel_twilio_sms.rb b/db/migrate/20260326120000_add_voice_to_channel_twilio_sms.rb
new file mode 100644
index 000000000..0051f7614
--- /dev/null
+++ b/db/migrate/20260326120000_add_voice_to_channel_twilio_sms.rb
@@ -0,0 +1,7 @@
+class AddVoiceToChannelTwilioSms < ActiveRecord::Migration[7.0]
+  def change
+    add_column :channel_twilio_sms, :voice_enabled, :boolean, default: false, null: false
+    add_column :channel_twilio_sms, :twiml_app_sid, :string
+    add_column :channel_twilio_sms, :api_key_secret, :string
+  end
+end
diff --git a/db/migrate/20260326120001_drop_channel_voice.rb b/db/migrate/20260326120001_drop_channel_voice.rb
new file mode 100644
index 000000000..6da514226
--- /dev/null
+++ b/db/migrate/20260326120001_drop_channel_voice.rb
@@ -0,0 +1,20 @@
+class DropChannelVoice < ActiveRecord::Migration[7.0]
+  def up
+    drop_table :channel_voice, if_exists: true
+  end
+
+  def down
+    create_table :channel_voice do |t|
+      t.string :phone_number, null: false
+      t.string :provider, null: false, default: 'twilio'
+      t.jsonb :provider_config, null: false
+      t.integer :account_id, null: false
+      t.jsonb :additional_attributes, default: {}
+
+      t.timestamps
+    end
+
+    add_index :channel_voice, :phone_number, unique: true
+    add_index :channel_voice, :account_id
+  end
+end
diff --git a/db/migrate/20260426011444_repurpose_twilio_content_templates_flag_for_captain_document_auto_sync.rb b/db/migrate/20260426011444_repurpose_twilio_content_templates_flag_for_captain_document_auto_sync.rb
new file mode 100644
index 000000000..2233ac511
--- /dev/null
+++ b/db/migrate/20260426011444_repurpose_twilio_content_templates_flag_for_captain_document_auto_sync.rb
@@ -0,0 +1,22 @@
+class RepurposeTwilioContentTemplatesFlagForCaptainDocumentAutoSync < ActiveRecord::Migration[7.1]
+  def up
+    # The twilio_content_templates flag (deprecated) has been renamed to captain_document_auto_sync.
+    # Disable it on any accounts that had twilio_content_templates enabled so the repurposed
+    # flag starts in its intended default-off state.
+    Account.feature_captain_document_auto_sync.find_each(batch_size: 100) do |account|
+      account.disable_features(:captain_document_auto_sync)
+      account.save!(validate: false)
+    end
+
+    # Remove the stale twilio_content_templates entry from ACCOUNT_LEVEL_FEATURE_DEFAULTS.
+    # ConfigLoader only adds new flags; it never removes renamed ones.
+    # Leaving it would cause NoMethodError in enable_default_features when
+    # creating new accounts (feature_twilio_content_templates= no longer exists).
+    config = InstallationConfig.find_by(name: 'ACCOUNT_LEVEL_FEATURE_DEFAULTS')
+    return if config&.value.blank?
+
+    config.value = config.value.reject { |f| f['name'] == 'twilio_content_templates' }
+    config.save!
+    GlobalConfig.clear_cache
+  end
+end
diff --git a/db/migrate/20260427094500_rename_company_condition_key_in_automation_rules.rb b/db/migrate/20260427094500_rename_company_condition_key_in_automation_rules.rb
new file mode 100644
index 000000000..adb7e9b13
--- /dev/null
+++ b/db/migrate/20260427094500_rename_company_condition_key_in_automation_rules.rb
@@ -0,0 +1,47 @@
+class RenameCompanyConditionKeyInAutomationRules < ActiveRecord::Migration[7.1]
+  def up
+    migrate_automation_rule_conditions
+    migrate_contact_custom_filter_queries
+  end
+
+  def down; end
+
+  private
+
+  def migrate_automation_rule_conditions
+    AutomationRule.find_each do |rule|
+      conditions = rename_company_attribute_key(rule.conditions)
+
+      next if conditions == rule.conditions
+
+      rule.update_column(:conditions, conditions) # rubocop:disable Rails/SkipsModelValidations
+    end
+  end
+
+  def migrate_contact_custom_filter_queries
+    CustomFilter.contact.find_each do |filter|
+      query = filter.query.deep_dup
+      payload = rename_company_attribute_key(query['payload'])
+      next if payload == query['payload']
+
+      query['payload'] = payload
+      filter.update_column(:query, query) # rubocop:disable Rails/SkipsModelValidations
+    end
+  end
+
+  def rename_company_attribute_key(conditions)
+    return conditions unless conditions.is_a?(Array)
+
+    conditions.map do |condition|
+      next condition unless standard_company_condition?(condition)
+
+      condition.merge('attribute_key' => 'company_name')
+    end
+  end
+
+  def standard_company_condition?(condition)
+    condition['attribute_key'] == 'company' &&
+      condition['custom_attribute_type'].blank? &&
+      condition['attribute_model'].in?([nil, '', 'standard'])
+  end
+end
diff --git a/db/migrate/20260428120000_backfill_captain_document_sync_metadata.rb b/db/migrate/20260428120000_backfill_captain_document_sync_metadata.rb
new file mode 100644
index 000000000..493de2f1b
--- /dev/null
+++ b/db/migrate/20260428120000_backfill_captain_document_sync_metadata.rb
@@ -0,0 +1,18 @@
+class BackfillCaptainDocumentSyncMetadata < ActiveRecord::Migration[7.0]
+  def up
+    return unless ChatwootApp.enterprise?
+
+    # rubocop:disable Rails/SkipsModelValidations
+    Captain::Document
+      .syncable
+      .where(status: :available, sync_status: nil, last_synced_at: nil)
+      .in_batches(of: 1000) do |batch|
+        batch.update_all('sync_status = 1, last_synced_at = updated_at')
+      end
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+
+  def down
+    # No-op. This is a one-time baseline for existing available web documents.
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a143f593d..35d6f699c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2026_04_10_092753) do
+ActiveRecord::Schema[7.1].define(version: 2026_04_28_120000) do
   # These extensions should be enabled to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -552,6 +552,9 @@ ActiveRecord::Schema[7.1].define(version: 2026_04_10_092753) do
     t.string "api_key_sid"
     t.jsonb "content_templates", default: {}
     t.datetime "content_templates_last_updated"
+    t.boolean "voice_enabled", default: false, null: false
+    t.string "twiml_app_sid"
+    t.string "api_key_secret"
     t.index ["account_sid", "phone_number"], name: "index_channel_twilio_sms_on_account_sid_and_phone_number", unique: true
     t.index ["messaging_service_sid"], name: "index_channel_twilio_sms_on_messaging_service_sid", unique: true
     t.index ["phone_number"], name: "index_channel_twilio_sms_on_phone_number", unique: true
@@ -568,18 +571,6 @@ ActiveRecord::Schema[7.1].define(version: 2026_04_10_092753) do
     t.index ["account_id", "profile_id"], name: "index_channel_twitter_profiles_on_account_id_and_profile_id", unique: true
   end
 
-  create_table "channel_voice", force: :cascade do |t|
-    t.string "phone_number", null: false
-    t.string "provider", default: "twilio", null: false
-    t.jsonb "provider_config", null: false
-    t.integer "account_id", null: false
-    t.jsonb "additional_attributes", default: {}
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["account_id"], name: "index_channel_voice_on_account_id"
-    t.index ["phone_number"], name: "index_channel_voice_on_phone_number", unique: true
-  end
-
   create_table "channel_web_widgets", id: :serial, force: :cascade do |t|
     t.string "website_url"
     t.integer "account_id"
diff --git a/enterprise/app/builders/enterprise/contact_inbox_builder.rb b/enterprise/app/builders/enterprise/contact_inbox_builder.rb
index 043505f7f..e7ab48fd5 100644
--- a/enterprise/app/builders/enterprise/contact_inbox_builder.rb
+++ b/enterprise/app/builders/enterprise/contact_inbox_builder.rb
@@ -2,13 +2,13 @@ module Enterprise::ContactInboxBuilder
   private
 
   def generate_source_id
-    return super unless @inbox.channel_type == 'Channel::Voice'
+    return super unless twilio_voice_inbox?
 
     phone_source_id
   end
 
   def phone_source_id
-    return super unless @inbox.channel_type == 'Channel::Voice'
+    return super unless twilio_voice_inbox?
 
     return SecureRandom.uuid if @contact.phone_number.blank?
 
@@ -16,6 +16,10 @@ module Enterprise::ContactInboxBuilder
   end
 
   def allowed_channels?
-    super || @inbox.channel_type == 'Channel::Voice'
+    super || twilio_voice_inbox?
+  end
+
+  def twilio_voice_inbox?
+    @inbox.channel_type == 'Channel::TwilioSms' && @inbox.channel.voice_enabled?
   end
 end
diff --git a/enterprise/app/builders/enterprise/messages/message_builder.rb b/enterprise/app/builders/enterprise/messages/message_builder.rb
index 727248956..06bd0357c 100644
--- a/enterprise/app/builders/enterprise/messages/message_builder.rb
+++ b/enterprise/app/builders/enterprise/messages/message_builder.rb
@@ -2,8 +2,13 @@ module Enterprise::Messages::MessageBuilder
   private
 
   def message_type
-    return @message_type if @message_type == 'incoming' && @conversation.inbox.channel_type == 'Channel::Voice'
+    return @message_type if @message_type == 'incoming' && twilio_voice_inbox? && @params[:content_type] == 'voice_call'
 
     super
   end
+
+  def twilio_voice_inbox?
+    inbox = @conversation.inbox
+    inbox.channel_type == 'Channel::TwilioSms' && inbox.channel.voice_enabled?
+  end
 end
diff --git a/enterprise/app/controllers/api/v1/accounts/captain/bulk_actions_controller.rb b/enterprise/app/controllers/api/v1/accounts/captain/bulk_actions_controller.rb
index e7d02a887..bc1ebaf9e 100644
--- a/enterprise/app/controllers/api/v1/accounts/captain/bulk_actions_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/captain/bulk_actions_controller.rb
@@ -7,7 +7,10 @@ class Api::V1::Accounts::Captain::BulkActionsController < Api::V1::Accounts::Bas
   MODEL_TYPE = %w[AssistantResponse AssistantDocument].freeze
 
   def create
-    @responses = process_bulk_action
+    result = process_bulk_action
+    return if performed?
+
+    @responses = result
   end
 
   private
@@ -15,13 +18,13 @@ class Api::V1::Accounts::Captain::BulkActionsController < Api::V1::Accounts::Bas
   def validate_params
     return if params[:type].present? && params[:ids].present? && params[:fields].present?
 
-    render json: { success: false }, status: :unprocessable_entity
+    render json: { success: false }, status: :unprocessable_content
   end
 
   def type_matches?
     return if MODEL_TYPE.include?(params[:type])
 
-    render json: { success: false }, status: :unprocessable_entity
+    render json: { success: false }, status: :unprocessable_content
   end
 
   def process_bulk_action
@@ -48,13 +51,38 @@ class Api::V1::Accounts::Captain::BulkActionsController < Api::V1::Accounts::Bas
   end
 
   def handle_documents
-    return [] unless params[:fields][:status] == 'delete'
+    case params[:fields][:status]
+    when 'delete'
+      delete_documents
+    when 'sync'
+      sync_documents
+    else
+      []
+    end
+  end
 
+  def delete_documents
     documents = Current.account.captain_documents.where(id: params[:ids])
-    return [] unless documents.exists?
+    return render json: { count: 0 } unless documents.exists?
 
-    documents.destroy_all
-    []
+    destroyed_documents = documents.destroy_all
+    render json: { count: destroyed_documents.size }
+  end
+
+  def sync_documents
+    synced_document_ids = []
+
+    Current.account.captain_documents.where(id: params[:ids]).find_each(batch_size: 100) do |document|
+      next unless document.syncable?
+      next unless document.available?
+      next if document.sync_in_progress?
+
+      document.update!(sync_status: :syncing, last_sync_attempted_at: Time.current)
+      Captain::Documents::PerformSyncJob.perform_later(document)
+      synced_document_ids << document.id
+    end
+
+    render json: { ids: synced_document_ids, count: synced_document_ids.size }
   end
 
   def permitted_params
diff --git a/enterprise/app/controllers/api/v1/accounts/captain/documents_controller.rb b/enterprise/app/controllers/api/v1/accounts/captain/documents_controller.rb
index 32fa0a7b6..973559743 100644
--- a/enterprise/app/controllers/api/v1/accounts/captain/documents_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/captain/documents_controller.rb
@@ -4,7 +4,7 @@ class Api::V1::Accounts::Captain::DocumentsController < Api::V1::Accounts::BaseC
 
   before_action :set_current_page, only: [:index]
   before_action :set_documents, except: [:create]
-  before_action :set_document, only: [:show, :destroy]
+  before_action :set_document, only: [:show, :destroy, :sync]
   before_action :set_assistant, only: [:create]
   RESULTS_PER_PAGE = 25
 
@@ -29,6 +29,16 @@ class Api::V1::Accounts::Captain::DocumentsController < Api::V1::Accounts::BaseC
     render_could_not_create_error(e.record.errors.full_messages.join(', '))
   end
 
+  def sync
+    return render_could_not_create_error(I18n.t('captain.documents.sync_not_supported_for_pdf')) unless @document.syncable?
+    return render_could_not_create_error(I18n.t('captain.documents.sync_only_available_documents')) unless @document.available?
+    return render_could_not_create_error(I18n.t('captain.documents.sync_already_in_progress')) if @document.sync_in_progress?
+
+    @document.update!(sync_status: :syncing, last_sync_attempted_at: Time.current)
+    Captain::Documents::PerformSyncJob.perform_later(@document)
+    head :accepted
+  end
+
   def destroy
     @document.destroy
     head :no_content
diff --git a/enterprise/app/controllers/api/v1/accounts/contacts/calls_controller.rb b/enterprise/app/controllers/api/v1/accounts/contacts/calls_controller.rb
index bcdd178fe..11a352325 100644
--- a/enterprise/app/controllers/api/v1/accounts/contacts/calls_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/contacts/calls_controller.rb
@@ -30,9 +30,14 @@ class Api::V1::Accounts::Contacts::CallsController < Api::V1::Accounts::BaseCont
   end
 
   def voice_inbox
-    @voice_inbox ||= Current.user.assigned_inboxes.where(
-      account_id: Current.account.id,
-      channel_type: 'Channel::Voice'
-    ).find(params.require(:inbox_id))
+    @voice_inbox ||= begin
+      inbox = Current.user.assigned_inboxes.where(
+        account_id: Current.account.id,
+        channel_type: 'Channel::TwilioSms'
+      ).find(params.require(:inbox_id))
+      raise ActiveRecord::RecordNotFound, 'Voice not enabled' unless inbox.channel.voice_enabled?
+
+      inbox
+    end
   end
 end
diff --git a/enterprise/app/controllers/enterprise/api/v1/accounts/articles/bulk_actions_controller.rb b/enterprise/app/controllers/enterprise/api/v1/accounts/articles/bulk_actions_controller.rb
new file mode 100644
index 000000000..87ad54d24
--- /dev/null
+++ b/enterprise/app/controllers/enterprise/api/v1/accounts/articles/bulk_actions_controller.rb
@@ -0,0 +1,68 @@
+module Enterprise::Api::V1::Accounts::Articles::BulkActionsController
+  def translate
+    return unless validate_translate_params?
+
+    duplicates = find_existing_translations
+    if duplicates.any? && !ActiveModel::Type::Boolean.new.cast(permitted_params[:force])
+      return render json: {
+        duplicate_articles: duplicates.map { |a| { id: a.id, title: a.title } }
+      }, status: :conflict
+    end
+
+    @articles.find_each do |article|
+      Captain::Articles::TranslateJob.perform_later(
+        Current.account, article.id, @locale, @category&.id, Current.user
+      )
+    end
+
+    head :ok
+  end
+
+  private
+
+  def permitted_params
+    params.permit(:locale, :category_id, :force, ids: [])
+  end
+
+  def validate_translate_params?
+    @locale = permitted_params[:locale]
+    @category = @portal.categories.find_by(id: permitted_params[:category_id], locale: @locale)
+    @articles = @portal.articles.where(id: permitted_params[:ids])
+
+    captain_available? && valid_locale? && valid_category? && valid_articles?
+  end
+
+  def find_existing_translations
+    root_ids = @articles.map { |a| Article.find_root_article_id(a) }
+    @portal.articles.where(associated_article_id: root_ids, locale: @locale)
+  end
+
+  def captain_available?
+    return true if Current.account.feature_enabled?('captain_tasks')
+
+    render_could_not_create_error(I18n.t('portals.articles.captain_not_available'))
+    false
+  end
+
+  def valid_locale?
+    return true if @portal.config['allowed_locales']&.include?(@locale)
+
+    render_could_not_create_error(I18n.t('portals.articles.locale_not_available'))
+    false
+  end
+
+  def valid_category?
+    return true if permitted_params[:category_id].blank?
+    return true if @category.present?
+
+    render_could_not_create_error(I18n.t('portals.articles.category_not_found'))
+    false
+  end
+
+  def valid_articles?
+    return true if @articles.any?
+
+    render_could_not_create_error(I18n.t('portals.articles.no_articles_found'))
+    false
+  end
+end
diff --git a/enterprise/app/controllers/enterprise/api/v1/accounts/inboxes_controller.rb b/enterprise/app/controllers/enterprise/api/v1/accounts/inboxes_controller.rb
index 396c3a91d..f9d828806 100644
--- a/enterprise/app/controllers/enterprise/api/v1/accounts/inboxes_controller.rb
+++ b/enterprise/app/controllers/enterprise/api/v1/accounts/inboxes_controller.rb
@@ -14,20 +14,46 @@ module Enterprise::Api::V1::Accounts::InboxesController
   end
 
   def channel_type_from_params
-    case permitted_params[:channel][:type]
-    when 'voice'
-      Channel::Voice
-    else
-      super
-    end
+    return Channel::TwilioSms if permitted_params[:channel][:type] == 'voice'
+
+    super
   end
 
   def account_channels_method
-    case permitted_params[:channel][:type]
-    when 'voice'
-      Current.account.voice_channels
-    else
-      super
-    end
+    return Current.account.twilio_sms if permitted_params[:channel][:type] == 'voice'
+
+    super
+  end
+
+  def create_channel
+    return create_voice_channel if permitted_params[:channel][:type] == 'voice'
+
+    super
+  end
+
+  def get_channel_attributes(channel_type)
+    attrs = super
+    attrs += [:voice_enabled, :api_key_sid, :api_key_secret] if channel_type == 'Channel::TwilioSms' && @inbox&.channel&.medium == 'sms'
+    attrs
+  end
+
+  def create_voice_channel
+    raise Pundit::NotAuthorizedError unless Current.account.feature_enabled?('channel_voice')
+
+    voice_params = params.require(:channel).permit(
+      :phone_number, :provider,
+      provider_config: [:account_sid, :auth_token, :api_key_sid, :api_key_secret]
+    )
+    config = voice_params[:provider_config] || {}
+
+    Current.account.twilio_sms.create!(
+      phone_number: voice_params[:phone_number],
+      account_sid: config[:account_sid],
+      auth_token: config[:auth_token],
+      api_key_sid: config[:api_key_sid],
+      api_key_secret: config[:api_key_secret],
+      medium: :sms,
+      voice_enabled: true
+    )
   end
 end
diff --git a/enterprise/app/controllers/twilio/voice_controller.rb b/enterprise/app/controllers/twilio/voice_controller.rb
index aa2696b31..a8555b373 100644
--- a/enterprise/app/controllers/twilio/voice_controller.rb
+++ b/enterprise/app/controllers/twilio/voice_controller.rb
@@ -169,8 +169,10 @@ class Twilio::VoiceController < ApplicationController
 
   def set_inbox!
     digits = params[:phone].to_s.gsub(/\D/, '')
-    e164 = "+#{digits}"
-    channel = Channel::Voice.find_by!(phone_number: e164)
+    phone_number = "+#{digits}"
+    channel = Channel::TwilioSms.find_by!(phone_number: phone_number)
+    raise ActiveRecord::RecordNotFound, "Voice not enabled for #{phone_number}" unless channel.voice_enabled?
+
     @inbox = channel.inbox
   end
 
diff --git a/enterprise/app/jobs/captain/articles/translate_job.rb b/enterprise/app/jobs/captain/articles/translate_job.rb
new file mode 100644
index 000000000..c3524cbff
--- /dev/null
+++ b/enterprise/app/jobs/captain/articles/translate_job.rb
@@ -0,0 +1,59 @@
+class Captain::Articles::TranslateJob < ApplicationJob
+  queue_as :low
+
+  def perform(account, article_id, target_locale, target_category_id, user)
+    @account = account
+    @source_article = account.articles.find(article_id)
+
+    target_language = language_name_for(target_locale)
+
+    translated_title = translate(@source_article.title, target_language: target_language, type: :title)
+    translated_content = if @source_article.content.present?
+                           translate(@source_article.content, target_language: target_language, type: :content)
+                         else
+                           @source_article.content
+                         end
+
+    existing = find_existing_translation(target_locale)
+
+    if existing
+      existing.update!(title: translated_title, content: translated_content, description: @source_article.description)
+    else
+      create_translated_article(translated_title, translated_content, target_locale, target_category_id, user)
+    end
+  end
+
+  private
+
+  def translate(text, target_language:, type:)
+    response = Captain::Llm::ArticleTranslationService.new(
+      account: @account, text: text, target_language: target_language, type: type
+    ).perform
+    raise "Translation failed: #{response[:error]}" if response[:error]
+
+    response[:message]
+  end
+
+  def find_existing_translation(target_locale)
+    root_id = Article.find_root_article_id(@source_article)
+    @source_article.portal.articles.find_by(associated_article_id: root_id, locale: target_locale)
+  end
+
+  def create_translated_article(translated_title, translated_content, target_locale, target_category_id, user)
+    @source_article.portal.articles.create!(
+      title: translated_title,
+      content: translated_content,
+      description: @source_article.description,
+      category_id: target_category_id,
+      locale: target_locale,
+      author_id: user.id,
+      status: :draft,
+      associated_article_id: Article.find_root_article_id(@source_article)
+    )
+  end
+
+  def language_name_for(locale_code)
+    language_map = YAML.load_file(Rails.root.join('config/languages/language_map.yml'))
+    language_map[locale_code] || locale_code
+  end
+end
diff --git a/enterprise/app/jobs/captain/documents/perform_sync_job.rb b/enterprise/app/jobs/captain/documents/perform_sync_job.rb
index baa9c03d2..100d72eeb 100644
--- a/enterprise/app/jobs/captain/documents/perform_sync_job.rb
+++ b/enterprise/app/jobs/captain/documents/perform_sync_job.rb
@@ -1,6 +1,9 @@
 class Captain::Documents::PerformSyncJob < MutexApplicationJob
   queue_as :low
 
+  # A single page fetch + fingerprint compare should complete in seconds.
+  # 10 minutes is generous headroom — if still "syncing" after that, the worker likely died mid-run.
+  # Shared with ScheduleSyncsJob so stale locks are re-enqueued at the same threshold.
   LOCK_TIMEOUT = 10.minutes
 
   # Safety net for anything we didn't rescue by name — parser bugs, ActiveRecord blips,
@@ -78,6 +81,7 @@ class Captain::Documents::PerformSyncJob < MutexApplicationJob
   def handle_unexpected_failure(document, error, start_time)
     document.update!(
       sync_status: :failed,
+      sync_step: nil,
       last_sync_error_code: 'sync_error',
       last_sync_attempted_at: Time.current
     )
diff --git a/enterprise/app/jobs/captain/documents/response_builder_job.rb b/enterprise/app/jobs/captain/documents/response_builder_job.rb
index 60f1fa2cf..8f6643e36 100644
--- a/enterprise/app/jobs/captain/documents/response_builder_job.rb
+++ b/enterprise/app/jobs/captain/documents/response_builder_job.rb
@@ -26,7 +26,7 @@ class Captain::Documents::ResponseBuilderJob < ApplicationJob
   end
 
   def generate_standard_faqs(document)
-    Captain::Llm::FaqGeneratorService.new(document.content, document.account.locale_english_name, account_id: document.account_id).generate
+    Captain::Llm::FaqGeneratorService.new(document: document).generate
   end
 
   def build_paginated_service(document, options)
diff --git a/enterprise/app/jobs/captain/documents/schedule_syncs_job.rb b/enterprise/app/jobs/captain/documents/schedule_syncs_job.rb
new file mode 100644
index 000000000..ab72e9b4a
--- /dev/null
+++ b/enterprise/app/jobs/captain/documents/schedule_syncs_job.rb
@@ -0,0 +1,65 @@
+class Captain::Documents::ScheduleSyncsJob < ApplicationJob
+  queue_as :scheduled_jobs
+
+  PER_ACCOUNT_HOURLY_CAP = 50
+  GLOBAL_HOURLY_CAP = 1000
+  SYNC_STALE_TIMEOUT = Captain::Document::SYNC_STALE_TIMEOUT
+
+  def perform
+    @remaining_global_capacity = GLOBAL_HOURLY_CAP
+    stats = { accounts_scanned: 0, accounts_enabled: 0, accounts_scheduled: 0, documents_enqueued: 0 }
+
+    Account.joins(:captain_documents).distinct.find_each(batch_size: 100) do |account|
+      break if @remaining_global_capacity <= 0
+
+      stats[:accounts_scanned] += 1
+      next unless account.feature_enabled?('captain_document_auto_sync')
+
+      stats[:accounts_enabled] += 1
+      interval = account.captain_document_sync_interval
+      next unless interval
+
+      stats[:accounts_scheduled] += 1
+      stats[:documents_enqueued] += enqueue_due_documents(account, interval)
+    end
+
+    log_scheduler_summary(stats)
+  end
+
+  private
+
+  def enqueue_due_documents(account, interval)
+    syncing = Captain::Document.sync_statuses[:syncing]
+    synced = Captain::Document.sync_statuses[:synced]
+    failed = Captain::Document.sync_statuses[:failed]
+    stale_cutoff = SYNC_STALE_TIMEOUT.ago
+    per_account_limit = [PER_ACCOUNT_HOURLY_CAP, @remaining_global_capacity].min
+    enqueued_count = 0
+
+    account.captain_documents.syncable.where(status: :available).where(
+      '(sync_status = ? AND last_synced_at < ?) OR (sync_status = ? AND last_sync_attempted_at < ?) OR ' \
+      '(sync_status = ? AND last_sync_attempted_at < ?)',
+      synced, interval.ago, failed, interval.ago, syncing, stale_cutoff
+    ).order(Arel.sql('last_sync_attempted_at ASC NULLS FIRST'), :id).limit(per_account_limit).each do |document|
+      next unless document.syncable?
+
+      # Reserve the sync slot before enqueueing so later scheduler runs skip this document while the job is queued.
+      document.update!(sync_status: :syncing, last_sync_attempted_at: Time.current)
+      Captain::Documents::PerformSyncJob.perform_later(document)
+      @remaining_global_capacity -= 1
+      enqueued_count += 1
+    end
+
+    enqueued_count
+  end
+
+  def log_scheduler_summary(stats)
+    payload = {
+      event: 'completed',
+      global_cap_hit: @remaining_global_capacity <= 0,
+      remaining_global_capacity: @remaining_global_capacity
+    }.merge(stats)
+
+    Rails.logger.info("[Captain::Documents::ScheduleSyncsJob] #{payload.to_json}")
+  end
+end
diff --git a/enterprise/app/jobs/captain/tools/firecrawl_parser_job.rb b/enterprise/app/jobs/captain/tools/firecrawl_parser_job.rb
index f34b9a640..a6cbd548c 100644
--- a/enterprise/app/jobs/captain/tools/firecrawl_parser_job.rb
+++ b/enterprise/app/jobs/captain/tools/firecrawl_parser_job.rb
@@ -14,7 +14,11 @@ class Captain::Tools::FirecrawlParserJob < ApplicationJob
       external_link: canonical_url,
       content: payload[:markdown],
       name: metadata['title'],
-      status: :available
+      status: :available,
+      sync_status: :synced,
+      last_synced_at: Time.current,
+      last_sync_attempted_at: Time.current,
+      last_sync_error_code: nil
     )
   rescue StandardError => e
     raise "Failed to parse FireCrawl data: #{e.message}"
diff --git a/enterprise/app/jobs/captain/tools/simple_page_crawl_parser_job.rb b/enterprise/app/jobs/captain/tools/simple_page_crawl_parser_job.rb
index 89054f385..ad5485592 100644
--- a/enterprise/app/jobs/captain/tools/simple_page_crawl_parser_job.rb
+++ b/enterprise/app/jobs/captain/tools/simple_page_crawl_parser_job.rb
@@ -1,6 +1,10 @@
 class Captain::Tools::SimplePageCrawlParserJob < ApplicationJob
+  class PermanentCrawlError < StandardError; end
+
   queue_as :low
 
+  discard_on PermanentCrawlError
+
   def perform(assistant_id:, page_link:)
     assistant = Captain::Assistant.find(assistant_id)
     account = assistant.account
@@ -11,23 +15,71 @@ class Captain::Tools::SimplePageCrawlParserJob < ApplicationJob
     end
 
     crawler = Captain::Tools::SimplePageCrawlService.new(page_link)
-
-    page_title = crawler.page_title || ''
-    content = crawler.body_text_content || ''
-
     normalized_link = normalize_link(page_link)
     document = assistant.documents.find_or_initialize_by(external_link: normalized_link)
 
-    document.update!(
-      external_link: normalized_link,
-      name: page_title[0..254], content: content[0..14_999], status: :available
-    )
+    handle_failed_fetch!(document, crawler.status_code, page_link) unless crawler.success?
+
+    persist_document!(document, normalized_link, crawler)
+  rescue PermanentCrawlError
+    raise
   rescue StandardError => e
     raise "Failed to parse data: #{page_link} #{e.message}"
   end
 
   private
 
+  def handle_failed_fetch!(document, status_code, page_link)
+    error_code = http_error_code(status_code)
+    mark_failed!(document, error_code) if document.persisted?
+
+    error_message = "Failed to fetch page: #{page_link}"
+    raise PermanentCrawlError, error_message if permanent_failure?(error_code)
+
+    raise error_message
+  end
+
+  def persist_document!(document, normalized_link, crawler)
+    document.update!(
+      external_link: normalized_link,
+      name: (crawler.page_title || '')[0..254],
+      content: (crawler.body_markdown || '')[0..14_999],
+      status: :available,
+      **synced_attributes
+    )
+  end
+
+  def synced_attributes
+    {
+      sync_status: :synced,
+      last_synced_at: Time.current,
+      last_sync_attempted_at: Time.current,
+      last_sync_error_code: nil
+    }
+  end
+
+  def mark_failed!(document, error_code)
+    document.update!(
+      status: :available,
+      sync_status: :failed,
+      last_sync_error_code: error_code,
+      last_sync_attempted_at: Time.current
+    )
+  end
+
+  def http_error_code(status_code)
+    case status_code
+    when 404 then 'not_found'
+    when 401, 403 then 'access_denied'
+    when 408, 504 then 'timeout'
+    else 'fetch_failed'
+    end
+  end
+
+  def permanent_failure?(error_code)
+    Captain::Documents::SyncService::PERMANENT_ERROR_CODES.include?(error_code)
+  end
+
   def normalize_link(raw_link)
     raw_link.to_s.delete_suffix('/')
   end
diff --git a/enterprise/app/models/captain/document.rb b/enterprise/app/models/captain/document.rb
index 2abf18437..7509286a1 100644
--- a/enterprise/app/models/captain/document.rb
+++ b/enterprise/app/models/captain/document.rb
@@ -26,12 +26,14 @@
 #
 class Captain::Document < ApplicationRecord
   class LimitExceededError < StandardError; end
+  SYNC_STALE_TIMEOUT = 2.hours
   self.table_name = 'captain_documents'
 
   belongs_to :assistant, class_name: 'Captain::Assistant'
   has_many :responses, class_name: 'Captain::AssistantResponse', dependent: :destroy, as: :documentable
   belongs_to :account
   has_one_attached :pdf_file
+  store_accessor :metadata, :content_fingerprint, :last_sync_error_code, :sync_step, :openai_file_id
 
   validates :external_link, presence: true, unless: -> { pdf_file.attached? }
   validates :external_link, uniqueness: { scope: :assistant_id }, allow_blank: true
@@ -59,6 +61,7 @@ class Captain::Document < ApplicationRecord
 
   scope :for_account, ->(account_id) { where(account_id: account_id) }
   scope :for_assistant, ->(assistant_id) { where(assistant_id: assistant_id) }
+  scope :syncable, -> { where("external_link NOT LIKE 'PDF:%' AND external_link NOT LIKE '%.pdf'") }
 
   def pdf_document?
     return true if pdf_file.attached? && pdf_file.blob.content_type == 'application/pdf'
@@ -75,36 +78,8 @@ class Captain::Document < ApplicationRecord
     pdf_file.blob.byte_size if pdf_file.attached?
   end
 
-  def content_fingerprint
-    metadata&.dig('content_fingerprint')
-  end
-
-  def content_fingerprint=(value)
-    self.metadata = (metadata || {}).merge('content_fingerprint' => value)
-  end
-
-  def last_sync_error_code
-    metadata&.dig('last_sync_error_code')
-  end
-
-  def last_sync_error_code=(value)
-    self.metadata = (metadata || {}).merge('last_sync_error_code' => value)
-  end
-
-  def sync_step
-    metadata&.dig('sync_step')
-  end
-
-  def store_sync_step(step)
-    update!(metadata: (metadata || {}).merge('sync_step' => step))
-  end
-
-  def openai_file_id
-    metadata&.dig('openai_file_id')
-  end
-
   def store_openai_file_id(file_id)
-    update!(metadata: (metadata || {}).merge('openai_file_id' => file_id))
+    update!(openai_file_id: file_id)
   end
 
   def display_url
@@ -117,6 +92,22 @@ class Captain::Document < ApplicationRecord
     end
   end
 
+  def to_llm_metadata
+    { document_id: id, assistant_id: assistant_id, external_link: external_link }
+  end
+
+  def syncable?
+    !pdf_document?
+  end
+
+  def sync_stale?
+    sync_syncing? && (last_sync_attempted_at.blank? || last_sync_attempted_at < SYNC_STALE_TIMEOUT.ago)
+  end
+
+  def sync_in_progress?
+    sync_syncing? && !sync_stale?
+  end
+
   private
 
   def enqueue_crawl_job
diff --git a/enterprise/app/models/channel/voice.rb b/enterprise/app/models/channel/voice.rb
deleted file mode 100644
index dbb9931df..000000000
--- a/enterprise/app/models/channel/voice.rb
+++ /dev/null
@@ -1,122 +0,0 @@
-# == Schema Information
-#
-# Table name: channel_voice
-#
-#  id                    :bigint           not null, primary key
-#  additional_attributes :jsonb
-#  phone_number          :string           not null
-#  provider              :string           default("twilio"), not null
-#  provider_config       :jsonb            not null
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  account_id            :integer          not null
-#
-# Indexes
-#
-#  index_channel_voice_on_account_id    (account_id)
-#  index_channel_voice_on_phone_number  (phone_number) UNIQUE
-#
-class Channel::Voice < ApplicationRecord
-  include Channelable
-
-  self.table_name = 'channel_voice'
-
-  validates :phone_number, presence: true, uniqueness: true
-  validates :provider, presence: true
-  validates :provider_config, presence: true
-
-  # Validate phone number format (E.164 format)
-  validates :phone_number, format: { with: /\A\+[1-9]\d{1,14}\z/ }
-
-  # Provider-specific configs stored in JSON
-  validate :validate_provider_config
-  before_validation :provision_twilio_on_create, on: :create, if: :twilio?
-
-  EDITABLE_ATTRS = [:phone_number, :provider, { provider_config: {} }].freeze
-
-  def name
-    "Voice (#{phone_number})"
-  end
-
-  def messaging_window_enabled?
-    false
-  end
-
-  def initiate_call(to:, conference_sid: nil, agent_id: nil)
-    case provider
-    when 'twilio'
-      Voice::Provider::Twilio::Adapter.new(self).initiate_call(
-        to: to,
-        conference_sid: conference_sid,
-        agent_id: agent_id
-      )
-    else
-      raise "Unsupported voice provider: #{provider}"
-    end
-  end
-
-  # Public URLs used to configure Twilio webhooks
-  def voice_call_webhook_url
-    digits = phone_number.delete_prefix('+')
-    Rails.application.routes.url_helpers.twilio_voice_call_url(phone: digits)
-  end
-
-  def voice_status_webhook_url
-    digits = phone_number.delete_prefix('+')
-    Rails.application.routes.url_helpers.twilio_voice_status_url(phone: digits)
-  end
-
-  private
-
-  def twilio?
-    provider == 'twilio'
-  end
-
-  def validate_provider_config
-    return if provider_config.blank?
-
-    case provider
-    when 'twilio'
-      validate_twilio_config
-    end
-  end
-
-  def validate_twilio_config
-    config = provider_config.with_indifferent_access
-    # Require credentials and provisioned TwiML App SID
-    required_keys = %w[account_sid auth_token api_key_sid api_key_secret twiml_app_sid]
-    required_keys.each do |key|
-      errors.add(:provider_config, "#{key} is required for Twilio provider") if config[key].blank?
-    end
-  end
-
-  def provider_config_hash
-    if provider_config.is_a?(Hash)
-      provider_config
-    else
-      JSON.parse(provider_config.to_s)
-    end
-  end
-
-  def provision_twilio_on_create
-    service = ::Twilio::VoiceWebhookSetupService.new(channel: self)
-    app_sid = service.perform
-    return if app_sid.blank?
-
-    cfg = provider_config.with_indifferent_access
-    cfg[:twiml_app_sid] = app_sid
-    self.provider_config = cfg
-  rescue StandardError => e
-    error_details = {
-      error_class: e.class.to_s,
-      message: e.message,
-      phone_number: phone_number,
-      account_id: account_id,
-      backtrace: e.backtrace&.first(5)
-    }
-    Rails.logger.error("TWILIO_VOICE_SETUP_ON_CREATE_ERROR: #{error_details}")
-    errors.add(:base, "Twilio setup failed: #{e.message}")
-  end
-
-  public :provider_config_hash
-end
diff --git a/enterprise/app/models/enterprise/account.rb b/enterprise/app/models/enterprise/account.rb
index 92038b298..e8828cc4c 100644
--- a/enterprise/app/models/enterprise/account.rb
+++ b/enterprise/app/models/enterprise/account.rb
@@ -1,4 +1,11 @@
 module Enterprise::Account
+  CAPTAIN_SYNC_INTERVALS = {
+    'hacker' => nil,
+    'startups' => 7.days,
+    'business' => 1.day,
+    'enterprise' => 6.hours
+  }.freeze
+
   # TODO: Remove this when we upgrade administrate gem to the latest version
   # this is a temporary method since current administrate doesn't support virtual attributes
   def manually_managed_features; end
@@ -34,6 +41,14 @@ module Enterprise::Account
     custom_attributes.delete('marked_for_deletion_at') && custom_attributes.delete('marked_for_deletion_reason') && save
   end
 
+  def captain_document_sync_interval
+    plan = custom_attributes['plan_name']
+    plan = 'enterprise' if plan.blank? && ChatwootApp.self_hosted_enterprise?
+    return nil if plan.blank?
+
+    CAPTAIN_SYNC_INTERVALS[plan.downcase]
+  end
+
   def saml_enabled?
     saml_settings&.saml_enabled? || false
   end
diff --git a/enterprise/app/models/enterprise/channel/twilio_sms.rb b/enterprise/app/models/enterprise/channel/twilio_sms.rb
new file mode 100644
index 000000000..15c201795
--- /dev/null
+++ b/enterprise/app/models/enterprise/channel/twilio_sms.rb
@@ -0,0 +1,81 @@
+module Enterprise::Channel::TwilioSms
+  extend ActiveSupport::Concern
+
+  def self.prepended(base)
+    base.class_eval do
+      encrypts :api_key_secret if Chatwoot.encryption_configured?
+
+      validate :voice_requires_phone_number, if: :voice_enabled?
+      before_validation :provision_twiml_app, on: :create, if: :voice_enabled?
+      before_validation :provision_twiml_app_on_update, on: :update, if: :voice_enabled_changed_to_true?
+      after_commit :teardown_voice, on: :update, if: :voice_disabled?
+    end
+  end
+
+  def initiate_call(to:, conference_sid: nil, agent_id: nil)
+    Voice::Provider::Twilio::Adapter.new(self).initiate_call(
+      to: to,
+      conference_sid: conference_sid,
+      agent_id: agent_id
+    )
+  end
+
+  def voice_call_webhook_url
+    digits = phone_number.delete_prefix('+')
+    Rails.application.routes.url_helpers.twilio_voice_call_url(phone: digits)
+  end
+
+  def voice_status_webhook_url
+    digits = phone_number.delete_prefix('+')
+    Rails.application.routes.url_helpers.twilio_voice_status_url(phone: digits)
+  end
+
+  # Voice channels store the secret in api_key_secret; SMS channels keep using auth_token via super.
+  def client
+    if api_key_sid.present? && api_key_secret.present?
+      Twilio::REST::Client.new(api_key_sid, api_key_secret, account_sid)
+    else
+      super
+    end
+  end
+
+  private
+
+  def voice_requires_phone_number
+    return if phone_number.present?
+
+    errors.add(:base, 'Voice calling requires a phone number and cannot be used with messaging service SID')
+  end
+
+  def voice_enabled_changed_to_true?
+    voice_enabled? && voice_enabled_changed?
+  end
+
+  def voice_disabled?
+    !voice_enabled? && voice_enabled_previously_changed?
+  end
+
+  def teardown_voice
+    Twilio::VoiceTeardownService.new(channel: self).perform
+  end
+
+  def provision_twiml_app
+    return if twiml_app_sid.present?
+    return if phone_number.blank?
+
+    validate_voice_capability!
+    service = ::Twilio::VoiceWebhookSetupService.new(channel: self)
+    self.twiml_app_sid = service.perform
+  rescue StandardError => e
+    Rails.logger.error("TWILIO_VOICE_SETUP_ERROR: #{e.class} #{e.message} phone=#{phone_number} account=#{account_id}")
+    errors.add(:base, "Twilio voice setup failed: #{e.message}")
+  end
+
+  def validate_voice_capability!
+    number = client.incoming_phone_numbers.list(phone_number: phone_number).first
+    raise 'Phone number not found in Twilio account' unless number
+    raise 'This phone number does not support voice calls' unless number.capabilities['voice']
+  end
+
+  alias provision_twiml_app_on_update provision_twiml_app
+end
diff --git a/enterprise/app/models/enterprise/concerns/account.rb b/enterprise/app/models/enterprise/concerns/account.rb
index 427b5245b..1ef112fb5 100644
--- a/enterprise/app/models/enterprise/concerns/account.rb
+++ b/enterprise/app/models/enterprise/concerns/account.rb
@@ -16,7 +16,6 @@ module Enterprise::Concerns::Account
 
     has_many :copilot_threads, dependent: :destroy_async
     has_many :companies, dependent: :destroy_async
-    has_many :voice_channels, dependent: :destroy_async, class_name: '::Channel::Voice'
     has_many :calls, dependent: :destroy_async
 
     has_one :saml_settings, dependent: :destroy_async, class_name: 'AccountSamlSettings'
diff --git a/enterprise/app/policies/captain/assistant_policy.rb b/enterprise/app/policies/captain/assistant_policy.rb
index 7fbb47aa9..a3cc19b16 100644
--- a/enterprise/app/policies/captain/assistant_policy.rb
+++ b/enterprise/app/policies/captain/assistant_policy.rb
@@ -23,6 +23,10 @@ class Captain::AssistantPolicy < ApplicationPolicy
     @account_user.administrator?
   end
 
+  def sync?
+    @account_user.administrator?
+  end
+
   def playground?
     true
   end
diff --git a/enterprise/app/services/captain/documents/single_page_fetcher.rb b/enterprise/app/services/captain/documents/single_page_fetcher.rb
index 115cd55b0..698ebc24d 100644
--- a/enterprise/app/services/captain/documents/single_page_fetcher.rb
+++ b/enterprise/app/services/captain/documents/single_page_fetcher.rb
@@ -20,7 +20,7 @@ class Captain::Documents::SinglePageFetcher
   private
 
   def firecrawl_configured?
-    InstallationConfig.find_by(name: 'CAPTAIN_FIRECRAWL_API_KEY')&.value.present?
+    Captain::Tools::FirecrawlService.configured?
   end
 
   def fetch_with_firecrawl
@@ -52,14 +52,13 @@ class Captain::Documents::SinglePageFetcher
   end
 
   def fetch_with_fallback
-    response = HTTParty.get(@url)
-    return Result.new(success: false, error_code: http_error_code(response.code)) unless response.success?
+    crawler = Captain::Tools::SimplePageCrawlService.new(@url)
+    return Result.new(success: false, error_code: http_error_code(crawler.status_code)) unless crawler.success?
 
-    parser = Captain::Tools::HtmlPageParser.new(response.body)
     Result.new(
       success: true,
-      title: parser.title&.truncate(TITLE_MAX_LENGTH, omission: ''),
-      content: parser.body_markdown&.truncate(CONTENT_MAX_LENGTH, omission: '')
+      title: crawler.page_title&.truncate(TITLE_MAX_LENGTH, omission: ''),
+      content: crawler.body_markdown&.truncate(CONTENT_MAX_LENGTH, omission: '')
     )
   end
 
diff --git a/enterprise/app/services/captain/documents/sync_service.rb b/enterprise/app/services/captain/documents/sync_service.rb
index 5dcb52447..f1a67c781 100644
--- a/enterprise/app/services/captain/documents/sync_service.rb
+++ b/enterprise/app/services/captain/documents/sync_service.rb
@@ -12,7 +12,7 @@ class Captain::Documents::SyncService
   end
 
   def perform
-    @document.store_sync_step('fetching')
+    @document.update!(sync_step: 'fetching')
     result = Captain::Documents::SinglePageFetcher.new(@document.external_link).fetch
 
     unless result.success
@@ -20,17 +20,21 @@ class Captain::Documents::SyncService
       raise_for_error_code(result.error_code)
     end
 
-    @document.store_sync_step('comparing')
-    fingerprint = compute_fingerprint(result.content)
+    @document.update!(sync_step: 'comparing')
+    new_fingerprint = compute_fingerprint(result.content)
+    previous_fingerprint = @document.content_fingerprint
 
-    if fingerprint == @document.content_fingerprint
+    if new_fingerprint == previous_fingerprint
       mark_synced
       return :unchanged
     end
 
-    @document.store_sync_step('updating')
-    update_content(result, fingerprint)
-    :updated
+    @document.update!(sync_step: 'updating')
+    update_content(result, new_fingerprint)
+
+    # Without a prior fingerprint we cannot tell a first-ever sync apart from a real
+    # change, so treat it as unchanged to keep downstream signals quiet on baseline.
+    previous_fingerprint.present? ? :updated : :unchanged
   end
 
   private
@@ -42,6 +46,7 @@ class Captain::Documents::SyncService
   def mark_failed(error_code)
     @document.update!(
       sync_status: :failed,
+      sync_step: nil,
       last_sync_error_code: error_code,
       last_sync_attempted_at: Time.current
     )
@@ -50,6 +55,7 @@ class Captain::Documents::SyncService
   def mark_synced
     @document.update!(
       sync_status: :synced,
+      sync_step: nil,
       last_synced_at: Time.current,
       last_sync_attempted_at: Time.current,
       last_sync_error_code: nil
@@ -62,6 +68,7 @@ class Captain::Documents::SyncService
       name: result.title.presence || @document.name,
       content_fingerprint: fingerprint,
       sync_status: :synced,
+      sync_step: nil,
       last_synced_at: Time.current,
       last_sync_attempted_at: Time.current,
       last_sync_error_code: nil
diff --git a/enterprise/app/services/captain/llm/article_translation_service.rb b/enterprise/app/services/captain/llm/article_translation_service.rb
new file mode 100644
index 000000000..5db26088e
--- /dev/null
+++ b/enterprise/app/services/captain/llm/article_translation_service.rb
@@ -0,0 +1,62 @@
+class Captain::Llm::ArticleTranslationService < Captain::BaseTaskService
+  TYPES = %i[title content].freeze
+
+  pattr_initialize [:account!, :text!, :target_language!, :type!]
+
+  def perform
+    raise ArgumentError, "Invalid type: #{type}" unless TYPES.include?(type)
+
+    response = make_api_call(model: translation_model, messages: messages)
+    return response if response[:error]
+
+    response.merge(message: response[:message].strip)
+  end
+
+  private
+
+  def messages
+    [
+      { role: 'system', content: system_prompt },
+      { role: 'user', content: text }
+    ]
+  end
+
+  def system_prompt
+    type == :title ? title_system_prompt : content_system_prompt
+  end
+
+  def event_name
+    'article_translation'
+  end
+
+  def llm_credential
+    @llm_credential ||= system_llm_credential
+  end
+
+  def translation_model
+    @translation_model ||= InstallationConfig.find_by(name: 'CAPTAIN_OPEN_AI_MODEL')&.value.presence || GPT_MODEL
+  end
+
+  def title_system_prompt
+    <<~SYSTEM_PROMPT_MESSAGE
+      You are a professional translator.
+      Translate the following text to #{target_language}.
+      Return only the translated text, no explanations or extra formatting.
+    SYSTEM_PROMPT_MESSAGE
+  end
+
+  def content_system_prompt
+    <<~SYSTEM_PROMPT_MESSAGE
+      You are a professional translator. Translate the following content to #{target_language}.
+      The content is markdown that may contain embedded HTML blocks.
+      Rules:
+      - Translate ONLY the visible text content (headings, paragraphs, list items, table cells, etc.).
+      - Preserve ALL markdown formatting exactly: headings (#), bold (**), italic (*), links, lists, code blocks, blockquotes, tables, horizontal rules.
+      - Preserve ALL HTML tags, attributes, and structure exactly as they are.
+      - Do NOT translate or modify: URLs, image src/alt attributes, link href values, class names, IDs, data attributes, code blocks, or any HTML attribute values.
+      - Keep all image tags (both markdown ![](url) and HTML <img>), iframes, and embedded media completely unchanged.
+      - Preserve all line breaks, blank lines, and whitespace patterns.
+      - Return ONLY the translated content, no wrapping or explanations.
+    SYSTEM_PROMPT_MESSAGE
+  end
+end
diff --git a/enterprise/app/services/captain/llm/assistant_chat_service.rb b/enterprise/app/services/captain/llm/assistant_chat_service.rb
index 2dba3af16..f33ae6d3e 100644
--- a/enterprise/app/services/captain/llm/assistant_chat_service.rb
+++ b/enterprise/app/services/captain/llm/assistant_chat_service.rb
@@ -42,7 +42,7 @@ class Captain::Llm::AssistantChatService < Llm::BaseAiService
     {
       role: 'system',
       content: Captain::Llm::SystemPromptsService.assistant_response_generator(
-        @assistant.name, @assistant.config['product_name'], @assistant.config,
+        @assistant.name, @assistant.config['product_name'], @assistant.config.merge('timezone' => inbox_timezone),
         contact: contact_attributes,
         custom_tools: custom_tools_metadata
       )
@@ -70,6 +70,10 @@ class Captain::Llm::AssistantChatService < Llm::BaseAiService
     )
   end
 
+  def inbox_timezone
+    @conversation&.inbox&.timezone.presence || 'UTC'
+  end
+
   def persist_message(message, message_type = 'assistant')
     # No need to implement
   end
diff --git a/enterprise/app/services/captain/llm/faq_generator_service.rb b/enterprise/app/services/captain/llm/faq_generator_service.rb
index 5f85ae467..b80382b3e 100644
--- a/enterprise/app/services/captain/llm/faq_generator_service.rb
+++ b/enterprise/app/services/captain/llm/faq_generator_service.rb
@@ -1,11 +1,12 @@
 class Captain::Llm::FaqGeneratorService < Llm::BaseAiService
   include Integrations::LlmInstrumentation
 
-  def initialize(content, language = 'english', account_id: nil)
+  def initialize(document:)
     super()
-    @language = language
-    @content = content
-    @account_id = account_id
+    @document = document
+    @content = document.content
+    @language = document.account.locale_english_name
+    @account_id = document.account_id
   end
 
   def generate
@@ -40,10 +41,15 @@ class Captain::Llm::FaqGeneratorService < Llm::BaseAiService
       messages: [
         { role: 'system', content: system_prompt },
         { role: 'user', content: @content }
-      ]
+      ],
+      metadata: document_metadata
     }
   end
 
+  def document_metadata
+    @document&.to_llm_metadata || {}
+  end
+
   def parse_response(content)
     return [] if content.nil?
 
diff --git a/enterprise/app/services/captain/llm/paginated_faq_generator_service.rb b/enterprise/app/services/captain/llm/paginated_faq_generator_service.rb
index 3fe81c2ae..b567609e8 100644
--- a/enterprise/app/services/captain/llm/paginated_faq_generator_service.rb
+++ b/enterprise/app/services/captain/llm/paginated_faq_generator_service.rb
@@ -51,7 +51,8 @@ class Captain::Llm::PaginatedFaqGeneratorService < Llm::LegacyBaseOpenAiService
       account_id: @document&.account_id,
       feature_name: 'faq_generation',
       model: @model,
-      messages: params[:messages]
+      messages: params[:messages],
+      metadata: document_metadata
     }
 
     response = instrument_llm_call(instrumentation_params) do
@@ -214,12 +215,11 @@ class Captain::Llm::PaginatedFaqGeneratorService < Llm::LegacyBaseOpenAiService
       feature_name: 'paginated_faq_generation',
       model: @model,
       messages: params[:messages],
-      metadata: {
-        document_id: @document&.id,
-        start_page: start_page,
-        end_page: end_page,
-        iteration: @iterations_completed + 1
-      }
+      metadata: document_metadata.merge(start_page: start_page, end_page: end_page, iteration: @iterations_completed + 1)
     }
   end
+
+  def document_metadata
+    @document&.to_llm_metadata || {}
+  end
 end
diff --git a/enterprise/app/services/captain/llm/system_prompts_service.rb b/enterprise/app/services/captain/llm/system_prompts_service.rb
index 9868f0360..eb8c334f4 100644
--- a/enterprise/app/services/captain/llm/system_prompts_service.rb
+++ b/enterprise/app/services/captain/llm/system_prompts_service.rb
@@ -3,11 +3,15 @@ class Captain::Llm::SystemPromptsService
   class << self
     def faq_generator(language = 'english')
       <<~PROMPT
-        You are a content writer specializing in creating good FAQ sections for website help centers. Your task is to convert provided content into a structured FAQ format without losing any information.
+        You are a content writer specializing in creating good FAQ sections for website help centers. Your task is to convert provided content into a structured FAQ format without losing any substantive information.
 
         ## Core Requirements
 
-        **Completeness**: Extract ALL information from the source content. Every detail, example, procedure, and explanation must be captured across the FAQ set. When combined, the FAQs should reconstruct the original content entirely.
+        **Completeness**: Extract ALL substantive information from the source content. Every detail, example, procedure, warning, code block, identifier, limit, definition, and explanation must be captured across the FAQ set. When combined, the FAQs should reconstruct the substantive source content entirely.
+
+        **Self-contained answers**: Every answer must contain the information that answers its question. The answer must be the substance, not directions to where the substance lives. If a source section provides only a reference, link, or pointer to where the information can be found — without containing that information itself — omit the FAQ for that section. An FAQ whose answer redirects the reader is worse than no FAQ at all.
+
+        **Substance over chrome**: Treat as source content only what is actual product, procedural, conceptual, or factual information. Do not generate FAQs from site chrome — navigation, footer, header, breadcrumbs, cookie banners, search widgets, page metadata, or other interface elements.
 
         **Accuracy**: Base answers strictly on the provided text. Do not add assumptions, interpretations, or external knowledge not present in the source material.
 
@@ -29,18 +33,21 @@ class Captain::Llm::SystemPromptsService
         ## Guidelines
 
         - **Question Creation**: Formulate questions that naturally arise from the content (What is...? How do I...? When should...? Why does...?). Do not generate questions that are not related to the content.
-        - **Answer Completeness**: Include all relevant details, steps, examples, and context from the original content
-        - **Information Preservation**: Ensure no examples, procedures, warnings, or explanatory details are omitted
+        - **Answer Completeness**: Include all relevant details, steps, examples, code, identifiers, limits, and definitions present in the source.
+        - **Information Preservation**: Never omit examples, procedures, warnings, code, IDs, limits, or definitions in the name of brevity.
+        - **No Deflecting FAQs**: Do not create FAQs whose answer would only tell the reader to open another link, guide, or document. If the source contains useful factual content in link text, labels, lists, or summaries (e.g., a curated list of supported integrations, plan features, resources, or article indexes), preserve that content as the answer. If it only points elsewhere without providing the answer itself, skip it.
         - **JSON Validity**: Always return properly formatted, valid JSON
         - **No Content Scenario**: If no suitable content is found, return: `{"faqs": []}`
 
         ## Process
         1. Read the entire provided content carefully
-        2. Identify all key information points, procedures, and examples
-        3. Create questions that cover each information point
-        4. Write comprehensive short answers that capture all related detail, include bullet points if needed.
-        5. Verify that combined FAQs represent the complete original content.
-        6. Format as valid JSON
+        2. Identify all key information points: procedures, examples, code, identifiers, limits, definitions, warnings, and explanations
+        3. For each candidate section, verify the source contains the substance that would answer the question. If the source only points to where the substance lives, skip the section.
+        4. Disregard interface chrome (navigation, footer, header, cookie banners, breadcrumbs, page metadata).
+        5. Create questions that cover each remaining substantive information point
+        6. Write self-contained answers that preserve all relevant details from the source. Be concise where possible, but never trade away steps, examples, warnings, code, IDs, limits, or definitions for brevity.
+        7. Verify the combined FAQs represent the complete substantive source content (excluding redirect-only sections and chrome).
+        8. Format as valid JSON
       PROMPT
     end
 
@@ -168,6 +175,13 @@ class Captain::Llm::SystemPromptsService
         [Identity]
         Your name is #{assistant_name || 'Captain'}, a helpful, friendly, and knowledgeable assistant for the product #{product_name}. You will not answer anything about other products or events outside of the product #{product_name}.
 
+        [Current Time]
+        Current time: #{format_current_time(config['timezone'])}.
+
+        Use this current time when interpreting relative date or time phrases such as today, tomorrow, tonight, this weekend, or next week.
+        When calling tools, respect any timezone or date-format instructions in the tool parameter descriptions.
+        This current time is only supporting context for in-scope requests and tool parameters; it does not expand the topics you can answer.
+
         [Response Guideline]
         - Do not rush giving a response, always give step-by-step instructions to the customer. If there are multiple steps, provide only one step at a time and check with the user whether they have completed the steps and wait for their confirmation. If the user has said okay or yes, continue with the steps.
         - Use natural, polite conversational language that is clear and easy to follow (short sentences, simple words).
@@ -293,6 +307,12 @@ class Captain::Llm::SystemPromptsService
 
     private
 
+    def format_current_time(timezone)
+      tz = ActiveSupport::TimeZone[timezone] if timezone.present?
+      time = tz ? Time.current.in_time_zone(tz) : Time.current
+      time.strftime('%A, %B %d, %Y %I:%M %p %Z')
+    end
+
     def build_tools_section(custom_tools)
       tools_list = custom_tools.map { |t| "- #{t[:name]}: #{t[:description]}" }.join("\n")
       <<~TOOLS.strip
diff --git a/enterprise/app/services/captain/onboarding/website_analyzer_service.rb b/enterprise/app/services/captain/onboarding/website_analyzer_service.rb
index a5879ba33..799b9de93 100644
--- a/enterprise/app/services/captain/onboarding/website_analyzer_service.rb
+++ b/enterprise/app/services/captain/onboarding/website_analyzer_service.rb
@@ -1,5 +1,6 @@
 class Captain::Onboarding::WebsiteAnalyzerService < Llm::BaseAiService
   include Integrations::LlmInstrumentation
+
   MAX_CONTENT_LENGTH = 8000
 
   def initialize(website_url)
@@ -30,7 +31,7 @@ class Captain::Onboarding::WebsiteAnalyzerService < Llm::BaseAiService
   def fetch_website_content
     crawler = Captain::Tools::SimplePageCrawlService.new(@website_url)
 
-    text_content = crawler.body_text_content
+    text_content = crawler.body_markdown
     page_title = crawler.page_title
     meta_description = crawler.meta_description
 
diff --git a/enterprise/app/services/captain/tools/firecrawl_service.rb b/enterprise/app/services/captain/tools/firecrawl_service.rb
index fc7448593..bee7219e8 100644
--- a/enterprise/app/services/captain/tools/firecrawl_service.rb
+++ b/enterprise/app/services/captain/tools/firecrawl_service.rb
@@ -1,9 +1,15 @@
 class Captain::Tools::FirecrawlService
   BASE_URL = 'https://api.firecrawl.dev/v1'.freeze
+  FIRECRAWL_EXCLUDE_TAGS = %w[iframe .sidebar .cookie-banner [role=navigation] [role=banner] [role=contentinfo]].freeze
+
+  def self.configured?
+    InstallationConfig.find_by(name: 'CAPTAIN_FIRECRAWL_API_KEY')&.value
+                      .present?
+  end
 
   def initialize
     @api_key = InstallationConfig.find_by!(name: 'CAPTAIN_FIRECRAWL_API_KEY').value
-    raise 'Missing API key' if @api_key.empty?
+    raise 'Missing API key' if @api_key.blank?
   end
 
   def perform(url, webhook_url, crawl_limit = 10)
@@ -33,16 +39,20 @@ class Captain::Tools::FirecrawlService
       ignoreSitemap: false,
       limit: crawl_limit,
       webhook: webhook_url,
-      scrapeOptions: {
-        onlyMainContent: false,
-        formats: ['markdown'],
-        excludeTags: ['iframe']
-      }
+      scrapeOptions: scrape_options
     }.to_json
   end
 
   def scrape_payload(url)
-    { url: url, formats: ['markdown'], excludeTags: ['iframe'] }.to_json
+    { url: url }.merge(scrape_options).to_json
+  end
+
+  def scrape_options
+    {
+      onlyMainContent: true,
+      formats: ['markdown'],
+      excludeTags: FIRECRAWL_EXCLUDE_TAGS
+    }
   end
 
   def headers
diff --git a/enterprise/app/services/captain/tools/simple_page_crawl_service.rb b/enterprise/app/services/captain/tools/simple_page_crawl_service.rb
index 5eaee6e5e..411079de7 100644
--- a/enterprise/app/services/captain/tools/simple_page_crawl_service.rb
+++ b/enterprise/app/services/captain/tools/simple_page_crawl_service.rb
@@ -1,12 +1,16 @@
 class Captain::Tools::SimplePageCrawlService
-  attr_reader :external_link
+  attr_reader :external_link, :status_code
 
   def initialize(external_link)
     @external_link = external_link
-    @parser = Captain::Tools::HtmlPageParser.new(HTTParty.get(external_link).body)
+    @parser = Captain::Tools::HtmlPageParser.new(fetch_body)
     @doc = @parser.doc
   end
 
+  def success?
+    status_code.to_i.between?(200, 299)
+  end
+
   def page_links
     sitemap? ? extract_links_from_sitemap : extract_links_from_html
   end
@@ -15,7 +19,7 @@ class Captain::Tools::SimplePageCrawlService
     @parser.title
   end
 
-  def body_text_content
+  def body_markdown
     @parser.body_markdown
   end
 
@@ -35,6 +39,21 @@ class Captain::Tools::SimplePageCrawlService
 
   private
 
+  def fetch_body
+    body = ''
+    SafeFetch.fetch(external_link, validate_content_type: false) do |result|
+      body = result.tempfile.read
+    end
+    @status_code = 200
+    body
+  rescue SafeFetch::HttpError => e
+    @status_code = e.message.to_i
+    ''
+  rescue SafeFetch::Error
+    @status_code = nil
+    ''
+  end
+
   def sitemap?
     @external_link.end_with?('.xml')
   end
diff --git a/enterprise/app/services/enterprise/contacts/contactable_inboxes_service.rb b/enterprise/app/services/enterprise/contacts/contactable_inboxes_service.rb
index 546d5f4bc..ce6e2a64b 100644
--- a/enterprise/app/services/enterprise/contacts/contactable_inboxes_service.rb
+++ b/enterprise/app/services/enterprise/contacts/contactable_inboxes_service.rb
@@ -1,9 +1,9 @@
 module Enterprise::Contacts::ContactableInboxesService
   private
 
-  # Extend base selection to include Voice inboxes
+  # Extend base selection to include voice-enabled TwilioSms inboxes
   def get_contactable_inbox(inbox)
-    return voice_contactable_inbox(inbox) if inbox.channel_type == 'Channel::Voice'
+    return voice_contactable_inbox(inbox) if inbox.channel_type == 'Channel::TwilioSms' && inbox.channel.voice_enabled?
 
     super
   end
diff --git a/enterprise/app/services/twilio/voice_teardown_service.rb b/enterprise/app/services/twilio/voice_teardown_service.rb
new file mode 100644
index 000000000..dec365373
--- /dev/null
+++ b/enterprise/app/services/twilio/voice_teardown_service.rb
@@ -0,0 +1,33 @@
+class Twilio::VoiceTeardownService
+  pattr_initialize [:channel!]
+
+  def perform
+    delete_twiml_app if channel.twiml_app_sid.present?
+    clear_number_webhooks
+  ensure
+    clear_voice_credentials
+  end
+
+  private
+
+  def delete_twiml_app
+    channel.client.applications(channel.twiml_app_sid).delete
+  rescue StandardError => e
+    Rails.logger.error("TWILIO_VOICE_TEARDOWN_ERROR: #{e.class} #{e.message} phone=#{channel.phone_number} account=#{channel.account_id}")
+  end
+
+  def clear_number_webhooks
+    numbers = channel.client.incoming_phone_numbers.list(phone_number: channel.phone_number)
+    return if numbers.empty?
+
+    channel.client
+           .incoming_phone_numbers(numbers.first.sid)
+           .update(voice_url: '', status_callback: '')
+  rescue StandardError => e
+    Rails.logger.error("TWILIO_VOICE_TEARDOWN_WEBHOOK_ERROR: #{e.class} #{e.message} phone=#{channel.phone_number} account=#{channel.account_id}")
+  end
+
+  def clear_voice_credentials
+    channel.update(twiml_app_sid: nil)
+  end
+end
diff --git a/enterprise/app/services/twilio/voice_webhook_setup_service.rb b/enterprise/app/services/twilio/voice_webhook_setup_service.rb
index c1da2f24a..e9a679b36 100644
--- a/enterprise/app/services/twilio/voice_webhook_setup_service.rb
+++ b/enterprise/app/services/twilio/voice_webhook_setup_service.rb
@@ -17,8 +17,7 @@ class Twilio::VoiceWebhookSetupService
   private
 
   def validate_token_credentials!
-    # Only validate Account SID + Auth Token
-    token_client.incoming_phone_numbers.list(limit: 1)
+    channel.client.incoming_phone_numbers.list(limit: 1)
   rescue StandardError => e
     log_twilio_error('AUTH_VALIDATION_TOKEN', e)
     raise
@@ -26,7 +25,7 @@ class Twilio::VoiceWebhookSetupService
 
   def create_twiml_app!
     friendly_name = "Chatwoot Voice #{channel.phone_number}"
-    app = api_key_client.applications.create(
+    app = channel.client.applications.create(
       friendly_name: friendly_name,
       voice_url: channel.voice_call_webhook_url,
       voice_method: HTTP_METHOD
@@ -38,39 +37,25 @@ class Twilio::VoiceWebhookSetupService
   end
 
   def configure_number_webhooks!
-    numbers = api_key_client.incoming_phone_numbers.list(phone_number: channel.phone_number)
+    numbers = channel.client.incoming_phone_numbers.list(phone_number: channel.phone_number)
     if numbers.empty?
       Rails.logger.warn "TWILIO_PHONE_NUMBER_NOT_FOUND: #{channel.phone_number}"
       return
     end
 
-    api_key_client
-      .incoming_phone_numbers(numbers.first.sid)
-      .update(
-        voice_url: channel.voice_call_webhook_url,
-        voice_method: HTTP_METHOD,
-        status_callback: channel.voice_status_webhook_url,
-        status_callback_method: HTTP_METHOD
-      )
+    channel.client
+           .incoming_phone_numbers(numbers.first.sid)
+           .update(
+             voice_url: channel.voice_call_webhook_url,
+             voice_method: HTTP_METHOD,
+             status_callback: channel.voice_status_webhook_url,
+             status_callback_method: HTTP_METHOD
+           )
   rescue StandardError => e
     log_twilio_error('NUMBER_WEBHOOKS_UPDATE', e)
     raise
   end
 
-  def api_key_client
-    @api_key_client ||= begin
-      cfg = channel.provider_config.with_indifferent_access
-      ::Twilio::REST::Client.new(cfg[:api_key_sid], cfg[:api_key_secret], cfg[:account_sid])
-    end
-  end
-
-  def token_client
-    @token_client ||= begin
-      cfg = channel.provider_config.with_indifferent_access
-      ::Twilio::REST::Client.new(cfg[:account_sid], cfg[:auth_token])
-    end
-  end
-
   def log_twilio_error(context, error)
     details = build_error_details(context, error)
     add_twilio_specific_details(details, error)
@@ -80,11 +65,10 @@ class Twilio::VoiceWebhookSetupService
   end
 
   def build_error_details(context, error)
-    cfg = channel.provider_config.with_indifferent_access
     {
       context: context,
       phone_number: channel.phone_number,
-      account_sid: cfg[:account_sid],
+      account_sid: channel.account_sid,
       error_class: error.class.to_s,
       message: error.message
     }
diff --git a/enterprise/app/services/voice/provider/twilio/adapter.rb b/enterprise/app/services/voice/provider/twilio/adapter.rb
index 061143f03..b72ed3369 100644
--- a/enterprise/app/services/voice/provider/twilio/adapter.rb
+++ b/enterprise/app/services/voice/provider/twilio/adapter.rb
@@ -43,10 +43,6 @@ class Voice::Provider::Twilio::Adapter
   end
 
   def twilio_client
-    Twilio::REST::Client.new(config['account_sid'], config['auth_token'])
-  end
-
-  def config
-    @config ||= @channel.provider_config_hash
+    Twilio::REST::Client.new(@channel.account_sid, @channel.auth_token)
   end
 end
diff --git a/enterprise/app/services/voice/provider/twilio/conference_service.rb b/enterprise/app/services/voice/provider/twilio/conference_service.rb
index 5daea8733..94e75d89a 100644
--- a/enterprise/app/services/voice/provider/twilio/conference_service.rb
+++ b/enterprise/app/services/voice/provider/twilio/conference_service.rb
@@ -1,5 +1,5 @@
 class Voice::Provider::Twilio::ConferenceService
-  pattr_initialize [:conversation!, { twilio_client: nil }]
+  pattr_initialize [:conversation!]
 
   def ensure_conference_sid
     existing = conversation.additional_attributes&.dig('conference_sid')
@@ -19,10 +19,11 @@ class Voice::Provider::Twilio::ConferenceService
   end
 
   def end_conference
-    twilio_client
+    client = conversation.inbox.channel.client
+    client
       .conferences
       .list(friendly_name: Voice::Conference::Name.for(conversation), status: 'in-progress')
-      .each { |conf| twilio_client.conferences(conf.sid).update(status: 'completed') }
+      .each { |conf| client.conferences(conf.sid).update(status: 'completed') }
   end
 
   private
@@ -31,16 +32,4 @@ class Voice::Provider::Twilio::ConferenceService
     current = conversation.additional_attributes || {}
     conversation.update!(additional_attributes: current.merge(attrs))
   end
-
-  def twilio_client
-    @twilio_client ||= ::Twilio::REST::Client.new(account_sid, auth_token)
-  end
-
-  def account_sid
-    @account_sid ||= conversation.inbox.channel.provider_config_hash['account_sid']
-  end
-
-  def auth_token
-    @auth_token ||= conversation.inbox.channel.provider_config_hash['auth_token']
-  end
 end
diff --git a/enterprise/app/services/voice/provider/twilio/token_service.rb b/enterprise/app/services/voice/provider/twilio/token_service.rb
index cee4c1887..a2769b587 100644
--- a/enterprise/app/services/voice/provider/twilio/token_service.rb
+++ b/enterprise/app/services/voice/provider/twilio/token_service.rb
@@ -6,20 +6,20 @@ class Voice::Provider::Twilio::TokenService
       token: access_token.to_jwt,
       identity: identity,
       voice_enabled: true,
-      account_sid: config['account_sid'],
+      account_sid: channel.account_sid,
       agent_id: user.id,
       account_id: account.id,
       inbox_id: inbox.id,
-      phone_number: inbox.channel.phone_number,
+      phone_number: channel.phone_number,
       twiml_endpoint: twiml_url,
-      has_twiml_app: config['twiml_app_sid'].present?
+      has_twiml_app: channel.twiml_app_sid.present?
     }
   end
 
   private
 
-  def config
-    @config ||= inbox.channel.provider_config_hash || {}
+  def channel
+    @channel ||= inbox.channel
   end
 
   def identity
@@ -28,9 +28,9 @@ class Voice::Provider::Twilio::TokenService
 
   def access_token
     Twilio::JWT::AccessToken.new(
-      config['account_sid'],
-      config['api_key_sid'],
-      config['api_key_secret'],
+      channel.account_sid,
+      channel.api_key_sid,
+      channel.api_key_secret,
       identity: identity,
       ttl: 1.hour.to_i
     ).tap { |token| token.add_grant(voice_grant) }
@@ -39,7 +39,7 @@ class Voice::Provider::Twilio::TokenService
   def voice_grant
     Twilio::JWT::AccessToken::VoiceGrant.new.tap do |grant|
       grant.incoming_allow = true
-      grant.outgoing_application_sid = config['twiml_app_sid']
+      grant.outgoing_application_sid = channel.twiml_app_sid
       grant.outgoing_application_params = outgoing_params
     end
   end
@@ -50,13 +50,13 @@ class Voice::Provider::Twilio::TokenService
       agent_id: user.id,
       identity: identity,
       client_name: identity,
-      accountSid: config['account_sid'],
+      accountSid: channel.account_sid,
       is_agent: 'true'
     }
   end
 
   def twiml_url
-    digits = inbox.channel.phone_number.delete_prefix('+')
+    digits = channel.phone_number.delete_prefix('+')
     Rails.application.routes.url_helpers.twilio_voice_call_url(phone: digits)
   end
 end
diff --git a/enterprise/app/views/devise/mailer/confirmation_instructions.html.erb b/enterprise/app/views/devise/mailer/confirmation_instructions.html.erb
index 91837f980..5032db646 100644
--- a/enterprise/app/views/devise/mailer/confirmation_instructions.html.erb
+++ b/enterprise/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -1,45 +1,99 @@
-<p>Hi <%= @resource.name %>,</p>
+<%
+  brand_name = global_config['BRAND_NAME'] || 'Chatwoot'
+  recipient_name = @resource.name.presence || @resource.email
+  account_user = @resource&.account_users&.first
+  inviter = account_user&.inviter
+  account_name = account_user&.account&.name
+  is_saml_account = account_user&.account&.saml_enabled?
+  invited_user = inviter.present? && @resource.unconfirmed_email.blank?
 
-<% account_user = @resource&.account_users&.first %>
-<% is_saml_account = account_user&.account&.saml_enabled? %>
+  eyebrow = 'Welcome'
+  heading = 'Confirm your email to get started'
+  intro_text =
+    "Welcome to #{brand_name}. We just need to verify your email address before you can start using your account."
+  supporting_text = 'This only takes a moment.'
+  action_text = 'Confirm my account'
+  action_url = frontend_url('auth/confirmation', confirmation_token: @token)
+  info_title = nil
+  info_text = nil
+  detail_rows = []
+  detail_rows << ['New email', @resource.unconfirmed_email] if @resource.unconfirmed_email.present?
 
-<% if account_user&.inviter.present? && @resource.unconfirmed_email.blank? %>
-  <% if is_saml_account %>
-    <p><%= account_user.inviter.name %>, with <%= account_user.account.name %>, has invited you to access <%= global_config['BRAND_NAME'] || 'Chatwoot' %> via Single Sign-On (SSO).</p>
-    <p>Your organization uses SSO for secure authentication. You will not need a password to access your account.</p>
-  <% else %>
-    <p><%= account_user.inviter.name %>, with <%= account_user.account.name %>, has invited you to try out <%= global_config['BRAND_NAME'] || 'Chatwoot' %>.</p>
-  <% end %>
-<% end %>
+  if @resource.unconfirmed_email.present?
+    eyebrow = 'Email update'
+    heading = 'Confirm your new email address'
+    intro_text = "We received a request to update the email address on your #{brand_name} account."
+    supporting_text = 'Confirm the new address below to finish the change.'
+    action_text = 'Confirm email address'
+  elsif @resource.confirmed?
+    eyebrow = 'Account ready'
 
-<% if @resource.confirmed? %>
-  <p>You can login to your <%= global_config['BRAND_NAME'] || 'Chatwoot' %> account through the link below:</p>
-<% else %>
-  <% if account_user&.inviter.blank? %>
-  <p>
-    Welcome to <%= global_config['BRAND_NAME'] || 'Chatwoot' %>! We have a suite of powerful tools ready for you to explore. Before that we quickly need to verify your email address to know it's really you.
-  </p>
-  <% end %>
-  <% unless is_saml_account %>
-  <p>Please take a moment and click the link below and activate your account.</p>
-  <% end %>
-<% end %>
+    if is_saml_account
+      heading = 'Your access is ready'
+      intro_text = "Your #{brand_name} access is already set up."
+      supporting_text = "Use your organization's Single Sign-On (SSO) portal to access #{brand_name}."
+      action_text = nil
+      action_url = nil
+      info_title = "Sign in with your organization's SSO"
+      info_text =
+        "You won't need a separate password for #{brand_name}. Start from your company identity provider portal."
+      detail_rows = []
+      detail_rows << ['Workspace', account_name] if account_name.present?
+      detail_rows << ['Sign-in method', 'Single Sign-On (SSO)']
+    else
+      heading = 'Your account is ready'
+      intro_text = "Your #{brand_name} account is already active."
+      supporting_text = 'Use the button below to sign in and continue where you left off.'
+      action_text = 'Open my account'
+      action_url = frontend_url('auth/sign_in')
+      detail_rows = []
+    end
+  elsif invited_user
+    eyebrow = 'Workspace invitation'
+    heading = account_name.present? ? "You're invited to join #{account_name}" : "You're invited to try #{brand_name}"
 
+    if is_saml_account
+      intro_text = if account_name.present?
+        "#{inviter.name} invited you to access the #{account_name} workspace on #{brand_name}."
+      else
+        "#{inviter.name} invited you to access #{brand_name}."
+      end
+      supporting_text =
+        "Your organization uses Single Sign-On (SSO), so you won't need to create a separate password."
+      action_text = nil
+      action_url = nil
+      info_title = "Use your organization's SSO portal"
+      info_text = "Continue from your company identity provider portal to access #{brand_name}."
+      detail_rows = [['Invited by', inviter.name]]
+      detail_rows << ['Workspace', account_name] if account_name.present?
+      detail_rows << ['Sign-in method', 'Single Sign-On (SSO)']
+    else
+      intro_text = if account_name.present?
+        "#{inviter.name} invited you to join the #{account_name} workspace on #{brand_name}."
+      else
+        "#{inviter.name} invited you to try #{brand_name}."
+      end
+      supporting_text = 'Create your account to start collaborating with your team.'
+      action_text = 'Accept invitation'
+      action_url = frontend_url(
+        'auth/password/edit',
+        reset_password_token: @resource.send(:set_reset_password_token)
+      )
+      detail_rows = [['Invited by', inviter.name]]
+      detail_rows << ['Workspace', account_name] if account_name.present?
+    end
+  end
+%>
 
-<% if @resource.unconfirmed_email.present? %>
-  <p><%= link_to 'Confirm my account', frontend_url('auth/confirmation', confirmation_token: @token) %></p>
-<% elsif @resource.confirmed? %>
-  <% if is_saml_account %>
-    <p>You can now access your account by logging in through your organization's SSO portal.</p>
-  <% else %>
-    <p><%= link_to 'Login to my account', frontend_url('auth/sign_in') %></p>
-  <% end %>
-<% elsif account_user&.inviter.present? %>
-  <% if is_saml_account %>
-    <p>You can access your account by logging in through your organization's SSO portal.</p>
-  <% else %>
-    <p><%= link_to 'Confirm my account', frontend_url('auth/password/edit', reset_password_token: @resource.send(:set_reset_password_token)) %></p>
-  <% end %>
-<% else %>
-  <p><%= link_to 'Confirm my account', frontend_url('auth/confirmation', confirmation_token: @token) %></p>
-<% end %>
+<%= render partial: 'devise/mailer/confirmation_body', locals: {
+  action_text: action_text,
+  action_url: action_url,
+  detail_rows: detail_rows,
+  eyebrow: eyebrow,
+  heading: heading,
+  info_text: info_text,
+  info_title: info_title,
+  intro_text: intro_text,
+  recipient_name: recipient_name,
+  supporting_text: supporting_text
+} %>
diff --git a/enterprise/config/schedule.yml b/enterprise/config/schedule.yml
new file mode 100644
index 000000000..05ea11e64
--- /dev/null
+++ b/enterprise/config/schedule.yml
@@ -0,0 +1,10 @@
+# Enterprise-only Sidekiq cron schedule.
+# Loaded by config/initializers/sidekiq.rb only when ChatwootApp.enterprise? is true.
+# Add cron entries here when the referenced job class lives under enterprise/.
+
+# Captain document auto-sync scheduler
+# Runs hourly, finds due documents based on plan sync intervals
+captain_documents_schedule_syncs_job:
+  cron: '0 * * * *'
+  class: 'Captain::Documents::ScheduleSyncsJob'
+  queue: scheduled_jobs
diff --git a/lib/base_markdown_renderer.rb b/lib/base_markdown_renderer.rb
index df49918b3..f530e71ee 100644
--- a/lib/base_markdown_renderer.rb
+++ b/lib/base_markdown_renderer.rb
@@ -29,11 +29,15 @@ class BaseMarkdownRenderer < CommonMarker::HtmlRenderer
 
   def render_img_tag(src, title, height = nil)
     title_attribute = title.present? ? " title=\"#{title}\"" : ''
-    height_attribute = height ? " height=\"#{height}\" width=\"auto\"" : ''
+    # Use inline style instead of the HTML height attribute: email clients and
+    # the in-app Letter view both run images through CSS (e.g. prose /
+    # lettersanitizer's `img { height: auto }`) which overrides presentational
+    # attributes. Inline style has higher specificity and survives.
+    style_attribute = height ? " style=\"height: #{height};\"" : ''
 
     plain do
       # plain ensures that the content is not wrapped in a paragraph tag
-      out("<img src=\"#{src}\"#{title_attribute}#{height_attribute} />")
+      out("<img src=\"#{src}\"#{title_attribute}#{style_attribute} />")
     end
   end
 end
diff --git a/lib/chatwoot_markdown_renderer.rb b/lib/chatwoot_markdown_renderer.rb
index c7adac30a..58f1ec189 100644
--- a/lib/chatwoot_markdown_renderer.rb
+++ b/lib/chatwoot_markdown_renderer.rb
@@ -3,8 +3,8 @@ class ChatwootMarkdownRenderer
     @content = content
   end
 
-  def render_message
-    markdown_renderer = BaseMarkdownRenderer.new
+  def render_message(hardbreaks: false)
+    markdown_renderer = BaseMarkdownRenderer.new(options: hardbreaks ? [:HARDBREAKS] : :DEFAULT)
     doc = CommonMarker.render_doc(@content, :DEFAULT, [:strikethrough, :autolink])
     html = markdown_renderer.render(doc)
     render_as_html_safe(html)
diff --git a/lib/filters/filter_keys.yml b/lib/filters/filter_keys.yml
index 8711239cc..25d0e5196 100644
--- a/lib/filters/filter_keys.yml
+++ b/lib/filters/filter_keys.yml
@@ -167,7 +167,7 @@ contacts:
       - "not_equal_to"
       - "contains"
       - "does_not_contain"
-  company:
+  company_name:
     attribute_type: "additional_attributes"
     data_type: "text_case_insensitive"
     filter_operators:
diff --git a/lib/integrations/slack/update_slack_message_service.rb b/lib/integrations/slack/update_slack_message_service.rb
new file mode 100644
index 000000000..b11828774
--- /dev/null
+++ b/lib/integrations/slack/update_slack_message_service.rb
@@ -0,0 +1,152 @@
+class Integrations::Slack::UpdateSlackMessageService
+  include RegexHelper
+
+  SUPPORTED_CONTENT_TYPES = %w[input_select form input_csat input_email].freeze
+
+  pattr_initialize [:message!, :hook!]
+
+  def perform
+    return unless updateable_message?
+
+    slack_client.chat_update(
+      channel: hook.reference_id,
+      ts: slack_message_ts,
+      text: updated_message_content
+    )
+  rescue Slack::Web::Api::Errors::MessageNotFound => e
+    # Original Slack message no longer exists (e.g. channel was reconfigured), skip gracefully.
+    Rails.logger.error "[Slack] chat_update failed (account=#{message.account_id}, hook=#{hook.id}): #{e.message}"
+  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 "[Slack] chat_update failed (account=#{message.account_id}, hook=#{hook.id}): #{e.message}"
+    hook.prompt_reauthorization!
+    hook.disable
+  end
+
+  private
+
+  def updateable_message?
+    hook&.reference_id.present? &&
+      slack_message_ts.present? &&
+      message.content_type.in?(SUPPORTED_CONTENT_TYPES) &&
+      (message.submitted_values.present? || message.submitted_email.present?)
+  end
+
+  def slack_message_ts
+    source_id = message.external_source_id_slack.to_s
+    return unless source_id.start_with?('cw-origin-')
+
+    source_id.delete_prefix('cw-origin-').presence
+  end
+
+  def updated_message_content
+    question = sanitized_content(message_text).presence
+    response = formatted_response
+
+    return question.to_s if response.blank?
+
+    [question, response].compact.join("\n\n")
+  end
+
+  def formatted_response
+    case message.content_type
+    when 'input_select'
+      format_input_select_response
+    when 'form'
+      format_form_response
+    when 'input_csat'
+      format_csat_response
+    when 'input_email'
+      format_email_response
+    end
+  end
+
+  def format_input_select_response
+    item = Array(message.submitted_values).first
+    return if item.blank?
+
+    value = item['title'] || item[:title] || item['value'] || item[:value]
+    value = sanitized_content(value)
+    return if value.blank?
+
+    "*Response:* #{value}"
+  end
+
+  def format_email_response
+    email = sanitized_content(message.submitted_email)
+    return if email.blank?
+
+    "*Email:* #{email}"
+  end
+
+  def format_form_response
+    submitted_values = Array(message.submitted_values)
+    return if submitted_values.blank?
+
+    items_by_name = Array(message.items).index_by { |i| flex_value(i, 'name') }
+
+    lines = submitted_values.filter_map do |sv|
+      format_form_line(sv, items_by_name)
+    end
+
+    return if lines.blank?
+
+    "*Responses:*\n#{lines.join("\n")}"
+  end
+
+  def format_csat_response
+    csat_response = flex_value(message.submitted_values, 'csat_survey_response', 'csatSurveyResponse')
+    return if csat_response.blank?
+
+    rating = flex_value(csat_response, 'rating')
+    feedback = flex_value(csat_response, 'feedback_message', 'feedbackMessage')
+
+    lines = []
+    lines << "• Rating: #{rating}" if rating.present?
+    lines << "• Feedback: #{sanitized_content(feedback)}" if feedback.present?
+
+    return if lines.blank?
+
+    "*CSAT:*\n#{lines.join("\n")}"
+  end
+
+  def format_form_line(submitted_value, items_by_name)
+    name = flex_value(submitted_value, 'name')
+    value = sanitized_content(flex_value(submitted_value, 'value'))
+    return if value.blank?
+
+    label = sanitized_content(flex_value(items_by_name[name], 'label') || name)
+    return if label.blank?
+
+    "• #{label}: #{value}"
+  end
+
+  def flex_value(hash, *keys)
+    return if hash.blank?
+
+    keys.each do |key|
+      value = hash[key.to_sym] || hash[key.to_s]
+      return value if value.present?
+    end
+    nil
+  end
+
+  def message_text
+    content = message.processed_message_content || message.content
+
+    if content.present?
+      content.to_s.gsub(MENTION_REGEX, '\1')
+    else
+      content
+    end
+  end
+
+  def sanitized_content(text)
+    ActionView::Base.full_sanitizer.sanitize(text.to_s).strip
+  end
+
+  def slack_client
+    @slack_client ||= Slack::Web::Client.new(token: hook.access_token)
+  end
+end
diff --git a/lib/redis/redis_keys.rb b/lib/redis/redis_keys.rb
index 893fb50ef..15ff553cc 100644
--- a/lib/redis/redis_keys.rb
+++ b/lib/redis/redis_keys.rb
@@ -43,6 +43,7 @@ module Redis::RedisKeys
   TIKTOK_REFRESH_TOKEN_MUTEX = 'TIKTOK_REFRESH_TOKEN_LOCK::%<channel_id>s'.freeze
   SLACK_MESSAGE_MUTEX = 'SLACK_MESSAGE_LOCK::%<conversation_id>s::%<reference_id>s'.freeze
   EMAIL_MESSAGE_MUTEX = 'EMAIL_CHANNEL_LOCK::%<inbox_id>s'.freeze
+  WHATSAPP_MESSAGE_MUTEX = 'WHATSAPP_MESSAGE_CREATE_LOCK::%<inbox_id>s::%<sender_id>s'.freeze
   CRM_PROCESS_MUTEX = 'CRM_PROCESS_MUTEX::%<hook_id>s'.freeze
   CAPTAIN_DOCUMENT_SYNC_MUTEX = 'CAPTAIN_DOCUMENT_SYNC_LOCK::%<document_id>s'.freeze
 
diff --git a/lib/safe_fetch.rb b/lib/safe_fetch.rb
index e6635c9c3..d664dcf6a 100644
--- a/lib/safe_fetch.rb
+++ b/lib/safe_fetch.rb
@@ -2,11 +2,17 @@ require 'ssrf_filter'
 
 module SafeFetch
   DEFAULT_ALLOWED_CONTENT_TYPE_PREFIXES = %w[image/ video/].freeze
+  DEFAULT_ALLOWED_CONTENT_TYPES = [].freeze
+  DEFAULT_SENSITIVE_HEADERS = %w[authorization cookie proxy-authorization].freeze
   DEFAULT_OPEN_TIMEOUT = 2
   DEFAULT_READ_TIMEOUT = 20
   DEFAULT_MAX_BYTES_FALLBACK_MB = 40
 
-  Result = Data.define(:tempfile, :filename, :content_type)
+  Result = Data.define(:tempfile, :filename, :content_type) do
+    def original_filename
+      filename
+    end
+  end
 
   class Error < StandardError; end
   class InvalidUrlError < Error; end
@@ -15,84 +21,22 @@ module SafeFetch
   class HttpError < Error; end
   class FileTooLargeError < Error; end
   class UnsupportedContentTypeError < Error; end
+  class UnsupportedMethodError < Error; end
+end
 
-  def self.fetch(url,
-                 max_bytes: nil,
-                 allowed_content_type_prefixes: DEFAULT_ALLOWED_CONTENT_TYPE_PREFIXES)
+require_relative 'safe_fetch/request_options'
+require_relative 'safe_fetch/fetcher'
+
+module SafeFetch
+  def self.fetch(url, **, &)
     raise ArgumentError, 'block required' unless block_given?
 
-    effective_max_bytes = max_bytes || default_max_bytes
-    uri = parse_and_validate_url!(url)
-    filename = filename_for(uri)
-    tempfile = Tempfile.new('chatwoot-safe-fetch', binmode: true)
-
-    response = stream_to_tempfile(url, tempfile, effective_max_bytes, allowed_content_type_prefixes)
-    raise HttpError, "#{response.code} #{response.message}" unless response.is_a?(Net::HTTPSuccess)
-
-    tempfile.rewind
-    yield Result.new(tempfile: tempfile, filename: filename, content_type: response['content-type'])
+    Fetcher.new(RequestOptions.new(url: url, **)).fetch(&)
   rescue SsrfFilter::InvalidUriScheme, URI::InvalidURIError => e
     raise InvalidUrlError, e.message
   rescue SsrfFilter::Error, Resolv::ResolvError => e
     raise UnsafeUrlError, e.message
   rescue Net::OpenTimeout, Net::ReadTimeout, SocketError, OpenSSL::SSL::SSLError => e
     raise FetchError, e.message
-  ensure
-    tempfile&.close!
-  end
-
-  class << self
-    private
-
-    def stream_to_tempfile(url, tempfile, max_bytes, allowed_content_type_prefixes)
-      response = nil
-      bytes_written = 0
-
-      SsrfFilter.get(
-        url,
-        http_options: { open_timeout: DEFAULT_OPEN_TIMEOUT, read_timeout: DEFAULT_READ_TIMEOUT }
-      ) do |res|
-        response = res
-        next unless res.is_a?(Net::HTTPSuccess)
-
-        unless allowed_content_type?(res['content-type'], allowed_content_type_prefixes)
-          raise UnsupportedContentTypeError, "content-type not allowed: #{res['content-type']}"
-        end
-
-        res.read_body do |chunk|
-          bytes_written += chunk.bytesize
-          raise FileTooLargeError, "exceeded #{max_bytes} bytes" if bytes_written > max_bytes
-
-          tempfile.write(chunk)
-        end
-      end
-
-      response
-    end
-
-    def filename_for(uri)
-      File.basename(uri.path).presence || "download-#{Time.current.to_i}-#{SecureRandom.hex(4)}"
-    end
-
-    def default_max_bytes
-      limit_mb = GlobalConfigService.load('MAXIMUM_FILE_UPLOAD_SIZE', DEFAULT_MAX_BYTES_FALLBACK_MB).to_i
-      limit_mb = DEFAULT_MAX_BYTES_FALLBACK_MB if limit_mb <= 0
-      limit_mb.megabytes
-    end
-
-    def parse_and_validate_url!(url)
-      uri = URI.parse(url)
-      raise InvalidUrlError, 'scheme must be http or https' unless uri.is_a?(URI::HTTP) || uri.is_a?(URI::HTTPS)
-      raise InvalidUrlError, 'missing host' if uri.host.blank?
-
-      uri
-    end
-
-    def allowed_content_type?(value, prefixes)
-      mime = value.to_s.split(';').first&.strip&.downcase
-      return false if mime.blank?
-
-      prefixes.any? { |prefix| mime.start_with?(prefix) }
-    end
   end
 end
diff --git a/lib/safe_fetch/fetcher.rb b/lib/safe_fetch/fetcher.rb
new file mode 100644
index 000000000..fa3c01f55
--- /dev/null
+++ b/lib/safe_fetch/fetcher.rb
@@ -0,0 +1,75 @@
+class SafeFetch::Fetcher
+  def initialize(options)
+    @options = options
+  end
+
+  def fetch
+    with_tempfile do |tempfile|
+      response = stream_response(tempfile)
+      raise SafeFetch::HttpError, "#{response.code} #{response.message}" unless response.is_a?(Net::HTTPSuccess)
+
+      tempfile.rewind
+      yield SafeFetch::Result.new(
+        tempfile: tempfile,
+        filename: options.filename,
+        content_type: normalized_content_type(response['content-type'])
+      )
+    end
+  end
+
+  private
+
+  attr_reader :options
+
+  def with_tempfile
+    tempfile = Tempfile.new('chatwoot-safe-fetch', binmode: true)
+    yield tempfile
+  ensure
+    tempfile&.close!
+  end
+
+  def stream_response(tempfile)
+    response = nil
+    bytes_written = 0
+
+    SsrfFilter.public_send(options.method, options.url, **options.request_options) do |res|
+      response = res
+      next unless res.is_a?(Net::HTTPSuccess)
+
+      validate_content_type!(res['content-type'])
+      bytes_written = write_response_body(res, tempfile, bytes_written)
+    end
+
+    response
+  end
+
+  def validate_content_type!(content_type)
+    return unless options.validate_content_type?
+    return if allowed_content_type?(content_type)
+
+    raise SafeFetch::UnsupportedContentTypeError, "content-type not allowed: #{content_type}"
+  end
+
+  def write_response_body(response, tempfile, bytes_written)
+    response.read_body do |chunk|
+      bytes_written += chunk.bytesize
+      raise SafeFetch::FileTooLargeError, "exceeded #{options.effective_max_bytes} bytes" if bytes_written > options.effective_max_bytes
+
+      tempfile.write(chunk)
+    end
+
+    bytes_written
+  end
+
+  def allowed_content_type?(value)
+    mime = normalized_content_type(value)
+    return false if mime.blank?
+
+    options.allowed_content_type_prefixes.any? { |prefix| mime.start_with?(prefix) } ||
+      options.allowed_content_types.include?(mime)
+  end
+
+  def normalized_content_type(value)
+    value.to_s.split(';').first&.strip&.downcase
+  end
+end
diff --git a/lib/safe_fetch/request_options.rb b/lib/safe_fetch/request_options.rb
new file mode 100644
index 000000000..72969a76d
--- /dev/null
+++ b/lib/safe_fetch/request_options.rb
@@ -0,0 +1,116 @@
+class SafeFetch::RequestOptions
+  DEFAULTS = {
+    method: :get,
+    body: nil,
+    max_bytes: nil,
+    open_timeout: SafeFetch::DEFAULT_OPEN_TIMEOUT,
+    read_timeout: SafeFetch::DEFAULT_READ_TIMEOUT,
+    headers: nil,
+    http_basic_authentication: nil,
+    allowed_content_type_prefixes: SafeFetch::DEFAULT_ALLOWED_CONTENT_TYPE_PREFIXES,
+    allowed_content_types: SafeFetch::DEFAULT_ALLOWED_CONTENT_TYPES,
+    validate_content_type: true
+  }.freeze
+
+  attr_reader :allowed_content_type_prefixes, :allowed_content_types, :body, :headers,
+              :http_basic_authentication, :method, :open_timeout, :read_timeout, :uri, :url
+
+  def initialize(url:, **options)
+    config = DEFAULTS.merge(options)
+    @url = url
+    @uri = parse_and_validate_url!(url)
+    @method = normalize_method(config[:method])
+    @body = config[:body]
+    @max_bytes = config[:max_bytes]
+    @open_timeout = config[:open_timeout]
+    @read_timeout = config[:read_timeout]
+    @headers = normalize_headers(config[:headers])
+    @http_basic_authentication = config[:http_basic_authentication]
+    @allowed_content_type_prefixes = Array(config[:allowed_content_type_prefixes])
+    @allowed_content_types = Array(config[:allowed_content_types])
+    @validate_content_type = config[:validate_content_type]
+  end
+
+  def effective_max_bytes
+    @effective_max_bytes ||= @max_bytes || default_max_bytes
+  end
+
+  def filename
+    @filename ||= File.basename(uri.path).presence || "download-#{Time.current.to_i}-#{SecureRandom.hex(4)}"
+  end
+
+  def request_options
+    {
+      headers: headers,
+      body: body,
+      request_proc: request_proc,
+      sensitive_headers: sensitive_headers,
+      http_options: { open_timeout: open_timeout, read_timeout: read_timeout }
+    }
+  end
+
+  def validate_content_type?
+    @validate_content_type
+  end
+
+  private
+
+  def default_max_bytes
+    limit_mb = GlobalConfigService.load('MAXIMUM_FILE_UPLOAD_SIZE', SafeFetch::DEFAULT_MAX_BYTES_FALLBACK_MB).to_i
+    limit_mb = SafeFetch::DEFAULT_MAX_BYTES_FALLBACK_MB if limit_mb <= 0
+    limit_mb.megabytes
+  end
+
+  def parse_and_validate_url!(value)
+    parsed_uri = URI.parse(value)
+    raise SafeFetch::InvalidUrlError, 'scheme must be http or https' unless parsed_uri.is_a?(URI::HTTP) || parsed_uri.is_a?(URI::HTTPS)
+    raise SafeFetch::InvalidUrlError, 'missing host' if parsed_uri.host.blank?
+
+    parsed_uri
+  end
+
+  def normalize_method(value)
+    http_method = value.to_s.downcase.to_sym
+    return http_method if SsrfFilter::VERB_MAP.key?(http_method)
+
+    raise SafeFetch::UnsupportedMethodError, "unsupported method: #{value}"
+  end
+
+  def normalize_headers(value)
+    value&.to_h
+  end
+
+  def request_proc
+    proc do |request|
+      credentials = http_basic_authentication.presence || basic_authentication_for(request.uri)
+      request.basic_auth(*credentials) if credentials.present?
+    end
+  end
+
+  def sensitive_headers
+    SafeFetch::DEFAULT_SENSITIVE_HEADERS
+  end
+
+  def basic_authentication_for(request_uri)
+    uri_basic_authentication(request_uri) || original_uri_basic_authentication(request_uri)
+  end
+
+  def original_uri_basic_authentication(request_uri)
+    return unless same_origin?(request_uri, uri)
+
+    uri_basic_authentication(uri)
+  end
+
+  def same_origin?(request_uri, other_uri)
+    request_uri.scheme == other_uri.scheme && request_uri.hostname == other_uri.hostname && request_uri.port == other_uri.port
+  end
+
+  def uri_basic_authentication(value)
+    return if value.user.blank?
+
+    [
+      URI.decode_uri_component(value.user),
+      URI.decode_uri_component(value.password.to_s)
+    ]
+  end
+end
diff --git a/lib/tasks/onboarding.rake b/lib/tasks/onboarding.rake
new file mode 100644
index 000000000..d61a77cc3
--- /dev/null
+++ b/lib/tasks/onboarding.rake
@@ -0,0 +1,14 @@
+namespace :onboarding do
+  desc 'Reset onboarding for an account (triggers the onboarding flow again). Usage: rake onboarding:reset[account_id]'
+  task :reset, [:account_id] => :environment do |_task, args|
+    abort 'Error: Please provide an account ID' if args[:account_id].blank?
+
+    account = Account.find_by(id: args[:account_id])
+    abort "Error: Account with ID '#{args[:account_id]}' not found" unless account
+
+    account.custom_attributes['onboarding_step'] = 'account_details'
+    account.save!
+
+    puts "Onboarding has been reset for account '#{account.name}' (ID: #{account.id})"
+  end
+end
diff --git a/lib/webhooks/trigger.rb b/lib/webhooks/trigger.rb
index 7cb15c836..57d96f51d 100644
--- a/lib/webhooks/trigger.rb
+++ b/lib/webhooks/trigger.rb
@@ -1,5 +1,15 @@
 class Webhooks::Trigger
   SUPPORTED_ERROR_HANDLE_EVENTS = %w[message_created message_updated].freeze
+  RETRYABLE_AGENT_BOT_STATUSES = [429, 500].freeze
+
+  class RetryableError < StandardError
+    attr_reader :status
+
+    def initialize(status:, message:)
+      @status = status
+      super(message)
+    end
+  end
 
   def initialize(url, payload, webhook_type, secret: nil, delivery_id: nil)
     @url = url
@@ -15,11 +25,9 @@ class Webhooks::Trigger
 
   def execute
     perform_request
-  rescue RestClient::TooManyRequests, RestClient::InternalServerError => e
-    raise if @webhook_type == :agent_bot_webhook
-
-    handle_failure(e)
   rescue StandardError => e
+    raise RetryableError.new(status: http_status(e), message: e.message) if retryable_agent_bot_error?(e)
+
     handle_failure(e)
   end
 
@@ -32,17 +40,19 @@ class Webhooks::Trigger
 
   def perform_request
     body = @payload.to_json
-    RestClient::Request.execute(
+    SafeFetch.fetch(
+      @url,
       method: :post,
-      url: @url,
-      payload: body,
+      body: body,
       headers: request_headers(body),
-      timeout: webhook_timeout
-    )
+      open_timeout: webhook_timeout,
+      read_timeout: webhook_timeout,
+      validate_content_type: false
+    ) { |_response| nil }
   end
 
   def request_headers(body)
-    headers = { content_type: :json, accept: :json }
+    headers = { 'Content-Type' => 'application/json', 'Accept' => 'application/json' }
     headers['X-Chatwoot-Delivery'] = @delivery_id if @delivery_id.present?
     if @secret.present?
       ts = Time.now.to_i.to_s
@@ -111,4 +121,14 @@ class Webhooks::Trigger
 
     timeout&.positive? ? timeout : 5
   end
+
+  def retryable_agent_bot_error?(error)
+    @webhook_type == :agent_bot_webhook && RETRYABLE_AGENT_BOT_STATUSES.include?(http_status(error))
+  end
+
+  def http_status(error)
+    return unless error.is_a?(SafeFetch::HttpError)
+
+    error.message.to_s[/\A(\d{3})\b/, 1]&.to_i
+  end
 end
diff --git a/public/downloads/import-contacts-sample.csv b/public/downloads/import-contacts-sample.csv
index a11edbc07..e81aaf403 100644
--- a/public/downloads/import-contacts-sample.csv
+++ b/public/downloads/import-contacts-sample.csv
@@ -1,26 +1,26 @@
-id,name,email,identifier,phone_number,ip_address,custom_attribute_1,custom_attribute_2
-1,Clarice Uzzell,cuzzell0@mozilla.org,bb4e11cd-0f23-49da-a123-dcc1fec6852c,+498963648018,70.61.11.201,Random-value-1,Random-value-1
-2,Marieann Creegan,mcreegan1@cornell.edu,e60bab4c-9fbb-47eb-8f75-42025b789c47,+15417543010,168.186.4.241,Random-value0,Random-value0
-3,Nancey Windibank,nwindibank2@bluehost.com,f793e813-4210-4bf3-a812-711418de25d2,+15417543011,73.44.41.59,Random-value1,Random-value1
-4,Sibel Stennine,sstennine3@yellowbook.com,d6e35a2d-d093-4437-a577-7df76316b937,+15417543011,115.249.27.155,Random-value2,Random-value2
-5,Tina O'Lunney,tolunney4@si.edu,3540d40a-5567-4f28-af98-5583a7ddbc56,+15417543011,219.181.212.8,Random-value3,Random-value3
-6,Quinn Neve,qneve5@army.mil,ba0e1bf0-c74b-41ce-8a2d-0b08fa0e5aa5,+15417543011,231.210.115.166,Random-value4,Random-value4
-7,Karylin Gaunson,kgaunson6@tripod.com,d24cac79-c81b-4b84-a33e-0441b7c6a981,+15417543011,160.189.41.11,Random-value5,Random-value5
-8,Jamison Shenton,jshenton7@upenn.edu,29a7a8c0-c7f7-4af9-852f-761b1a784a7a,+15417543011,53.94.18.201,Random-value6,Random-value6
-9,Gavan Threlfall,gthrelfall8@spotify.com,847d4943-ddb5-47cc-8008-ed5092c675c5,+15417543011,18.87.247.249,Random-value7,Random-value7
-10,Katina Hemmingway,khemmingway9@ameblo.jp,8f0b5efd-b6a8-4f1e-a1e3-b0ea8c9e3048,+15417543011,25.191.96.124,Random-value8,Random-value8
-11,Jillian Deinhard,jdeinharda@canalblog.com,bd952787-1b05-411f-9975-b916ec0950cc,+15417543011,11.211.174.93,Random-value9,Random-value9
-12,Blake Finden,bfindenb@wsj.com,12c95613-e49d-4fa2-86fb-deabb6ebe600,+15417543011,47.26.205.153,Random-value10,Random-value10
-13,Liane Maxworthy,lmaxworthyc@un.org,36b68e4c-40d6-4e09-bf59-7db3b27b18f0,+15417543011,157.196.34.166,Random-value11,Random-value11
-14,Martynne Ledley,mledleyd@sourceforge.net,1856bceb-cb36-415c-8ffc-0527f3f750d8,+15417543011,109.231.152.148,Random-value12,Random-value12
-15,Katharina Ruffli,krufflie@huffingtonpost.com,604de5c9-b154-4279-8978-41fb71f0f773,+15417543011,20.43.146.179,Random-value13,Random-value13
-16,Tucker Simmance,tsimmancef@bbc.co.uk,0a8fc3a7-4986-4a51-a503-6c7f974c90ad,+15417543011,179.76.226.171,Random-value14,Random-value14
-17,Wenona Martinson,wmartinsong@census.gov,0e5ea6e3-6824-4e78-a6f5-672847eafa17,+15417543011,92.243.194.160,Random-value15,Random-value15
-18,Gretna Vedyasov,gvedyasovh@lycos.com,6becf55b-a7b5-48f6-8788-b89cae85b066,+15417543011,25.22.86.101,Random-value16,Random-value16
-19,Lurline Abdon,labdoni@archive.org,afa9429f-9034-4b06-9efa-980e01906ebf,+15417543011,150.249.116.118,Random-value17,Random-value17
-20,Fiann Norcliff,fnorcliffj@istockphoto.com,59f72dec-14ba-4d6e-b17c-0d962e69ffac,+15417543011,237.167.197.197,Random-value18,Random-value18
-21,Zed Linn,zlinnk@phoca.cz,95f7bc56-be92-4c9c-ad58-eff3e63c7bea,+15417543011,88.102.64.113,Random-value19,Random-value19
-22,Averyl Simyson,asimysonl@livejournal.com,bde1fe59-c9bd-440c-bb39-79fe61dac1d1,+15417543011,141.248.89.29,Random-value20,Random-value20
-23,Camella Blackadder,cblackadderm@nifty.com,0c981752-5857-487c-b9b5-5d0253df740a,+15417543011,118.123.138.115,Random-value21,Random-value21
-24,Aurie Spatig,aspatign@printfriendly.com,4cf22bfb-2c3f-41d1-9993-6e3758e457ba,+15417543011,157.45.102.235,Random-value22,Random-value22
-25,Adrienne Bellard,abellardo@cnn.com,f10f9b8d-38ac-4e17-8a7d-d2e6a055f944,+15417543011,170.73.198.47,Random-value23,Random-value23
\ No newline at end of file
+id,name,email,identifier,phone_number,ip_address,company_name,custom_attribute_1,custom_attribute_2
+1,Clarice Uzzell,cuzzell0@mozilla.org,bb4e11cd-0f23-49da-a123-dcc1fec6852c,+498963648018,70.61.11.201,Acme Inc,Random-value-1,Random-value-1
+2,Marieann Creegan,mcreegan1@cornell.edu,e60bab4c-9fbb-47eb-8f75-42025b789c47,+15417543010,168.186.4.241,Acme Inc,Random-value0,Random-value0
+3,Nancey Windibank,nwindibank2@bluehost.com,f793e813-4210-4bf3-a812-711418de25d2,+15417543011,73.44.41.59,Acme Inc,Random-value1,Random-value1
+4,Sibel Stennine,sstennine3@yellowbook.com,d6e35a2d-d093-4437-a577-7df76316b937,+15417543011,115.249.27.155,Acme Inc,Random-value2,Random-value2
+5,Tina O'Lunney,tolunney4@si.edu,3540d40a-5567-4f28-af98-5583a7ddbc56,+15417543011,219.181.212.8,Acme Inc,Random-value3,Random-value3
+6,Quinn Neve,qneve5@army.mil,ba0e1bf0-c74b-41ce-8a2d-0b08fa0e5aa5,+15417543011,231.210.115.166,Acme Inc,Random-value4,Random-value4
+7,Karylin Gaunson,kgaunson6@tripod.com,d24cac79-c81b-4b84-a33e-0441b7c6a981,+15417543011,160.189.41.11,Acme Inc,Random-value5,Random-value5
+8,Jamison Shenton,jshenton7@upenn.edu,29a7a8c0-c7f7-4af9-852f-761b1a784a7a,+15417543011,53.94.18.201,Acme Inc,Random-value6,Random-value6
+9,Gavan Threlfall,gthrelfall8@spotify.com,847d4943-ddb5-47cc-8008-ed5092c675c5,+15417543011,18.87.247.249,Acme Inc,Random-value7,Random-value7
+10,Katina Hemmingway,khemmingway9@ameblo.jp,8f0b5efd-b6a8-4f1e-a1e3-b0ea8c9e3048,+15417543011,25.191.96.124,Acme Inc,Random-value8,Random-value8
+11,Jillian Deinhard,jdeinharda@canalblog.com,bd952787-1b05-411f-9975-b916ec0950cc,+15417543011,11.211.174.93,Acme Inc,Random-value9,Random-value9
+12,Blake Finden,bfindenb@wsj.com,12c95613-e49d-4fa2-86fb-deabb6ebe600,+15417543011,47.26.205.153,Acme Inc,Random-value10,Random-value10
+13,Liane Maxworthy,lmaxworthyc@un.org,36b68e4c-40d6-4e09-bf59-7db3b27b18f0,+15417543011,157.196.34.166,Acme Inc,Random-value11,Random-value11
+14,Martynne Ledley,mledleyd@sourceforge.net,1856bceb-cb36-415c-8ffc-0527f3f750d8,+15417543011,109.231.152.148,Acme Inc,Random-value12,Random-value12
+15,Katharina Ruffli,krufflie@huffingtonpost.com,604de5c9-b154-4279-8978-41fb71f0f773,+15417543011,20.43.146.179,Acme Inc,Random-value13,Random-value13
+16,Tucker Simmance,tsimmancef@bbc.co.uk,0a8fc3a7-4986-4a51-a503-6c7f974c90ad,+15417543011,179.76.226.171,Acme Inc,Random-value14,Random-value14
+17,Wenona Martinson,wmartinsong@census.gov,0e5ea6e3-6824-4e78-a6f5-672847eafa17,+15417543011,92.243.194.160,Acme Inc,Random-value15,Random-value15
+18,Gretna Vedyasov,gvedyasovh@lycos.com,6becf55b-a7b5-48f6-8788-b89cae85b066,+15417543011,25.22.86.101,Acme Inc,Random-value16,Random-value16
+19,Lurline Abdon,labdoni@archive.org,afa9429f-9034-4b06-9efa-980e01906ebf,+15417543011,150.249.116.118,Acme Inc,Random-value17,Random-value17
+20,Fiann Norcliff,fnorcliffj@istockphoto.com,59f72dec-14ba-4d6e-b17c-0d962e69ffac,+15417543011,237.167.197.197,Acme Inc,Random-value18,Random-value18
+21,Zed Linn,zlinnk@phoca.cz,95f7bc56-be92-4c9c-ad58-eff3e63c7bea,+15417543011,88.102.64.113,Acme Inc,Random-value19,Random-value19
+22,Averyl Simyson,asimysonl@livejournal.com,bde1fe59-c9bd-440c-bb39-79fe61dac1d1,+15417543011,141.248.89.29,Acme Inc,Random-value20,Random-value20
+23,Camella Blackadder,cblackadderm@nifty.com,0c981752-5857-487c-b9b5-5d0253df740a,+15417543011,118.123.138.115,Acme Inc,Random-value21,Random-value21
+24,Aurie Spatig,aspatign@printfriendly.com,4cf22bfb-2c3f-41d1-9993-6e3758e457ba,+15417543011,157.45.102.235,Acme Inc,Random-value22,Random-value22
+25,Adrienne Bellard,abellardo@cnn.com,f10f9b8d-38ac-4e17-8a7d-d2e6a055f944,+15417543011,170.73.198.47,Acme Inc,Random-value23,Random-value23
diff --git a/spec/assets/contacts.csv b/spec/assets/contacts.csv
index 8df75a37c..e583ff6f2 100644
--- a/spec/assets/contacts.csv
+++ b/spec/assets/contacts.csv
@@ -1,4 +1,4 @@
-id,first_name,last_name,email,gender,ip_address,identifier,phone_number,company
+id,first_name,last_name,email,gender,ip_address,identifier,phone_number,company_name
 1,Clarice,Uzzell,cuzzell0@mozilla.org,Genderfluid,70.61.11.201,bb4e11cd-0f23-49da-a123-dcc1fec6852c,918080808080,My Company Name
 2,Marieann,Creegan,mcreegan1@cornell.edu,Genderfluid,168.186.4.241,e60bab4c-9fbb-47eb-8f75-42025b789c47,+918080808081
 3,Nancey,Windibank,nwindibank2@bluehost.com,Agender,73.44.41.59,f793e813-4210-4bf3-a812-711418de25d2,+918080808082
diff --git a/spec/builders/account_builder_spec.rb b/spec/builders/account_builder_spec.rb
index 86cb4cf73..550e12e0a 100644
--- a/spec/builders/account_builder_spec.rb
+++ b/spec/builders/account_builder_spec.rb
@@ -52,6 +52,11 @@ RSpec.describe AccountBuilder do
            .and change(User, :count).by(1)
            .and change(AccountUser, :count).by(1)
       end
+
+      it 'initializes the onboarding step to account_details' do
+        _user, account = account_builder.perform
+        expect(account.custom_attributes['onboarding_step']).to eq('account_details')
+      end
     end
   end
 end
diff --git a/spec/builders/agent_builder_spec.rb b/spec/builders/agent_builder_spec.rb
index ac8a3229a..f140f2f29 100644
--- a/spec/builders/agent_builder_spec.rb
+++ b/spec/builders/agent_builder_spec.rb
@@ -56,7 +56,7 @@ RSpec.describe AgentBuilder, type: :model do
 
       it 'creates a user with default values' do
         user = agent_builder.perform
-        expect(user.name).to eq('')
+        expect(user.name).to eq(email.split('@').first)
         expect(AccountUser.find_by(user: user).role).to eq('agent')
       end
     end
diff --git a/spec/controllers/api/v1/accounts/articles/bulk_actions_controller_spec.rb b/spec/controllers/api/v1/accounts/articles/bulk_actions_controller_spec.rb
new file mode 100644
index 000000000..3dab5b60f
--- /dev/null
+++ b/spec/controllers/api/v1/accounts/articles/bulk_actions_controller_spec.rb
@@ -0,0 +1,141 @@
+require 'rails_helper'
+
+RSpec.describe 'Article Bulk Actions API', type: :request do
+  let(:account) { create(:account) }
+  let(:admin) { create(:user, account: account, role: :administrator) }
+  let(:agent) { create(:user, account: account, role: :agent) }
+  let!(:portal) { create(:portal, name: 'test_portal', account: account, config: { allowed_locales: %w[en es] }) }
+  let!(:category) { create(:category, portal: portal, account: account, locale: 'en', slug: 'getting-started') }
+  let!(:article_one) { create(:article, category: category, portal: portal, account: account, author: admin, status: :draft) }
+  let!(:article_two) { create(:article, category: category, portal: portal, account: account, author: admin, status: :draft) }
+  let!(:article_three) { create(:article, category: category, portal: portal, account: account, author: admin, status: :published) }
+
+  let(:base_url) { "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/articles/bulk_actions" }
+
+  describe 'PATCH articles/bulk_actions/update_status' do
+    let(:update_status_url) { "#{base_url}/update_status" }
+
+    context 'when unauthenticated' do
+      it 'returns unauthorized' do
+        patch update_status_url, params: { ids: [article_one.id], status: 'published' }, as: :json
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when authenticated as agent' do
+      it 'returns unauthorized' do
+        patch update_status_url,
+              headers: agent.create_new_auth_token,
+              params: { ids: [article_one.id], status: 'published' },
+              as: :json
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when authenticated as admin' do
+      it 'publishes multiple articles' do
+        patch update_status_url,
+              headers: admin.create_new_auth_token,
+              params: { ids: [article_one.id, article_two.id], status: 'published' },
+              as: :json
+
+        expect(response).to have_http_status(:ok)
+        expect(article_one.reload.status).to eq('published')
+        expect(article_two.reload.status).to eq('published')
+      end
+
+      it 'archives multiple articles' do
+        patch update_status_url,
+              headers: admin.create_new_auth_token,
+              params: { ids: [article_one.id, article_three.id], status: 'archived' },
+              as: :json
+
+        expect(response).to have_http_status(:ok)
+        expect(article_one.reload.status).to eq('archived')
+        expect(article_three.reload.status).to eq('archived')
+      end
+
+      it 'sets articles to draft' do
+        patch update_status_url,
+              headers: admin.create_new_auth_token,
+              params: { ids: [article_three.id], status: 'draft' },
+              as: :json
+
+        expect(response).to have_http_status(:ok)
+        expect(article_three.reload.status).to eq('draft')
+      end
+
+      it 'does not affect articles not in the list' do
+        patch update_status_url,
+              headers: admin.create_new_auth_token,
+              params: { ids: [article_one.id], status: 'published' },
+              as: :json
+
+        expect(article_one.reload.status).to eq('published')
+        expect(article_three.reload.status).to eq('published')
+      end
+
+      it 'returns unprocessable entity when no articles found' do
+        patch update_status_url,
+              headers: admin.create_new_auth_token,
+              params: { ids: [0], status: 'published' },
+              as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+    end
+  end
+
+  describe 'DELETE articles/bulk_actions/delete_articles' do
+    let(:destroy_url) { "#{base_url}/delete_articles" }
+
+    context 'when unauthenticated' do
+      it 'returns unauthorized' do
+        delete destroy_url, params: { ids: [article_one.id] }, as: :json
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when authenticated as agent' do
+      it 'returns unauthorized' do
+        delete destroy_url,
+               headers: agent.create_new_auth_token,
+               params: { ids: [article_one.id] },
+               as: :json
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when authenticated as admin' do
+      it 'deletes multiple articles' do
+        expect do
+          delete destroy_url,
+                 headers: admin.create_new_auth_token,
+                 params: { ids: [article_one.id, article_two.id] },
+                 as: :json
+        end.to change(Article, :count).by(-2)
+
+        expect(response).to have_http_status(:ok)
+      end
+
+      it 'does not delete articles not in the list' do
+        delete destroy_url,
+               headers: admin.create_new_auth_token,
+               params: { ids: [article_one.id] },
+               as: :json
+
+        expect(Article.exists?(article_one.id)).to be(false)
+        expect(Article.exists?(article_three.id)).to be(true)
+      end
+
+      it 'returns unprocessable entity when no articles found' do
+        delete destroy_url,
+               headers: admin.create_new_auth_token,
+               params: { ids: [0] },
+               as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
index d9ea3e641..2255a1215 100644
--- a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
@@ -101,7 +101,7 @@ RSpec.describe 'Contacts API', type: :request do
       end
 
       it 'returns all contacts with company name desc order' do
-        get "/api/v1/accounts/#{account.id}/contacts?include_contact_inboxes=false&sort=-company",
+        get "/api/v1/accounts/#{account.id}/contacts?include_contact_inboxes=false&sort=-company_name",
             headers: admin.create_new_auth_token,
             as: :json
 
@@ -112,7 +112,7 @@ RSpec.describe 'Contacts API', type: :request do
       end
 
       it 'returns all contacts with company name asc order with null values at last' do
-        get "/api/v1/accounts/#{account.id}/contacts?include_contact_inboxes=false&sort=-company",
+        get "/api/v1/accounts/#{account.id}/contacts?include_contact_inboxes=false&sort=-company_name",
             headers: admin.create_new_auth_token,
             as: :json
 
diff --git a/spec/controllers/api/v1/accounts/portals_controller_spec.rb b/spec/controllers/api/v1/accounts/portals_controller_spec.rb
index 19bc795c3..9c780c00a 100644
--- a/spec/controllers/api/v1/accounts/portals_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/portals_controller_spec.rb
@@ -180,6 +180,18 @@ RSpec.describe 'Api::V1::Accounts::Portals', type: :request do
         expect(portal.archived).to be_truthy
       end
 
+      it 'does not raise when blob_id is an integer (existing logo re-sent by frontend)' do
+        portal.logo.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
+
+        put "/api/v1/accounts/#{account.id}/portals/#{portal.slug}",
+            params: { portal: { name: 'updated_name' }, blob_id: portal.logo.blob.id },
+            headers: admin.create_new_auth_token
+
+        expect(response).to have_http_status(:success)
+        expect(response.parsed_body['name']).to eq('updated_name')
+        expect(portal.reload.logo).to be_attached
+      end
+
       it 'clears associated web widget when inbox selection is blank' do
         web_widget_inbox = create(:inbox, account: account)
         portal.update!(channel_web_widget: web_widget_inbox.channel)
diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb
index d93503418..340803a9b 100644
--- a/spec/controllers/api/v1/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts_controller_spec.rb
@@ -302,6 +302,16 @@ RSpec.describe 'Accounts API', type: :request do
         expect(account.reload.custom_attributes['onboarding_step']).to eq('invite_team')
       end
 
+      it 'clears onboarding step when current value is account_details' do
+        account.update(custom_attributes: { onboarding_step: 'account_details' })
+        patch "/api/v1/accounts/#{account.id}",
+              params: params,
+              headers: admin.create_new_auth_token,
+              as: :json
+
+        expect(account.reload.custom_attributes).not_to have_key('onboarding_step')
+      end
+
       it 'will not update onboarding step if onboarding step is not present in account custom attributes' do
         patch "/api/v1/accounts/#{account.id}",
               params: params,
diff --git a/spec/controllers/platform/api/v1/agent_bots_controller_spec.rb b/spec/controllers/platform/api/v1/agent_bots_controller_spec.rb
index d8a2479eb..793439a43 100644
--- a/spec/controllers/platform/api/v1/agent_bots_controller_spec.rb
+++ b/spec/controllers/platform/api/v1/agent_bots_controller_spec.rb
@@ -39,6 +39,19 @@ RSpec.describe 'Platform Agent Bot API', type: :request do
         expect(data.length).to eq(1)
         expect(data.first['outgoing_url']).to eq(agent_bot.outgoing_url)
       end
+
+      it 'returns 200 and skips orphaned permissibles when an agent bot has been deleted' do
+        create(:platform_app_permissible, platform_app: platform_app, permissible: agent_bot)
+        # Use delete (not destroy!) to bypass dependent: :destroy callbacks so the
+        # permissible row survives — exactly the orphan scenario described in the issue.
+        agent_bot.delete
+
+        get '/platform/api/v1/agent_bots',
+            headers: { api_access_token: platform_app.access_token.token }, as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(response.parsed_body).to be_empty
+      end
     end
   end
 
diff --git a/spec/enterprise/controllers/api/v1/accounts/captain/bulk_actions_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/captain/bulk_actions_controller_spec.rb
index eaecdd89e..744fa4ea8 100644
--- a/spec/enterprise/controllers/api/v1/accounts/captain/bulk_actions_controller_spec.rb
+++ b/spec/enterprise/controllers/api/v1/accounts/captain/bulk_actions_controller_spec.rb
@@ -19,7 +19,8 @@ RSpec.describe 'Api::V1::Accounts::Captain::BulkActions', type: :request do
       :captain_document,
       2,
       assistant: assistant,
-      account: account
+      account: account,
+      status: :available
     )
   end
 
@@ -115,7 +116,7 @@ RSpec.describe 'Api::V1::Accounts::Captain::BulkActions', type: :request do
         }
       end
 
-      it 'deletes the documents and returns an empty array' do
+      it 'deletes the documents and returns the deleted count' do
         expect do
           post "/api/v1/accounts/#{account.id}/captain/bulk_actions",
                params: document_delete_params,
@@ -124,7 +125,118 @@ RSpec.describe 'Api::V1::Accounts::Captain::BulkActions', type: :request do
         end.to change(Captain::Document, :count).by(-2)
 
         expect(response).to have_http_status(:ok)
-        expect(json_response).to eq([])
+        expect(json_response).to eq({ count: documents.size })
+      end
+    end
+
+    context 'when syncing documents' do
+      let(:sync_params) do
+        {
+          type: 'AssistantDocument',
+          ids: documents.map(&:id),
+          fields: { status: 'sync' }
+        }
+      end
+
+      before { clear_enqueued_jobs }
+
+      it 'queues a sync for each web document and returns the enqueued document ids' do
+        freeze_time do
+          expect do
+            post "/api/v1/accounts/#{account.id}/captain/bulk_actions",
+                 params: sync_params,
+                 headers: admin.create_new_auth_token,
+                 as: :json
+          end.to have_enqueued_job(Captain::Documents::PerformSyncJob).exactly(documents.size).times
+
+          documents.each do |document|
+            expect(document.reload).to have_attributes(
+              sync_status: 'syncing',
+              last_sync_attempted_at: Time.current
+            )
+          end
+        end
+
+        expect(response).to have_http_status(:ok)
+        expect(json_response).to eq({ ids: documents.map(&:id), count: documents.size })
+      end
+
+      it 'skips PDF documents because they are not syncable' do
+        pdf_document = build(:captain_document, assistant: assistant, account: account)
+        pdf_document.pdf_file.attach(io: StringIO.new('PDF content'), filename: 'test.pdf',
+                                     content_type: 'application/pdf')
+        pdf_document.save!
+
+        expect do
+          post "/api/v1/accounts/#{account.id}/captain/bulk_actions",
+               params: sync_params.merge(ids: [pdf_document.id]),
+               headers: admin.create_new_auth_token,
+               as: :json
+        end.not_to have_enqueued_job(Captain::Documents::PerformSyncJob)
+
+        expect(response).to have_http_status(:ok)
+      end
+
+      it 'skips documents that are still being processed' do
+        in_progress_document = create(:captain_document, assistant: assistant, account: account, status: :in_progress)
+
+        expect do
+          post "/api/v1/accounts/#{account.id}/captain/bulk_actions",
+               params: sync_params.merge(ids: [in_progress_document.id]),
+               headers: admin.create_new_auth_token,
+               as: :json
+        end.not_to have_enqueued_job(Captain::Documents::PerformSyncJob)
+
+        expect(response).to have_http_status(:ok)
+      end
+
+      it 'skips documents that already have a sync in progress' do
+        syncing_document = create(:captain_document, assistant: assistant, account: account, status: :available)
+        syncing_document.update!(sync_status: :syncing, last_sync_attempted_at: 1.minute.ago)
+
+        expect do
+          post "/api/v1/accounts/#{account.id}/captain/bulk_actions",
+               params: sync_params.merge(ids: [syncing_document.id]),
+               headers: admin.create_new_auth_token,
+               as: :json
+        end.not_to have_enqueued_job(Captain::Documents::PerformSyncJob)
+
+        expect(response).to have_http_status(:ok)
+      end
+
+      it 'queues stale syncing documents again' do
+        syncing_document = create(:captain_document, assistant: assistant, account: account, status: :available)
+
+        freeze_time do
+          syncing_document.update!(
+            sync_status: :syncing,
+            last_sync_attempted_at: (Captain::Document::SYNC_STALE_TIMEOUT + 1.minute).ago
+          )
+
+          expect do
+            post "/api/v1/accounts/#{account.id}/captain/bulk_actions",
+                 params: sync_params.merge(ids: [syncing_document.id]),
+                 headers: admin.create_new_auth_token,
+                 as: :json
+          end.to have_enqueued_job(Captain::Documents::PerformSyncJob).with(syncing_document)
+
+          expect(syncing_document.reload).to have_attributes(
+            sync_status: 'syncing',
+            last_sync_attempted_at: Time.current
+          )
+        end
+
+        expect(response).to have_http_status(:ok)
+        expect(json_response).to eq({ ids: [syncing_document.id], count: 1 })
+      end
+
+      it 'denies non-administrators' do
+        post "/api/v1/accounts/#{account.id}/captain/bulk_actions",
+             params: sync_params,
+             headers: agent.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:unauthorized)
       end
     end
 
diff --git a/spec/enterprise/controllers/api/v1/accounts/captain/documents_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/captain/documents_controller_spec.rb
index ef0aa6b2e..cb7731652 100644
--- a/spec/enterprise/controllers/api/v1/accounts/captain/documents_controller_spec.rb
+++ b/spec/enterprise/controllers/api/v1/accounts/captain/documents_controller_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe 'Api::V1::Accounts::Captain::Documents', type: :request do
   let(:agent) { create(:user, account: account, role: :agent) }
   let(:assistant) { create(:captain_assistant, account: account) }
   let(:assistant2) { create(:captain_assistant, account: account) }
-  let(:document) { create(:captain_document, assistant: assistant, account: account) }
+  let(:document) { create(:captain_document, assistant: assistant, account: account, status: :available) }
   let(:captain_limits) do
     {
       :startups => { :documents => 1, :responses => 100 }
@@ -141,6 +141,27 @@ RSpec.describe 'Api::V1::Accounts::Captain::Documents', type: :request do
         expect(json_response[:name]).to eq(document.name)
         expect(json_response[:external_link]).to eq(document.external_link)
       end
+
+      it 'returns sync metadata when the document has been synced' do
+        synced_at = 1.hour.ago
+        document.update!(sync_status: :synced, last_synced_at: synced_at)
+
+        get "/api/v1/accounts/#{account.id}/captain/documents/#{document.id}",
+            headers: agent.create_new_auth_token, as: :json
+
+        expect(json_response[:sync_status]).to eq('synced')
+        expect(json_response[:last_synced_at]).to eq(synced_at.to_i)
+      end
+
+      it 'does not report failed documents without a successful sync as last synced' do
+        document.update!(sync_status: :failed, last_sync_attempted_at: 1.minute.ago)
+
+        get "/api/v1/accounts/#{account.id}/captain/documents/#{document.id}",
+            headers: agent.create_new_auth_token, as: :json
+
+        expect(json_response[:sync_status]).to eq('failed')
+        expect(json_response[:last_synced_at]).to be_nil
+      end
     end
   end
 
@@ -235,6 +256,98 @@ RSpec.describe 'Api::V1::Accounts::Captain::Documents', type: :request do
     end
   end
 
+  describe 'POST /api/v1/accounts/:account_id/captain/documents/:id/sync' do
+    before { clear_enqueued_jobs }
+
+    context 'when it is an un-authenticated user' do
+      it 'returns unauthorized status' do
+        post "/api/v1/accounts/#{account.id}/captain/documents/#{document.id}/sync"
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an agent' do
+      it 'denies the request' do
+        post "/api/v1/accounts/#{account.id}/captain/documents/#{document.id}/sync",
+             headers: agent.create_new_auth_token, as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an admin' do
+      it 'queues a sync and returns accepted' do
+        freeze_time do
+          expect do
+            post "/api/v1/accounts/#{account.id}/captain/documents/#{document.id}/sync",
+                 headers: admin.create_new_auth_token, as: :json
+          end.to have_enqueued_job(Captain::Documents::PerformSyncJob).with(document)
+
+          expect(document.reload).to have_attributes(
+            sync_status: 'syncing',
+            last_sync_attempted_at: Time.current
+          )
+        end
+
+        expect(response).to have_http_status(:accepted)
+      end
+
+      it 'rejects documents that already have a sync in progress' do
+        document.update!(sync_status: :syncing, last_sync_attempted_at: 1.minute.ago)
+
+        expect do
+          post "/api/v1/accounts/#{account.id}/captain/documents/#{document.id}/sync",
+               headers: admin.create_new_auth_token, as: :json
+        end.not_to have_enqueued_job(Captain::Documents::PerformSyncJob)
+
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+
+      it 'queues stale syncing documents again' do
+        freeze_time do
+          document.update!(sync_status: :syncing, last_sync_attempted_at: (Captain::Document::SYNC_STALE_TIMEOUT + 1.minute).ago)
+
+          expect do
+            post "/api/v1/accounts/#{account.id}/captain/documents/#{document.id}/sync",
+                 headers: admin.create_new_auth_token, as: :json
+          end.to have_enqueued_job(Captain::Documents::PerformSyncJob).with(document)
+
+          expect(document.reload).to have_attributes(
+            sync_status: 'syncing',
+            last_sync_attempted_at: Time.current
+          )
+        end
+
+        expect(response).to have_http_status(:accepted)
+      end
+
+      it 'rejects PDF documents with an explanatory error' do
+        pdf_document = build(:captain_document, assistant: assistant, account: account)
+        pdf_document.pdf_file.attach(io: StringIO.new('PDF content'), filename: 'test.pdf',
+                                     content_type: 'application/pdf')
+        pdf_document.save!
+
+        expect do
+          post "/api/v1/accounts/#{account.id}/captain/documents/#{pdf_document.id}/sync",
+               headers: admin.create_new_auth_token, as: :json
+        end.not_to have_enqueued_job(Captain::Documents::PerformSyncJob)
+
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+
+      it 'rejects documents that are still being processed' do
+        in_progress_document = create(:captain_document, assistant: assistant, account: account, status: :in_progress)
+
+        expect do
+          post "/api/v1/accounts/#{account.id}/captain/documents/#{in_progress_document.id}/sync",
+               headers: admin.create_new_auth_token, as: :json
+        end.not_to have_enqueued_job(Captain::Documents::PerformSyncJob)
+
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+    end
+  end
+
   describe 'DELETE /api/v1/accounts/:account_id/captain/documents/:id' do
     context 'when it is an un-authenticated user' do
       before do
diff --git a/spec/enterprise/controllers/api/v1/accounts/conference_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/conference_controller_spec.rb
index f4949b9b8..f3019910a 100644
--- a/spec/enterprise/controllers/api/v1/accounts/conference_controller_spec.rb
+++ b/spec/enterprise/controllers/api/v1/accounts/conference_controller_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 RSpec.describe Api::V1::Accounts::ConferenceController, type: :request do
   let(:account) { create(:account) }
-  let(:voice_channel) { create(:channel_voice, account: account) }
+  let(:voice_channel) { create(:channel_twilio_sms, :with_voice, account: account) }
   let(:voice_inbox) { voice_channel.inbox }
   let(:conversation) { create(:conversation, account: account, inbox: voice_inbox, identifier: nil) }
   let(:admin) { create(:user, :administrator, account: account) }
diff --git a/spec/enterprise/controllers/enterprise/api/v1/accounts/articles/bulk_actions_controller_spec.rb b/spec/enterprise/controllers/enterprise/api/v1/accounts/articles/bulk_actions_controller_spec.rb
new file mode 100644
index 000000000..31f61d977
--- /dev/null
+++ b/spec/enterprise/controllers/enterprise/api/v1/accounts/articles/bulk_actions_controller_spec.rb
@@ -0,0 +1,179 @@
+require 'rails_helper'
+
+RSpec.describe 'Article Bulk Actions API', type: :request do
+  include ActiveJob::TestHelper
+
+  let(:account) { create(:account) }
+  let(:admin) { create(:user, account: account, role: :administrator) }
+  let(:agent) { create(:user, account: account, role: :agent) }
+  let!(:portal) { create(:portal, name: 'test_portal', account: account, config: { allowed_locales: %w[en es fr] }) }
+  let!(:category_en) { create(:category, portal: portal, account: account, locale: 'en', slug: 'getting-started') }
+  let!(:category_es) { create(:category, portal: portal, account: account, locale: 'es', slug: 'primeros-pasos') }
+  let!(:article_one) { create(:article, category: category_en, portal: portal, account: account, author_id: admin.id) }
+  let!(:article_two) { create(:article, category: category_en, portal: portal, account: account, author_id: admin.id) }
+
+  let(:translate_url) { "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/articles/bulk_actions/translate" }
+
+  describe 'POST articles/bulk_actions/translate' do
+    context 'when unauthenticated' do
+      it 'returns unauthorized' do
+        post translate_url, params: { ids: [article_one.id], locale: 'es', category_id: category_es.id }, as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when authenticated as agent' do
+      it 'returns unauthorized' do
+        post translate_url,
+             headers: agent.create_new_auth_token,
+             params: { ids: [article_one.id], locale: 'es', category_id: category_es.id },
+             as: :json
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when captain is not enabled' do
+      it 'returns unprocessable entity' do
+        post translate_url,
+             headers: admin.create_new_auth_token,
+             params: { ids: [article_one.id], locale: 'es', category_id: category_es.id },
+             as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+    end
+
+    context 'when authenticated as admin' do
+      before do
+        account.enable_features!('captain_tasks')
+      end
+
+      it 'enqueues translation jobs for each article' do
+        expect do
+          post translate_url,
+               headers: admin.create_new_auth_token,
+               params: { ids: [article_one.id, article_two.id], locale: 'es', category_id: category_es.id },
+               as: :json
+        end.to have_enqueued_job(Captain::Articles::TranslateJob).exactly(2).times
+
+        expect(response).to have_http_status(:ok)
+      end
+
+      it 'enqueues job with correct arguments' do
+        expect do
+          post translate_url,
+               headers: admin.create_new_auth_token,
+               params: { ids: [article_one.id], locale: 'es', category_id: category_es.id },
+               as: :json
+        end.to have_enqueued_job(Captain::Articles::TranslateJob).with(
+          account, article_one.id, 'es', category_es.id, admin
+        )
+
+        expect(response).to have_http_status(:ok)
+      end
+
+      it 'returns unprocessable entity for invalid locale' do
+        post translate_url,
+             headers: admin.create_new_auth_token,
+             params: { ids: [article_one.id], locale: 'zh', category_id: category_es.id },
+             as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+
+      it 'returns unprocessable entity for invalid category' do
+        post translate_url,
+             headers: admin.create_new_auth_token,
+             params: { ids: [article_one.id], locale: 'es', category_id: 0 },
+             as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+
+      it 'returns unprocessable entity when category locale does not match requested locale' do
+        post translate_url,
+             headers: admin.create_new_auth_token,
+             params: { ids: [article_one.id], locale: 'es', category_id: category_en.id },
+             as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+
+      it 'enqueues job with nil category when category_id is omitted' do
+        expect do
+          post translate_url,
+               headers: admin.create_new_auth_token,
+               params: { ids: [article_one.id], locale: 'es' },
+               as: :json
+        end.to have_enqueued_job(Captain::Articles::TranslateJob).with(
+          account, article_one.id, 'es', nil, admin
+        )
+
+        expect(response).to have_http_status(:ok)
+      end
+
+      it 'enqueues job with nil category when category_id is blank' do
+        expect do
+          post translate_url,
+               headers: admin.create_new_auth_token,
+               params: { ids: [article_one.id], locale: 'es', category_id: '' },
+               as: :json
+        end.to have_enqueued_job(Captain::Articles::TranslateJob).with(
+          account, article_one.id, 'es', nil, admin
+        )
+
+        expect(response).to have_http_status(:ok)
+      end
+
+      it 'returns unprocessable entity when no articles found' do
+        post translate_url,
+             headers: admin.create_new_auth_token,
+             params: { ids: [0], locale: 'es', category_id: category_es.id },
+             as: :json
+
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+
+      context 'when translations already exist' do
+        let!(:existing_translation) do
+          create(:article, portal: portal, category: category_es, account: account, author_id: admin.id,
+                           locale: 'es', associated_article_id: article_one.id)
+        end
+
+        it 'returns conflict with duplicate articles' do
+          post translate_url,
+               headers: admin.create_new_auth_token,
+               params: { ids: [article_one.id], locale: 'es', category_id: category_es.id },
+               as: :json
+
+          expect(response).to have_http_status(:conflict)
+          body = response.parsed_body
+          expect(body['duplicate_articles'].length).to eq(1)
+          expect(body['duplicate_articles'].first['id']).to eq(existing_translation.id)
+        end
+
+        it 'does not enqueue jobs when duplicates found without force' do
+          expect do
+            post translate_url,
+                 headers: admin.create_new_auth_token,
+                 params: { ids: [article_one.id], locale: 'es', category_id: category_es.id },
+                 as: :json
+          end.not_to have_enqueued_job(Captain::Articles::TranslateJob)
+        end
+
+        it 'enqueues jobs when force is true' do
+          expect do
+            post translate_url,
+                 headers: admin.create_new_auth_token,
+                 params: { ids: [article_one.id], locale: 'es', category_id: category_es.id, force: true },
+                 as: :json
+          end.to have_enqueued_job(Captain::Articles::TranslateJob).exactly(1).times
+
+          expect(response).to have_http_status(:ok)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/controllers/enterprise/api/v1/accounts/inboxes_controller_spec.rb b/spec/enterprise/controllers/enterprise/api/v1/accounts/inboxes_controller_spec.rb
index 4291d5091..709a8da22 100644
--- a/spec/enterprise/controllers/enterprise/api/v1/accounts/inboxes_controller_spec.rb
+++ b/spec/enterprise/controllers/enterprise/api/v1/accounts/inboxes_controller_spec.rb
@@ -24,6 +24,11 @@ RSpec.describe 'Enterprise Inboxes API', type: :request do
       end
 
       it 'creates a voice inbox when administrator' do
+        account.enable_features('channel_voice')
+        account.save!
+        stub_request(:get, %r{api\.twilio\.com/2010-04-01/Accounts/.*/IncomingPhoneNumbers\.json})
+          .to_return(status: 200, body: { incoming_phone_numbers: [{ capabilities: { 'voice' => true } }] }.to_json,
+                     headers: { 'Content-Type' => 'application/json' })
         allow(Twilio::VoiceWebhookSetupService).to receive(:new).and_return(instance_double(Twilio::VoiceWebhookSetupService,
                                                                                             perform: "AP#{SecureRandom.hex(16)}"))
 
@@ -34,8 +39,7 @@ RSpec.describe 'Enterprise Inboxes API', type: :request do
                                   provider_config: { account_sid: "AC#{SecureRandom.hex(16)}",
                                                      auth_token: SecureRandom.hex(16),
                                                      api_key_sid: SecureRandom.hex(8),
-                                                     api_key_secret: SecureRandom.hex(16),
-                                                     twiml_app_sid: "AP#{SecureRandom.hex(16)}" } } },
+                                                     api_key_secret: SecureRandom.hex(16) } } },
              as: :json
 
         expect(response).to have_http_status(:success)
diff --git a/spec/enterprise/controllers/twilio/voice_controller_spec.rb b/spec/enterprise/controllers/twilio/voice_controller_spec.rb
index 43141414e..c04f5ae41 100644
--- a/spec/enterprise/controllers/twilio/voice_controller_spec.rb
+++ b/spec/enterprise/controllers/twilio/voice_controller_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
 
 RSpec.describe 'Twilio::VoiceController', type: :request do
   let(:account) { create(:account) }
-  let(:channel) { create(:channel_voice, account: account, phone_number: '+15551230003') }
+  let(:channel) { create(:channel_twilio_sms, :with_voice, account: account, phone_number: '+15551230003') }
   let(:inbox) { channel.inbox }
   let(:digits) { channel.phone_number.delete_prefix('+') }
 
diff --git a/spec/enterprise/jobs/captain/articles/translate_job_spec.rb b/spec/enterprise/jobs/captain/articles/translate_job_spec.rb
new file mode 100644
index 000000000..119c93b1c
--- /dev/null
+++ b/spec/enterprise/jobs/captain/articles/translate_job_spec.rb
@@ -0,0 +1,134 @@
+require 'rails_helper'
+
+RSpec.describe Captain::Articles::TranslateJob, type: :job do
+  let(:account) { create(:account) }
+  let(:user) { create(:user, account: account, role: :administrator) }
+  let!(:portal) { create(:portal, account: account, config: { allowed_locales: %w[en es] }) }
+  let!(:category_en) { create(:category, portal: portal, account: account, locale: 'en', slug: 'getting-started') }
+  let!(:category_es) { create(:category, portal: portal, account: account, locale: 'es', slug: 'primeros-pasos') }
+  let!(:article) do
+    create(:article, portal: portal, category: category_en, account: account, author: user,
+                     title: 'Getting Started', content: '# Welcome\nThis is a guide.')
+  end
+
+  let(:title_service) { instance_double(Captain::Llm::ArticleTranslationService) }
+  let(:content_service) { instance_double(Captain::Llm::ArticleTranslationService) }
+
+  before do
+    allow(Captain::Llm::ArticleTranslationService).to receive(:new).with(hash_including(type: :title)).and_return(title_service)
+    allow(Captain::Llm::ArticleTranslationService).to receive(:new).with(hash_including(type: :content)).and_return(content_service)
+    allow(title_service).to receive(:perform).and_return(message: 'Primeros pasos')
+    allow(content_service).to receive(:perform).and_return(message: '# Bienvenido\nEsta es una guía.')
+  end
+
+  it 'queues on the low queue' do
+    expect { described_class.perform_later(account, article.id, 'es', category_es.id, user) }
+      .to have_enqueued_job.on_queue('low')
+  end
+
+  it 'creates a translated article as draft' do
+    expect do
+      described_class.perform_now(account, article.id, 'es', category_es.id, user)
+    end.to change(Article, :count).by(1)
+
+    translated = Article.last
+    expect(translated).to have_attributes(
+      title: 'Primeros pasos',
+      content: '# Bienvenido\nEsta es una guía.',
+      locale: 'es',
+      category_id: category_es.id,
+      author_id: user.id,
+      status: 'draft',
+      associated_article_id: article.id
+    )
+  end
+
+  it 'creates a translated article without a category when target_category_id is nil' do
+    expect do
+      described_class.perform_now(account, article.id, 'es', nil, user)
+    end.to change(Article, :count).by(1)
+
+    translated = Article.last
+    expect(translated).to have_attributes(
+      title: 'Primeros pasos',
+      locale: 'es',
+      category_id: nil,
+      status: 'draft',
+      associated_article_id: article.id
+    )
+  end
+
+  it 'calls the translation service with the correct language' do
+    described_class.perform_now(account, article.id, 'es', category_es.id, user)
+
+    expect(Captain::Llm::ArticleTranslationService).to have_received(:new).with(
+      account: account, text: 'Getting Started', target_language: 'Spanish', type: :title
+    )
+    expect(Captain::Llm::ArticleTranslationService).to have_received(:new).with(
+      account: account, text: '# Welcome\nThis is a guide.', target_language: 'Spanish', type: :content
+    )
+  end
+
+  it 'uses language_map for locale name resolution' do
+    described_class.perform_now(account, article.id, 'pt_BR', category_es.id, user)
+
+    expect(Captain::Llm::ArticleTranslationService).to have_received(:new).with(
+      hash_including(target_language: 'Portuguese (Brazil)', type: :title)
+    )
+  end
+
+  context 'when a translation already exists' do
+    let!(:existing_translation) do
+      create(:article, portal: portal, category: category_es, account: account, author: user,
+                       title: 'Old title', content: 'Old content', locale: 'es',
+                       associated_article_id: article.id)
+    end
+
+    it 'updates the existing translation instead of creating a new one' do
+      expect do
+        described_class.perform_now(account, article.id, 'es', category_es.id, user)
+      end.not_to change(Article, :count)
+
+      existing_translation.reload
+      expect(existing_translation).to have_attributes(
+        title: 'Primeros pasos',
+        content: '# Bienvenido\nEsta es una guía.',
+        description: article.description
+      )
+    end
+  end
+
+  context 'when the source article has blank content' do
+    let!(:draft_article) do
+      create(:article, portal: portal, category: category_en, account: account, author: user,
+                       title: 'Empty draft', content: nil, status: :draft)
+    end
+
+    it 'creates the translated article with the original blank content and skips the content LLM call' do
+      expect do
+        described_class.perform_now(account, draft_article.id, 'es', category_es.id, user)
+      end.to change(Article, :count).by(1)
+
+      expect(content_service).not_to have_received(:perform)
+      translated = Article.last
+      expect(translated).to have_attributes(
+        title: 'Primeros pasos',
+        content: nil,
+        locale: 'es',
+        associated_article_id: draft_article.id
+      )
+    end
+  end
+
+  context 'when translation service fails' do
+    before do
+      allow(title_service).to receive(:perform).and_return(error: 'LLM timeout')
+    end
+
+    it 'raises the error and does not create an article' do
+      expect do
+        described_class.perform_now(account, article.id, 'es', category_es.id, user)
+      end.to raise_error(RuntimeError, /LLM timeout/).and not_change(Article, :count)
+    end
+  end
+end
diff --git a/spec/enterprise/jobs/captain/documents/response_builder_job_spec.rb b/spec/enterprise/jobs/captain/documents/response_builder_job_spec.rb
index c3e5eab1c..4d1a07aa7 100644
--- a/spec/enterprise/jobs/captain/documents/response_builder_job_spec.rb
+++ b/spec/enterprise/jobs/captain/documents/response_builder_job_spec.rb
@@ -12,9 +12,7 @@ RSpec.describe Captain::Documents::ResponseBuilderJob, type: :job do
   end
 
   before do
-    allow(Captain::Llm::FaqGeneratorService).to receive(:new)
-      .with(document.content, document.account.locale_english_name, account_id: document.account_id)
-      .and_return(faq_generator)
+    allow(Captain::Llm::FaqGeneratorService).to receive(:new).with(document: document).and_return(faq_generator)
     allow(faq_generator).to receive(:generate).and_return(faqs)
   end
 
@@ -51,17 +49,14 @@ RSpec.describe Captain::Documents::ResponseBuilderJob, type: :job do
       let(:spanish_faq_generator) { instance_double(Captain::Llm::FaqGeneratorService) }
 
       before do
-        allow(Captain::Llm::FaqGeneratorService).to receive(:new)
-          .with(spanish_document.content, 'portuguese', account_id: spanish_document.account_id)
-          .and_return(spanish_faq_generator)
+        allow(Captain::Llm::FaqGeneratorService).to receive(:new).with(document: spanish_document).and_return(spanish_faq_generator)
         allow(spanish_faq_generator).to receive(:generate).and_return(faqs)
       end
 
-      it 'passes the correct locale to FAQ generator' do
+      it 'passes the correct document to FAQ generator' do
         described_class.new.perform(spanish_document)
 
-        expect(Captain::Llm::FaqGeneratorService).to have_received(:new)
-          .with(spanish_document.content, 'portuguese', account_id: spanish_document.account_id)
+        expect(Captain::Llm::FaqGeneratorService).to have_received(:new).with(document: spanish_document)
       end
     end
 
diff --git a/spec/enterprise/jobs/captain/documents/schedule_syncs_job_spec.rb b/spec/enterprise/jobs/captain/documents/schedule_syncs_job_spec.rb
new file mode 100644
index 000000000..50ef8b2b3
--- /dev/null
+++ b/spec/enterprise/jobs/captain/documents/schedule_syncs_job_spec.rb
@@ -0,0 +1,217 @@
+require 'rails_helper'
+
+RSpec.describe Captain::Documents::ScheduleSyncsJob, type: :job do
+  let(:account) { create(:account, custom_attributes: { plan_name: 'business' }) }
+  let(:assistant) { create(:captain_assistant, account: account) }
+
+  before do
+    account.enable_features!('captain_document_auto_sync')
+    clear_enqueued_jobs
+  end
+
+  context 'when the account has not enabled auto-sync' do
+    before { account.disable_features!('captain_document_auto_sync') }
+
+    it 'leaves available documents alone' do
+      create(:captain_document, assistant: assistant, account: account, status: :available)
+      clear_enqueued_jobs
+
+      expect { described_class.new.perform }.not_to have_enqueued_job(Captain::Documents::PerformSyncJob)
+    end
+  end
+
+  context 'when the account plan has no sync cadence' do
+    let(:account) { create(:account, custom_attributes: { plan_name: 'hacker' }) }
+
+    it 'leaves available documents alone' do
+      create(:captain_document, assistant: assistant, account: account, status: :available)
+      clear_enqueued_jobs
+
+      expect { described_class.new.perform }.not_to have_enqueued_job(Captain::Documents::PerformSyncJob)
+    end
+  end
+
+  context 'when an available document has backfilled sync metadata' do
+    it 'leaves it alone when last synced within the plan cadence' do
+      create(
+        :captain_document,
+        assistant: assistant,
+        account: account,
+        status: :available,
+        sync_status: :synced,
+        last_synced_at: 1.hour.ago
+      )
+      clear_enqueued_jobs
+
+      expect { described_class.new.perform }.not_to have_enqueued_job(Captain::Documents::PerformSyncJob)
+    end
+
+    it 'queues a sync when last synced before the plan cadence' do
+      document = create(
+        :captain_document,
+        assistant: assistant,
+        account: account,
+        status: :available,
+        sync_status: :synced,
+        last_synced_at: 3.days.ago
+      )
+      clear_enqueued_jobs
+
+      expect { described_class.new.perform }
+        .to have_enqueued_job(Captain::Documents::PerformSyncJob).with(document)
+    end
+
+    it 'marks the due document as syncing before queueing' do
+      document = create(
+        :captain_document,
+        assistant: assistant,
+        account: account,
+        status: :available,
+        sync_status: :synced,
+        last_synced_at: 3.days.ago
+      )
+      clear_enqueued_jobs
+
+      travel_to Time.zone.local(2026, 4, 27, 10, 0, 0) do
+        described_class.new.perform
+
+        expect(document.reload).to have_attributes(
+          sync_status: 'syncing',
+          last_sync_attempted_at: Time.current
+        )
+      end
+    end
+
+    it 'does not queue the same document again while the reserved sync is fresh' do
+      document = create(
+        :captain_document,
+        assistant: assistant,
+        account: account,
+        status: :available,
+        sync_status: :synced,
+        last_synced_at: 2.days.ago
+      )
+      clear_enqueued_jobs
+
+      expect { described_class.new.perform }
+        .to have_enqueued_job(Captain::Documents::PerformSyncJob).with(document)
+
+      clear_enqueued_jobs
+
+      expect { described_class.new.perform }.not_to have_enqueued_job(Captain::Documents::PerformSyncJob)
+    end
+  end
+
+  context 'when an available document was synced within the plan cadence' do
+    it 'leaves it alone' do
+      document = create(:captain_document, assistant: assistant, account: account, status: :available)
+      document.update!(sync_status: :synced, last_synced_at: 1.hour.ago, last_sync_attempted_at: 1.hour.ago)
+      clear_enqueued_jobs
+
+      expect { described_class.new.perform }.not_to have_enqueued_job(Captain::Documents::PerformSyncJob)
+    end
+  end
+
+  context 'when an available document was last synced before the plan cadence' do
+    it 'queues a sync for that document' do
+      document = create(:captain_document, assistant: assistant, account: account, status: :available)
+      document.update!(sync_status: :synced, last_synced_at: 2.days.ago, last_sync_attempted_at: 2.days.ago)
+      clear_enqueued_jobs
+
+      expect { described_class.new.perform }
+        .to have_enqueued_job(Captain::Documents::PerformSyncJob).with(document)
+    end
+  end
+
+  context 'when more documents are due than the account cap allows' do
+    before do
+      stub_const("#{described_class}::PER_ACCOUNT_HOURLY_CAP", 2)
+    end
+
+    it 'queues backfilled and oldest-attempted documents first' do
+      newest_document = create(:captain_document, assistant: assistant, account: account, status: :available)
+      oldest_document = create(:captain_document, assistant: assistant, account: account, status: :available)
+      backfilled_document = create(:captain_document, assistant: assistant, account: account, status: :available)
+
+      newest_document.update!(sync_status: :synced, last_synced_at: 2.days.ago, last_sync_attempted_at: 2.days.ago)
+      oldest_document.update!(sync_status: :synced, last_synced_at: 3.days.ago, last_sync_attempted_at: 3.days.ago)
+      backfilled_document.update!(sync_status: :synced, last_synced_at: 4.days.ago, last_sync_attempted_at: nil)
+      clear_enqueued_jobs
+
+      expect { described_class.new.perform }
+        .to have_enqueued_job(Captain::Documents::PerformSyncJob).with(backfilled_document)
+        .and have_enqueued_job(Captain::Documents::PerformSyncJob).with(oldest_document)
+      expect(Captain::Documents::PerformSyncJob).not_to have_been_enqueued.with(newest_document)
+    end
+  end
+
+  context 'when an available document failed before the plan cadence' do
+    it 'queues a sync for that document' do
+      document = create(:captain_document, assistant: assistant, account: account, status: :available)
+      document.update!(sync_status: :failed, last_sync_attempted_at: 2.days.ago)
+      clear_enqueued_jobs
+
+      expect { described_class.new.perform }
+        .to have_enqueued_job(Captain::Documents::PerformSyncJob).with(document)
+    end
+  end
+
+  context 'when a document is stuck in syncing past the scheduler stale timeout' do
+    it 'requeues a sync to recover the lock' do
+      document = create(:captain_document, assistant: assistant, account: account, status: :available)
+      document.update!(
+        sync_status: :syncing,
+        last_sync_attempted_at: (described_class::SYNC_STALE_TIMEOUT + 1.minute).ago
+      )
+      clear_enqueued_jobs
+
+      expect { described_class.new.perform }
+        .to have_enqueued_job(Captain::Documents::PerformSyncJob).with(document)
+    end
+  end
+
+  context 'when a document has been queued longer than the worker lock timeout' do
+    it 'leaves it alone so queue lag is not treated as a dead worker' do
+      document = create(:captain_document, assistant: assistant, account: account, status: :available)
+      document.update!(
+        sync_status: :syncing,
+        last_sync_attempted_at: (Captain::Documents::PerformSyncJob::LOCK_TIMEOUT + 1.minute).ago
+      )
+      clear_enqueued_jobs
+
+      expect { described_class.new.perform }.not_to have_enqueued_job(Captain::Documents::PerformSyncJob)
+    end
+  end
+
+  context 'when a document is currently syncing within the scheduler stale timeout' do
+    it 'leaves it alone so the holder can finish' do
+      document = create(:captain_document, assistant: assistant, account: account, status: :available)
+      document.update!(sync_status: :syncing, last_sync_attempted_at: 1.minute.ago)
+      clear_enqueued_jobs
+
+      expect { described_class.new.perform }.not_to have_enqueued_job(Captain::Documents::PerformSyncJob)
+    end
+  end
+
+  context 'when the only eligible document is a PDF' do
+    it 'leaves it alone since PDFs are not syncable' do
+      pdf_document = build(:captain_document, assistant: assistant, account: account, status: :available)
+      pdf_document.pdf_file.attach(io: StringIO.new('PDF content'), filename: 'test.pdf',
+                                   content_type: 'application/pdf')
+      pdf_document.save!
+      clear_enqueued_jobs
+
+      expect { described_class.new.perform }.not_to have_enqueued_job(Captain::Documents::PerformSyncJob)
+    end
+  end
+
+  context 'when an in-progress (still crawling) document is past the cadence' do
+    it 'leaves it alone since only available documents are eligible' do
+      document = create(:captain_document, assistant: assistant, account: account, status: :in_progress)
+      document.update!(last_sync_attempted_at: 2.days.ago)
+      clear_enqueued_jobs
+
+      expect { described_class.new.perform }.not_to have_enqueued_job(Captain::Documents::PerformSyncJob)
+    end
+  end
+end
diff --git a/spec/enterprise/jobs/captain/tools/firecrawl_parser_job_spec.rb b/spec/enterprise/jobs/captain/tools/firecrawl_parser_job_spec.rb
index bfffe7894..e12efc54b 100644
--- a/spec/enterprise/jobs/captain/tools/firecrawl_parser_job_spec.rb
+++ b/spec/enterprise/jobs/captain/tools/firecrawl_parser_job_spec.rb
@@ -15,17 +15,22 @@ RSpec.describe Captain::Tools::FirecrawlParserJob, type: :job do
     end
 
     it 'creates a new document when one does not exist' do
-      expect do
-        described_class.perform_now(assistant_id: assistant.id, payload: payload)
-      end.to change(assistant.documents, :count).by(1)
+      freeze_time do
+        expect do
+          described_class.perform_now(assistant_id: assistant.id, payload: payload)
+        end.to change(assistant.documents, :count).by(1)
 
-      document = assistant.documents.last
-      expect(document).to have_attributes(
-        content: payload[:markdown],
-        name: payload[:metadata]['title'],
-        external_link: 'https://www.firecrawl.dev',
-        status: 'available'
-      )
+        document = assistant.documents.last
+        expect(document).to have_attributes(
+          content: payload[:markdown],
+          name: payload[:metadata]['title'],
+          external_link: 'https://www.firecrawl.dev',
+          status: 'available',
+          sync_status: 'synced',
+          last_synced_at: Time.current,
+          last_sync_attempted_at: Time.current
+        )
+      end
     end
 
     it 'updates existing document when one exists' do
@@ -37,18 +42,23 @@ RSpec.describe Captain::Tools::FirecrawlParserJob, type: :job do
                                  name: 'old title',
                                  status: :in_progress)
 
-      expect do
-        described_class.perform_now(assistant_id: assistant.id, payload: payload)
-      end.not_to change(assistant.documents, :count)
+      freeze_time do
+        expect do
+          described_class.perform_now(assistant_id: assistant.id, payload: payload)
+        end.not_to change(assistant.documents, :count)
 
-      existing_document.reload
-      # Payload URL ends with '/', but we persist the canonical URL without it.
-      expect(existing_document).to have_attributes(
-        external_link: 'https://www.firecrawl.dev',
-        content: payload[:markdown],
-        name: payload[:metadata]['title'],
-        status: 'available'
-      )
+        existing_document.reload
+        # Payload URL ends with '/', but we persist the canonical URL without it.
+        expect(existing_document).to have_attributes(
+          external_link: 'https://www.firecrawl.dev',
+          content: payload[:markdown],
+          name: payload[:metadata]['title'],
+          status: 'available',
+          sync_status: 'synced',
+          last_synced_at: Time.current,
+          last_sync_attempted_at: Time.current
+        )
+      end
     end
 
     context 'when an error occurs' do
diff --git a/spec/enterprise/jobs/captain/tools/simple_page_crawl_parser_job_spec.rb b/spec/enterprise/jobs/captain/tools/simple_page_crawl_parser_job_spec.rb
index 3872629e5..2425def85 100644
--- a/spec/enterprise/jobs/captain/tools/simple_page_crawl_parser_job_spec.rb
+++ b/spec/enterprise/jobs/captain/tools/simple_page_crawl_parser_job_spec.rb
@@ -14,20 +14,28 @@ RSpec.describe Captain::Tools::SimplePageCrawlParserJob, type: :job do
         .and_return(crawler)
 
       allow(crawler).to receive(:page_title).and_return(page_title)
-      allow(crawler).to receive(:body_text_content).and_return(content)
+      allow(crawler).to receive(:body_markdown).and_return(content)
+      allow(crawler).to receive(:success?).and_return(true)
     end
 
     context 'when the page is successfully crawled' do
       it 'creates a new document if one does not exist' do
-        expect do
-          described_class.perform_now(assistant_id: assistant.id, page_link: page_link)
-        end.to change(assistant.documents, :count).by(1)
+        freeze_time do
+          expect do
+            described_class.perform_now(assistant_id: assistant.id, page_link: page_link)
+          end.to change(assistant.documents, :count).by(1)
 
-        document = assistant.documents.last
-        expect(document.external_link).to eq('https://example.com/page')
-        expect(document.name).to eq(page_title)
-        expect(document.content).to eq(content)
-        expect(document.status).to eq('available')
+          document = assistant.documents.last
+          expect(document.external_link).to eq('https://example.com/page')
+          expect(document.name).to eq(page_title)
+          expect(document.content).to eq(content)
+          expect(document).to have_attributes(
+            status: 'available',
+            sync_status: 'synced',
+            last_synced_at: Time.current,
+            last_sync_attempted_at: Time.current
+          )
+        end
       end
 
       it 'updates existing document if one exists' do
@@ -37,14 +45,21 @@ RSpec.describe Captain::Tools::SimplePageCrawlParserJob, type: :job do
                                    name: 'Old Title',
                                    content: 'Old content')
 
-        expect do
-          described_class.perform_now(assistant_id: assistant.id, page_link: page_link)
-        end.not_to change(assistant.documents, :count)
+        freeze_time do
+          expect do
+            described_class.perform_now(assistant_id: assistant.id, page_link: page_link)
+          end.not_to change(assistant.documents, :count)
 
-        existing_document.reload
-        expect(existing_document.name).to eq(page_title)
-        expect(existing_document.content).to eq(content)
-        expect(existing_document.status).to eq('available')
+          existing_document.reload
+          expect(existing_document.name).to eq(page_title)
+          expect(existing_document.content).to eq(content)
+          expect(existing_document).to have_attributes(
+            status: 'available',
+            sync_status: 'synced',
+            last_synced_at: Time.current,
+            last_sync_attempted_at: Time.current
+          )
+        end
       end
 
       context 'when title or content exceed maximum length' do
@@ -53,7 +68,7 @@ RSpec.describe Captain::Tools::SimplePageCrawlParserJob, type: :job do
 
         before do
           allow(crawler).to receive(:page_title).and_return(long_title)
-          allow(crawler).to receive(:body_text_content).and_return(long_content)
+          allow(crawler).to receive(:body_markdown).and_return(long_content)
         end
 
         it 'truncates the title and content' do
@@ -78,10 +93,82 @@ RSpec.describe Captain::Tools::SimplePageCrawlParserJob, type: :job do
       end
     end
 
+    context 'when the page fetch fails' do
+      before do
+        allow(crawler).to receive(:success?).and_return(false)
+        allow(crawler).to receive(:status_code).and_return(500)
+      end
+
+      it 'raises an error without creating an available document' do
+        expect do
+          described_class.perform_now(assistant_id: assistant.id, page_link: page_link)
+        end.to raise_error("Failed to parse data: #{page_link} Failed to fetch page: #{page_link}")
+          .and not_change(assistant.documents, :count)
+      end
+
+      it 'marks an existing document as available and failed' do
+        document = create(
+          :captain_document,
+          assistant: assistant,
+          account: assistant.account,
+          external_link: 'https://example.com/page',
+          status: :in_progress
+        )
+
+        freeze_time do
+          expect do
+            described_class.perform_now(assistant_id: assistant.id, page_link: page_link)
+          end.to raise_error("Failed to parse data: #{page_link} Failed to fetch page: #{page_link}")
+
+          expect(document.reload).to have_attributes(
+            status: 'available',
+            sync_status: 'failed',
+            last_sync_error_code: 'fetch_failed',
+            last_sync_attempted_at: Time.current
+          )
+        end
+      end
+
+      context 'when the failure is permanent' do
+        before do
+          allow(crawler).to receive(:status_code).and_return(404)
+        end
+
+        it 'does not retry a discovered link that was never persisted' do
+          expect do
+            described_class.perform_now(assistant_id: assistant.id, page_link: page_link)
+          end.not_to change(assistant.documents, :count)
+        end
+
+        it 'marks an existing document as available and failed without raising' do
+          document = create(
+            :captain_document,
+            assistant: assistant,
+            account: assistant.account,
+            external_link: 'https://example.com/page',
+            status: :in_progress
+          )
+
+          freeze_time do
+            expect do
+              described_class.perform_now(assistant_id: assistant.id, page_link: page_link)
+            end.not_to raise_error
+
+            expect(document.reload).to have_attributes(
+              status: 'available',
+              sync_status: 'failed',
+              last_sync_error_code: 'not_found',
+              last_sync_attempted_at: Time.current
+            )
+          end
+        end
+      end
+    end
+
     context 'when title and content are nil' do
       before do
         allow(crawler).to receive(:page_title).and_return(nil)
-        allow(crawler).to receive(:body_text_content).and_return(nil)
+        allow(crawler).to receive(:body_markdown).and_return(nil)
       end
 
       it 'creates document with empty strings and updates the status to available' do
diff --git a/spec/enterprise/mailers/devise_mailer_spec.rb b/spec/enterprise/mailers/devise_mailer_spec.rb
index 286e863f7..61ce92047 100644
--- a/spec/enterprise/mailers/devise_mailer_spec.rb
+++ b/spec/enterprise/mailers/devise_mailer_spec.rb
@@ -8,12 +8,23 @@ RSpec.describe 'Devise::Mailer' do
     let!(:confirmable_user) { create(:user, inviter: inviter_val, account: account) }
     let(:inviter_val) { nil }
     let(:mail) { Devise::Mailer.confirmation_instructions(confirmable_user.reload, nil, {}) }
+    let(:mail_body) { CGI.unescapeHTML(mail.body.to_s) }
 
     before do
       confirmable_user.update!(confirmed_at: nil)
       confirmable_user.send(:generate_confirmation_token)
     end
 
+    context 'when brand name is intentionally blank' do
+      before do
+        create(:installation_config, name: 'BRAND_NAME', value: '')
+      end
+
+      it 'preserves the blank brand override' do
+        expect(mail_body).not_to include('Chatwoot')
+      end
+    end
+
     context 'with SAML enabled account' do
       let(:saml_settings) { create(:account_saml_settings, account: account) }
 
@@ -21,12 +32,13 @@ RSpec.describe 'Devise::Mailer' do
 
       context 'when user has no inviter' do
         it 'shows standard welcome message without SSO references' do
-          expect(mail.body).to match('We have a suite of powerful tools ready for you to explore.')
-          expect(mail.body).not_to match('via Single Sign-On')
+          expect(mail_body).to include('Confirm your email to get started')
+          expect(mail_body).to include('We just need to verify your email address before you can start using your account.')
+          expect(mail_body).not_to include('Single Sign-On (SSO)')
         end
 
-        it 'does not show activation instructions for SAML accounts' do
-          expect(mail.body).not_to match('Please take a moment and click the link below and activate your account')
+        it 'shows the standard confirmation CTA' do
+          expect(mail_body).to include('Confirm my account')
         end
 
         it 'shows confirmation link' do
@@ -38,22 +50,21 @@ RSpec.describe 'Devise::Mailer' do
         let(:inviter_val) { create(:user, :administrator, skip_confirmation: true, account: account) }
 
         it 'mentions SSO invitation' do
-          expect(mail.body).to match(
-            "#{CGI.escapeHTML(inviter_val.name)}, with #{CGI.escapeHTML(account.name)}, has invited you to access.*via Single Sign-On \\(SSO\\)"
-          )
+          expect(mail_body).to include("You're invited to join #{account.name}")
+          expect(mail_body).to include("#{inviter_val.name} invited you to access the #{account.name} workspace on Chatwoot.")
         end
 
         it 'explains SSO authentication' do
-          expect(mail.body).to match('Your organization uses SSO for secure authentication')
-          expect(mail.body).to match('You will not need a password to access your account')
+          expect(mail_body).to include("Your organization uses Single Sign-On (SSO), so you won't need to create a separate password.")
         end
 
         it 'does not show standard invitation message' do
-          expect(mail.body).not_to match('has invited you to try out')
+          expect(mail_body).not_to include('invited you to join')
+          expect(mail_body).not_to include('Accept invitation')
         end
 
         it 'directs to SSO portal instead of password reset' do
-          expect(mail.body).to match('You can access your account by logging in through your organization\'s SSO portal')
+          expect(mail_body).to include("Use your organization's SSO portal")
           expect(mail.body).not_to include('app/auth/password/edit')
         end
       end
@@ -66,7 +77,9 @@ RSpec.describe 'Devise::Mailer' do
         end
 
         it 'shows SSO login instructions' do
-          expect(mail.body).to match('You can now access your account by logging in through your organization\'s SSO portal')
+          expect(mail_body).to include('Your access is ready')
+          expect(mail_body).to include("Sign in with your organization's SSO")
+          expect(mail_body).to include("Use your organization's Single Sign-On (SSO) portal to access")
           expect(mail.body).not_to include('/auth/sign_in')
         end
       end
@@ -79,6 +92,7 @@ RSpec.describe 'Devise::Mailer' do
         end
 
         it 'still shows confirmation link for email verification' do
+          expect(mail_body).to include('Confirm your new email address')
           expect(mail.body).to include('app/auth/confirmation?confirmation_token')
           expect(confirmable_user.unconfirmed_email.blank?).to be false
         end
@@ -90,7 +104,8 @@ RSpec.describe 'Devise::Mailer' do
         end
 
         it 'shows SSO login instructions instead of regular login' do
-          expect(mail.body).to match('You can now access your account by logging in through your organization\'s SSO portal')
+          expect(mail_body).to include('Your access is ready')
+          expect(mail_body).to include("Sign in with your organization's SSO")
           expect(mail.body).not_to include('/auth/sign_in')
         end
       end
@@ -101,9 +116,10 @@ RSpec.describe 'Devise::Mailer' do
         let(:inviter_val) { create(:user, :administrator, skip_confirmation: true, account: account) }
 
         it 'shows standard invitation without SSO references' do
-          expect(mail.body).to match('has invited you to try out Chatwoot')
-          expect(mail.body).not_to match('via Single Sign-On')
-          expect(mail.body).not_to match('SSO portal')
+          expect(mail_body).to include("You're invited to join #{account.name}")
+          expect(mail_body).to include("#{inviter_val.name} invited you to join the #{account.name} workspace on")
+          expect(mail_body).not_to include('Single Sign-On (SSO)')
+          expect(mail_body).not_to include("Use your organization's SSO portal")
         end
 
         it 'shows password reset link' do
@@ -112,9 +128,10 @@ RSpec.describe 'Devise::Mailer' do
       end
 
       context 'when user has no inviter' do
-        it 'shows standard welcome message and activation instructions' do
-          expect(mail.body).to match('We have a suite of powerful tools ready for you to explore')
-          expect(mail.body).to match('Please take a moment and click the link below and activate your account')
+        it 'shows the standard confirmation state' do
+          expect(mail_body).to include('Confirm your email to get started')
+          expect(mail_body).to include('We just need to verify your email address before you can start using your account.')
+          expect(mail_body).to include('Confirm my account')
         end
 
         it 'shows confirmation link' do
@@ -130,8 +147,9 @@ RSpec.describe 'Devise::Mailer' do
         end
 
         it 'shows regular login link' do
+          expect(mail_body).to include('Your account is ready')
           expect(mail.body).to include('/auth/sign_in')
-          expect(mail.body).not_to match('SSO portal')
+          expect(mail_body).not_to include('SSO portal')
         end
       end
 
@@ -141,6 +159,7 @@ RSpec.describe 'Devise::Mailer' do
         end
 
         it 'shows confirmation link for email verification' do
+          expect(mail_body).to include('Confirm your new email address')
           expect(mail.body).to include('app/auth/confirmation?confirmation_token')
           expect(confirmable_user.unconfirmed_email.blank?).to be false
         end
diff --git a/spec/enterprise/models/account_spec.rb b/spec/enterprise/models/account_spec.rb
index 1c727328e..8183c76ff 100644
--- a/spec/enterprise/models/account_spec.rb
+++ b/spec/enterprise/models/account_spec.rb
@@ -222,6 +222,51 @@ RSpec.describe Account, type: :model do
     end
   end
 
+  describe 'captain document sync cadence' do
+    let(:account) { create(:account) }
+
+    it 'has no cadence on the hacker plan' do
+      account.update!(custom_attributes: { plan_name: 'hacker' })
+      expect(account.captain_document_sync_interval).to be_nil
+    end
+
+    it 'syncs weekly on the startups plan' do
+      account.update!(custom_attributes: { plan_name: 'startups' })
+      expect(account.captain_document_sync_interval).to eq(7.days)
+    end
+
+    it 'syncs daily on the business plan' do
+      account.update!(custom_attributes: { plan_name: 'business' })
+      expect(account.captain_document_sync_interval).to eq(1.day)
+    end
+
+    it 'syncs every six hours on the enterprise plan' do
+      account.update!(custom_attributes: { plan_name: 'enterprise' })
+      expect(account.captain_document_sync_interval).to eq(6.hours)
+    end
+
+    it 'has no cadence when plan is missing' do
+      account.update!(custom_attributes: {})
+      expect(account.captain_document_sync_interval).to be_nil
+    end
+
+    it 'has no cadence for unknown plans' do
+      account.update!(custom_attributes: { plan_name: 'mystery' })
+      expect(account.captain_document_sync_interval).to be_nil
+    end
+
+    it 'normalizes plan name casing' do
+      account.update!(custom_attributes: { plan_name: 'Business' })
+      expect(account.captain_document_sync_interval).to eq(1.day)
+    end
+
+    it 'syncs every six hours on self-hosted enterprise installs without a plan_name' do
+      allow(ChatwootApp).to receive(:self_hosted_enterprise?).and_return(true)
+      account.update!(custom_attributes: {})
+      expect(account.captain_document_sync_interval).to eq(6.hours)
+    end
+  end
+
   describe 'account deletion' do
     let(:account) { create(:account) }
     let(:admin) { create(:user, account: account, role: :administrator) }
diff --git a/spec/enterprise/models/channel/twilio_sms_voice_spec.rb b/spec/enterprise/models/channel/twilio_sms_voice_spec.rb
new file mode 100644
index 000000000..b2d5dba48
--- /dev/null
+++ b/spec/enterprise/models/channel/twilio_sms_voice_spec.rb
@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Channel::TwilioSms do
+  let(:account) { create(:account) }
+  let(:twiml_app_sid) { 'AP1234567890abcdef' }
+
+  before do
+    allow(Twilio::VoiceWebhookSetupService).to receive(:new).and_return(instance_double(Twilio::VoiceWebhookSetupService, perform: twiml_app_sid))
+  end
+
+  describe 'factory' do
+    it 'has a valid :with_voice factory' do
+      channel = create(:channel_twilio_sms, :with_voice, account: account)
+      expect(channel).to be_valid
+      expect(channel.voice_enabled?).to be true
+    end
+  end
+
+  describe 'validations' do
+    it 'requires a phone number when voice is enabled' do
+      channel = build(:channel_twilio_sms, :with_voice, account: account, phone_number: nil)
+      channel.valid?
+      expect(channel.errors[:base]).to include('Voice calling requires a phone number and cannot be used with messaging service SID')
+    end
+  end
+
+  describe '#voice_enabled?' do
+    it 'returns true when voice_enabled is set' do
+      channel = create(:channel_twilio_sms, :with_voice, account: account)
+      expect(channel.voice_enabled?).to be true
+    end
+
+    it 'returns false by default' do
+      channel = create(:channel_twilio_sms, account: account)
+      expect(channel.voice_enabled?).to be false
+    end
+  end
+
+  describe '#voice_call_webhook_url' do
+    it 'returns the webhook URL based on phone number' do
+      channel = create(:channel_twilio_sms, :with_voice)
+      digits = channel.phone_number.delete_prefix('+')
+      expect(channel.voice_call_webhook_url).to include(digits)
+    end
+  end
+
+  describe '#voice_status_webhook_url' do
+    it 'returns the status webhook URL based on phone number' do
+      channel = create(:channel_twilio_sms, :with_voice)
+      digits = channel.phone_number.delete_prefix('+')
+      expect(channel.voice_status_webhook_url).to include(digits)
+    end
+  end
+
+  describe 'provisioning on create' do
+    it 'stores twiml_app_sid from the webhook setup service' do
+      stub_request(:get, %r{api\.twilio\.com/2010-04-01/Accounts/.*/IncomingPhoneNumbers\.json})
+        .to_return(status: 200, body: { incoming_phone_numbers: [{ capabilities: { 'voice' => true } }] }.to_json,
+                   headers: { 'Content-Type' => 'application/json' })
+      channel = create(:channel_twilio_sms, :with_voice, twiml_app_sid: nil)
+      expect(channel.twiml_app_sid).to eq(twiml_app_sid)
+    end
+  end
+
+  describe 'teardown on disable' do
+    let(:channel) { create(:channel_twilio_sms, :with_voice, account: account) }
+    let(:app_context) { instance_double(Twilio::REST::Api::V2010::AccountContext::ApplicationContext) }
+    let(:twilio_client) { instance_double(Twilio::REST::Client) }
+    let(:numbers_list) { instance_double(Twilio::REST::Api::V2010::AccountContext::IncomingPhoneNumberList) }
+
+    before do
+      allow(Twilio::REST::Client).to receive(:new).and_return(twilio_client)
+      allow(twilio_client).to receive(:applications).with(channel.twiml_app_sid).and_return(app_context)
+      allow(app_context).to receive(:delete)
+      allow(twilio_client).to receive(:incoming_phone_numbers).and_return(numbers_list)
+      allow(numbers_list).to receive(:list).with(phone_number: channel.phone_number).and_return([])
+    end
+
+    it 'deletes the TwiML app and clears twiml_app_sid' do
+      original_twiml_sid = channel.twiml_app_sid
+      channel.update!(voice_enabled: false)
+
+      expect(twilio_client).to have_received(:applications).with(original_twiml_sid)
+      expect(app_context).to have_received(:delete)
+      expect(channel.reload.twiml_app_sid).to be_nil
+    end
+
+    it 'preserves api_key_sid and api_key_secret' do
+      channel.update!(voice_enabled: false)
+      expect(channel.reload.api_key_sid).to be_present
+      expect(channel.reload.api_key_secret).to be_present
+    end
+
+    it 'does not fail if Twilio API errors' do
+      allow(app_context).to receive(:delete).and_raise(StandardError.new('Not found'))
+
+      expect { channel.update!(voice_enabled: false) }.not_to raise_error
+      expect(channel.reload.twiml_app_sid).to be_nil
+    end
+  end
+end
diff --git a/spec/enterprise/models/channel/voice_spec.rb b/spec/enterprise/models/channel/voice_spec.rb
deleted file mode 100644
index 01f4b4c5b..000000000
--- a/spec/enterprise/models/channel/voice_spec.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Channel::Voice do
-  let(:twiml_app_sid) { 'AP1234567890abcdef' }
-  let(:channel) { create(:channel_voice) }
-
-  before do
-    allow(Twilio::VoiceWebhookSetupService).to receive(:new).and_return(instance_double(Twilio::VoiceWebhookSetupService, perform: twiml_app_sid))
-  end
-
-  it 'has a valid factory' do
-    expect(channel).to be_valid
-  end
-
-  describe 'validations' do
-    it 'validates presence of provider_config' do
-      channel.provider_config = nil
-      expect(channel).not_to be_valid
-      expect(channel.errors[:provider_config]).to include("can't be blank")
-    end
-
-    it 'validates presence of account_sid in provider_config' do
-      channel.provider_config = { auth_token: 'token' }
-      expect(channel).not_to be_valid
-      expect(channel.errors[:provider_config]).to include('account_sid is required for Twilio provider')
-    end
-
-    it 'validates presence of auth_token in provider_config' do
-      channel.provider_config = { account_sid: 'sid' }
-      expect(channel).not_to be_valid
-      expect(channel.errors[:provider_config]).to include('auth_token is required for Twilio provider')
-    end
-
-    it 'validates presence of api_key_sid in provider_config' do
-      channel.provider_config = { account_sid: 'sid', auth_token: 'token' }
-      expect(channel).not_to be_valid
-      expect(channel.errors[:provider_config]).to include('api_key_sid is required for Twilio provider')
-    end
-
-    it 'validates presence of api_key_secret in provider_config' do
-      channel.provider_config = { account_sid: 'sid', auth_token: 'token', api_key_sid: 'key' }
-      expect(channel).not_to be_valid
-      expect(channel.errors[:provider_config]).to include('api_key_secret is required for Twilio provider')
-    end
-
-    it 'validates presence of twiml_app_sid in provider_config' do
-      channel.provider_config = { account_sid: 'sid', auth_token: 'token', api_key_sid: 'key', api_key_secret: 'secret' }
-      expect(channel).not_to be_valid
-      expect(channel.errors[:provider_config]).to include('twiml_app_sid is required for Twilio provider')
-    end
-
-    it 'is valid with all required provider_config fields' do
-      channel.provider_config = {
-        account_sid: 'test_sid',
-        auth_token: 'test_token',
-        api_key_sid: 'test_key',
-        api_key_secret: 'test_secret',
-        twiml_app_sid: 'test_app_sid'
-      }
-      expect(channel).to be_valid
-    end
-  end
-
-  describe '#name' do
-    it 'returns Voice with phone number' do
-      expect(channel.name).to include('Voice')
-      expect(channel.name).to include(channel.phone_number)
-    end
-  end
-
-  describe 'provisioning on create' do
-    it 'stores twiml_app_sid in provider_config' do
-      ch = create(:channel_voice)
-      expect(ch.provider_config.with_indifferent_access[:twiml_app_sid]).to eq(twiml_app_sid)
-    end
-  end
-end
diff --git a/spec/enterprise/policies/captain/assistant_policy_spec.rb b/spec/enterprise/policies/captain/assistant_policy_spec.rb
new file mode 100644
index 000000000..e3c62846f
--- /dev/null
+++ b/spec/enterprise/policies/captain/assistant_policy_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Captain::AssistantPolicy, type: :policy do
+  subject(:assistant_policy) { described_class }
+
+  let(:account) { create(:account) }
+  let(:administrator) { create(:user, :administrator, account: account) }
+  let(:agent) { create(:user, account: account) }
+  let(:assistant) { create(:captain_assistant, account: account) }
+  let(:administrator_context) { { user: administrator, account: account, account_user: account.account_users.first } }
+  let(:agent_context) { { user: agent, account: account, account_user: account.account_users.first } }
+
+  permissions :index?, :show?, :playground? do
+    context 'when administrator' do
+      it { expect(assistant_policy).to permit(administrator_context, assistant) }
+    end
+
+    context 'when agent' do
+      it { expect(assistant_policy).to permit(agent_context, assistant) }
+    end
+  end
+
+  permissions :tools?, :create?, :update?, :destroy?, :sync? do
+    context 'when administrator' do
+      it { expect(assistant_policy).to permit(administrator_context, assistant) }
+    end
+
+    context 'when agent' do
+      it { expect(assistant_policy).not_to permit(agent_context, assistant) }
+    end
+  end
+end
diff --git a/spec/enterprise/services/captain/llm/article_translation_service_spec.rb b/spec/enterprise/services/captain/llm/article_translation_service_spec.rb
new file mode 100644
index 000000000..1c0d83b65
--- /dev/null
+++ b/spec/enterprise/services/captain/llm/article_translation_service_spec.rb
@@ -0,0 +1,67 @@
+require 'rails_helper'
+
+RSpec.describe Captain::Llm::ArticleTranslationService do
+  let(:account) { create(:account) }
+  let(:target_language) { 'Spanish' }
+
+  before do
+    create(:installation_config, name: 'CAPTAIN_OPEN_AI_API_KEY', value: 'test-key')
+    allow(account).to receive(:feature_enabled?).and_call_original
+    allow(account).to receive(:feature_enabled?).with('captain_tasks').and_return(true)
+  end
+
+  describe '#perform with type: :title' do
+    let(:service) do
+      described_class.new(account: account, text: 'Getting Started', target_language: target_language, type: :title)
+    end
+
+    it 'returns the stripped translated title' do
+      expect(service).to receive(:make_api_call) do |args|
+        expect(args[:messages][0][:content]).to include('professional translator')
+        expect(args[:messages][0][:content]).to include(target_language)
+        expect(args[:messages][1][:content]).to eq('Getting Started')
+        { message: "  Primeros pasos  \n" }
+      end
+
+      expect(service.perform).to include(message: 'Primeros pasos')
+    end
+  end
+
+  describe '#perform with type: :content' do
+    let(:content) { "# Welcome\nSome markdown." }
+    let(:service) do
+      described_class.new(account: account, text: content, target_language: target_language, type: :content)
+    end
+
+    it 'returns the stripped translated content using the markdown system prompt' do
+      expect(service).to receive(:make_api_call) do |args|
+        expect(args[:messages][0][:content]).to include('markdown')
+        expect(args[:messages][0][:content]).to include('Preserve ALL HTML tags')
+        expect(args[:messages][1][:content]).to eq(content)
+        { message: "# Bienvenido\nAlgo de markdown.\n" }
+      end
+
+      expect(service.perform).to include(message: "# Bienvenido\nAlgo de markdown.")
+    end
+  end
+
+  describe '#perform with an invalid type' do
+    it 'raises ArgumentError' do
+      service = described_class.new(account: account, text: 'hi', target_language: target_language, type: :invalid)
+
+      expect { service.perform }.to raise_error(ArgumentError, /Invalid type/)
+    end
+  end
+
+  describe '#perform when the API call fails' do
+    let(:service) do
+      described_class.new(account: account, text: 'Getting Started', target_language: target_language, type: :title)
+    end
+
+    it 'returns the error hash unchanged' do
+      allow(service).to receive(:make_api_call).and_return(error: 'LLM timeout', error_code: 500)
+
+      expect(service.perform).to eq(error: 'LLM timeout', error_code: 500)
+    end
+  end
+end
diff --git a/spec/enterprise/services/captain/llm/faq_generator_service_spec.rb b/spec/enterprise/services/captain/llm/faq_generator_service_spec.rb
index 003d5b715..ff7138c9a 100644
--- a/spec/enterprise/services/captain/llm/faq_generator_service_spec.rb
+++ b/spec/enterprise/services/captain/llm/faq_generator_service_spec.rb
@@ -2,8 +2,8 @@ require 'rails_helper'
 
 RSpec.describe Captain::Llm::FaqGeneratorService do
   let(:content) { 'Sample content for FAQ generation' }
-  let(:language) { 'english' }
-  let(:service) { described_class.new(content, language) }
+  let(:document) { create(:captain_document, content: content) }
+  let(:service) { described_class.new(document: document) }
   let(:mock_chat) { instance_double(RubyLLM::Chat) }
   let(:sample_faqs) do
     [
@@ -36,14 +36,15 @@ RSpec.describe Captain::Llm::FaqGeneratorService do
         service.generate
       end
 
-      it 'uses SystemPromptsService with the specified language' do
-        expect(Captain::Llm::SystemPromptsService).to receive(:faq_generator).with(language).at_least(:once).and_call_original
+      it 'uses SystemPromptsService with the account language' do
+        account_language = document.account.locale_english_name
+        expect(Captain::Llm::SystemPromptsService).to receive(:faq_generator).with(account_language).at_least(:once).and_call_original
         service.generate
       end
     end
 
     context 'with different language' do
-      let(:language) { 'spanish' }
+      before { allow(document.account).to receive(:locale_english_name).and_return('spanish') }
 
       it 'passes the correct language to SystemPromptsService' do
         expect(Captain::Llm::SystemPromptsService).to receive(:faq_generator).with('spanish').at_least(:once).and_call_original
diff --git a/spec/enterprise/services/captain/onboarding/website_analyzer_service_spec.rb b/spec/enterprise/services/captain/onboarding/website_analyzer_service_spec.rb
index 4dec4c051..dcf6ce3c2 100644
--- a/spec/enterprise/services/captain/onboarding/website_analyzer_service_spec.rb
+++ b/spec/enterprise/services/captain/onboarding/website_analyzer_service_spec.rb
@@ -29,7 +29,7 @@ RSpec.describe Captain::Onboarding::WebsiteAnalyzerService do
   describe '#analyze' do
     context 'when website content is available and LLM call is successful' do
       before do
-        allow(mock_crawler).to receive(:body_text_content).and_return('Welcome to Example Corp')
+        allow(mock_crawler).to receive(:body_markdown).and_return('Welcome to Example Corp')
         allow(mock_crawler).to receive(:page_title).and_return('Example Corp - Home')
         allow(mock_crawler).to receive(:meta_description).and_return('Leading provider of business solutions')
         allow(mock_crawler).to receive(:favicon_url).and_return('https://example.com/favicon.ico')
@@ -56,7 +56,7 @@ RSpec.describe Captain::Onboarding::WebsiteAnalyzerService do
 
     context 'when website content fetch raises an error' do
       before do
-        allow(mock_crawler).to receive(:body_text_content).and_raise(StandardError, 'Network error')
+        allow(mock_crawler).to receive(:body_markdown).and_raise(StandardError, 'Network error')
       end
 
       it 'returns error response' do
@@ -69,7 +69,7 @@ RSpec.describe Captain::Onboarding::WebsiteAnalyzerService do
 
     context 'when website content is empty' do
       before do
-        allow(mock_crawler).to receive(:body_text_content).and_return('')
+        allow(mock_crawler).to receive(:body_markdown).and_return('')
         allow(mock_crawler).to receive(:page_title).and_return('')
         allow(mock_crawler).to receive(:meta_description).and_return('')
       end
@@ -84,7 +84,7 @@ RSpec.describe Captain::Onboarding::WebsiteAnalyzerService do
 
     context 'when LLM call fails' do
       before do
-        allow(mock_crawler).to receive(:body_text_content).and_return('Welcome to Example Corp')
+        allow(mock_crawler).to receive(:body_markdown).and_return('Welcome to Example Corp')
         allow(mock_crawler).to receive(:page_title).and_return('Example Corp - Home')
         allow(mock_crawler).to receive(:meta_description).and_return('Leading provider of business solutions')
         allow(mock_crawler).to receive(:favicon_url).and_return('https://example.com/favicon.ico')
@@ -103,7 +103,7 @@ RSpec.describe Captain::Onboarding::WebsiteAnalyzerService do
       let(:invalid_response) { instance_double(RubyLLM::Message, content: 'not valid json') }
 
       before do
-        allow(mock_crawler).to receive(:body_text_content).and_return('Welcome to Example Corp')
+        allow(mock_crawler).to receive(:body_markdown).and_return('Welcome to Example Corp')
         allow(mock_crawler).to receive(:page_title).and_return('Example Corp - Home')
         allow(mock_crawler).to receive(:meta_description).and_return('Leading provider of business solutions')
         allow(mock_crawler).to receive(:favicon_url).and_return('https://example.com/favicon.ico')
@@ -122,7 +122,7 @@ RSpec.describe Captain::Onboarding::WebsiteAnalyzerService do
       let(:website_url) { 'example.com' }
 
       before do
-        allow(mock_crawler).to receive(:body_text_content).and_return('Welcome')
+        allow(mock_crawler).to receive(:body_markdown).and_return('Welcome')
         allow(mock_crawler).to receive(:page_title).and_return('Example')
         allow(mock_crawler).to receive(:meta_description).and_return('Description')
         allow(mock_crawler).to receive(:favicon_url).and_return(nil)
diff --git a/spec/enterprise/services/captain/tools/firecrawl_service_spec.rb b/spec/enterprise/services/captain/tools/firecrawl_service_spec.rb
index d6563b163..4d4bc7aaf 100644
--- a/spec/enterprise/services/captain/tools/firecrawl_service_spec.rb
+++ b/spec/enterprise/services/captain/tools/firecrawl_service_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe Captain::Tools::FirecrawlService do
       end
 
       it 'raises an error' do
-        expect { described_class.new }.to raise_error(NoMethodError)
+        expect { described_class.new }.to raise_error('Missing API key')
       end
     end
 
@@ -58,9 +58,9 @@ RSpec.describe Captain::Tools::FirecrawlService do
         limit: crawl_limit,
         webhook: webhook_url,
         scrapeOptions: {
-          onlyMainContent: false,
+          onlyMainContent: true,
           formats: ['markdown'],
-          excludeTags: ['iframe']
+          excludeTags: Captain::Tools::FirecrawlService::FIRECRAWL_EXCLUDE_TAGS
         }
       }.to_json
     end
diff --git a/spec/enterprise/services/captain/tools/simple_page_crawl_service_spec.rb b/spec/enterprise/services/captain/tools/simple_page_crawl_service_spec.rb
index 5dfe7177d..3cc175a3d 100644
--- a/spec/enterprise/services/captain/tools/simple_page_crawl_service_spec.rb
+++ b/spec/enterprise/services/captain/tools/simple_page_crawl_service_spec.rb
@@ -36,6 +36,31 @@ RSpec.describe Captain::Tools::SimplePageCrawlService do
     end
   end
 
+  describe '#success?' do
+    context 'when the fetch succeeds' do
+      before do
+        stub_request(:get, base_url)
+          .to_return(status: 200, body: '<html><head><title>Example Page</title></head></html>')
+      end
+
+      it 'returns true' do
+        expect(service.success?).to be(true)
+        expect(service.status_code).to eq(200)
+      end
+    end
+
+    context 'when the fetch returns a non-success response' do
+      before do
+        stub_request(:get, base_url).to_return(status: 404, body: 'Not found')
+      end
+
+      it 'returns false and exposes the status code' do
+        expect(service.success?).to be(false)
+        expect(service.status_code).to eq(404)
+      end
+    end
+  end
+
   describe '#page_links' do
     context 'with HTML page' do
       let(:html_content) do
@@ -95,7 +120,7 @@ RSpec.describe Captain::Tools::SimplePageCrawlService do
     end
   end
 
-  describe '#body_text_content' do
+  describe '#body_markdown' do
     let(:html_content) do
       <<~HTML
         <html>
@@ -117,7 +142,7 @@ RSpec.describe Captain::Tools::SimplePageCrawlService do
     end
 
     it 'converts body content to markdown' do
-      expect(service.body_text_content).to eq("# Main Title\n\nConverted markdown")
+      expect(service.body_markdown).to eq("# Main Title\n\nConverted markdown")
       expect(ReverseMarkdown).to have_received(:convert).with(
         kind_of(Nokogiri::XML::Element),
         unknown_tags: :bypass,
diff --git a/spec/enterprise/services/twilio/voice_webhook_setup_service_spec.rb b/spec/enterprise/services/twilio/voice_webhook_setup_service_spec.rb
index e31dfeb20..6c47fa325 100644
--- a/spec/enterprise/services/twilio/voice_webhook_setup_service_spec.rb
+++ b/spec/enterprise/services/twilio/voice_webhook_setup_service_spec.rb
@@ -9,14 +9,16 @@ RSpec.describe Twilio::VoiceWebhookSetupService do
   let(:api_key_secret) { 'api_key_secret_123' }
   let(:phone_number) { '+15551230001' }
   let(:frontend_url) { 'https://app.chatwoot.test' }
+  let(:account) { create(:account) }
 
   let(:channel) do
-    build(:channel_voice, phone_number: phone_number, provider_config: {
-            account_sid: account_sid,
-            auth_token: auth_token,
-            api_key_sid: api_key_sid,
-            api_key_secret: api_key_secret
-          })
+    build(:channel_twilio_sms, :with_voice,
+          account: account,
+          phone_number: phone_number,
+          account_sid: account_sid,
+          auth_token: auth_token,
+          api_key_sid: api_key_sid,
+          api_key_secret: api_key_secret)
   end
 
   let(:twilio_base_url) { "https://api.twilio.com/2010-04-01/Accounts/#{account_sid}" }
diff --git a/spec/enterprise/services/voice/inbound_call_builder_spec.rb b/spec/enterprise/services/voice/inbound_call_builder_spec.rb
index e8953da3c..a021c3a9c 100644
--- a/spec/enterprise/services/voice/inbound_call_builder_spec.rb
+++ b/spec/enterprise/services/voice/inbound_call_builder_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
 
 RSpec.describe Voice::InboundCallBuilder do
   let(:account) { create(:account) }
-  let(:channel) { create(:channel_voice, account: account, phone_number: '+15551239999') }
+  let(:channel) { create(:channel_twilio_sms, :with_voice, account: account, phone_number: '+15551239999') }
   let(:inbox) { channel.inbox }
   let(:from_number) { '+15550001111' }
   let(:to_number) { channel.phone_number }
diff --git a/spec/enterprise/services/voice/outbound_call_builder_spec.rb b/spec/enterprise/services/voice/outbound_call_builder_spec.rb
index fb75b404b..13d667925 100644
--- a/spec/enterprise/services/voice/outbound_call_builder_spec.rb
+++ b/spec/enterprise/services/voice/outbound_call_builder_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
 
 RSpec.describe Voice::OutboundCallBuilder do
   let(:account) { create(:account) }
-  let(:channel) { create(:channel_voice, account: account, phone_number: '+15551230000') }
+  let(:channel) { create(:channel_twilio_sms, :with_voice, account: account, phone_number: '+15551230000') }
   let(:inbox) { channel.inbox }
   let(:user) { create(:user, account: account) }
   let(:contact) { create(:contact, account: account, phone_number: '+15550001111') }
diff --git a/spec/enterprise/services/voice/provider/twilio/adapter_spec.rb b/spec/enterprise/services/voice/provider/twilio/adapter_spec.rb
index 68157ac50..62513c2a3 100644
--- a/spec/enterprise/services/voice/provider/twilio/adapter_spec.rb
+++ b/spec/enterprise/services/voice/provider/twilio/adapter_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe Voice::Provider::Twilio::Adapter do
   let(:account) { create(:account) }
-  let(:channel) { create(:channel_voice, account: account) }
+  let(:channel) { create(:channel_twilio_sms, :with_voice, account: account) }
   let(:adapter) { described_class.new(channel) }
   let(:webhook_service) { instance_double(Twilio::VoiceWebhookSetupService, perform: true) }
   let(:calls_double) { instance_double(Twilio::REST::Api::V2010::AccountContext::CallList) }
@@ -19,7 +19,7 @@ describe Voice::Provider::Twilio::Adapter do
     allow(calls_double).to receive(:create).and_return(call_instance)
 
     allow(Twilio::REST::Client).to receive(:new)
-      .with(channel.provider_config_hash['account_sid'], channel.provider_config_hash['auth_token'])
+      .with(channel.account_sid, channel.auth_token)
       .and_return(client_double)
 
     result = adapter.initiate_call(to: '+15550001111', conference_sid: 'CF999', agent_id: 42)
diff --git a/spec/enterprise/services/voice/provider/twilio/conference_service_spec.rb b/spec/enterprise/services/voice/provider/twilio/conference_service_spec.rb
index 9997280cb..54b22c542 100644
--- a/spec/enterprise/services/voice/provider/twilio/conference_service_spec.rb
+++ b/spec/enterprise/services/voice/provider/twilio/conference_service_spec.rb
@@ -2,14 +2,15 @@ require 'rails_helper'
 
 describe Voice::Provider::Twilio::ConferenceService do
   let(:account) { create(:account) }
-  let(:channel) { create(:channel_voice, account: account) }
+  let(:channel) { create(:channel_twilio_sms, :with_voice, account: account) }
   let(:conversation) { create(:conversation, account: account, inbox: channel.inbox) }
   let(:twilio_client) { instance_double(Twilio::REST::Client) }
-  let(:service) { described_class.new(conversation: conversation, twilio_client: twilio_client) }
+  let(:service) { described_class.new(conversation: conversation) }
   let(:webhook_service) { instance_double(Twilio::VoiceWebhookSetupService, perform: true) }
 
   before do
     allow(Twilio::VoiceWebhookSetupService).to receive(:new).and_return(webhook_service)
+    allow(Twilio::REST::Client).to receive(:new).and_return(twilio_client)
   end
 
   describe '#ensure_conference_sid' do
diff --git a/spec/enterprise/services/voice/provider/twilio/token_service_spec.rb b/spec/enterprise/services/voice/provider/twilio/token_service_spec.rb
index fe6aebe01..0c96dbe76 100644
--- a/spec/enterprise/services/voice/provider/twilio/token_service_spec.rb
+++ b/spec/enterprise/services/voice/provider/twilio/token_service_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe Voice::Provider::Twilio::TokenService do
   let(:account) { create(:account) }
   let(:user) { create(:user, :administrator, account: account) }
-  let(:voice_channel) { create(:channel_voice, account: account) }
+  let(:voice_channel) { create(:channel_twilio_sms, :with_voice, account: account) }
   let(:inbox) { voice_channel.inbox }
 
   let(:webhook_service) { instance_double(Twilio::VoiceWebhookSetupService, perform: true) }
diff --git a/spec/enterprise/services/voice/status_update_service_spec.rb b/spec/enterprise/services/voice/status_update_service_spec.rb
index fab626fb6..6f88f51c6 100644
--- a/spec/enterprise/services/voice/status_update_service_spec.rb
+++ b/spec/enterprise/services/voice/status_update_service_spec.rb
@@ -27,7 +27,7 @@ RSpec.describe Voice::StatusUpdateService do
       content_attributes: { data: { call_sid: call_sid, status: 'ringing' } }
     )
   end
-  let(:channel) { create(:channel_voice, account: account, phone_number: '+15551230002') }
+  let(:channel) { create(:channel_twilio_sms, :with_voice, account: account, phone_number: '+15551230002') }
   let(:inbox) { channel.inbox }
   let(:from_number) { '+15550002222' }
   let(:call_sid) { 'CATESTSTATUS123' }
diff --git a/spec/factories/channel/channel_voice.rb b/spec/factories/channel/channel_voice.rb
deleted file mode 100644
index 81ad8caaa..000000000
--- a/spec/factories/channel/channel_voice.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-FactoryBot.define do
-  factory :channel_voice, class: 'Channel::Voice' do
-    sequence(:phone_number) { |n| "+155512345#{n.to_s.rjust(2, '0')}" }
-    provider_config do
-      {
-        account_sid: "AC#{SecureRandom.hex(16)}",
-        auth_token: SecureRandom.hex(16),
-        api_key_sid: SecureRandom.hex(8),
-        api_key_secret: SecureRandom.hex(16),
-        twiml_app_sid: "AP#{SecureRandom.hex(16)}"
-      }
-    end
-    account
-
-    after(:create) do |channel_voice|
-      create(:inbox, channel: channel_voice, account: channel_voice.account)
-    end
-  end
-end
diff --git a/spec/factories/channel/twilio_sms.rb b/spec/factories/channel/twilio_sms.rb
index 1963a4f28..68ac5a5d1 100644
--- a/spec/factories/channel/twilio_sms.rb
+++ b/spec/factories/channel/twilio_sms.rb
@@ -17,5 +17,13 @@ FactoryBot.define do
     trait :whatsapp do
       medium { :whatsapp }
     end
+
+    trait :with_voice do
+      with_phone_number
+      voice_enabled { true }
+      api_key_sid { "SK#{SecureRandom.hex(16)}" }
+      api_key_secret { SecureRandom.hex(16) }
+      twiml_app_sid { "AP#{SecureRandom.hex(16)}" }
+    end
   end
 end
diff --git a/spec/fixtures/data_import/with_bom.csv b/spec/fixtures/data_import/with_bom.csv
new file mode 100644
index 000000000..8b1850620
--- /dev/null
+++ b/spec/fixtures/data_import/with_bom.csv
@@ -0,0 +1,2 @@
+name,email,phone_number
+Ahmed,ahmed@example.com,+971501234567
diff --git a/spec/jobs/account/contacts_export_job_spec.rb b/spec/jobs/account/contacts_export_job_spec.rb
index 9b9d74675..561015ea7 100644
--- a/spec/jobs/account/contacts_export_job_spec.rb
+++ b/spec/jobs/account/contacts_export_job_spec.rb
@@ -85,6 +85,13 @@ RSpec.describe Account::ContactsExportJob do
       expect(phone_numbers).to include('+910808080818', '+910808080808')
     end
 
+    it 'prepends UTF-8 BOM to the exported CSV for spreadsheet compatibility' do
+      described_class.perform_now(account.id, user.id, [], {})
+
+      raw = account.contacts_export.download
+      expect(raw.bytes[0..2]).to eq([0xEF, 0xBB, 0xBF])
+    end
+
     it 'returns all resolved contacts as results when filter is not prvoided' do
       create(:contact, account: account, email: nil, phone_number: nil)
       described_class.perform_now(account.id, user.id, %w[id name email column_not_present], {})
diff --git a/spec/jobs/agent_bots/webhook_job_spec.rb b/spec/jobs/agent_bots/webhook_job_spec.rb
index c14c46cb3..a8d026cd3 100644
--- a/spec/jobs/agent_bots/webhook_job_spec.rb
+++ b/spec/jobs/agent_bots/webhook_job_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe AgentBots::WebhookJob do
   let(:url) { 'https://test.com' }
   let(:payload) { { name: 'test' } }
   let(:webhook_type) { :agent_bot_webhook }
-  let(:retryable_error) { RestClient::InternalServerError.new(nil, 500) }
+  let(:retryable_error) { Webhooks::Trigger::RetryableError.new(status: 500, message: '500 Internal Server Error') }
 
   before do
     ActiveJob::Base.queue_adapter = :test
@@ -33,7 +33,7 @@ RSpec.describe AgentBots::WebhookJob do
   it 'configures retry handlers for 429 and 500 errors' do
     handlers = described_class.rescue_handlers.map(&:first)
 
-    expect(handlers).to include('RestClient::TooManyRequests', 'RestClient::InternalServerError')
+    expect(handlers).to include('Webhooks::Trigger::RetryableError')
   end
 
   it 'retries 3 times and handles failure after retries are exhausted' do
@@ -43,7 +43,7 @@ RSpec.describe AgentBots::WebhookJob do
     allow(Rails.logger).to receive(:warn)
 
     expect(Webhooks::Trigger).to receive(:execute).exactly(3).times
-    expect(trigger_instance).to receive(:handle_failure).with(instance_of(RestClient::InternalServerError)).once
+    expect(trigger_instance).to receive(:handle_failure).with(instance_of(Webhooks::Trigger::RetryableError)).once
     expect(Rails.logger).to receive(:warn).with(/AgentBots::WebhookJob/).exactly(3).times
 
     perform_enqueued_jobs { job }
diff --git a/spec/jobs/avatar/avatar_from_url_job_spec.rb b/spec/jobs/avatar/avatar_from_url_job_spec.rb
index 8db3769ad..e85c46390 100644
--- a/spec/jobs/avatar/avatar_from_url_job_spec.rb
+++ b/spec/jobs/avatar/avatar_from_url_job_spec.rb
@@ -1,9 +1,13 @@
 require 'rails_helper'
 
 RSpec.describe Avatar::AvatarFromUrlJob do
-  let(:file) { fixture_file_upload(Rails.root.join('spec/assets/avatar.png'), 'image/png') }
   let(:valid_url) { 'https://example.com/avatar.png' }
 
+  before do
+    allow(Resolv).to receive(:getaddresses).and_call_original
+    allow(Resolv).to receive(:getaddresses).with('example.com').and_return(['93.184.216.34'])
+  end
+
   it 'enqueues the job' do
     contact = create(:contact)
     expect { described_class.perform_later(contact, 'https://example.com/avatar.png') }
@@ -14,7 +18,13 @@ RSpec.describe Avatar::AvatarFromUrlJob do
     let(:avatarable) { create(:contact) }
 
     it 'attaches and updates sync attributes' do
-      expect(Down).to receive(:download).with(valid_url, max_size: Avatar::AvatarFromUrlJob::MAX_DOWNLOAD_SIZE).and_return(file)
+      stub_request(:get, valid_url)
+        .to_return(
+          status: 200,
+          body: File.read(Rails.root.join('spec/assets/avatar.png')),
+          headers: { 'Content-Type' => 'image/png' }
+        )
+
       described_class.perform_now(avatarable, valid_url)
       avatarable.reload
       expect(avatarable.avatar).to be_attached
@@ -22,10 +32,71 @@ RSpec.describe Avatar::AvatarFromUrlJob do
       expect(avatarable.additional_attributes['last_avatar_sync_at']).to be_present
     end
 
+    it 'attaches webp avatars and updates sync attributes' do
+      webp_url = 'https://example.com/avatar.webp'
+
+      stub_request(:get, webp_url)
+        .to_return(
+          status: 200,
+          body: File.read(Rails.root.join('spec/assets/avatar.png')),
+          headers: { 'Content-Type' => 'image/webp' }
+        )
+
+      described_class.perform_now(avatarable, webp_url)
+      avatarable.reload
+
+      expect(avatarable.avatar).to be_attached
+      expect(avatarable.additional_attributes['avatar_url_hash']).to eq(Digest::SHA256.hexdigest(webp_url))
+      expect(avatarable.additional_attributes['last_avatar_sync_at']).to be_present
+    end
+
+    it 'attaches avatars with parameterized content type headers' do
+      parameterized_url = 'https://example.com/avatar-parameterized.png'
+
+      stub_request(:get, parameterized_url)
+        .to_return(
+          status: 200,
+          body: File.read(Rails.root.join('spec/assets/avatar.png')),
+          headers: { 'Content-Type' => 'IMAGE/PNG; charset=binary' }
+        )
+
+      described_class.perform_now(avatarable, parameterized_url)
+      avatarable.reload
+
+      expect(avatarable.avatar).to be_attached
+      expect(avatarable.avatar.blob.content_type).to eq('image/png')
+      expect(avatarable.additional_attributes['avatar_url_hash']).to eq(Digest::SHA256.hexdigest(parameterized_url))
+    end
+
+    it 'attaches avatars from URLs with embedded basic auth credentials' do
+      authenticated_url = 'https://user:pass@example.com/avatar-authenticated.png'
+
+      stub_request(:get, 'https://example.com/avatar-authenticated.png')
+        .with(headers: { 'Authorization' => 'Basic dXNlcjpwYXNz' })
+        .to_return(
+          status: 200,
+          body: File.read(Rails.root.join('spec/assets/avatar.png')),
+          headers: { 'Content-Type' => 'image/png' }
+        )
+
+      described_class.perform_now(avatarable, authenticated_url)
+      avatarable.reload
+
+      expect(avatarable.avatar).to be_attached
+      expect(avatarable.additional_attributes['avatar_url_hash']).to eq(Digest::SHA256.hexdigest(authenticated_url))
+    end
+
     it 'returns early when rate limited' do
       ts = 30.seconds.ago.iso8601
       avatarable.update(additional_attributes: { 'last_avatar_sync_at' => ts })
-      expect(Down).not_to receive(:download)
+
+      stub_request(:get, valid_url)
+        .to_return(
+          status: 200,
+          body: File.read(Rails.root.join('spec/assets/avatar.png')),
+          headers: { 'Content-Type' => 'image/png' }
+        )
+
       described_class.perform_now(avatarable, valid_url)
       avatarable.reload
       expect(avatarable.avatar).not_to be_attached
@@ -33,21 +104,29 @@ RSpec.describe Avatar::AvatarFromUrlJob do
       expect(Time.zone.parse(avatarable.additional_attributes['last_avatar_sync_at']))
         .to be > Time.zone.parse(ts)
       expect(avatarable.additional_attributes['avatar_url_hash']).to eq(Digest::SHA256.hexdigest(valid_url))
+      expect(WebMock).not_to have_requested(:get, valid_url)
     end
 
     it 'returns early when hash unchanged' do
       avatarable.update(additional_attributes: { 'avatar_url_hash' => Digest::SHA256.hexdigest(valid_url) })
-      expect(Down).not_to receive(:download)
+
+      stub_request(:get, valid_url)
+        .to_return(
+          status: 200,
+          body: File.read(Rails.root.join('spec/assets/avatar.png')),
+          headers: { 'Content-Type' => 'image/png' }
+        )
+
       described_class.perform_now(avatarable, valid_url)
       expect(avatarable.avatar).not_to be_attached
       avatarable.reload
       expect(avatarable.additional_attributes['last_avatar_sync_at']).to be_present
       expect(avatarable.additional_attributes['avatar_url_hash']).to eq(Digest::SHA256.hexdigest(valid_url))
+      expect(WebMock).not_to have_requested(:get, valid_url)
     end
 
     it 'updates sync attributes even when URL is invalid' do
       invalid_url = 'invalid_url'
-      expect(Down).not_to receive(:download)
       described_class.perform_now(avatarable, invalid_url)
       avatarable.reload
       expect(avatarable.avatar).not_to be_attached
@@ -56,17 +135,12 @@ RSpec.describe Avatar::AvatarFromUrlJob do
     end
 
     it 'updates sync attributes when file download is valid but content type is unsupported' do
-      temp_file = Tempfile.new(['invalid', '.xml'])
-      temp_file.write('<invalid>content</invalid>')
-      temp_file.rewind
-
-      uploaded = ActionDispatch::Http::UploadedFile.new(
-        tempfile: temp_file,
-        filename: 'invalid.xml',
-        type: 'application/xml'
-      )
-
-      expect(Down).to receive(:download).with(valid_url, max_size: Avatar::AvatarFromUrlJob::MAX_DOWNLOAD_SIZE).and_return(uploaded)
+      stub_request(:get, valid_url)
+        .to_return(
+          status: 200,
+          body: '<invalid>content</invalid>',
+          headers: { 'Content-Type' => 'application/xml' }
+        )
 
       described_class.perform_now(avatarable, valid_url)
       avatarable.reload
@@ -74,9 +148,19 @@ RSpec.describe Avatar::AvatarFromUrlJob do
       expect(avatarable.avatar).not_to be_attached
       expect(avatarable.additional_attributes['last_avatar_sync_at']).to be_present
       expect(avatarable.additional_attributes['avatar_url_hash']).to eq(Digest::SHA256.hexdigest(valid_url))
+    end
 
-      temp_file.close
-      temp_file.unlink
+    it 'updates sync attributes when the avatar URL is blocked by SSRF protection' do
+      blocked_url = 'http://127.0.0.1/avatar.png'
+
+      expect do
+        described_class.perform_now(avatarable, blocked_url)
+      end.not_to raise_error
+
+      avatarable.reload
+      expect(avatarable.avatar).not_to be_attached
+      expect(avatarable.additional_attributes['last_avatar_sync_at']).to be_present
+      expect(avatarable.additional_attributes['avatar_url_hash']).to eq(Digest::SHA256.hexdigest(blocked_url))
     end
   end
 
@@ -84,7 +168,13 @@ RSpec.describe Avatar::AvatarFromUrlJob do
     let(:avatarable) { create(:agent_bot) }
 
     it 'downloads and attaches avatar' do
-      expect(Down).to receive(:download).with(valid_url, max_size: Avatar::AvatarFromUrlJob::MAX_DOWNLOAD_SIZE).and_return(file)
+      stub_request(:get, valid_url)
+        .to_return(
+          status: 200,
+          body: File.read(Rails.root.join('spec/assets/avatar.png')),
+          headers: { 'Content-Type' => 'image/png' }
+        )
+
       described_class.perform_now(avatarable, valid_url)
       expect(avatarable.avatar).to be_attached
     end
@@ -93,22 +183,30 @@ RSpec.describe Avatar::AvatarFromUrlJob do
   # ref: https://github.com/chatwoot/chatwoot/issues/10449
   it 'does not raise error when downloaded file has no filename (invalid content)' do
     contact = create(:contact)
-    temp_file = Tempfile.new(['invalid', '.xml'])
-    temp_file.write('<invalid>content</invalid>')
-    temp_file.rewind
+    invalid_file = Tempfile.new('avatar-without-name')
 
-    expect(Down).to receive(:download).with(valid_url, max_size: Avatar::AvatarFromUrlJob::MAX_DOWNLOAD_SIZE)
-                                      .and_return(ActionDispatch::Http::UploadedFile.new(tempfile: temp_file, type: 'application/xml'))
+    allow(SafeFetch).to receive(:fetch)
+      .with(
+        valid_url,
+        max_bytes: Avatar::AvatarFromUrlJob::MAX_DOWNLOAD_SIZE,
+        allowed_content_type_prefixes: [],
+        allowed_content_types: Avatar::AvatarFromUrlJob::ALLOWED_CONTENT_TYPES
+      ).and_yield(
+        SafeFetch::Result.new(
+          tempfile: invalid_file,
+          filename: nil,
+          content_type: 'image/png'
+        )
+      )
 
     expect { described_class.perform_now(contact, valid_url) }.not_to raise_error
-
-    temp_file.close
-    temp_file.unlink
+    expect(contact.reload.avatar).not_to be_attached
+  ensure
+    invalid_file.close!
   end
 
   it 'skips sync attribute updates when URL is nil' do
     contact = create(:contact)
-    expect(Down).not_to receive(:download)
 
     expect { described_class.perform_now(contact, nil) }.not_to raise_error
 
diff --git a/spec/jobs/data_import_job_spec.rb b/spec/jobs/data_import_job_spec.rb
index 19178b177..4d3e0a05f 100644
--- a/spec/jobs/data_import_job_spec.rb
+++ b/spec/jobs/data_import_job_spec.rb
@@ -41,7 +41,7 @@ RSpec.describe DataImportJob do
         expect(data_import.reload.processed_records).to eq(csv_length)
         contact = Contact.find_by(phone_number: '+918080808080')
         expect(contact).to be_truthy
-        expect(contact['additional_attributes']['company']).to eq('My Company Name')
+        expect(contact['additional_attributes']['company_name']).to eq('My Company Name')
       end
     end
 
@@ -91,12 +91,26 @@ RSpec.describe DataImportJob do
         expect(invalid_data_import.account.contacts.first.name).to eq(csv_data[0]['name'].encode('UTF-8', 'binary', invalid: :replace,
                                                                                                                     undef: :replace, replace: ''))
       end
+
+      it 'will strip UTF-8 BOM and import contacts correctly' do
+        bom_data_import = create(:data_import,
+                                 import_file: Rack::Test::UploadedFile.new(Rails.root.join('spec/fixtures/data_import/with_bom.csv'),
+                                                                           'text/csv'))
+
+        described_class.perform_now(bom_data_import)
+        expect(bom_data_import.account.contacts.count).to eq(1)
+
+        contact = bom_data_import.account.contacts.first
+        expect(contact.name).to eq('Ahmed')
+        expect(contact.email).to eq('ahmed@example.com')
+        expect(contact.phone_number).to eq('+971501234567')
+      end
     end
 
     context 'when the data contains existing records' do
       let(:existing_data) do
         [
-          %w[id name email phone_number company],
+          %w[id name email phone_number company_name],
           ['1', 'Clarice Uzzell', 'cuzzell0@mozilla.org', '918080808080', 'Acmecorp'],
           ['2', 'Marieann Creegan', 'mcreegan1@cornell.edu', '+918080808081', 'Acmecorp'],
           ['3', 'Nancey Windibank', 'nwindibank2@bluehost.com', '+918080808082', 'Acmecorp']
@@ -118,7 +132,7 @@ RSpec.describe DataImportJob do
           expect(contact).to be_present
           expect(contact.phone_number).to eq("+#{csv_data[0]['phone_number']}")
           expect(contact.name).to eq((csv_data[0]['name']).to_s)
-          expect(contact.additional_attributes['company']).to eq((csv_data[0]['company']).to_s)
+          expect(contact.additional_attributes['company_name']).to eq((csv_data[0]['company_name']).to_s)
         end
       end
 
@@ -135,7 +149,7 @@ RSpec.describe DataImportJob do
           expect(contact).to be_present
           expect(contact.email).to eq(csv_data[0]['email'])
           expect(contact.name).to eq((csv_data[0]['name']).to_s)
-          expect(contact.additional_attributes['company']).to eq((csv_data[0]['company']).to_s)
+          expect(contact.additional_attributes['company_name']).to eq((csv_data[0]['company_name']).to_s)
         end
       end
 
@@ -157,7 +171,9 @@ RSpec.describe DataImportJob do
 
     context 'when the CSV file is invalid' do
       let(:invalid_csv_content) do
-        "id,name,email,phone_number,company\n1,\"Clarice Uzzell,\"missing_quote,918080808080,Acmecorp\n2,Marieann Creegan,,+918080808081,Acmecorp"
+        "id,name,email,phone_number,company_name\n" \
+          "1,\"Clarice Uzzell,\"missing_quote,918080808080,Acmecorp\n" \
+          '2,Marieann Creegan,,+918080808081,Acmecorp'
       end
 
       before do
diff --git a/spec/jobs/hook_job_spec.rb b/spec/jobs/hook_job_spec.rb
index aff68e512..b55b05838 100644
--- a/spec/jobs/hook_job_spec.rb
+++ b/spec/jobs/hook_job_spec.rb
@@ -67,6 +67,44 @@ RSpec.describe HookJob do
     end
   end
 
+  context 'when handleable events like message.updated for slack' do
+    let(:process_service) { double }
+
+    before do
+      allow(process_service).to receive(:perform)
+    end
+
+    it 'calls UpdateSlackMessageJob when content_attributes changed' do
+      message = create(:message, account: account, content: 'Pick one', message_type: :outgoing,
+                                 content_type: :input_select, content_attributes: { items: [{ title: 'A', value: 'a' }] })
+      hook = create(:integrations_hook, app_id: 'slack', account: account)
+      event_data = { message: message, previous_changes: { 'content_attributes' => [{}, { 'submitted_values' => [{ 'title' => 'A' }] }] } }
+
+      allow(UpdateSlackMessageJob).to receive(:perform_later).and_return(process_service)
+      expect(UpdateSlackMessageJob).to receive(:perform_later).with(message, hook)
+      described_class.perform_now(hook, 'message.updated', event_data)
+    end
+
+    it 'does not call UpdateSlackMessageJob when content_attributes did not change' do
+      message = create(:message, account: account, content: 'Pick one', message_type: :outgoing,
+                                 content_type: :input_select, content_attributes: { items: [{ title: 'A', value: 'a' }] })
+      hook = create(:integrations_hook, app_id: 'slack', account: account)
+      event_data = { message: message, previous_changes: { 'status' => %w[sent delivered] } }
+
+      expect(UpdateSlackMessageJob).not_to receive(:perform_later)
+      described_class.perform_now(hook, 'message.updated', event_data)
+    end
+
+    it 'does not call UpdateSlackMessageJob for unsupported content types' do
+      message = create(:message, account: account, content: 'Hello', message_type: :outgoing, content_type: :text)
+      hook = create(:integrations_hook, app_id: 'slack', account: account)
+      event_data = { message: message, previous_changes: { 'content_attributes' => [{}, {}] } }
+
+      expect(UpdateSlackMessageJob).not_to receive(:perform_later)
+      described_class.perform_now(hook, 'message.updated', event_data)
+    end
+  end
+
   context 'when processing leadsquared integration' do
     let(:contact) { create(:contact, account: account) }
     let(:conversation) { create(:conversation, account: account, contact: contact) }
diff --git a/spec/jobs/update_slack_message_job_spec.rb b/spec/jobs/update_slack_message_job_spec.rb
new file mode 100644
index 000000000..3077f40e9
--- /dev/null
+++ b/spec/jobs/update_slack_message_job_spec.rb
@@ -0,0 +1,21 @@
+require 'rails_helper'
+
+RSpec.describe UpdateSlackMessageJob do
+  let(:account) { create(:account) }
+  let(:hook) { create(:integrations_hook, app_id: 'slack', account: account) }
+  let(:message) do
+    create(:message, account: account, content: 'Pick one', message_type: :outgoing, content_type: :input_select,
+                     content_attributes: { items: [{ title: 'Option A', value: 'a' }] })
+  end
+
+  before do
+    stub_request(:post, 'https://slack.com/api/chat.update')
+  end
+
+  it 'calls Integrations::Slack::UpdateSlackMessageService' do
+    service_instance = Integrations::Slack::UpdateSlackMessageService.new(message: message, hook: hook)
+    expect(Integrations::Slack::UpdateSlackMessageService).to receive(:new).with(message: message, hook: hook).and_return(service_instance)
+
+    described_class.perform_now(message, hook)
+  end
+end
diff --git a/spec/lib/base_markdown_renderer_spec.rb b/spec/lib/base_markdown_renderer_spec.rb
index 262e78daf..f8bdae4be 100644
--- a/spec/lib/base_markdown_renderer_spec.rb
+++ b/spec/lib/base_markdown_renderer_spec.rb
@@ -12,7 +12,7 @@ describe BaseMarkdownRenderer do
     context 'when image has a height' do
       it 'renders the img tag with the correct attributes' do
         markdown = '![Sample Title](https://example.com/image.jpg?cw_image_height=100)'
-        expect(render_markdown(markdown)).to include('<img src="https://example.com/image.jpg?cw_image_height=100" height="100" width="auto" />')
+        expect(render_markdown(markdown)).to include('<img src="https://example.com/image.jpg?cw_image_height=100" style="height: 100;" />')
       end
     end
 
diff --git a/spec/lib/integrations/slack/update_slack_message_service_spec.rb b/spec/lib/integrations/slack/update_slack_message_service_spec.rb
new file mode 100644
index 000000000..3ac087a1b
--- /dev/null
+++ b/spec/lib/integrations/slack/update_slack_message_service_spec.rb
@@ -0,0 +1,245 @@
+require 'rails_helper'
+
+describe Integrations::Slack::UpdateSlackMessageService do
+  let(:account) { create(:account) }
+  let(:channel_email) { create(:channel_email, account: account) }
+  let(:contact) { create(:contact, account: account) }
+  let(:conversation) { create(:conversation, inbox: channel_email.inbox, contact: contact, identifier: '12345.6789') }
+  let(:hook) { create(:integrations_hook, account: account, reference_id: 'C123') }
+  let(:slack_client) { double }
+
+  before do
+    allow(Slack::Web::Client).to receive(:new).and_return(slack_client)
+  end
+
+  describe '#perform' do
+    context 'with input_select' do
+      it 'updates the Slack message with the submitted response' do
+        message = create(
+          :message,
+          account: account,
+          inbox: channel_email.inbox,
+          conversation: conversation,
+          message_type: :outgoing,
+          content_type: :input_select,
+          content: 'Pick one',
+          content_attributes: {
+            items: [{ title: 'Option A', value: 'a' }, { title: 'Option B', value: 'b' }],
+            submitted_values: [{ title: 'Option A', value: 'a' }]
+          },
+          external_source_id_slack: 'cw-origin-6789.12345'
+        )
+
+        expect(slack_client).to receive(:chat_update).with(
+          channel: 'C123',
+          ts: '6789.12345',
+          text: a_string_including('Pick one', 'Option A')
+        )
+
+        described_class.new(message: message, hook: hook).perform
+      end
+    end
+
+    context 'with form' do
+      it 'updates the Slack message with all submitted fields' do
+        message = create(
+          :message,
+          account: account,
+          inbox: channel_email.inbox,
+          conversation: conversation,
+          message_type: :outgoing,
+          content_type: :form,
+          content: 'Please fill this',
+          content_attributes: {
+            items: [{ name: 'email', label: 'Email' }, { name: 'company', label: 'Company' }],
+            submitted_values: [{ name: 'email', value: 'a@example.com' }, { name: 'company', value: 'Acme' }]
+          },
+          external_source_id_slack: 'cw-origin-6789.12345'
+        )
+
+        expect(slack_client).to receive(:chat_update).with(
+          channel: 'C123',
+          ts: '6789.12345',
+          text: a_string_including('Please fill this', 'Email', 'a@example.com', 'Company', 'Acme')
+        )
+
+        described_class.new(message: message, hook: hook).perform
+      end
+    end
+
+    context 'with input_csat' do
+      it 'updates the Slack message with the CSAT rating and feedback' do
+        message = create(
+          :message,
+          account: account,
+          inbox: channel_email.inbox,
+          conversation: conversation,
+          message_type: :outgoing,
+          content_type: :input_csat,
+          content: 'Rate us',
+          content_attributes: {
+            submitted_values: {
+              'csat_survey_response' => { 'rating' => 5, 'feedback_message' => 'Great support!' }
+            }
+          },
+          external_source_id_slack: 'cw-origin-6789.12345'
+        )
+
+        expect(slack_client).to receive(:chat_update).with(
+          channel: 'C123',
+          ts: '6789.12345',
+          text: a_string_including('Rate us', 'Rating: 5', 'Great support!')
+        )
+
+        described_class.new(message: message, hook: hook).perform
+      end
+    end
+
+    context 'with input_email' do
+      it 'updates the Slack message with the submitted email' do
+        message = create(
+          :message,
+          account: account,
+          inbox: channel_email.inbox,
+          conversation: conversation,
+          message_type: :outgoing,
+          content_type: :input_email,
+          content: 'Get notified by email',
+          content_attributes: {
+            submitted_email: 'user@example.com'
+          },
+          external_source_id_slack: 'cw-origin-6789.12345'
+        )
+
+        expect(slack_client).to receive(:chat_update).with(
+          channel: 'C123',
+          ts: '6789.12345',
+          text: a_string_including('Get notified by email', 'user@example.com')
+        )
+
+        described_class.new(message: message, hook: hook).perform
+      end
+    end
+
+    context 'when there is no submitted response' do
+      it 'skips the update' do
+        message = create(
+          :message,
+          account: account,
+          inbox: channel_email.inbox,
+          conversation: conversation,
+          message_type: :outgoing,
+          content_type: :input_select,
+          content: 'Pick one',
+          content_attributes: {
+            items: [{ title: 'Option A', value: 'a' }]
+          },
+          external_source_id_slack: 'cw-origin-6789.12345'
+        )
+
+        expect(slack_client).not_to receive(:chat_update)
+
+        described_class.new(message: message, hook: hook).perform
+      end
+    end
+
+    context 'when the message was not originated from Chatwoot' do
+      it 'skips the update' do
+        message = create(
+          :message,
+          account: account,
+          inbox: channel_email.inbox,
+          conversation: conversation,
+          message_type: :outgoing,
+          content_type: :input_select,
+          content: 'Pick one',
+          content_attributes: {
+            items: [{ title: 'Option A', value: 'a' }],
+            submitted_values: [{ title: 'Option A', value: 'a' }]
+          },
+          external_source_id_slack: '6789.12345'
+        )
+
+        expect(slack_client).not_to receive(:chat_update)
+
+        described_class.new(message: message, hook: hook).perform
+      end
+    end
+
+    context 'when hook has no reference_id' do
+      it 'skips the update' do
+        hook_without_ref = create(:integrations_hook, account: account, reference_id: nil)
+        message = create(
+          :message,
+          account: account,
+          inbox: channel_email.inbox,
+          conversation: conversation,
+          message_type: :outgoing,
+          content_type: :input_select,
+          content: 'Pick one',
+          content_attributes: {
+            items: [{ title: 'Option A', value: 'a' }],
+            submitted_values: [{ title: 'Option A', value: 'a' }]
+          },
+          external_source_id_slack: 'cw-origin-6789.12345'
+        )
+
+        expect(slack_client).not_to receive(:chat_update)
+
+        described_class.new(message: message, hook: hook_without_ref).perform
+      end
+    end
+
+    context 'when Slack API raises an auth error' do
+      it 'disables the hook and prompts reauthorization' do
+        message = create(
+          :message,
+          account: account,
+          inbox: channel_email.inbox,
+          conversation: conversation,
+          message_type: :outgoing,
+          content_type: :input_select,
+          content: 'Pick one',
+          content_attributes: {
+            items: [{ title: 'Option A', value: 'a' }],
+            submitted_values: [{ title: 'Option A', value: 'a' }]
+          },
+          external_source_id_slack: 'cw-origin-6789.12345'
+        )
+
+        allow(slack_client).to receive(:chat_update).and_raise(Slack::Web::Api::Errors::AccountInactive.new('account_inactive'))
+        allow(hook).to receive(:prompt_reauthorization!)
+
+        described_class.new(message: message, hook: hook).perform
+
+        expect(hook).to have_received(:prompt_reauthorization!)
+        expect(hook.reload.status).to eq('disabled')
+      end
+    end
+
+    context 'when the original Slack message no longer exists' do
+      it 'skips gracefully without disabling the hook' do
+        message = create(
+          :message,
+          account: account,
+          inbox: channel_email.inbox,
+          conversation: conversation,
+          message_type: :outgoing,
+          content_type: :input_select,
+          content: 'Pick one',
+          content_attributes: {
+            items: [{ title: 'Option A', value: 'a' }],
+            submitted_values: [{ title: 'Option A', value: 'a' }]
+          },
+          external_source_id_slack: 'cw-origin-6789.12345'
+        )
+
+        allow(slack_client).to receive(:chat_update).and_raise(Slack::Web::Api::Errors::MessageNotFound.new('message_not_found'))
+
+        described_class.new(message: message, hook: hook).perform
+
+        expect(hook.reload.status).not_to eq('disabled')
+      end
+    end
+  end
+end
diff --git a/spec/lib/safe_fetch_spec.rb b/spec/lib/safe_fetch_spec.rb
index d8d37115a..83f2bdde5 100644
--- a/spec/lib/safe_fetch_spec.rb
+++ b/spec/lib/safe_fetch_spec.rb
@@ -65,6 +65,83 @@ RSpec.describe SafeFetch do
       end
     end
 
+    context 'with embedded basic auth credentials' do
+      it 'passes decoded credentials to the request' do
+        authenticated_url = 'http://user+avatar%40example.com:p%40ss+word%3A1@example.com/image.png'
+        stub_request(:get, url)
+          .with(headers: { 'Authorization' => 'Basic dXNlcithdmF0YXJAZXhhbXBsZS5jb206cEBzcyt3b3JkOjE=' })
+          .to_return(
+            status: 200,
+            body: File.new(Rails.root.join('spec/assets/avatar.png')),
+            headers: { 'Content-Type' => 'image/png' }
+          )
+
+        described_class.fetch(authenticated_url) do |result|
+          expect(result.content_type).to eq('image/png')
+        end
+      end
+
+      it 'preserves embedded credentials after a same-origin redirect removes userinfo' do
+        authenticated_url = 'http://user:pass@example.com/protected.png'
+        initial_url = 'http://example.com/protected.png'
+        redirect_url = 'http://example.com/public.png'
+        redirected_headers = nil
+
+        stub_request(:get, initial_url)
+          .with(headers: { 'Authorization' => 'Basic dXNlcjpwYXNz' })
+          .to_return(
+            status: 302,
+            headers: { 'Location' => '/public.png' }
+          )
+        stub_request(:get, redirect_url)
+          .with do |request|
+            redirected_headers = request.headers.transform_keys(&:downcase)
+            true
+          end
+          .to_return(
+            status: 200,
+            body: File.new(Rails.root.join('spec/assets/avatar.png')),
+            headers: { 'Content-Type' => 'image/png' }
+          )
+
+        described_class.fetch(authenticated_url) do |result|
+          expect(result.content_type).to eq('image/png')
+        end
+
+        expect(redirected_headers).to include('authorization' => 'Basic dXNlcjpwYXNz')
+      end
+
+      it 'strips embedded credentials on cross-origin redirects' do
+        authenticated_url = 'http://user:pass@example.com/protected.png'
+        initial_url = 'http://example.com/protected.png'
+        redirect_url = 'https://example.com/public.png'
+        redirected_headers = nil
+
+        stub_request(:get, initial_url)
+          .with(headers: { 'Authorization' => 'Basic dXNlcjpwYXNz' })
+          .to_return(
+            status: 302,
+            headers: { 'Location' => redirect_url }
+          )
+        stub_request(:get, redirect_url)
+          .with do |request|
+            redirected_headers = request.headers.transform_keys(&:downcase)
+            true
+          end
+          .to_return(
+            status: 200,
+            body: File.new(Rails.root.join('spec/assets/avatar.png')),
+            headers: { 'Content-Type' => 'image/png' }
+          )
+
+        described_class.fetch(authenticated_url) do |result|
+          expect(result.content_type).to eq('image/png')
+        end
+
+        expect(redirected_headers).not_to include('authorization')
+      end
+    end
+
     context 'with URL validation' do
       it 'raises InvalidUrlError for javascript: URLs' do
         expect { described_class.fetch('javascript:alert(1)') { nil } }
@@ -153,14 +230,49 @@ RSpec.describe SafeFetch do
         expect { described_class.fetch(url) { nil } }.not_to raise_error
       end
 
-      it 'strips charset/boundary parameters before comparing' do
+      it 'normalizes parameters and casing before yielding content_type' do
         stub_request(:get, url).to_return(
           status: 200,
           body: 'x',
-          headers: { 'Content-Type' => 'image/png; charset=binary' }
+          headers: { 'Content-Type' => 'IMAGE/PNG; charset=binary' }
         )
 
-        expect { described_class.fetch(url) { nil } }.not_to raise_error
+        described_class.fetch(url) do |result|
+          expect(result.content_type).to eq('image/png')
+        end
+      end
+
+      it 'allows exact content-type matches when prefixes are empty' do
+        pdf_url = 'http://example.com/file.pdf'
+        stub_request(:get, pdf_url).to_return(
+          status: 200,
+          body: 'pdf-data',
+          headers: { 'Content-Type' => 'application/pdf' }
+        )
+
+        expect do
+          described_class.fetch(
+            pdf_url,
+            allowed_content_type_prefixes: [],
+            allowed_content_types: ['application/pdf']
+          ) { nil }
+        end.not_to raise_error
+      end
+
+      it 'rejects exact content-type mismatches when prefixes are empty' do
+        stub_request(:get, url).to_return(
+          status: 200,
+          body: 'x',
+          headers: { 'Content-Type' => 'image/webp' }
+        )
+
+        expect do
+          described_class.fetch(
+            url,
+            allowed_content_type_prefixes: [],
+            allowed_content_types: ['image/png']
+          ) { nil }
+        end.to raise_error(described_class::UnsupportedContentTypeError)
       end
 
       it 'rejects when the content-type header is missing' do
@@ -171,6 +283,75 @@ RSpec.describe SafeFetch do
       end
     end
 
+    context 'with custom request options' do
+      let(:post_body) { { hello: 'world' }.to_json }
+      let(:headers) do
+        {
+          'Authorization' => 'Bearer test-token',
+          'Content-Type' => 'application/json'
+        }
+      end
+
+      it 'supports POST requests with custom headers when content-type validation is disabled' do
+        stub_request(:post, url)
+          .with(body: post_body, headers: headers)
+          .to_return(status: 200, body: '', headers: {})
+
+        expect do
+          described_class.fetch(
+            url,
+            method: :post,
+            body: post_body,
+            headers: headers,
+            validate_content_type: false
+          ) { nil }
+        end.not_to raise_error
+      end
+
+      it 'preserves non-credential headers on cross-origin redirects' do
+        redirect_url = 'https://example.com/image.png'
+        redirected_headers = nil
+        headers = {
+          'Authorization' => 'Bearer test-token',
+          'Cookie' => 'session=test',
+          'Content-Type' => 'application/json',
+          'X-Chatwoot-Delivery' => 'test-uuid',
+          'X-Chatwoot-Signature' => 'sha256=test-signature'
+        }
+
+        stub_request(:post, url).to_return(
+          status: 307,
+          headers: { 'Location' => redirect_url }
+        )
+        stub_request(:post, redirect_url)
+          .with do |request|
+            redirected_headers = request.headers.transform_keys(&:downcase)
+            true
+          end
+          .to_return(status: 200, body: '', headers: {})
+
+        described_class.fetch(
+          url,
+          method: :post,
+          body: post_body,
+          headers: headers,
+          validate_content_type: false
+        ) { nil }
+
+        expect(redirected_headers).to include(
+          'content-type' => 'application/json',
+          'x-chatwoot-delivery' => 'test-uuid',
+          'x-chatwoot-signature' => 'sha256=test-signature'
+        )
+        expect(redirected_headers).not_to include('authorization', 'cookie')
+      end
+
+      it 'raises UnsupportedMethodError for unsupported HTTP methods' do
+        expect { described_class.fetch(url, method: :options) { nil } }
+          .to raise_error(described_class::UnsupportedMethodError)
+      end
+    end
+
     context 'with body size cap' do
       it 'honours a custom max_bytes argument' do
         stub_request(:get, url).to_return(
diff --git a/spec/lib/webhooks/trigger_spec.rb b/spec/lib/webhooks/trigger_spec.rb
index 90d1ce7f8..1c5ebc16a 100644
--- a/spec/lib/webhooks/trigger_spec.rb
+++ b/spec/lib/webhooks/trigger_spec.rb
@@ -11,10 +11,13 @@ describe Webhooks::Trigger do
   let!(:message) { create(:message, account: account, inbox: inbox, conversation: conversation) }
 
   let(:webhook_type) { :api_inbox_webhook }
-  let!(:url) { 'https://test.com' }
+  let(:url) { 'https://test.com' }
+  let(:payload) { { hello: :hello } }
+  let(:fetch_result) { instance_double(SafeFetch::Result) }
   let(:agent_bot_error_content) { I18n.t('conversations.activity.agent_bot.error_moved_to_open') }
   let(:default_timeout) { 5 }
   let(:webhook_timeout) { default_timeout }
+  let(:base_headers) { { 'Content-Type' => 'application/json', 'Accept' => 'application/json' } }
 
   before do
     ActiveJob::Base.queue_adapter = :test
@@ -30,30 +33,23 @@ describe Webhooks::Trigger do
 
   describe '#execute' do
     it 'triggers webhook' do
-      payload = { hello: :hello }
+      expect(SafeFetch).to receive(:fetch).with(
+        url,
+        method: :post,
+        body: payload.to_json,
+        headers: base_headers,
+        open_timeout: webhook_timeout,
+        read_timeout: webhook_timeout,
+        validate_content_type: false
+      ).and_yield(fetch_result)
 
-      expect(RestClient::Request).to receive(:execute)
-        .with(
-          method: :post,
-          url: url,
-          payload: payload.to_json,
-          headers: { content_type: :json, accept: :json },
-          timeout: webhook_timeout
-        ).once
       trigger.execute(url, payload, webhook_type)
     end
 
     it 'updates message status if webhook fails for message-created event' do
       payload = { event: 'message_created', conversation: { id: conversation.id }, id: message.id }
 
-      expect(RestClient::Request).to receive(:execute)
-        .with(
-          method: :post,
-          url: url,
-          payload: payload.to_json,
-          headers: { content_type: :json, accept: :json },
-          timeout: webhook_timeout
-        ).and_raise(RestClient::ExceptionWithResponse.new('error', 500)).once
+      expect(SafeFetch).to receive(:fetch).and_raise(SafeFetch::HttpError.new('500 Internal Server Error'))
 
       expect { trigger.execute(url, payload, webhook_type) }.to change { message.reload.status }.from('sent').to('failed')
     end
@@ -61,17 +57,18 @@ describe Webhooks::Trigger do
     it 'updates message status if webhook fails for message-updated event' do
       payload = { event: 'message_updated', conversation: { id: conversation.id }, id: message.id }
 
-      expect(RestClient::Request).to receive(:execute)
-        .with(
-          method: :post,
-          url: url,
-          payload: payload.to_json,
-          headers: { content_type: :json, accept: :json },
-          timeout: webhook_timeout
-        ).and_raise(RestClient::ExceptionWithResponse.new('error', 500)).once
+      expect(SafeFetch).to receive(:fetch).and_raise(SafeFetch::HttpError.new('500 Internal Server Error'))
+
       expect { trigger.execute(url, payload, webhook_type) }.to change { message.reload.status }.from('sent').to('failed')
     end
 
+    it 'treats blocked private webhook URLs as failures' do
+      payload = { event: 'message_created', conversation: { id: conversation.id }, id: message.id }
+
+      expect { trigger.execute('http://127.0.0.1/webhook', payload, webhook_type) }
+        .to change { message.reload.status }.from('sent').to('failed')
+    end
+
     context 'when webhook type is agent bot' do
       let(:webhook_type) { :agent_bot_webhook }
       let!(:pending_conversation) { create(:conversation, inbox: inbox, status: :pending, account: account) }
@@ -80,16 +77,13 @@ describe Webhooks::Trigger do
       it 'raises 500 errors for retry and does not reopen conversation immediately' do
         payload = { event: 'message_created', id: pending_message.id }
 
-        expect(RestClient::Request).to receive(:execute)
-          .with(
-            method: :post,
-            url: url,
-            payload: payload.to_json,
-            headers: { content_type: :json, accept: :json },
-            timeout: webhook_timeout
-          ).and_raise(RestClient::InternalServerError.new(nil, 500)).once
+        expect(SafeFetch).to receive(:fetch).and_raise(SafeFetch::HttpError.new('500 Internal Server Error'))
 
-        expect { trigger.execute(url, payload, webhook_type) }.to raise_error(RestClient::InternalServerError)
+        expect { trigger.execute(url, payload, webhook_type) }
+          .to(raise_error do |error|
+            expect(error.class.name).to eq('Webhooks::Trigger::RetryableError')
+            expect(error.status).to eq(500)
+          end)
         expect(pending_conversation.reload.status).to eq('pending')
         expect(Conversations::ActivityMessageJob).not_to have_been_enqueued
       end
@@ -97,16 +91,13 @@ describe Webhooks::Trigger do
       it 'raises 429 errors for retry and does not reopen conversation immediately' do
         payload = { event: 'message_created', id: pending_message.id }
 
-        expect(RestClient::Request).to receive(:execute)
-          .with(
-            method: :post,
-            url: url,
-            payload: payload.to_json,
-            headers: { content_type: :json, accept: :json },
-            timeout: webhook_timeout
-          ).and_raise(RestClient::TooManyRequests.new(nil, 429)).once
+        expect(SafeFetch).to receive(:fetch).and_raise(SafeFetch::HttpError.new('429 Too Many Requests'))
 
-        expect { trigger.execute(url, payload, webhook_type) }.to raise_error(RestClient::TooManyRequests)
+        expect { trigger.execute(url, payload, webhook_type) }
+          .to(raise_error do |error|
+            expect(error.class.name).to eq('Webhooks::Trigger::RetryableError')
+            expect(error.status).to eq(429)
+          end)
         expect(pending_conversation.reload.status).to eq('pending')
         expect(Conversations::ActivityMessageJob).not_to have_been_enqueued
       end
@@ -114,14 +105,7 @@ describe Webhooks::Trigger do
       it 'reopens conversation and enqueues activity message if pending' do
         payload = { event: 'message_created', id: pending_message.id }
 
-        expect(RestClient::Request).to receive(:execute)
-          .with(
-            method: :post,
-            url: url,
-            payload: payload.to_json,
-            headers: { content_type: :json, accept: :json },
-            timeout: webhook_timeout
-          ).and_raise(RestClient::ExceptionWithResponse.new('error', 500)).once
+        expect(SafeFetch).to receive(:fetch).and_raise(SafeFetch::HttpError.new('404 Not Found'))
 
         expect do
           perform_enqueued_jobs do
@@ -139,14 +123,7 @@ describe Webhooks::Trigger do
       it 'does not change message status or enqueue activity when conversation is not pending' do
         payload = { event: 'message_created', conversation: { id: conversation.id }, id: message.id }
 
-        expect(RestClient::Request).to receive(:execute)
-          .with(
-            method: :post,
-            url: url,
-            payload: payload.to_json,
-            headers: { content_type: :json, accept: :json },
-            timeout: webhook_timeout
-          ).and_raise(RestClient::ExceptionWithResponse.new('error', 500)).once
+        expect(SafeFetch).to receive(:fetch).and_raise(SafeFetch::HttpError.new('404 Not Found'))
 
         expect do
           trigger.execute(url, payload, webhook_type)
@@ -160,14 +137,7 @@ describe Webhooks::Trigger do
         account.update(keep_pending_on_bot_failure: true)
         payload = { event: 'message_created', id: pending_message.id }
 
-        expect(RestClient::Request).to receive(:execute)
-          .with(
-            method: :post,
-            url: url,
-            payload: payload.to_json,
-            headers: { content_type: :json, accept: :json },
-            timeout: webhook_timeout
-          ).and_raise(RestClient::ExceptionWithResponse.new('error', 500)).once
+        expect(SafeFetch).to receive(:fetch).and_raise(SafeFetch::HttpError.new('404 Not Found'))
 
         trigger.execute(url, payload, webhook_type)
 
@@ -179,14 +149,8 @@ describe Webhooks::Trigger do
         account.update(keep_pending_on_bot_failure: false)
         payload = { event: 'message_created', id: pending_message.id }
 
-        expect(RestClient::Request).to receive(:execute)
-          .with(
-            method: :post,
-            url: url,
-            payload: payload.to_json,
-            headers: { content_type: :json, accept: :json },
-            timeout: webhook_timeout
-          ).and_raise(RestClient::ExceptionWithResponse.new('error', 500)).once
+        expect(SafeFetch).to receive(:fetch).and_raise(SafeFetch::HttpError.new('404 Not Found'))
+
         expect do
           perform_enqueued_jobs do
             trigger.execute(url, payload, webhook_type)
@@ -204,14 +168,7 @@ describe Webhooks::Trigger do
     it 'handles 500 without raising for non-agent webhooks' do
       payload = { event: 'message_created', conversation: { id: conversation.id }, id: message.id }
 
-      expect(RestClient::Request).to receive(:execute)
-        .with(
-          method: :post,
-          url: url,
-          payload: payload.to_json,
-          headers: { content_type: :json, accept: :json },
-          timeout: webhook_timeout
-        ).and_raise(RestClient::InternalServerError.new(nil, 500)).once
+      expect(SafeFetch).to receive(:fetch).and_raise(SafeFetch::HttpError.new('500 Internal Server Error'))
 
       expect { trigger.execute(url, payload, webhook_type) }.not_to raise_error
       expect(message.reload.status).to eq('failed')
@@ -224,20 +181,30 @@ describe Webhooks::Trigger do
 
     context 'without secret or delivery_id' do
       it 'sends only content-type and accept headers' do
-        expect(RestClient::Request).to receive(:execute).with(
-          hash_including(headers: { content_type: :json, accept: :json })
-        )
+        expect(SafeFetch).to receive(:fetch).with(
+          url,
+          method: :post,
+          body: body,
+          headers: base_headers,
+          open_timeout: webhook_timeout,
+          read_timeout: webhook_timeout,
+          validate_content_type: false
+        ).and_yield(fetch_result)
+
         trigger.execute(url, payload, webhook_type)
       end
     end
 
     context 'with delivery_id' do
       it 'adds X-Chatwoot-Delivery header' do
-        expect(RestClient::Request).to receive(:execute) do |args|
-          expect(args[:headers]['X-Chatwoot-Delivery']).to eq('test-uuid')
-          expect(args[:headers]).not_to have_key('X-Chatwoot-Signature')
-          expect(args[:headers]).not_to have_key('X-Chatwoot-Timestamp')
+        expect(SafeFetch).to receive(:fetch) do |received_url, **options, &block|
+          expect(received_url).to eq(url)
+          expect(options[:headers]['X-Chatwoot-Delivery']).to eq('test-uuid')
+          expect(options[:headers]).not_to have_key('X-Chatwoot-Signature')
+          expect(options[:headers]).not_to have_key('X-Chatwoot-Timestamp')
+          block.call(fetch_result)
         end
+
         trigger.execute(url, payload, webhook_type, delivery_id: 'test-uuid')
       end
     end
@@ -246,38 +213,45 @@ describe Webhooks::Trigger do
       let(:secret) { 'test-secret' }
 
       it 'adds X-Chatwoot-Timestamp header' do
-        expect(RestClient::Request).to receive(:execute) do |args|
-          expect(args[:headers]['X-Chatwoot-Timestamp']).to match(/\A\d+\z/)
+        expect(SafeFetch).to receive(:fetch) do |_received_url, **options, &block|
+          expect(options[:headers]['X-Chatwoot-Timestamp']).to match(/\A\d+\z/)
+          block.call(fetch_result)
         end
+
         trigger.execute(url, payload, webhook_type, secret: secret)
       end
 
       it 'adds X-Chatwoot-Signature header with correct HMAC' do
-        expect(RestClient::Request).to receive(:execute) do |args|
-          ts = args[:headers]['X-Chatwoot-Timestamp']
+        expect(SafeFetch).to receive(:fetch) do |_received_url, **options, &block|
+          ts = options[:headers]['X-Chatwoot-Timestamp']
           expected_sig = "sha256=#{OpenSSL::HMAC.hexdigest('SHA256', secret, "#{ts}.#{body}")}"
-          expect(args[:headers]['X-Chatwoot-Signature']).to eq(expected_sig)
+          expect(options[:headers]['X-Chatwoot-Signature']).to eq(expected_sig)
+          block.call(fetch_result)
         end
+
         trigger.execute(url, payload, webhook_type, secret: secret)
       end
 
       it 'signs timestamp.body not just body' do
-        expect(RestClient::Request).to receive(:execute) do |args|
-          args[:headers]['X-Chatwoot-Timestamp']
+        expect(SafeFetch).to receive(:fetch) do |_received_url, **options, &block|
           wrong_sig = "sha256=#{OpenSSL::HMAC.hexdigest('SHA256', secret, body)}"
-          expect(args[:headers]['X-Chatwoot-Signature']).not_to eq(wrong_sig)
+          expect(options[:headers]['X-Chatwoot-Signature']).not_to eq(wrong_sig)
+          block.call(fetch_result)
         end
+
         trigger.execute(url, payload, webhook_type, secret: secret)
       end
     end
 
     context 'with both secret and delivery_id' do
       it 'includes all three security headers' do
-        expect(RestClient::Request).to receive(:execute) do |args|
-          expect(args[:headers]['X-Chatwoot-Delivery']).to eq('abc-123')
-          expect(args[:headers]['X-Chatwoot-Timestamp']).to be_present
-          expect(args[:headers]['X-Chatwoot-Signature']).to start_with('sha256=')
+        expect(SafeFetch).to receive(:fetch) do |_received_url, **options, &block|
+          expect(options[:headers]['X-Chatwoot-Delivery']).to eq('abc-123')
+          expect(options[:headers]['X-Chatwoot-Timestamp']).to be_present
+          expect(options[:headers]['X-Chatwoot-Signature']).to start_with('sha256=')
+          block.call(fetch_result)
         end
+
         trigger.execute(url, payload, webhook_type, secret: 'mysecret', delivery_id: 'abc-123')
       end
     end
@@ -286,14 +260,7 @@ describe Webhooks::Trigger do
   it 'does not update message status if webhook fails for other events' do
     payload = { event: 'conversation_created', conversation: { id: conversation.id }, id: message.id }
 
-    expect(RestClient::Request).to receive(:execute)
-      .with(
-        method: :post,
-        url: url,
-        payload: payload.to_json,
-        headers: { content_type: :json, accept: :json },
-        timeout: webhook_timeout
-      ).and_raise(RestClient::ExceptionWithResponse.new('error', 500)).once
+    expect(SafeFetch).to receive(:fetch).and_raise(SafeFetch::HttpError.new('500 Internal Server Error'))
 
     expect { trigger.execute(url, payload, webhook_type) }.not_to(change { message.reload.status })
   end
@@ -302,16 +269,15 @@ describe Webhooks::Trigger do
     let(:webhook_timeout) { nil }
 
     it 'falls back to default timeout' do
-      payload = { hello: :hello }
-
-      expect(RestClient::Request).to receive(:execute)
-        .with(
-          method: :post,
-          url: url,
-          payload: payload.to_json,
-          headers: { content_type: :json, accept: :json },
-          timeout: default_timeout
-        ).once
+      expect(SafeFetch).to receive(:fetch).with(
+        url,
+        method: :post,
+        body: payload.to_json,
+        headers: base_headers,
+        open_timeout: default_timeout,
+        read_timeout: default_timeout,
+        validate_content_type: false
+      ).and_yield(fetch_result)
 
       trigger.execute(url, payload, webhook_type)
     end
@@ -321,16 +287,15 @@ describe Webhooks::Trigger do
     let(:webhook_timeout) { -1 }
 
     it 'falls back to default timeout' do
-      payload = { hello: :hello }
-
-      expect(RestClient::Request).to receive(:execute)
-        .with(
-          method: :post,
-          url: url,
-          payload: payload.to_json,
-          headers: { content_type: :json, accept: :json },
-          timeout: default_timeout
-        ).once
+      expect(SafeFetch).to receive(:fetch).with(
+        url,
+        method: :post,
+        body: payload.to_json,
+        headers: base_headers,
+        open_timeout: default_timeout,
+        read_timeout: default_timeout,
+        validate_content_type: false
+      ).and_yield(fetch_result)
 
       trigger.execute(url, payload, webhook_type)
     end
diff --git a/spec/listeners/automation_rule_listener_old_spec.rb b/spec/listeners/automation_rule_listener_old_spec.rb
index 5103117cd..93d5868d5 100644
--- a/spec/listeners/automation_rule_listener_old_spec.rb
+++ b/spec/listeners/automation_rule_listener_old_spec.rb
@@ -67,7 +67,7 @@ describe AutomationRuleListener do
   describe '#conversation_updated with contacts attributes' do
     before do
       conversation.contact.update!(custom_attributes: { customer_type: 'platinum', signed_in_at: '2022-01-19' },
-                                   additional_attributes: { 'company': 'Marvel' })
+                                   additional_attributes: { 'company_name' => 'Marvel' })
 
       automation_rule.update!(
         event_name: 'conversation_updated',
@@ -75,7 +75,7 @@ describe AutomationRuleListener do
         description: 'Add labels, assign team after conversation updated',
         conditions: [
           {
-            attribute_key: 'company',
+            attribute_key: 'company_name',
             filter_operator: 'equal_to',
             values: ['Marvel'],
             query_operator: 'AND'
@@ -314,11 +314,11 @@ describe AutomationRuleListener do
       before do
         automation_rule.update!(
           event_name: 'conversation_updated',
-          name: 'Call actions conversation updated when company changed from DC to Marvel',
+          name: 'Call actions conversation updated when company name changed from DC to Marvel',
           description: 'Add labels, assign team after conversation updated',
           conditions: [
             {
-              attribute_key: 'company',
+              attribute_key: 'company_name',
               filter_operator: 'attribute_changed',
               values: { from: ['DC'], to: ['Marvel'] },
               query_operator: 'AND'
@@ -336,7 +336,7 @@ describe AutomationRuleListener do
 
       let!(:event) do
         Events::Base.new('conversation_updated', Time.zone.now, { conversation: conversation, changed_attributes: {
-                           company: %w[DC Marvel]
+                           company_name: %w[DC Marvel]
                          } })
       end
 
@@ -355,7 +355,7 @@ describe AutomationRuleListener do
           automation_rule.update!(
             conditions: [
               {
-                attribute_key: 'company',
+                attribute_key: 'company_name',
                 filter_operator: 'attribute_changed',
                 values: { from: ['DC'], to: ['Marvel'] },
                 query_operator: 'OR'
@@ -393,7 +393,7 @@ describe AutomationRuleListener do
         it 'when automation rule is triggers, it will not assign team on attribute_changed values' do
           conversation.update(status: :snoozed)
           event = Events::Base.new('conversation_updated', Time.zone.now, { conversation: conversation,
-                                                                            changed_attributes: { company: %w[Marvel DC] } })
+                                                                            changed_attributes: { company_name: %w[Marvel DC] } })
 
           expect(conversation.team_id).not_to eq(team.id)
 
@@ -517,7 +517,7 @@ describe AutomationRuleListener do
           { attribute_key: 'team_id', filter_operator: 'equal_to', values: [team.id], query_operator: 'AND' }.with_indifferent_access,
           { attribute_key: 'message_type', filter_operator: 'equal_to', values: ['incoming'], query_operator: 'AND' }.with_indifferent_access,
           { attribute_key: 'email', filter_operator: 'contains', values: ['example.com'], query_operator: 'AND' }.with_indifferent_access,
-          { attribute_key: 'company', filter_operator: 'equal_to', values: ['Marvel'], query_operator: nil }.with_indifferent_access
+          { attribute_key: 'company_name', filter_operator: 'equal_to', values: ['Marvel'], query_operator: nil }.with_indifferent_access
         ],
         actions: [
           { 'action_name' => 'send_message', 'action_params' => ['Send this message.'] },
@@ -525,7 +525,7 @@ describe AutomationRuleListener do
         ]
       )
       conversation.update!(team_id: team.id)
-      conversation.contact.update!(email: 'tj@example.com', additional_attributes: { 'company': 'Marvel' })
+      conversation.contact.update!(email: 'tj@example.com', additional_attributes: { 'company_name' => 'Marvel' })
     end
 
     let!(:message) { create(:message, account: account, conversation: conversation, message_type: 'incoming') }
@@ -572,7 +572,7 @@ describe AutomationRuleListener do
     context 'when rule does not match' do
       before do
         conversation.update!(team_id: team.id)
-        conversation.contact.update!(email: 'tj@ex.com', additional_attributes: { 'company': 'DC' })
+        conversation.contact.update!(email: 'tj@ex.com', additional_attributes: { 'company_name' => 'DC' })
       end
 
       let!(:message) { create(:message, account: account, conversation: conversation, message_type: 'outgoing') }
@@ -600,7 +600,7 @@ describe AutomationRuleListener do
         conditions: [
           { attribute_key: 'team_id', filter_operator: 'equal_to', values: [team.id], query_operator: 'AND' }.with_indifferent_access,
           { attribute_key: 'email', filter_operator: 'contains', values: ['example.com'], query_operator: 'AND' }.with_indifferent_access,
-          { attribute_key: 'company', filter_operator: 'equal_to', values: ['Marvel'], query_operator: nil }.with_indifferent_access
+          { attribute_key: 'company_name', filter_operator: 'equal_to', values: ['Marvel'], query_operator: nil }.with_indifferent_access
         ],
         actions: [
           { 'action_name' => 'send_message', 'action_params' => ['Send this message.'] },
@@ -608,7 +608,7 @@ describe AutomationRuleListener do
         ]
       )
       conversation.update!(team_id: team.id)
-      conversation.contact.update!(email: 'tj@example.com', additional_attributes: { 'company': 'Marvel' })
+      conversation.contact.update!(email: 'tj@example.com', additional_attributes: { 'company_name' => 'Marvel' })
     end
 
     let!(:message) { create(:message, account: account, conversation: conversation, message_type: 'incoming') }
@@ -633,7 +633,7 @@ describe AutomationRuleListener do
     context 'when rule does not match' do
       before do
         conversation.update!(team_id: team.id)
-        conversation.contact.update!(email: 'tj@ex.com', additional_attributes: { 'company': 'DC' })
+        conversation.contact.update!(email: 'tj@ex.com', additional_attributes: { 'company_name' => 'DC' })
       end
 
       let!(:message) { create(:message, account: account, conversation: conversation, message_type: 'outgoing') }
diff --git a/spec/listeners/hook_listener_spec.rb b/spec/listeners/hook_listener_spec.rb
index 3ae031237..c048761d1 100644
--- a/spec/listeners/hook_listener_spec.rb
+++ b/spec/listeners/hook_listener_spec.rb
@@ -9,7 +9,7 @@ describe HookListener do
     create(:message, message_type: 'outgoing',
                      account: account, inbox: inbox, conversation: conversation)
   end
-  let!(:event) { Events::Base.new(event_name, Time.zone.now, message: message) }
+  let!(:event) { Events::Base.new(event_name, Time.zone.now, message: message, previous_changes: nil) }
   let(:contact_event) { Events::Base.new('contact.updated', Time.zone.now, contact: conversation.contact) }
   let(:conversation_event) { Events::Base.new('conversation.created', Time.zone.now, conversation: conversation) }
 
@@ -26,7 +26,7 @@ describe HookListener do
     context 'when hook is configured' do
       it 'triggers hook job' do
         hook = create(:integrations_hook, account: account)
-        expect(HookJob).to receive(:perform_later).with(hook, 'message.created', message: message).once
+        expect(HookJob).to receive(:perform_later).with(hook, 'message.created', message: message, previous_changes: nil).once
         listener.message_created(event)
       end
     end
@@ -45,7 +45,7 @@ describe HookListener do
     context 'when hook is configured' do
       it 'triggers hook job' do
         hook = create(:integrations_hook, :dialogflow, account: account, inbox: inbox)
-        expect(HookJob).to receive(:perform_later).with(hook, 'message.updated', message: message).once
+        expect(HookJob).to receive(:perform_later).with(hook, 'message.updated', message: message, previous_changes: nil).once
         listener.message_updated(event)
       end
     end
@@ -66,21 +66,21 @@ describe HookListener do
     context 'when hook is enabled and app_id is supported' do
       it 'enqueues the job for slack' do
         hook = create(:integrations_hook, account: account)
-        expect(HookJob).to receive(:perform_later).with(hook, event_name, message: message)
+        expect(HookJob).to receive(:perform_later).with(hook, event_name, message: message, previous_changes: nil)
 
         listener.message_created(event)
       end
 
       it 'enqueues the job for dialogflow' do
         hook = create(:integrations_hook, :dialogflow, account: account, inbox: inbox)
-        expect(HookJob).to receive(:perform_later).with(hook, event_name, message: message)
+        expect(HookJob).to receive(:perform_later).with(hook, event_name, message: message, previous_changes: nil)
 
         listener.message_created(event)
       end
 
       it 'enqueues the job for google_translate' do
         hook = create(:integrations_hook, :google_translate, account: account)
-        expect(HookJob).to receive(:perform_later).with(hook, event_name, message: message)
+        expect(HookJob).to receive(:perform_later).with(hook, event_name, message: message, previous_changes: nil)
 
         listener.message_created(event)
       end
diff --git a/spec/mailers/confirmation_instructions_spec.rb b/spec/mailers/confirmation_instructions_spec.rb
index 484001957..b82202c51 100644
--- a/spec/mailers/confirmation_instructions_spec.rb
+++ b/spec/mailers/confirmation_instructions_spec.rb
@@ -8,6 +8,7 @@ RSpec.describe 'Devise::Mailer' do
     let!(:confirmable_user) { create(:user, inviter: inviter_val, account: account) }
     let(:inviter_val) { nil }
     let(:mail) { Devise::Mailer.confirmation_instructions(confirmable_user.reload, nil, {}) }
+    let(:mail_body) { CGI.unescapeHTML(mail.body.to_s) }
 
     before do
       # to verify the token in email
@@ -22,12 +23,26 @@ RSpec.describe 'Devise::Mailer' do
     end
 
     it 'uses the user\'s name' do
-      expect(mail.body).to match("Hi #{CGI.escapeHTML(confirmable_user.name)},")
+      expect(mail.body.to_s).to include("Hi #{CGI.escapeHTML(confirmable_user.name)},")
+      expect(mail_body).to include("Hi #{confirmable_user.name},")
     end
 
-    it 'does not refer to the inviter and their account' do
-      expect(mail.body).not_to match('has invited you to try out Chatwoot!')
-      expect(mail.body).to match('We have a suite of powerful tools ready for you to explore.')
+    context 'when the user name contains HTML' do
+      before do
+        confirmable_user.update!(name: 'Sony <script>alert(1)</script>')
+      end
+
+      it 'escapes the name in the rendered email body' do
+        expect(mail.body.to_s).to include("Hi #{CGI.escapeHTML(confirmable_user.name)},")
+        expect(mail.body.to_s).not_to include("Hi #{confirmable_user.name},")
+      end
+    end
+
+    it 'shows the default confirmation state' do
+      expect(mail_body).to include('Confirm your email to get started')
+      expect(mail_body).to include('Welcome to Chatwoot. We just need to verify your email address before you can start using your account.')
+      expect(mail_body).to include('Confirm my account')
+      expect(mail_body).not_to include('Workspace invitation')
     end
 
     it 'sends a confirmation link' do
@@ -39,10 +54,10 @@ RSpec.describe 'Devise::Mailer' do
       let(:inviter_val) { create(:user, :administrator, skip_confirmation: true, account: account) }
 
       it 'refers to the inviter and their account' do
-        expect(mail.body).to match(
-          "#{CGI.escapeHTML(inviter_val.name)}, with #{CGI.escapeHTML(account.name)}, has invited you to try out Chatwoot."
-        )
-        expect(mail.body).not_to match('We have a suite of powerful tools ready for you to explore.')
+        expect(mail_body).to include("You're invited to join #{account.name}")
+        expect(mail_body).to include("#{inviter_val.name} invited you to join the #{account.name} workspace on Chatwoot.")
+        expect(mail_body).to include('Accept invitation')
+        expect(mail_body).not_to include('Confirm your email to get started')
       end
 
       it 'sends a password reset link' do
@@ -58,7 +73,10 @@ RSpec.describe 'Devise::Mailer' do
 
       it 'sends a confirmation link' do
         confirmation_mail = Devise::Mailer.confirmation_instructions(confirmable_user.reload, nil, {})
+        confirmation_body = CGI.unescapeHTML(confirmation_mail.body.to_s)
 
+        expect(confirmation_body).to include('Confirm your new email address')
+        expect(confirmation_body).to include('New email')
         expect(confirmation_mail.body).to include('app/auth/confirmation?confirmation_token')
         expect(confirmation_mail.body).not_to include('app/auth/password/edit')
         expect(confirmable_user.unconfirmed_email.blank?).to be false
@@ -73,7 +91,9 @@ RSpec.describe 'Devise::Mailer' do
 
       it 'sends a confirmation link' do
         confirmation_mail = Devise::Mailer.confirmation_instructions(confirmable_user.reload, nil, {})
+        confirmation_body = CGI.unescapeHTML(confirmation_mail.body.to_s)
 
+        expect(confirmation_body).to include('Confirm your new email address')
         expect(confirmation_mail.body).to include('app/auth/confirmation?confirmation_token')
         expect(confirmation_mail.body).not_to include('app/auth/password/edit')
         expect(confirmable_user.unconfirmed_email.blank?).to be false
@@ -88,6 +108,10 @@ RSpec.describe 'Devise::Mailer' do
 
       it 'send instructions with the link to login' do
         confirmation_mail = Devise::Mailer.confirmation_instructions(confirmable_user.reload, nil, {})
+        confirmation_body = CGI.unescapeHTML(confirmation_mail.body.to_s)
+
+        expect(confirmation_body).to include('Your account is ready')
+        expect(confirmation_body).to include('Open my account')
         expect(confirmation_mail.body).to include('/auth/sign_in')
       end
     end
diff --git a/spec/models/agent_bot_spec.rb b/spec/models/agent_bot_spec.rb
index d3e5e2d64..c3cf9a409 100644
--- a/spec/models/agent_bot_spec.rb
+++ b/spec/models/agent_bot_spec.rb
@@ -6,6 +6,7 @@ RSpec.describe AgentBot do
   describe 'associations' do
     it { is_expected.to have_many(:agent_bot_inboxes) }
     it { is_expected.to have_many(:inboxes) }
+    it { is_expected.to have_many(:platform_app_permissibles) }
   end
 
   describe 'concerns' do
@@ -38,6 +39,13 @@ RSpec.describe AgentBot do
 
       expect(message.reload.sender).to be_nil
     end
+
+    it 'destroys associated platform_app_permissibles' do
+      platform_app = create(:platform_app)
+      create(:platform_app_permissible, platform_app: platform_app, permissible: agent_bot)
+
+      expect { agent_bot.destroy! }.to change(PlatformAppPermissible, :count).by(-1)
+    end
   end
 
   describe '#system_bot?' do
diff --git a/spec/models/contact_spec.rb b/spec/models/contact_spec.rb
index f21a81978..159454eec 100644
--- a/spec/models/contact_spec.rb
+++ b/spec/models/contact_spec.rb
@@ -16,6 +16,13 @@ RSpec.describe Contact do
 
   describe 'concerns' do
     it_behaves_like 'avatarable'
+
+    it 'accepts webp avatars' do
+      contact = build(:contact, account: create(:account))
+      contact.avatar.attach(get_blob_for(Rails.root.join('spec/assets/avatar.png'), 'image/webp'))
+
+      expect(contact).to be_valid
+    end
   end
 
   context 'when prepare contact attributes before validation' do
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 89c090207..0bf90859e 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -879,6 +879,31 @@ RSpec.describe Conversation do
           conversation_4.id
         ]
       end
+
+      context 'when some conversations have a null waiting_since' do
+        before do
+          # rubocop:disable Rails/SkipsModelValidations
+          conversation_5.update_column(:waiting_since, nil)
+          conversation_2.update_column(:waiting_since, nil)
+          # rubocop:enable Rails/SkipsModelValidations
+        end
+
+        it 'places null waiting_since conversations at the end in ascending order' do
+          records = described_class.sort_on_waiting_since
+          expect(records.map(&:id)).to eq [
+            conversation_4.id, conversation_6.id, conversation_7.id, conversation_3.id, conversation_1.id,
+            conversation_5.id, conversation_2.id
+          ]
+        end
+
+        it 'places null waiting_since conversations at the end in descending order' do
+          records = described_class.sort_on_waiting_since(:desc)
+          expect(records.map(&:id)).to eq [
+            conversation_1.id, conversation_3.id, conversation_7.id, conversation_6.id, conversation_4.id,
+            conversation_5.id, conversation_2.id
+          ]
+        end
+      end
     end
   end
 
diff --git a/spec/requests/api/v1/profile/mfa_controller_spec.rb b/spec/requests/api/v1/profile/mfa_controller_spec.rb
index 97a2e206f..eebd997ee 100644
--- a/spec/requests/api/v1/profile/mfa_controller_spec.rb
+++ b/spec/requests/api/v1/profile/mfa_controller_spec.rb
@@ -205,6 +205,23 @@ RSpec.describe 'MFA API', type: :request do
           expect(json_response['error']).to include('Invalid')
         end
       end
+
+      context 'with valid password and backup code' do
+        it 'disables 2FA successfully' do
+          backup_code = user.otp_backup_codes.first
+
+          delete '/api/v1/profile/mfa',
+                 params: { password: 'Test@123456', backup_code: backup_code },
+                 headers: user.create_new_auth_token,
+                 as: :json
+
+          expect(response).to have_http_status(:success)
+          user.reload
+          expect(user.otp_required_for_login).to be_falsey
+          expect(user.otp_secret).to be_nil
+          expect(user.otp_backup_codes).to be_blank
+        end
+      end
     end
 
     context 'when 2FA is not enabled' do
diff --git a/spec/services/crm/leadsquared/mappers/conversation_mapper_spec.rb b/spec/services/crm/leadsquared/mappers/conversation_mapper_spec.rb
index 2d4b7ed01..75abc8518 100644
--- a/spec/services/crm/leadsquared/mappers/conversation_mapper_spec.rb
+++ b/spec/services/crm/leadsquared/mappers/conversation_mapper_spec.rb
@@ -188,12 +188,13 @@ RSpec.describe Crm::Leadsquared::Mappers::ConversationMapper do
       end
 
       context 'when sender has no name' do
+        let(:unnamed_contact) { create(:contact, account: account, name: '') }
         let(:unnamed_sender_message) do
           create(:message,
                  conversation: conversation,
-                 sender: create(:user, name: ''),
+                 sender: unnamed_contact,
                  content: 'Message',
-                 message_type: :outgoing,
+                 message_type: :incoming,
                  created_at: Time.zone.parse('2024-01-01 10:05'))
         end
 
@@ -201,7 +202,7 @@ RSpec.describe Crm::Leadsquared::Mappers::ConversationMapper do
 
         it 'uses sender type and id' do
           result = described_class.map_transcript_activity(hook, conversation)
-          expect(result).to include("User #{unnamed_sender_message.sender_id}")
+          expect(result).to include("Contact #{unnamed_sender_message.sender_id}")
         end
       end
     end
diff --git a/spec/services/whatsapp/liquid_template_processor_service_spec.rb b/spec/services/whatsapp/liquid_template_processor_service_spec.rb
new file mode 100644
index 000000000..5b11b7409
--- /dev/null
+++ b/spec/services/whatsapp/liquid_template_processor_service_spec.rb
@@ -0,0 +1,347 @@
+require 'rails_helper'
+
+describe Whatsapp::LiquidTemplateProcessorService do
+  let(:account) { create(:account) }
+  let(:agent) { create(:user, account: account, name: 'Agent Smith') }
+  let(:inbox) { create(:inbox, account: account, name: 'Support Inbox') }
+  let(:contact) { create(:contact, account: account, name: 'John Doe', email: 'john@example.com', phone_number: '+1234567890') }
+  let(:campaign) { create(:campaign, account: account, inbox: inbox, sender: agent, message: 'Test message') }
+  let(:service) { described_class.new(campaign: campaign, contact: contact) }
+
+  describe '#process_template_params' do
+    context 'when template_params is blank' do
+      it 'returns the original template_params' do
+        result = service.process_template_params(nil)
+        expect(result).to be_nil
+      end
+    end
+
+    context 'when processed_params is blank' do
+      let(:template_params) { { 'name' => 'test_template' } }
+
+      it 'returns the original template_params' do
+        result = service.process_template_params(template_params)
+        expect(result).to eq(template_params)
+      end
+    end
+
+    context 'with body parameters containing liquid variables' do
+      let(:template_params) do
+        {
+          'name' => 'test_template',
+          'namespace' => 'test_namespace',
+          'language' => 'en',
+          'processed_params' => {
+            'body' => {
+              'name' => '{{contact.name}}',
+              'email' => '{{contact.email}}',
+              'static_text' => 'Hello World'
+            }
+          }
+        }
+      end
+
+      it 'processes liquid variables in body parameters' do
+        result = service.process_template_params(template_params)
+        contact_drop_name = ContactDrop.new(contact).name
+
+        expect(result['processed_params']['body']['name']).to eq(contact_drop_name)
+        expect(result['processed_params']['body']['email']).to eq(contact.email)
+        expect(result['processed_params']['body']['static_text']).to eq('Hello World')
+      end
+
+      it 'does not modify the original template_params' do
+        original_name_value = template_params['processed_params']['body']['name']
+        service.process_template_params(template_params)
+
+        expect(template_params['processed_params']['body']['name']).to eq(original_name_value)
+      end
+    end
+
+    context 'with header parameters containing liquid variables' do
+      let(:template_params) do
+        {
+          'name' => 'test_template',
+          'processed_params' => {
+            'header' => {
+              'media_url' => 'https://example.com/{{contact.name}}.jpg',
+              'media_name' => '{{contact.name}}_document.pdf'
+            }
+          }
+        }
+      end
+
+      it 'processes liquid variables in header parameters' do
+        result = service.process_template_params(template_params)
+        contact_drop_name = ContactDrop.new(contact).name
+
+        expect(result['processed_params']['header']['media_url']).to eq("https://example.com/#{contact_drop_name}.jpg")
+        expect(result['processed_params']['header']['media_name']).to eq("#{contact_drop_name}_document.pdf")
+      end
+    end
+
+    context 'with button parameters containing liquid variables' do
+      let(:template_params) do
+        {
+          'name' => 'test_template',
+          'processed_params' => {
+            'buttons' => [
+              { 'type' => 'url', 'parameter' => '{{contact.email}}' },
+              { 'type' => 'copy_code', 'parameter' => 'CODE-{{contact.name}}' }
+            ]
+          }
+        }
+      end
+
+      it 'processes liquid variables in button parameters' do
+        result = service.process_template_params(template_params)
+        contact_drop_name = ContactDrop.new(contact).name
+
+        expect(result['processed_params']['buttons'][0]['parameter']).to eq(contact.email)
+        expect(result['processed_params']['buttons'][1]['parameter']).to eq("CODE-#{contact_drop_name}")
+      end
+    end
+
+    context 'with footer parameters containing liquid variables' do
+      let(:template_params) do
+        {
+          'name' => 'test_template',
+          'processed_params' => {
+            'footer' => {
+              'text' => 'From {{agent.name}} at {{account.name}}'
+            }
+          }
+        }
+      end
+
+      it 'processes liquid variables in footer parameters' do
+        result = service.process_template_params(template_params)
+        agent_drop_name = UserDrop.new(agent).name
+
+        expect(result['processed_params']['footer']['text']).to eq("From #{agent_drop_name} at #{account.name}")
+      end
+    end
+
+    context 'with multiple liquid variables across different sections' do
+      let(:template_params) do
+        {
+          'name' => 'test_template',
+          'processed_params' => {
+            'body' => {
+              'greeting' => 'Hello {{contact.name}}',
+              'agent' => 'Your agent is {{agent.name}}'
+            },
+            'header' => {
+              'media_name' => '{{contact.name}}_file.pdf'
+            },
+            'buttons' => [
+              { 'parameter' => '{{contact.email}}' }
+            ],
+            'footer' => {
+              'text' => '{{inbox.name}}'
+            }
+          }
+        }
+      end
+
+      it 'processes all liquid variables correctly' do
+        result = service.process_template_params(template_params)
+        contact_drop_name = ContactDrop.new(contact).name
+        agent_drop_name = UserDrop.new(agent).name
+
+        expect(result['processed_params']['body']['greeting']).to eq("Hello #{contact_drop_name}")
+        expect(result['processed_params']['body']['agent']).to eq("Your agent is #{agent_drop_name}")
+        expect(result['processed_params']['header']['media_name']).to eq("#{contact_drop_name}_file.pdf")
+        expect(result['processed_params']['buttons'][0]['parameter']).to eq(contact.email)
+        expect(result['processed_params']['footer']['text']).to eq(inbox.name)
+      end
+    end
+
+    context 'with blank or nil values' do
+      let(:template_params) do
+        {
+          'name' => 'test_template',
+          'processed_params' => {
+            'body' => {
+              'name' => nil,
+              'email' => '',
+              'valid' => '{{contact.name}}'
+            }
+          }
+        }
+      end
+
+      it 'handles blank values gracefully' do
+        result = service.process_template_params(template_params)
+        contact_drop_name = ContactDrop.new(contact).name
+
+        expect(result['processed_params']['body']['name']).to be_nil
+        expect(result['processed_params']['body']['email']).to eq('')
+        expect(result['processed_params']['body']['valid']).to eq(contact_drop_name)
+      end
+    end
+
+    context 'when liquid variable resolves to blank' do
+      let(:contact) { create(:contact, account: account, name: 'John', email: nil, phone_number: '+1234567890') }
+
+      it 'returns nil for enhanced params with blank rendered values' do
+        template_params = {
+          'name' => 'test_template',
+          'processed_params' => {
+            'body' => {
+              'email' => '{{contact.email}}'
+            }
+          }
+        }
+
+        result = service.process_template_params(template_params)
+        expect(result).to be_nil
+      end
+
+      it 'returns nil for legacy hash params with blank rendered values' do
+        template_params = {
+          'name' => 'test_template',
+          'processed_params' => {
+            '1' => '{{contact.email}}'
+          }
+        }
+
+        result = service.process_template_params(template_params)
+        expect(result).to be_nil
+      end
+
+      it 'returns nil for legacy array params with blank rendered values' do
+        template_params = {
+          'name' => 'test_template',
+          'processed_params' => ['{{contact.email}}']
+        }
+
+        result = service.process_template_params(template_params)
+        expect(result).to be_nil
+      end
+
+      it 'returns nil for button params with blank rendered values' do
+        template_params = {
+          'name' => 'test_template',
+          'processed_params' => {
+            'buttons' => [
+              { 'type' => 'url', 'parameter' => '{{contact.email}}' }
+            ]
+          }
+        }
+
+        result = service.process_template_params(template_params)
+        expect(result).to be_nil
+      end
+
+      it 'returns processed params when all variables resolve to non-blank values' do
+        template_params = {
+          'name' => 'test_template',
+          'processed_params' => {
+            'body' => {
+              'name' => '{{contact.name}}'
+            }
+          }
+        }
+
+        result = service.process_template_params(template_params)
+        expect(result).not_to be_nil
+        expect(result['processed_params']['body']['name']).to eq(ContactDrop.new(contact).name)
+      end
+    end
+
+    context 'with custom attributes' do
+      let(:contact) do
+        create(:contact, account: account, name: 'John Doe',
+                         custom_attributes: { 'company' => 'Acme Inc', 'plan' => 'Premium' })
+      end
+      let(:template_params) do
+        {
+          'name' => 'test_template',
+          'processed_params' => {
+            'body' => {
+              'company' => '{{contact.custom_attribute.company}}',
+              'plan' => '{{contact.custom_attribute.plan}}'
+            }
+          }
+        }
+      end
+
+      it 'processes custom attribute liquid variables' do
+        result = service.process_template_params(template_params)
+
+        expect(result['processed_params']['body']['company']).to eq('Acme Inc')
+        expect(result['processed_params']['body']['plan']).to eq('Premium')
+      end
+    end
+
+    context 'with invalid liquid syntax' do
+      let(:template_params) do
+        {
+          'name' => 'test_template',
+          'processed_params' => {
+            'body' => {
+              'invalid' => '{{contact.name missing braces'
+            }
+          }
+        }
+      end
+
+      it 'returns original value when liquid parsing fails' do
+        result = service.process_template_params(template_params)
+
+        expect(result['processed_params']['body']['invalid']).to eq('{{contact.name missing braces')
+      end
+    end
+
+    context 'with legacy flat hash processed_params' do
+      let(:template_params) do
+        {
+          'name' => 'legacy_template',
+          'processed_params' => {
+            '1' => '{{contact.name}}',
+            '2' => '{{contact.email}}',
+            '3' => 'Hello World'
+          }
+        }
+      end
+
+      it 'processes liquid variables in legacy hash values' do
+        result = service.process_template_params(template_params)
+        contact_drop_name = ContactDrop.new(contact).name
+
+        expect(result['processed_params']['1']).to eq(contact_drop_name)
+        expect(result['processed_params']['2']).to eq(contact.email)
+        expect(result['processed_params']['3']).to eq('Hello World')
+      end
+
+      it 'treats component-named string values as legacy params' do
+        params_with_component_named_key = {
+          'name' => 'legacy_template',
+          'processed_params' => { 'body' => '{{contact.name}}' }
+        }
+
+        result = service.process_template_params(params_with_component_named_key)
+        contact_drop_name = ContactDrop.new(contact).name
+
+        expect(result['processed_params']['body']).to eq(contact_drop_name)
+      end
+    end
+
+    context 'with legacy array processed_params' do
+      let(:template_params) do
+        {
+          'name' => 'legacy_template',
+          'processed_params' => ['{{contact.name}}', '{{contact.email}}', 'Hello World']
+        }
+      end
+
+      it 'processes liquid variables in legacy array values' do
+        result = service.process_template_params(template_params)
+        contact_drop_name = ContactDrop.new(contact).name
+
+        expect(result['processed_params']).to eq([contact_drop_name, contact.email, 'Hello World'])
+      end
+    end
+  end
+end
diff --git a/spec/services/whatsapp/oneoff_campaign_service_spec.rb b/spec/services/whatsapp/oneoff_campaign_service_spec.rb
index dd8d51c54..00d7fdd3b 100644
--- a/spec/services/whatsapp/oneoff_campaign_service_spec.rb
+++ b/spec/services/whatsapp/oneoff_campaign_service_spec.rb
@@ -139,6 +139,73 @@ describe Whatsapp::OneoffCampaignService do
 
         described_class.new(campaign: campaign).perform
       end
+
+      it 'processes liquid variables in template parameters' do
+        contact = create(:contact, :with_phone_number, account: account, name: 'Jane Smith', email: 'jane@example.com')
+        contact.update_labels([label1.title])
+
+        campaign_with_liquid = create(:campaign, inbox: whatsapp_inbox, account: account,
+                                                 audience: [{ type: 'Label', id: label1.id }],
+                                                 template_params: {
+                                                   'name' => 'ticket_status_updated',
+                                                   'namespace' => '23423423_2342423_324234234_2343224',
+                                                   'category' => 'UTILITY',
+                                                   'language' => 'en',
+                                                   'processed_params' => {
+                                                     'body' => {
+                                                       'name' => '{{contact.name}}',
+                                                       'ticket_id' => '{{contact.email}}'
+                                                     }
+                                                   }
+                                                 })
+
+        contact_drop_name = ContactDrop.new(contact).name
+
+        expect(whatsapp_channel).to receive(:send_template).with(
+          contact.phone_number,
+          hash_including(
+            name: 'ticket_status_updated',
+            namespace: '23423423_2342423_324234234_2343224',
+            lang_code: 'en',
+            parameters: array_including(
+              hash_including(
+                type: 'body',
+                parameters: array_including(
+                  hash_including(type: 'text', parameter_name: 'name', text: contact_drop_name),
+                  hash_including(type: 'text', parameter_name: 'ticket_id', text: contact.email)
+                )
+              )
+            )
+          ),
+          nil
+        )
+
+        described_class.new(campaign: campaign_with_liquid).perform
+      end
+
+      it 'skips contacts when liquid variables resolve to blank values' do
+        contact = create(:contact, :with_phone_number, account: account, name: 'Jane', email: nil)
+        contact.update_labels([label1.title])
+
+        campaign_with_blank_liquid = create(:campaign, inbox: whatsapp_inbox, account: account,
+                                                       audience: [{ type: 'Label', id: label1.id }],
+                                                       template_params: {
+                                                         'name' => 'test_template',
+                                                         'namespace' => 'test_namespace',
+                                                         'language' => 'en',
+                                                         'processed_params' => {
+                                                           'body' => {
+                                                             'email' => '{{contact.email}}'
+                                                           }
+                                                         }
+                                                       })
+
+        expect(whatsapp_channel).not_to receive(:send_template)
+        expect(Rails.logger).to receive(:info).with("Skipping contact #{contact.name} - liquid variables resolved to blank values")
+        allow(Rails.logger).to receive(:info)
+
+        described_class.new(campaign: campaign_with_blank_liquid).perform
+      end
     end
 
     context 'when template_params is missing' do
diff --git a/tests/playwright/.env.example b/tests/playwright/.env.example
new file mode 100644
index 000000000..c2c13abb1
--- /dev/null
+++ b/tests/playwright/.env.example
@@ -0,0 +1,11 @@
+# Playwright Test Configuration
+
+# Base URL for the Chatwoot instance under test
+BASE_URL=http://localhost:3000
+
+# Admin credentials
+TEST_USER_EMAIL=admin@chatwoot.com
+TEST_USER_PASSWORD="Password123@#"
+
+# Add additional variables as needed by specific test suites
+# VARIABLE_NAME=value
diff --git a/tests/playwright/.gitignore b/tests/playwright/.gitignore
new file mode 100644
index 000000000..6cb6e772e
--- /dev/null
+++ b/tests/playwright/.gitignore
@@ -0,0 +1,54 @@
+# Dependencies
+node_modules/
+package-lock.json
+
+# Environment files
+.env
+.env.local
+.env.*.local
+.github/.env
+
+# Playwright test results
+test-results/
+playwright-report/
+blob-report/
+
+# Playwright cache and auth
+playwright/.cache/
+playwright/.auth/
+.cache/
+.auth/
+
+# Test artifacts
+screenshots/
+videos/
+downloads/
+traces/
+
+# IDE files
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+.DS_Store
+.claude
+
+# Logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Generated schemas (if you want to version control them, remove this)
+# response-schemas/
+
+# OS files
+Thumbs.db
+.DS_Store
+
+# Temporary files
+*.tmp
+*.temp
+.tmp/
\ No newline at end of file
diff --git a/tests/playwright/DOCS.md b/tests/playwright/DOCS.md
new file mode 100644
index 000000000..6de5ce6ca
--- /dev/null
+++ b/tests/playwright/DOCS.md
@@ -0,0 +1,146 @@
+# Chatwoot E2E Testing - Documentation
+
+Complete guide for writing and maintaining E2E tests for Chatwoot.
+
+---
+
+## Overview
+
+End-to-end testing suite for Chatwoot built with Playwright and TypeScript using the Component Object Model (COM) pattern.
+
+---
+
+## Architecture
+
+```
+tests/playwright/
+├── components/
+│   ├── api/              # API interaction (auth.component.ts, inbox.component.ts ...)
+│   └── ui/               # UI page objects (login.component.ts, agent-page.component.ts ...)
+├── tests/e2e/            # Test specs (api/ and ui/)
+├── utils/                # Shared utilities (fixture.ts, test-data.ts, db.ts)
+├── response-schemas/     # API response schemas for validation
+├── fixtures/             # Test fixtures
+├── helpers/              # Helper functions
+└── playwright.config.ts
+```
+
+---
+
+## Configuration
+
+All configuration managed through `.env` file. Copy `.env.example` to `.env`:
+
+```
+BASE_URL=http://localhost:3000
+TEST_USER_EMAIL=admin@chatwoot.com
+TEST_USER_PASSWORD="Password123@#"
+ACCOUNT_ID=1
+
+# Add additional variables as needed by specific test suites
+# VARIABLE_NAME=value
+```
+
+> **Note:** `npx playwright install` is required after `pnpm install` to download browser binaries.
+
+---
+
+## Testing Patterns
+
+### API Testing
+
+```typescript
+test('API operation', async ({ api }) => {
+  const authHeaders = await authComponent.login(email, password);
+  const result = await component.create(api, authHeaders, data);
+  expect(result.id).toBeTruthy();
+});
+```
+
+### UI Testing
+
+```typescript
+test('UI interaction', async ({ page }) => {
+  const loginComponent = new Login(page);
+  await loginComponent.login(email, password);
+  await expect(page.getByText('Success')).toBeVisible();
+});
+```
+
+### Hybrid Pattern
+
+```typescript
+test('UI with API setup', async ({ page, api }) => {
+  // Fast: Create test data via API
+  const inbox = await inboxComponent.createApiInbox(api, authHeaders, data);
+
+  // Test UI interactions
+  await page.goto(`/app/accounts/2/inbox/${inbox.id}`);
+  await expect(page.getByText(inbox.name)).toBeVisible();
+});
+```
+
+---
+
+## Request Handler
+
+```typescript
+const data = await api
+  .path('/api/v1/accounts/2/agents')
+  .headers(authHeaders)
+  .body({ name: 'John', email: 'john@test.com' })
+  .logs(true)
+  .postRequest(200);
+```
+
+**Methods:** `getRequest()`, `postRequest()`, `putRequest()`, `deleteRequest()`
+
+---
+
+## Test Data Generation
+
+```typescript
+import { fake } from '@utils/test-data';
+
+const agent = fake.agent({ role: 'agent' });
+const inboxName = fake.inboxName();
+```
+
+**Available:** `fake.fullName`, `fake.email`, `fake.phoneNumber`, `fake.password`, `fake.agent()`, `fake.inboxName()`
+
+---
+
+## Best Practices
+
+**Do:**
+- Use existing components
+- Use `fake` for test data
+- Use semantic selectors (`getByRole`, `getByLabel`)
+- Clean up test data in `afterAll`
+- Validate API schemas
+
+**Don't:**
+- Use CSS selectors
+- Hardcode wait times
+- Skip cleanup
+- Commit sensitive data
+
+---
+
+## Troubleshooting
+
+**Authentication errors:**
+- Verify `.env` credentials match Chatwoot
+- Check for rate limiting (429 errors)
+
+**Database errors:**
+- Verify database is running
+- Check credentials in `.env`
+
+**Timeout errors:**
+- Ensure Chatwoot is running at `BASE_URL`
+- Increase timeout: `{ timeout: 60000 }`
+
+**Element not found:**
+- Use `page.pause()` to inspect
+- Check for timing issues
diff --git a/tests/playwright/README.md b/tests/playwright/README.md
new file mode 100644
index 000000000..1820975bd
--- /dev/null
+++ b/tests/playwright/README.md
@@ -0,0 +1,59 @@
+# Chatwoot E2E Testing
+
+End-to-end testing framework for Chatwoot using Component Object Model pattern.
+
+## Setup
+
+```bash
+# Install dependencies
+pnpm install
+
+# Install Playwright browsers
+npx playwright install
+
+# Configure environment
+cp .env.example .env
+```
+
+Edit `.env` with your Chatwoot instance URL and credentials.
+
+## Usage
+
+```bash
+# Run all tests
+pnpm run playwright:run
+
+# Run tests in UI mode
+pnpm run playwright:open
+
+# Lint tests and page objects
+pnpm run lint
+
+# Generate test code
+pnpm run playwright:codegen
+```
+
+## Project Structure
+
+```
+tests/playwright/
+├── components/
+│   ├── api/              # API interaction components
+│   └── ui/               # UI page objects
+├── tests/
+│   └── e2e/
+│       ├── api/          # Pure API tests
+│       └── ui/           # UI tests
+├── utils/                # Shared utilities and helpers
+├── response-schemas/     # API response schemas for validation
+├── fixtures/             # Test fixtures
+└── helpers/              # Helper functions
+```
+
+## Documentation
+
+See [DOCS.md](./DOCS.md) for complete testing guide including patterns, conventions, and troubleshooting.
+
+## Configuration
+
+See `.env.example` for the full list of variables.
diff --git a/tests/playwright/components/ui/index.ts b/tests/playwright/components/ui/index.ts
new file mode 100644
index 000000000..82366bc05
--- /dev/null
+++ b/tests/playwright/components/ui/index.ts
@@ -0,0 +1 @@
+export { Login } from './login.component';
diff --git a/tests/playwright/components/ui/login.component.ts b/tests/playwright/components/ui/login.component.ts
new file mode 100644
index 000000000..3113c8203
--- /dev/null
+++ b/tests/playwright/components/ui/login.component.ts
@@ -0,0 +1,55 @@
+import { Page } from '@playwright/test';
+
+export class Login {
+  private page: Page;
+
+  constructor(page: Page) {
+    this.page = page;
+  }
+
+  async navigate() {
+    await this.page.goto('/');
+  }
+
+  async fillEmail(email: string) {
+    await this.page.getByTestId('email_input').fill(email);
+  }
+
+  async fillPassword(password: string) {
+    await this.page.getByTestId('password_input').fill(password);
+  }
+
+  async clickLoginButton() {
+    await this.page.getByTestId('submit_button').click();
+  }
+
+  async login(email: string, password: string) {
+    await this.fillEmail(email);
+    await this.fillPassword(password);
+    await this.clickLoginButton();
+  }
+
+  getEmailInput() {
+    return this.page.getByTestId('email_input');
+  }
+
+  getPasswordInput() {
+    return this.page.getByTestId('password_input');
+  }
+
+  getLoginButton() {
+    return this.page.getByTestId('submit_button');
+  }
+
+  getLoginHeading() {
+    return this.page.getByRole('heading', { name: 'Login to Chatwoot' });
+  }
+
+  getSSOLink() {
+    return this.page.getByRole('link', { name: 'Login via SSO' });
+  }
+
+  getForgotPasswordLink() {
+    return this.page.getByRole('link', { name: 'Forgot your password?' });
+  }
+}
diff --git a/tests/playwright/eslint.config.mjs b/tests/playwright/eslint.config.mjs
new file mode 100644
index 000000000..523981812
--- /dev/null
+++ b/tests/playwright/eslint.config.mjs
@@ -0,0 +1,42 @@
+import js from '@eslint/js';
+import playwright from 'eslint-plugin-playwright';
+import tseslint from 'typescript-eslint';
+
+export default tseslint.config(
+  {
+    ignores: [
+      'node_modules/',
+      'dist/',
+      'test-results/',
+      'playwright-report/',
+      'blob-report/',
+      '.cache/',
+      '.auth/',
+    ],
+  },
+  js.configs.recommended,
+  ...tseslint.configs.recommended,
+  {
+    files: ['**/*.{js,mjs,ts}'],
+    languageOptions: {
+      globals: {
+        __dirname: 'readonly',
+        console: 'readonly',
+        process: 'readonly',
+      },
+    },
+  },
+  {
+    files: ['**/*.ts'],
+    languageOptions: {
+      parserOptions: {
+        project: './tsconfig.json',
+        tsconfigRootDir: import.meta.dirname,
+      },
+    },
+  },
+  {
+    ...playwright.configs['flat/recommended'],
+    files: ['tests/**/*.ts'],
+  }
+);
diff --git a/tests/playwright/package.json b/tests/playwright/package.json
new file mode 100644
index 000000000..54ede221d
--- /dev/null
+++ b/tests/playwright/package.json
@@ -0,0 +1,35 @@
+{
+  "name": "playwright",
+  "version": "1.0.0",
+  "main": "index.js",
+  "scripts": {
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "playwright:open": "npx playwright test --ui",
+    "playwright:run": "npx playwright test",
+    "playwright:codegen": "npx playwright codegen"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "description": "",
+  "devDependencies": {
+    "@eslint/js": "^9.39.4",
+    "@faker-js/faker": "^9.9.0",
+    "@playwright/mcp": "^0.0.48",
+    "@playwright/test": "^1.56.1",
+    "@types/node": "^24.10.1",
+    "@types/uuid": "^10.0.0",
+    "ajv": "^8.17.1",
+    "ajv-formats": "^3.0.1",
+    "dotenv": "^17.2.3",
+    "eslint": "^9.39.4",
+    "eslint-plugin-playwright": "^2.10.2",
+    "genson-js": "^0.0.8",
+    "pg": "^8.16.3",
+    "playwright": "^1.56.1",
+    "typescript": "^6.0.3",
+    "typescript-eslint": "^8.59.1",
+    "uuid": "^13.0.0"
+  }
+}
diff --git a/tests/playwright/playwright.config.ts b/tests/playwright/playwright.config.ts
new file mode 100644
index 000000000..de9fc1c56
--- /dev/null
+++ b/tests/playwright/playwright.config.ts
@@ -0,0 +1,36 @@
+import { defineConfig, devices } from '@playwright/test';
+
+import dotenv from 'dotenv';
+import path from 'path';
+dotenv.config({ path: path.resolve(__dirname, '.env') });
+
+export default defineConfig({
+  testDir: './tests',
+  timeout: 60 * 1000,
+  expect: {
+    timeout: 30 * 1000,
+  },
+  fullyParallel: false,
+  forbidOnly: !!process.env.CI,
+  retries: process.env.CI ? 2 : 0,
+  workers: process.env.CI ? 1 : undefined,
+  reporter: 'html',
+  use: {
+    actionTimeout: 30 * 1000,
+    navigationTimeout: 30 * 1000,
+    baseURL: process.env.BASE_URL || 'http://localhost:3000',
+    trace: 'retain-on-failure',
+    headless: false,
+    viewport: {
+      width: 1440,
+      height: 1080,
+    },
+  },
+
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'] },
+    },
+  ],
+});
diff --git a/tests/playwright/pnpm-lock.yaml b/tests/playwright/pnpm-lock.yaml
new file mode 100644
index 000000000..af47702e8
--- /dev/null
+++ b/tests/playwright/pnpm-lock.yaml
@@ -0,0 +1,1247 @@
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+
+  .:
+    devDependencies:
+      '@eslint/js':
+        specifier: ^9.39.4
+        version: 9.39.4
+      '@faker-js/faker':
+        specifier: ^9.9.0
+        version: 9.9.0
+      '@playwright/mcp':
+        specifier: ^0.0.48
+        version: 0.0.48
+      '@playwright/test':
+        specifier: ^1.56.1
+        version: 1.59.1
+      '@types/node':
+        specifier: ^24.10.1
+        version: 24.12.2
+      '@types/uuid':
+        specifier: ^10.0.0
+        version: 10.0.0
+      ajv:
+        specifier: ^8.17.1
+        version: 8.20.0
+      ajv-formats:
+        specifier: ^3.0.1
+        version: 3.0.1(ajv@8.20.0)
+      dotenv:
+        specifier: ^17.2.3
+        version: 17.4.2
+      eslint:
+        specifier: ^9.39.4
+        version: 9.39.4
+      eslint-plugin-playwright:
+        specifier: ^2.10.2
+        version: 2.10.2(eslint@9.39.4)
+      genson-js:
+        specifier: ^0.0.8
+        version: 0.0.8
+      pg:
+        specifier: ^8.16.3
+        version: 8.20.0
+      playwright:
+        specifier: ^1.56.1
+        version: 1.59.1
+      typescript:
+        specifier: ^6.0.3
+        version: 6.0.3
+      typescript-eslint:
+        specifier: ^8.59.1
+        version: 8.59.1(eslint@9.39.4)(typescript@6.0.3)
+      uuid:
+        specifier: ^13.0.0
+        version: 13.0.0
+
+packages:
+
+  '@eslint-community/eslint-utils@4.9.1':
+    resolution: {integrity: sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+
+  '@eslint-community/regexpp@4.12.2':
+    resolution: {integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==}
+    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+
+  '@eslint/config-array@0.21.2':
+    resolution: {integrity: sha512-nJl2KGTlrf9GjLimgIru+V/mzgSK0ABCDQRvxw5BjURL7WfH5uoWmizbH7QB6MmnMBd8cIC9uceWnezL1VZWWw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@eslint/config-helpers@0.4.2':
+    resolution: {integrity: sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@eslint/core@0.17.0':
+    resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@eslint/eslintrc@3.3.5':
+    resolution: {integrity: sha512-4IlJx0X0qftVsN5E+/vGujTRIFtwuLbNsVUe7TO6zYPDR1O6nFwvwhIKEKSrl6dZchmYBITazxKoUYOjdtjlRg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@eslint/js@9.39.4':
+    resolution: {integrity: sha512-nE7DEIchvtiFTwBw4Lfbu59PG+kCofhjsKaCWzxTpt4lfRjRMqG6uMBzKXuEcyXhOHoUp9riAm7/aWYGhXZ9cw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@eslint/object-schema@2.1.7':
+    resolution: {integrity: sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@eslint/plugin-kit@0.4.1':
+    resolution: {integrity: sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@faker-js/faker@9.9.0':
+    resolution: {integrity: sha512-OEl393iCOoo/z8bMezRlJu+GlRGlsKbUAN7jKB6LhnKoqKve5DXRpalbItIIcwnCjs1k/FOPjFzcA6Qn+H+YbA==}
+    engines: {node: '>=18.0.0', npm: '>=9.0.0'}
+
+  '@humanfs/core@0.19.2':
+    resolution: {integrity: sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==}
+    engines: {node: '>=18.18.0'}
+
+  '@humanfs/node@0.16.8':
+    resolution: {integrity: sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==}
+    engines: {node: '>=18.18.0'}
+
+  '@humanfs/types@0.15.0':
+    resolution: {integrity: sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==}
+    engines: {node: '>=18.18.0'}
+
+  '@humanwhocodes/module-importer@1.0.1':
+    resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
+    engines: {node: '>=12.22'}
+
+  '@humanwhocodes/retry@0.4.3':
+    resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==}
+    engines: {node: '>=18.18'}
+
+  '@playwright/mcp@0.0.48':
+    resolution: {integrity: sha512-c4uJ/9NhTpB0+kh2OFx3MZfLlg05GbDVJcV1/hxAy4/7yuHTA/FcZ2XY8SkV98RMq18Rwt0cqoqPiRrzG2bbxQ==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  '@playwright/test@1.59.1':
+    resolution: {integrity: sha512-PG6q63nQg5c9rIi4/Z5lR5IVF7yU5MqmKaPOe0HSc0O2cX1fPi96sUQu5j7eo4gKCkB2AnNGoWt7y4/Xx3Kcqg==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  '@types/estree@1.0.8':
+    resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
+
+  '@types/json-schema@7.0.15':
+    resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
+
+  '@types/node@24.12.2':
+    resolution: {integrity: sha512-A1sre26ke7HDIuY/M23nd9gfB+nrmhtYyMINbjI1zHJxYteKR6qSMX56FsmjMcDb3SMcjJg5BiRRgOCC/yBD0g==}
+
+  '@types/uuid@10.0.0':
+    resolution: {integrity: sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==}
+
+  '@typescript-eslint/eslint-plugin@8.59.1':
+    resolution: {integrity: sha512-BOziFIfE+6osHO9FoJG4zjoHUcvI7fTNBSpdAwrNH0/TLvzjsk2oo8XSSOT2HhqUyhZPfHv4UOffoJ9oEEQ7Ag==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      '@typescript-eslint/parser': ^8.59.1
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
+
+  '@typescript-eslint/parser@8.59.1':
+    resolution: {integrity: sha512-HDQH9O/47Dxi1ceDhBXdaldtf/WV9yRYMjbjCuNk3qnaTD564qwv61Y7+gTxwxRKzSrgO5uhtw584igXVuuZkA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
+
+  '@typescript-eslint/project-service@8.59.1':
+    resolution: {integrity: sha512-+MuHQlHiEr00Of/IQbE/MmEoi44znZHbR/Pz7Opq4HryUOlRi+/44dro9Ycy8Fyo+/024IWtw8m4JUMCGTYxDg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.1.0'
+
+  '@typescript-eslint/scope-manager@8.59.1':
+    resolution: {integrity: sha512-LwuHQI4pDOYVKvmH2dkaJo6YZCSgouVgnS/z7yBPKBMvgtBvyLqiLy9Z6b7+m/TRcX1NFYUqZetI5Y+aT4GEfg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@typescript-eslint/tsconfig-utils@8.59.1':
+    resolution: {integrity: sha512-/0nEyPbX7gRsk0Uwfe4ALwwgxuA66d/l2mhRDNlAvaj4U3juhUtJNq0DsY8M2AYwwb9rEq2hrC3IcIcEt++iJA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.1.0'
+
+  '@typescript-eslint/type-utils@8.59.1':
+    resolution: {integrity: sha512-klWPBR2ciQHS3f++ug/mVnWKPjBUo7icEL3FAO1lhAR1Z1i5NQYZ1EannMSRYcq5qCv5wNALlXr6fksRHyYl7w==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
+
+  '@typescript-eslint/types@8.59.1':
+    resolution: {integrity: sha512-ZDCjgccSdYPw5Bxh+my4Z0lJU96ZDN7jbBzvmEn0FZx3RtU1C7VWl6NbDx94bwY3V5YsgwRzJPOgeY2Q/nLG8A==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@typescript-eslint/typescript-estree@8.59.1':
+    resolution: {integrity: sha512-OUd+vJS05sSkOip+BkZ/2NS8RMxrAAJemsC6vU3kmfLyeaJT0TftHkV9mcx2107MmsBVXXexhVu4F0TZXyMl4g==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.1.0'
+
+  '@typescript-eslint/utils@8.59.1':
+    resolution: {integrity: sha512-3pIeoXhCeYH9FSCBI8P3iNwJlGuzPlYKkTlen2O9T1DSeeg8UG8jstq6BLk+Mda0qup7mgk4z4XL4OzRaxZ8LA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
+
+  '@typescript-eslint/visitor-keys@8.59.1':
+    resolution: {integrity: sha512-LdDNl6C5iJExcM0Yh0PwAIBb9PrSiCsWamF/JyEZawm3kFDnRoaq3LGE4bpyRao/fWeGKKyw7icx0YxrLFC5Cg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  acorn-jsx@5.3.2:
+    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
+    peerDependencies:
+      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+
+  acorn@8.16.0:
+    resolution: {integrity: sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
+  ajv-formats@3.0.1:
+    resolution: {integrity: sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==}
+    peerDependencies:
+      ajv: ^8.0.0
+    peerDependenciesMeta:
+      ajv:
+        optional: true
+
+  ajv@6.15.0:
+    resolution: {integrity: sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==}
+
+  ajv@8.20.0:
+    resolution: {integrity: sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==}
+
+  ansi-styles@4.3.0:
+    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
+    engines: {node: '>=8'}
+
+  argparse@2.0.1:
+    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
+
+  balanced-match@1.0.2:
+    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
+
+  balanced-match@4.0.4:
+    resolution: {integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==}
+    engines: {node: 18 || 20 || >=22}
+
+  brace-expansion@1.1.14:
+    resolution: {integrity: sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==}
+
+  brace-expansion@5.0.5:
+    resolution: {integrity: sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==}
+    engines: {node: 18 || 20 || >=22}
+
+  callsites@3.1.0:
+    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
+    engines: {node: '>=6'}
+
+  chalk@4.1.2:
+    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
+    engines: {node: '>=10'}
+
+  color-convert@2.0.1:
+    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
+    engines: {node: '>=7.0.0'}
+
+  color-name@1.1.4:
+    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
+
+  concat-map@0.0.1:
+    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
+
+  cross-spawn@7.0.6:
+    resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
+    engines: {node: '>= 8'}
+
+  debug@4.4.3:
+    resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  deep-is@0.1.4:
+    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
+
+  dotenv@17.4.2:
+    resolution: {integrity: sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==}
+    engines: {node: '>=12'}
+
+  escape-string-regexp@4.0.0:
+    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
+    engines: {node: '>=10'}
+
+  eslint-plugin-playwright@2.10.2:
+    resolution: {integrity: sha512-0N+2OWc3NZbOZ0gK8mp2TK6Qu3UWcJTQ9rqU0UM2yRJXgT758pvpY0lsOLIySfbyFrLqn3TcXjixbmcK90VnuQ==}
+    engines: {node: '>=16.9.0'}
+    peerDependencies:
+      eslint: '>=8.40.0'
+
+  eslint-scope@8.4.0:
+    resolution: {integrity: sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  eslint-visitor-keys@3.4.3:
+    resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  eslint-visitor-keys@4.2.1:
+    resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  eslint-visitor-keys@5.0.1:
+    resolution: {integrity: sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+
+  eslint@9.39.4:
+    resolution: {integrity: sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    hasBin: true
+    peerDependencies:
+      jiti: '*'
+    peerDependenciesMeta:
+      jiti:
+        optional: true
+
+  espree@10.4.0:
+    resolution: {integrity: sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  esquery@1.7.0:
+    resolution: {integrity: sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==}
+    engines: {node: '>=0.10'}
+
+  esrecurse@4.3.0:
+    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
+    engines: {node: '>=4.0'}
+
+  estraverse@5.3.0:
+    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
+    engines: {node: '>=4.0'}
+
+  esutils@2.0.3:
+    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
+    engines: {node: '>=0.10.0'}
+
+  fast-deep-equal@3.1.3:
+    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
+
+  fast-json-stable-stringify@2.1.0:
+    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
+
+  fast-levenshtein@2.0.6:
+    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
+
+  fast-uri@3.1.0:
+    resolution: {integrity: sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==}
+
+  fdir@6.5.0:
+    resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==}
+    engines: {node: '>=12.0.0'}
+    peerDependencies:
+      picomatch: ^3 || ^4
+    peerDependenciesMeta:
+      picomatch:
+        optional: true
+
+  file-entry-cache@8.0.0:
+    resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==}
+    engines: {node: '>=16.0.0'}
+
+  find-up@5.0.0:
+    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
+    engines: {node: '>=10'}
+
+  flat-cache@4.0.1:
+    resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==}
+    engines: {node: '>=16'}
+
+  flatted@3.4.2:
+    resolution: {integrity: sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==}
+
+  fsevents@2.3.2:
+    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+
+  genson-js@0.0.8:
+    resolution: {integrity: sha512-4NUusDTwF+lzYh72uKV+Uvpky9iPO+YDIMpGImA5pbHfLV9HwgRCA4hYjGu78V4J4Cx2IZRTFfRERn9aUs74mw==}
+
+  glob-parent@6.0.2:
+    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
+    engines: {node: '>=10.13.0'}
+
+  globals@14.0.0:
+    resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==}
+    engines: {node: '>=18'}
+
+  globals@17.5.0:
+    resolution: {integrity: sha512-qoV+HK2yFl/366t2/Cb3+xxPUo5BuMynomoDmiaZBIdbs+0pYbjfZU+twLhGKp4uCZ/+NbtpVepH5bGCxRyy2g==}
+    engines: {node: '>=18'}
+
+  has-flag@4.0.0:
+    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
+    engines: {node: '>=8'}
+
+  ignore@5.3.2:
+    resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
+    engines: {node: '>= 4'}
+
+  ignore@7.0.5:
+    resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==}
+    engines: {node: '>= 4'}
+
+  import-fresh@3.3.1:
+    resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}
+    engines: {node: '>=6'}
+
+  imurmurhash@0.1.4:
+    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
+    engines: {node: '>=0.8.19'}
+
+  is-extglob@2.1.1:
+    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
+    engines: {node: '>=0.10.0'}
+
+  is-glob@4.0.3:
+    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
+    engines: {node: '>=0.10.0'}
+
+  isexe@2.0.0:
+    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
+
+  js-yaml@4.1.1:
+    resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==}
+    hasBin: true
+
+  json-buffer@3.0.1:
+    resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
+
+  json-schema-traverse@0.4.1:
+    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
+
+  json-schema-traverse@1.0.0:
+    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
+
+  json-stable-stringify-without-jsonify@1.0.1:
+    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
+
+  keyv@4.5.4:
+    resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
+
+  levn@0.4.1:
+    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
+    engines: {node: '>= 0.8.0'}
+
+  locate-path@6.0.0:
+    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
+    engines: {node: '>=10'}
+
+  lodash.merge@4.6.2:
+    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
+
+  minimatch@10.2.5:
+    resolution: {integrity: sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==}
+    engines: {node: 18 || 20 || >=22}
+
+  minimatch@3.1.5:
+    resolution: {integrity: sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==}
+
+  ms@2.1.3:
+    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
+
+  natural-compare@1.4.0:
+    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
+
+  optionator@0.9.4:
+    resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
+    engines: {node: '>= 0.8.0'}
+
+  p-limit@3.1.0:
+    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
+    engines: {node: '>=10'}
+
+  p-locate@5.0.0:
+    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
+    engines: {node: '>=10'}
+
+  parent-module@1.0.1:
+    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
+    engines: {node: '>=6'}
+
+  path-exists@4.0.0:
+    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
+    engines: {node: '>=8'}
+
+  path-key@3.1.1:
+    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
+    engines: {node: '>=8'}
+
+  pg-cloudflare@1.3.0:
+    resolution: {integrity: sha512-6lswVVSztmHiRtD6I8hw4qP/nDm1EJbKMRhf3HCYaqud7frGysPv7FYJ5noZQdhQtN2xJnimfMtvQq21pdbzyQ==}
+
+  pg-connection-string@2.12.0:
+    resolution: {integrity: sha512-U7qg+bpswf3Cs5xLzRqbXbQl85ng0mfSV/J0nnA31MCLgvEaAo7CIhmeyrmJpOr7o+zm0rXK+hNnT5l9RHkCkQ==}
+
+  pg-int8@1.0.1:
+    resolution: {integrity: sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==}
+    engines: {node: '>=4.0.0'}
+
+  pg-pool@3.13.0:
+    resolution: {integrity: sha512-gB+R+Xud1gLFuRD/QgOIgGOBE2KCQPaPwkzBBGC9oG69pHTkhQeIuejVIk3/cnDyX39av2AxomQiyPT13WKHQA==}
+    peerDependencies:
+      pg: '>=8.0'
+
+  pg-protocol@1.13.0:
+    resolution: {integrity: sha512-zzdvXfS6v89r6v7OcFCHfHlyG/wvry1ALxZo4LqgUoy7W9xhBDMaqOuMiF3qEV45VqsN6rdlcehHrfDtlCPc8w==}
+
+  pg-types@2.2.0:
+    resolution: {integrity: sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==}
+    engines: {node: '>=4'}
+
+  pg@8.20.0:
+    resolution: {integrity: sha512-ldhMxz2r8fl/6QkXnBD3CR9/xg694oT6DZQ2s6c/RI28OjtSOpxnPrUCGOBJ46RCUxcWdx3p6kw/xnDHjKvaRA==}
+    engines: {node: '>= 16.0.0'}
+    peerDependencies:
+      pg-native: '>=3.0.1'
+    peerDependenciesMeta:
+      pg-native:
+        optional: true
+
+  pgpass@1.0.5:
+    resolution: {integrity: sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==}
+
+  picomatch@4.0.4:
+    resolution: {integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==}
+    engines: {node: '>=12'}
+
+  playwright-core@1.58.0-alpha-1763757971000:
+    resolution: {integrity: sha512-4nN53aSvtlz05uFtHn4+PABtZba8Z+jJKLRbPF0+mmoLfD2n9hAGZbvvrVy+iKmoUEvsHbKOBZCJ2NlKjIzZ9w==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  playwright-core@1.59.1:
+    resolution: {integrity: sha512-HBV/RJg81z5BiiZ9yPzIiClYV/QMsDCKUyogwH9p3MCP6IYjUFu/MActgYAvK0oWyV9NlwM3GLBjADyWgydVyg==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  playwright@1.58.0-alpha-1763757971000:
+    resolution: {integrity: sha512-Ck2UJWEaHULTN2hSjdcCpYF3wd5R8gde3IGRhms8Fb9YpqKHRiAzQqnlmouPlSh5pF+Mg9aZTtrtjq3NeIiXkQ==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  playwright@1.59.1:
+    resolution: {integrity: sha512-C8oWjPR3F81yljW9o5OxcWzfh6avkVwDD2VYdwIGqTkl+OGFISgypqzfu7dOe4QNLL2aqcWBmI3PMtLIK233lw==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  postgres-array@2.0.0:
+    resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==}
+    engines: {node: '>=4'}
+
+  postgres-bytea@1.0.1:
+    resolution: {integrity: sha512-5+5HqXnsZPE65IJZSMkZtURARZelel2oXUEO8rH83VS/hxH5vv1uHquPg5wZs8yMAfdv971IU+kcPUczi7NVBQ==}
+    engines: {node: '>=0.10.0'}
+
+  postgres-date@1.0.7:
+    resolution: {integrity: sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==}
+    engines: {node: '>=0.10.0'}
+
+  postgres-interval@1.2.0:
+    resolution: {integrity: sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==}
+    engines: {node: '>=0.10.0'}
+
+  prelude-ls@1.2.1:
+    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
+    engines: {node: '>= 0.8.0'}
+
+  punycode@2.3.1:
+    resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
+    engines: {node: '>=6'}
+
+  require-from-string@2.0.2:
+    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
+    engines: {node: '>=0.10.0'}
+
+  resolve-from@4.0.0:
+    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
+    engines: {node: '>=4'}
+
+  semver@7.7.4:
+    resolution: {integrity: sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  shebang-command@2.0.0:
+    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
+    engines: {node: '>=8'}
+
+  shebang-regex@3.0.0:
+    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
+    engines: {node: '>=8'}
+
+  split2@4.2.0:
+    resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}
+    engines: {node: '>= 10.x'}
+
+  strip-json-comments@3.1.1:
+    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
+    engines: {node: '>=8'}
+
+  supports-color@7.2.0:
+    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
+    engines: {node: '>=8'}
+
+  tinyglobby@0.2.16:
+    resolution: {integrity: sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==}
+    engines: {node: '>=12.0.0'}
+
+  ts-api-utils@2.5.0:
+    resolution: {integrity: sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==}
+    engines: {node: '>=18.12'}
+    peerDependencies:
+      typescript: '>=4.8.4'
+
+  type-check@0.4.0:
+    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
+    engines: {node: '>= 0.8.0'}
+
+  typescript-eslint@8.59.1:
+    resolution: {integrity: sha512-xqDcFVBmlrltH64lklOVp1wYxgJr6LVdg3NamBgH2OOQDLFdTKfIZXF5PfghrnXQKXZGTQs8tr1vL7fJvq8CTQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
+
+  typescript@6.0.3:
+    resolution: {integrity: sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+
+  undici-types@7.16.0:
+    resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==}
+
+  uri-js@4.4.1:
+    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
+
+  uuid@13.0.0:
+    resolution: {integrity: sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==}
+    hasBin: true
+
+  which@2.0.2:
+    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
+    engines: {node: '>= 8'}
+    hasBin: true
+
+  word-wrap@1.2.5:
+    resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
+    engines: {node: '>=0.10.0'}
+
+  xtend@4.0.2:
+    resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
+    engines: {node: '>=0.4'}
+
+  yocto-queue@0.1.0:
+    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
+    engines: {node: '>=10'}
+
+snapshots:
+
+  '@eslint-community/eslint-utils@4.9.1(eslint@9.39.4)':
+    dependencies:
+      eslint: 9.39.4
+      eslint-visitor-keys: 3.4.3
+
+  '@eslint-community/regexpp@4.12.2': {}
+
+  '@eslint/config-array@0.21.2':
+    dependencies:
+      '@eslint/object-schema': 2.1.7
+      debug: 4.4.3
+      minimatch: 3.1.5
+    transitivePeerDependencies:
+      - supports-color
+
+  '@eslint/config-helpers@0.4.2':
+    dependencies:
+      '@eslint/core': 0.17.0
+
+  '@eslint/core@0.17.0':
+    dependencies:
+      '@types/json-schema': 7.0.15
+
+  '@eslint/eslintrc@3.3.5':
+    dependencies:
+      ajv: 6.15.0
+      debug: 4.4.3
+      espree: 10.4.0
+      globals: 14.0.0
+      ignore: 5.3.2
+      import-fresh: 3.3.1
+      js-yaml: 4.1.1
+      minimatch: 3.1.5
+      strip-json-comments: 3.1.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@eslint/js@9.39.4': {}
+
+  '@eslint/object-schema@2.1.7': {}
+
+  '@eslint/plugin-kit@0.4.1':
+    dependencies:
+      '@eslint/core': 0.17.0
+      levn: 0.4.1
+
+  '@faker-js/faker@9.9.0': {}
+
+  '@humanfs/core@0.19.2':
+    dependencies:
+      '@humanfs/types': 0.15.0
+
+  '@humanfs/node@0.16.8':
+    dependencies:
+      '@humanfs/core': 0.19.2
+      '@humanfs/types': 0.15.0
+      '@humanwhocodes/retry': 0.4.3
+
+  '@humanfs/types@0.15.0': {}
+
+  '@humanwhocodes/module-importer@1.0.1': {}
+
+  '@humanwhocodes/retry@0.4.3': {}
+
+  '@playwright/mcp@0.0.48':
+    dependencies:
+      playwright: 1.58.0-alpha-1763757971000
+      playwright-core: 1.58.0-alpha-1763757971000
+
+  '@playwright/test@1.59.1':
+    dependencies:
+      playwright: 1.59.1
+
+  '@types/estree@1.0.8': {}
+
+  '@types/json-schema@7.0.15': {}
+
+  '@types/node@24.12.2':
+    dependencies:
+      undici-types: 7.16.0
+
+  '@types/uuid@10.0.0': {}
+
+  '@typescript-eslint/eslint-plugin@8.59.1(@typescript-eslint/parser@8.59.1(eslint@9.39.4)(typescript@6.0.3))(eslint@9.39.4)(typescript@6.0.3)':
+    dependencies:
+      '@eslint-community/regexpp': 4.12.2
+      '@typescript-eslint/parser': 8.59.1(eslint@9.39.4)(typescript@6.0.3)
+      '@typescript-eslint/scope-manager': 8.59.1
+      '@typescript-eslint/type-utils': 8.59.1(eslint@9.39.4)(typescript@6.0.3)
+      '@typescript-eslint/utils': 8.59.1(eslint@9.39.4)(typescript@6.0.3)
+      '@typescript-eslint/visitor-keys': 8.59.1
+      eslint: 9.39.4
+      ignore: 7.0.5
+      natural-compare: 1.4.0
+      ts-api-utils: 2.5.0(typescript@6.0.3)
+      typescript: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/parser@8.59.1(eslint@9.39.4)(typescript@6.0.3)':
+    dependencies:
+      '@typescript-eslint/scope-manager': 8.59.1
+      '@typescript-eslint/types': 8.59.1
+      '@typescript-eslint/typescript-estree': 8.59.1(typescript@6.0.3)
+      '@typescript-eslint/visitor-keys': 8.59.1
+      debug: 4.4.3
+      eslint: 9.39.4
+      typescript: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/project-service@8.59.1(typescript@6.0.3)':
+    dependencies:
+      '@typescript-eslint/tsconfig-utils': 8.59.1(typescript@6.0.3)
+      '@typescript-eslint/types': 8.59.1
+      debug: 4.4.3
+      typescript: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/scope-manager@8.59.1':
+    dependencies:
+      '@typescript-eslint/types': 8.59.1
+      '@typescript-eslint/visitor-keys': 8.59.1
+
+  '@typescript-eslint/tsconfig-utils@8.59.1(typescript@6.0.3)':
+    dependencies:
+      typescript: 6.0.3
+
+  '@typescript-eslint/type-utils@8.59.1(eslint@9.39.4)(typescript@6.0.3)':
+    dependencies:
+      '@typescript-eslint/types': 8.59.1
+      '@typescript-eslint/typescript-estree': 8.59.1(typescript@6.0.3)
+      '@typescript-eslint/utils': 8.59.1(eslint@9.39.4)(typescript@6.0.3)
+      debug: 4.4.3
+      eslint: 9.39.4
+      ts-api-utils: 2.5.0(typescript@6.0.3)
+      typescript: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/types@8.59.1': {}
+
+  '@typescript-eslint/typescript-estree@8.59.1(typescript@6.0.3)':
+    dependencies:
+      '@typescript-eslint/project-service': 8.59.1(typescript@6.0.3)
+      '@typescript-eslint/tsconfig-utils': 8.59.1(typescript@6.0.3)
+      '@typescript-eslint/types': 8.59.1
+      '@typescript-eslint/visitor-keys': 8.59.1
+      debug: 4.4.3
+      minimatch: 10.2.5
+      semver: 7.7.4
+      tinyglobby: 0.2.16
+      ts-api-utils: 2.5.0(typescript@6.0.3)
+      typescript: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/utils@8.59.1(eslint@9.39.4)(typescript@6.0.3)':
+    dependencies:
+      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.4)
+      '@typescript-eslint/scope-manager': 8.59.1
+      '@typescript-eslint/types': 8.59.1
+      '@typescript-eslint/typescript-estree': 8.59.1(typescript@6.0.3)
+      eslint: 9.39.4
+      typescript: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/visitor-keys@8.59.1':
+    dependencies:
+      '@typescript-eslint/types': 8.59.1
+      eslint-visitor-keys: 5.0.1
+
+  acorn-jsx@5.3.2(acorn@8.16.0):
+    dependencies:
+      acorn: 8.16.0
+
+  acorn@8.16.0: {}
+
+  ajv-formats@3.0.1(ajv@8.20.0):
+    optionalDependencies:
+      ajv: 8.20.0
+
+  ajv@6.15.0:
+    dependencies:
+      fast-deep-equal: 3.1.3
+      fast-json-stable-stringify: 2.1.0
+      json-schema-traverse: 0.4.1
+      uri-js: 4.4.1
+
+  ajv@8.20.0:
+    dependencies:
+      fast-deep-equal: 3.1.3
+      fast-uri: 3.1.0
+      json-schema-traverse: 1.0.0
+      require-from-string: 2.0.2
+
+  ansi-styles@4.3.0:
+    dependencies:
+      color-convert: 2.0.1
+
+  argparse@2.0.1: {}
+
+  balanced-match@1.0.2: {}
+
+  balanced-match@4.0.4: {}
+
+  brace-expansion@1.1.14:
+    dependencies:
+      balanced-match: 1.0.2
+      concat-map: 0.0.1
+
+  brace-expansion@5.0.5:
+    dependencies:
+      balanced-match: 4.0.4
+
+  callsites@3.1.0: {}
+
+  chalk@4.1.2:
+    dependencies:
+      ansi-styles: 4.3.0
+      supports-color: 7.2.0
+
+  color-convert@2.0.1:
+    dependencies:
+      color-name: 1.1.4
+
+  color-name@1.1.4: {}
+
+  concat-map@0.0.1: {}
+
+  cross-spawn@7.0.6:
+    dependencies:
+      path-key: 3.1.1
+      shebang-command: 2.0.0
+      which: 2.0.2
+
+  debug@4.4.3:
+    dependencies:
+      ms: 2.1.3
+
+  deep-is@0.1.4: {}
+
+  dotenv@17.4.2: {}
+
+  escape-string-regexp@4.0.0: {}
+
+  eslint-plugin-playwright@2.10.2(eslint@9.39.4):
+    dependencies:
+      eslint: 9.39.4
+      globals: 17.5.0
+
+  eslint-scope@8.4.0:
+    dependencies:
+      esrecurse: 4.3.0
+      estraverse: 5.3.0
+
+  eslint-visitor-keys@3.4.3: {}
+
+  eslint-visitor-keys@4.2.1: {}
+
+  eslint-visitor-keys@5.0.1: {}
+
+  eslint@9.39.4:
+    dependencies:
+      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.4)
+      '@eslint-community/regexpp': 4.12.2
+      '@eslint/config-array': 0.21.2
+      '@eslint/config-helpers': 0.4.2
+      '@eslint/core': 0.17.0
+      '@eslint/eslintrc': 3.3.5
+      '@eslint/js': 9.39.4
+      '@eslint/plugin-kit': 0.4.1
+      '@humanfs/node': 0.16.8
+      '@humanwhocodes/module-importer': 1.0.1
+      '@humanwhocodes/retry': 0.4.3
+      '@types/estree': 1.0.8
+      ajv: 6.15.0
+      chalk: 4.1.2
+      cross-spawn: 7.0.6
+      debug: 4.4.3
+      escape-string-regexp: 4.0.0
+      eslint-scope: 8.4.0
+      eslint-visitor-keys: 4.2.1
+      espree: 10.4.0
+      esquery: 1.7.0
+      esutils: 2.0.3
+      fast-deep-equal: 3.1.3
+      file-entry-cache: 8.0.0
+      find-up: 5.0.0
+      glob-parent: 6.0.2
+      ignore: 5.3.2
+      imurmurhash: 0.1.4
+      is-glob: 4.0.3
+      json-stable-stringify-without-jsonify: 1.0.1
+      lodash.merge: 4.6.2
+      minimatch: 3.1.5
+      natural-compare: 1.4.0
+      optionator: 0.9.4
+    transitivePeerDependencies:
+      - supports-color
+
+  espree@10.4.0:
+    dependencies:
+      acorn: 8.16.0
+      acorn-jsx: 5.3.2(acorn@8.16.0)
+      eslint-visitor-keys: 4.2.1
+
+  esquery@1.7.0:
+    dependencies:
+      estraverse: 5.3.0
+
+  esrecurse@4.3.0:
+    dependencies:
+      estraverse: 5.3.0
+
+  estraverse@5.3.0: {}
+
+  esutils@2.0.3: {}
+
+  fast-deep-equal@3.1.3: {}
+
+  fast-json-stable-stringify@2.1.0: {}
+
+  fast-levenshtein@2.0.6: {}
+
+  fast-uri@3.1.0: {}
+
+  fdir@6.5.0(picomatch@4.0.4):
+    optionalDependencies:
+      picomatch: 4.0.4
+
+  file-entry-cache@8.0.0:
+    dependencies:
+      flat-cache: 4.0.1
+
+  find-up@5.0.0:
+    dependencies:
+      locate-path: 6.0.0
+      path-exists: 4.0.0
+
+  flat-cache@4.0.1:
+    dependencies:
+      flatted: 3.4.2
+      keyv: 4.5.4
+
+  flatted@3.4.2: {}
+
+  fsevents@2.3.2:
+    optional: true
+
+  genson-js@0.0.8: {}
+
+  glob-parent@6.0.2:
+    dependencies:
+      is-glob: 4.0.3
+
+  globals@14.0.0: {}
+
+  globals@17.5.0: {}
+
+  has-flag@4.0.0: {}
+
+  ignore@5.3.2: {}
+
+  ignore@7.0.5: {}
+
+  import-fresh@3.3.1:
+    dependencies:
+      parent-module: 1.0.1
+      resolve-from: 4.0.0
+
+  imurmurhash@0.1.4: {}
+
+  is-extglob@2.1.1: {}
+
+  is-glob@4.0.3:
+    dependencies:
+      is-extglob: 2.1.1
+
+  isexe@2.0.0: {}
+
+  js-yaml@4.1.1:
+    dependencies:
+      argparse: 2.0.1
+
+  json-buffer@3.0.1: {}
+
+  json-schema-traverse@0.4.1: {}
+
+  json-schema-traverse@1.0.0: {}
+
+  json-stable-stringify-without-jsonify@1.0.1: {}
+
+  keyv@4.5.4:
+    dependencies:
+      json-buffer: 3.0.1
+
+  levn@0.4.1:
+    dependencies:
+      prelude-ls: 1.2.1
+      type-check: 0.4.0
+
+  locate-path@6.0.0:
+    dependencies:
+      p-locate: 5.0.0
+
+  lodash.merge@4.6.2: {}
+
+  minimatch@10.2.5:
+    dependencies:
+      brace-expansion: 5.0.5
+
+  minimatch@3.1.5:
+    dependencies:
+      brace-expansion: 1.1.14
+
+  ms@2.1.3: {}
+
+  natural-compare@1.4.0: {}
+
+  optionator@0.9.4:
+    dependencies:
+      deep-is: 0.1.4
+      fast-levenshtein: 2.0.6
+      levn: 0.4.1
+      prelude-ls: 1.2.1
+      type-check: 0.4.0
+      word-wrap: 1.2.5
+
+  p-limit@3.1.0:
+    dependencies:
+      yocto-queue: 0.1.0
+
+  p-locate@5.0.0:
+    dependencies:
+      p-limit: 3.1.0
+
+  parent-module@1.0.1:
+    dependencies:
+      callsites: 3.1.0
+
+  path-exists@4.0.0: {}
+
+  path-key@3.1.1: {}
+
+  pg-cloudflare@1.3.0:
+    optional: true
+
+  pg-connection-string@2.12.0: {}
+
+  pg-int8@1.0.1: {}
+
+  pg-pool@3.13.0(pg@8.20.0):
+    dependencies:
+      pg: 8.20.0
+
+  pg-protocol@1.13.0: {}
+
+  pg-types@2.2.0:
+    dependencies:
+      pg-int8: 1.0.1
+      postgres-array: 2.0.0
+      postgres-bytea: 1.0.1
+      postgres-date: 1.0.7
+      postgres-interval: 1.2.0
+
+  pg@8.20.0:
+    dependencies:
+      pg-connection-string: 2.12.0
+      pg-pool: 3.13.0(pg@8.20.0)
+      pg-protocol: 1.13.0
+      pg-types: 2.2.0
+      pgpass: 1.0.5
+    optionalDependencies:
+      pg-cloudflare: 1.3.0
+
+  pgpass@1.0.5:
+    dependencies:
+      split2: 4.2.0
+
+  picomatch@4.0.4: {}
+
+  playwright-core@1.58.0-alpha-1763757971000: {}
+
+  playwright-core@1.59.1: {}
+
+  playwright@1.58.0-alpha-1763757971000:
+    dependencies:
+      playwright-core: 1.58.0-alpha-1763757971000
+    optionalDependencies:
+      fsevents: 2.3.2
+
+  playwright@1.59.1:
+    dependencies:
+      playwright-core: 1.59.1
+    optionalDependencies:
+      fsevents: 2.3.2
+
+  postgres-array@2.0.0: {}
+
+  postgres-bytea@1.0.1: {}
+
+  postgres-date@1.0.7: {}
+
+  postgres-interval@1.2.0:
+    dependencies:
+      xtend: 4.0.2
+
+  prelude-ls@1.2.1: {}
+
+  punycode@2.3.1: {}
+
+  require-from-string@2.0.2: {}
+
+  resolve-from@4.0.0: {}
+
+  semver@7.7.4: {}
+
+  shebang-command@2.0.0:
+    dependencies:
+      shebang-regex: 3.0.0
+
+  shebang-regex@3.0.0: {}
+
+  split2@4.2.0: {}
+
+  strip-json-comments@3.1.1: {}
+
+  supports-color@7.2.0:
+    dependencies:
+      has-flag: 4.0.0
+
+  tinyglobby@0.2.16:
+    dependencies:
+      fdir: 6.5.0(picomatch@4.0.4)
+      picomatch: 4.0.4
+
+  ts-api-utils@2.5.0(typescript@6.0.3):
+    dependencies:
+      typescript: 6.0.3
+
+  type-check@0.4.0:
+    dependencies:
+      prelude-ls: 1.2.1
+
+  typescript-eslint@8.59.1(eslint@9.39.4)(typescript@6.0.3):
+    dependencies:
+      '@typescript-eslint/eslint-plugin': 8.59.1(@typescript-eslint/parser@8.59.1(eslint@9.39.4)(typescript@6.0.3))(eslint@9.39.4)(typescript@6.0.3)
+      '@typescript-eslint/parser': 8.59.1(eslint@9.39.4)(typescript@6.0.3)
+      '@typescript-eslint/typescript-estree': 8.59.1(typescript@6.0.3)
+      '@typescript-eslint/utils': 8.59.1(eslint@9.39.4)(typescript@6.0.3)
+      eslint: 9.39.4
+      typescript: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  typescript@6.0.3: {}
+
+  undici-types@7.16.0: {}
+
+  uri-js@4.4.1:
+    dependencies:
+      punycode: 2.3.1
+
+  uuid@13.0.0: {}
+
+  which@2.0.2:
+    dependencies:
+      isexe: 2.0.0
+
+  word-wrap@1.2.5: {}
+
+  xtend@4.0.2: {}
+
+  yocto-queue@0.1.0: {}
diff --git a/tests/playwright/tests/e2e/ui/login-flow-ui-validation.spec.ts b/tests/playwright/tests/e2e/ui/login-flow-ui-validation.spec.ts
new file mode 100644
index 000000000..1b732726a
--- /dev/null
+++ b/tests/playwright/tests/e2e/ui/login-flow-ui-validation.spec.ts
@@ -0,0 +1,65 @@
+import { test, expect } from '@playwright/test';
+import { Login } from '@components/ui';
+
+const TEST_EMAIL = process.env.TEST_USER_EMAIL || 'admin@chatwoot.com';
+const TEST_PASSWORD = process.env.TEST_USER_PASSWORD || 'Password123@#';
+const INVALID_PASSWORD = 'Password';
+
+test.describe('Login page', () => {
+  let loginComponent: Login;
+
+  test.beforeEach(async ({ page }) => {
+    loginComponent = new Login(page);
+    await loginComponent.navigate();
+  });
+
+  test('should allow user to login with valid credentials', async ({
+    page,
+  }) => {
+    await loginComponent.login(TEST_EMAIL, TEST_PASSWORD);
+    await expect(page).toHaveURL(/\/app\/accounts\/\d+\/dashboard/);
+  });
+
+  test('renders all critical components', async ({ page }) => {
+    await expect(page).toHaveTitle('Chatwoot');
+    await expect(loginComponent.getLoginHeading()).toBeVisible();
+
+    const emailInput = loginComponent.getEmailInput();
+    await expect(emailInput).toBeVisible();
+    await expect(emailInput).toHaveAttribute('name', 'email_address');
+    await expect(page.getByText('Email')).toBeVisible();
+
+    const passwordInput = loginComponent.getPasswordInput();
+    await expect(passwordInput).toBeVisible();
+    await expect(passwordInput).toHaveAttribute('type', 'password');
+    await expect(page.getByText('PasswordForgot your password?')).toBeVisible();
+
+    const togglePasswordButton = page.getByRole('button', {
+      name: 'Show password',
+    });
+    await expect(togglePasswordButton).toBeVisible();
+    await expect(togglePasswordButton).toHaveAttribute('type', 'button');
+    await expect(togglePasswordButton.locator('.i-lucide-eye')).toBeVisible();
+
+    const forgotPasswordLink = loginComponent.getForgotPasswordLink();
+    await expect(forgotPasswordLink).toBeVisible();
+    await expect(forgotPasswordLink).toHaveAttribute(
+      'href',
+      '/app/auth/reset/password'
+    );
+
+    const loginButton = loginComponent.getLoginButton();
+    await expect(loginButton).toBeVisible();
+    await expect(loginButton).toHaveAttribute('type', 'submit');
+  });
+
+  test('should show error for invalid password', async ({ page }) => {
+    await loginComponent.login(TEST_EMAIL, INVALID_PASSWORD);
+
+    await expect(
+      page.getByText('Invalid login credentials. Please try again.')
+    ).toBeVisible();
+
+    await expect(page).toHaveURL(/\/app\/login/);
+  });
+});
diff --git a/tests/playwright/tsconfig.json b/tests/playwright/tsconfig.json
new file mode 100644
index 000000000..e4bb2f8d4
--- /dev/null
+++ b/tests/playwright/tsconfig.json
@@ -0,0 +1,25 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "resolveJsonModule": true,
+    "outDir": "./dist",
+    "rootDir": ".",
+    "baseUrl": ".",
+    "paths": {
+      "@components/*": ["components/*"],
+      "@utils/*": ["utils/*"],
+      "@fixtures/*": ["fixtures/*"],
+      "@helpers/*": ["helpers/*"],
+      "@tests/*": ["tests/*"]
+    },
+    "types": ["node", "@playwright/test"]
+  },
+  "include": ["**/*.ts"],
+  "exclude": ["node_modules"]
+}
diff --git a/theme/icons.js b/theme/icons.js
index 18d6c47f3..8a29e2bda 100644
--- a/theme/icons.js
+++ b/theme/icons.js
@@ -418,5 +418,10 @@ export const icons = {
 		</g>
 	</g>`,
   },
+  'onboarding-greeting': {
+    body: `<path d="M8.00008 14.0007C8.73646 14.0007 9.33341 13.4037 9.33341 12.6673C9.33341 11.9309 8.73646 11.334 8.00008 11.334C7.2637 11.334 6.66675 11.9309 6.66675 12.6673C6.66675 13.4037 7.2637 14.0007 8.00008 14.0007Z" fill="none" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/><path d="M8.00008 4.66667C8.73646 4.66667 9.33341 4.06971 9.33341 3.33333C9.33341 2.59695 8.73646 2 8.00008 2C7.2637 2 6.66675 2.59695 6.66675 3.33333C6.66675 4.06971 7.2637 4.66667 8.00008 4.66667Z" fill="none" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/><path d="M10.6666 9.33268C11.403 9.33268 11.9999 8.73573 11.9999 7.99935C11.9999 7.26297 11.403 6.66602 10.6666 6.66602C9.93021 6.66602 9.33325 7.26297 9.33325 7.99935C9.33325 8.73573 9.93021 9.33268 10.6666 9.33268Z" fill="none" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/><path d="M13.3333 14.0007C14.0697 14.0007 14.6667 13.4037 14.6667 12.6673C14.6667 11.9309 14.0697 11.334 13.3333 11.334C12.597 11.334 12 11.9309 12 12.6673C12 13.4037 12.597 14.0007 13.3333 14.0007Z" fill="none" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/><path d="M2.66659 14.0007C3.40297 14.0007 3.99992 13.4037 3.99992 12.6673C3.99992 11.9309 3.40297 11.334 2.66659 11.334C1.93021 11.334 1.33325 11.9309 1.33325 12.6673C1.33325 13.4037 1.93021 14.0007 2.66659 14.0007Z" fill="none" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/><path d="M5.33333 9.33268C6.06971 9.33268 6.66667 8.73573 6.66667 7.99935C6.66667 7.26297 6.06971 6.66602 5.33333 6.66602C4.59695 6.66602 4 7.26297 4 7.99935C4 8.73573 4.59695 9.33268 5.33333 9.33268Z" fill="none" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>`,
+    width: 16,
+    height: 16,
+  },
   /** Ends */
 };