Merge branch 'develop' into feat/captain-credit-usage

VERSION_CW

@@ -1 +1 @@
-4.16.1
+4.16.0

app/builders/agent_builder.rb

@@ -2,14 +2,6 @@
 # It initializes with necessary attributes and provides a perform method
 # to create a user and account user in a transaction.
 class AgentBuilder
-  LIMIT_EXCEEDED_MESSAGE = 'Account limit exceeded. Please purchase more licenses'.freeze
-
-  class LimitExceededError < StandardError
-    def initialize
-      super(AgentBuilder::LIMIT_EXCEEDED_MESSAGE)
-    end
-  end
-
   # Initializes an AgentBuilder with necessary attributes.
   # @param email [String] the email of the user.
   # @param name [String] the name of the user.
@@ -22,23 +14,15 @@ class AgentBuilder
   # Creates a user and account user in a transaction.
   # @return [User] the created user.
   def perform
-    account.with_lock do
-      raise LimitExceededError unless can_add_agent?
-
-      ActiveRecord::Base.transaction do
-        @user = find_or_create_user
-        create_account_user
-      end
+    ActiveRecord::Base.transaction do
+      @user = find_or_create_user
+      create_account_user
     end
     @user
   end
 
   private
 
-  def can_add_agent?
-    account.usage_limits[:agents] > account.account_users.count
-  end
-
   # Finds a user by email or creates a new one with a temporary password.
   # @return [User] the found or created user.
   def find_or_create_user

app/controllers/api/v1/accounts/agents_controller.rb

@@ -1,6 +1,8 @@
 class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
   before_action :fetch_agent, except: [:create, :index, :bulk_create]
   before_action :check_authorization
+  before_action :validate_limit, only: [:create]
+  before_action :validate_limit_for_bulk_create, only: [:bulk_create]
 
   def index
     @agents = agents
@@ -18,8 +20,6 @@ class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
     )
 
     @agent = builder.perform
-  rescue AgentBuilder::LimitExceededError => e
-    render_payment_required(e.message)
   end
 
   def update
@@ -36,13 +36,25 @@ class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
   def bulk_create
     emails = params[:emails]
 
-    bulk_create_agents(emails)
+    emails.each do |email|
+      builder = AgentBuilder.new(
+        email: email,
+        name: email.split('@').first,
+        inviter: current_user,
+        account: Current.account
+      )
+      begin
+        builder.perform
+      rescue ActiveRecord::RecordInvalid => e
+        Rails.logger.info "[Agent#bulk_create] ignoring email #{email}, errors: #{e.record.errors}"
+      end
+    end
+
     # This endpoint is used to bulk create agents during onboarding
     # onboarding_step key in present in Current account custom attributes, since this is a one time operation
-    clear_onboarding_step
+    Current.account.custom_attributes.delete('onboarding_step')
+    Current.account.save!
     head :ok
-  rescue AgentBuilder::LimitExceededError => e
-    render_payment_required(e.message)
   end
 
   private
@@ -75,33 +87,22 @@ class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
     @agents ||= Current.account.users.order_by_full_name.includes(:account_users, { avatar_attachment: [:blob] })
   end
 
-  def bulk_create_agents(emails)
-    Current.account.with_lock do
-      raise AgentBuilder::LimitExceededError if emails.count > available_agent_count
+  def validate_limit_for_bulk_create
+    limit_available = params[:emails].count <= available_agent_count
 
-      emails.each { |email| create_agent_from_email(email) }
-    end
+    render_payment_required('Account limit exceeded. Please purchase more licenses') unless limit_available
   end
 
-  def create_agent_from_email(email)
-    builder = AgentBuilder.new(
-      email: email,
-      name: email.split('@').first,
-      inviter: current_user,
-      account: Current.account
-    )
-    builder.perform
-  rescue ActiveRecord::RecordInvalid => e
-    Rails.logger.info "[Agent#bulk_create] ignoring email #{email}, errors: #{e.record.errors}"
-  end
-
-  def clear_onboarding_step
-    Current.account.custom_attributes.delete('onboarding_step')
-    Current.account.save!
+  def validate_limit
+    render_payment_required('Account limit exceeded. Please purchase more licenses') unless can_add_agent?
   end
 
   def available_agent_count
-    Current.account.usage_limits[:agents] - Current.account.account_users.count
+    Current.account.usage_limits[:agents] - agents.count
+  end
+
+  def can_add_agent?
+    available_agent_count.positive?
   end
 
   def delete_user_record(agent)

app/controllers/api/v1/accounts/integrations/base_controller.rb

@@ -1,9 +0,0 @@
-class Api::V1::Accounts::Integrations::BaseController < Api::V1::Accounts::BaseController
-  private
-
-  # Managing an integration hook (create/update/destroy) is admin-only, enforced via HookPolicy.
-  # Subclasses opt in per action with `before_action :check_authorization, only: [...]`.
-  def check_authorization
-    authorize(:hook)
-  end
-end

app/controllers/api/v1/accounts/integrations/hooks_controller.rb

@@ -1,4 +1,4 @@
-class Api::V1::Accounts::Integrations::HooksController < Api::V1::Accounts::Integrations::BaseController
+class Api::V1::Accounts::Integrations::HooksController < Api::V1::Accounts::BaseController
   before_action :fetch_hook, except: [:create]
   before_action :check_authorization
 
@@ -35,6 +35,10 @@ class Api::V1::Accounts::Integrations::HooksController < Api::V1::Accounts::Inte
     @hook = Current.account.hooks.find(params[:id])
   end
 
+  def check_authorization
+    authorize(:hook)
+  end
+
   def permitted_params
     params.require(:hook).permit(:app_id, :inbox_id, :status, settings: {})
   end

app/controllers/api/v1/accounts/integrations/linear_controller.rb

@@ -1,7 +1,6 @@
-class Api::V1::Accounts::Integrations::LinearController < Api::V1::Accounts::Integrations::BaseController
+class Api::V1::Accounts::Integrations::LinearController < Api::V1::Accounts::BaseController
   before_action :fetch_conversation, only: [:create_issue, :link_issue, :unlink_issue, :linked_issues]
   before_action :fetch_hook, only: [:destroy]
-  before_action :check_authorization, only: [:destroy]
 
   def destroy
     revoke_linear_token

app/controllers/api/v1/accounts/integrations/notion_controller.rb

@@ -1,6 +1,5 @@
-class Api::V1::Accounts::Integrations::NotionController < Api::V1::Accounts::Integrations::BaseController
+class Api::V1::Accounts::Integrations::NotionController < Api::V1::Accounts::BaseController
   before_action :fetch_hook, only: [:destroy]
-  before_action :check_authorization, only: [:destroy]
 
   def destroy
     @hook.destroy!

app/controllers/api/v1/accounts/integrations/shopify_controller.rb

@@ -1,8 +1,7 @@
-class Api::V1::Accounts::Integrations::ShopifyController < Api::V1::Accounts::Integrations::BaseController
+class Api::V1::Accounts::Integrations::ShopifyController < Api::V1::Accounts::BaseController
   include Shopify::IntegrationHelper
   before_action :setup_shopify_context, only: [:orders]
   before_action :fetch_hook, except: [:auth]
-  before_action :check_authorization, only: [:destroy]
   before_action :validate_contact, only: [:orders]
 
   def auth

app/controllers/webhooks/whatsapp_controller.rb

@@ -47,10 +47,18 @@ class Webhooks::WhatsappController < ActionController::API
     metadata = params.dig(:entry, 0, :changes, 0, :value, :metadata)
     return if metadata.blank?
 
-    Whatsapp::WebhookChannelFinderService.new(
-      display_phone_number: metadata[:display_phone_number],
-      phone_number_id: metadata[:phone_number_id]
-    ).perform
+    phone_number = normalized_phone_number(metadata[:display_phone_number])
+    phone_number_id = metadata[:phone_number_id]
+    channel = Channel::Whatsapp.find_by(phone_number: phone_number)
+
+    return channel if channel && channel.provider_config['phone_number_id'] == phone_number_id
+  end
+
+  def normalized_phone_number(phone_number)
+    return if phone_number.blank?
+
+    phone_number = phone_number.to_s
+    phone_number.start_with?('+') ? phone_number : "+#{phone_number}"
   end
 
   def inactive_whatsapp_number?

app/javascript/dashboard/api/captain/assistant.js

@@ -26,20 +26,13 @@ class CaptainAssistant extends ApiClient {
     });
   }
 
-  getMetrics({ assistantId, range, signal }) {
+  getStats({ assistantId, range, signal }) {
     const requestConfig = {
       params: { range, timezone_offset: getTimezoneOffset() },
     };
     if (signal) requestConfig.signal = signal;
 
-    return axios.get(`${this.url}/${assistantId}/metrics`, requestConfig);
-  }
-
-  getFaqStats({ assistantId, signal }) {
-    const requestConfig = {};
-    if (signal) requestConfig.signal = signal;
-
-    return axios.get(`${this.url}/${assistantId}/faq_stats`, requestConfig);
+    return axios.get(`${this.url}/${assistantId}/stats`, requestConfig);
   }
 
   getSummary({ assistantId, range, stats }) {

app/javascript/dashboard/api/captain/faqSuggestions.js

@@ -1,36 +0,0 @@
-/* global axios */
-import ApiClient from '../ApiClient';
-
-class CaptainFaqSuggestions extends ApiClient {
-  constructor() {
-    super('captain/faq_suggestions', { accountScoped: true });
-  }
-
-  get({ page = 1, search, assistantId, status = 'open', signal } = {}) {
-    return axios.get(this.url, {
-      params: {
-        page,
-        search,
-        assistant_id: assistantId,
-        status,
-      },
-      signal,
-    });
-  }
-
-  update(id, data) {
-    return axios.patch(`${this.url}/${id}`, { faq_suggestion: data });
-  }
-
-  approve(id, data) {
-    return axios.post(`${this.url}/${id}/approve`, {
-      faq_suggestion: data,
-    });
-  }
-
-  dismiss(id) {
-    return axios.post(`${this.url}/${id}/dismiss`);
-  }
-}
-
-export default new CaptainFaqSuggestions();

app/javascript/dashboard/api/captain/response.js

@@ -6,15 +6,15 @@ class CaptainResponses extends ApiClient {
     super('captain/assistant_responses', { accountScoped: true });
   }
 
-  get({ page = 1, search, assistantId, documentId, signal } = {}) {
+  get({ page = 1, search, assistantId, documentId, status } = {}) {
     return axios.get(this.url, {
       params: {
         page,
         search,
         assistant_id: assistantId,
         document_id: documentId,
+        status,
       },
-      signal,
     });
   }
 }

app/javascript/dashboard/components-next/captain/assistant/FaqSuggestionCard.vue

@@ -1,115 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { dynamicTime } from 'shared/helpers/timeHelper';
-
-import Button from 'dashboard/components-next/button/Button.vue';
-import CardLayout from 'dashboard/components-next/CardLayout.vue';
-import Icon from 'dashboard/components-next/icon/Icon.vue';
-
-const props = defineProps({
-  suggestion: {
-    type: Object,
-    required: true,
-  },
-  isLoading: {
-    type: Boolean,
-    default: false,
-  },
-});
-
-const emit = defineEmits(['approve', 'dismiss', 'review']);
-const { t } = useI18n();
-
-const sourceLabel = computed(() =>
-  t('CAPTAIN.FAQ_SUGGESTIONS.SOURCE_COUNT', {
-    count: props.suggestion.source_count,
-  })
-);
-
-const updatedAt = computed(() =>
-  dynamicTime(props.suggestion.updated_at || props.suggestion.created_at)
-);
-
-const language = computed(() =>
-  props.suggestion.language?.replace('_', '-').toUpperCase()
-);
-</script>
-
-<template>
-  <CardLayout>
-    <div
-      class="flex flex-col gap-3 sm:flex-row sm:items-start sm:justify-between"
-    >
-      <div class="min-w-0">
-        <div class="mb-2 flex flex-wrap items-center gap-2">
-          <span
-            class="inline-flex items-center gap-1.5 rounded-full bg-n-brand/10 px-2.5 py-1 text-xs font-medium text-n-blue-11"
-          >
-            <Icon icon="i-lucide-messages-square" class="size-3.5" />
-            {{ sourceLabel }}
-          </span>
-          <span
-            v-if="language"
-            class="rounded-full bg-n-alpha-2 px-2.5 py-1 text-xs font-medium text-n-slate-11"
-          >
-            {{ language }}
-          </span>
-        </div>
-        <h3 class="text-base font-medium leading-6 text-n-slate-12">
-          {{ suggestion.question }}
-        </h3>
-      </div>
-      <Button
-        :label="$t('CAPTAIN.FAQ_SUGGESTIONS.REVIEW')"
-        icon="i-lucide-list-collapse"
-        size="sm"
-        variant="faded"
-        color="slate"
-        class="shrink-0"
-        @click="emit('review', suggestion)"
-      />
-    </div>
-
-    <p class="line-clamp-2 text-sm leading-5 text-n-slate-11">
-      {{ suggestion.answer }}
-    </p>
-
-    <div
-      class="flex flex-col gap-3 border-t border-n-weak pt-2.5 sm:flex-row sm:items-center sm:justify-between"
-    >
-      <div
-        class="flex min-w-0 flex-wrap items-center gap-x-4 gap-y-2 text-xs text-n-slate-10"
-      >
-        <span class="inline-flex min-w-0 items-center gap-1.5">
-          <Icon icon="i-woot-captain" class="size-3.5 shrink-0" />
-          <span class="truncate">{{ suggestion.assistant?.name }}</span>
-        </span>
-        <span class="inline-flex items-center gap-1.5">
-          <Icon icon="i-lucide-clock-3" class="size-3.5" />
-          {{ updatedAt }}
-        </span>
-      </div>
-
-      <div class="flex items-center gap-2">
-        <Button
-          :label="$t('CAPTAIN.FAQ_SUGGESTIONS.DISMISS')"
-          icon="i-lucide-circle-x"
-          size="sm"
-          variant="ghost"
-          color="slate"
-          :disabled="isLoading"
-          @click="emit('dismiss', suggestion)"
-        />
-        <Button
-          :label="$t('CAPTAIN.FAQ_SUGGESTIONS.APPROVE')"
-          icon="i-lucide-circle-check-big"
-          size="sm"
-          :is-loading="isLoading"
-          :disabled="isLoading"
-          @click="emit('approve', suggestion)"
-        />
-      </div>
-    </div>
-  </CardLayout>
-</template>

app/javascript/dashboard/components-next/captain/pageComponents/emptyStates/ResponsePageEmptyState.vue

@@ -7,7 +7,24 @@ import ResponseCard from 'dashboard/components-next/captain/assistant/ResponseCa
 import FeatureSpotlight from 'dashboard/components-next/feature-spotlight/FeatureSpotlight.vue';
 import { responsesList } from 'dashboard/components-next/captain/pageComponents/emptyStates/captainEmptyStateContent.js';
 
-const emit = defineEmits(['click']);
+import { computed } from 'vue';
+
+const props = defineProps({
+  variant: {
+    type: String,
+    default: 'approved',
+    validator: value => ['approved', 'pending'].includes(value),
+  },
+  hasActiveFilters: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const emit = defineEmits(['click', 'clearFilters']);
+
+const isApproved = computed(() => props.variant === 'approved');
+const isPending = computed(() => props.variant === 'pending');
 
 const { isOnChatwootCloud } = useAccount();
 const { replaceInstallationName } = useBranding();
@@ -15,10 +32,15 @@ const { replaceInstallationName } = useBranding();
 const onClick = () => {
   emit('click');
 };
+
+const onClearFilters = () => {
+  emit('clearFilters');
+};
 </script>
 
 <template>
   <FeatureSpotlight
+    v-if="isApproved"
     :title="$t('CAPTAIN.RESPONSES.EMPTY_STATE.FEATURE_SPOTLIGHT.TITLE')"
     :note="$t('CAPTAIN.RESPONSES.EMPTY_STATE.FEATURE_SPOTLIGHT.NOTE')"
     fallback-thumbnail="/assets/images/dashboard/captain/faqs-light.svg"
@@ -28,12 +50,16 @@ const onClick = () => {
     class="mb-8"
   />
   <EmptyStateLayout
-    :title="$t('CAPTAIN.RESPONSES.EMPTY_STATE.TITLE')"
-    :subtitle="$t('CAPTAIN.RESPONSES.EMPTY_STATE.SUBTITLE')"
+    :title="
+      isPending
+        ? $t('CAPTAIN.RESPONSES.EMPTY_STATE.NO_PENDING_TITLE')
+        : $t('CAPTAIN.RESPONSES.EMPTY_STATE.TITLE')
+    "
+    :subtitle="isApproved ? $t('CAPTAIN.RESPONSES.EMPTY_STATE.SUBTITLE') : ''"
     :action-perms="['administrator']"
-    show-backdrop
+    :show-backdrop="isApproved"
   >
-    <template #empty-state-item>
+    <template v-if="isApproved" #empty-state-item>
       <div class="grid grid-cols-1 gap-4 p-px overflow-hidden">
         <ResponseCard
           v-for="(response, index) in responsesList.slice(0, 5)"
@@ -51,10 +77,18 @@ const onClick = () => {
     <template #actions>
       <div class="flex flex-col items-center gap-3">
         <Button
+          v-if="isApproved"
           :label="$t('CAPTAIN.RESPONSES.ADD_NEW')"
           icon="i-lucide-plus"
           @click="onClick"
         />
+        <Button
+          v-else-if="isPending && hasActiveFilters"
+          :label="$t('CAPTAIN.RESPONSES.EMPTY_STATE.CLEAR_SEARCH')"
+          variant="link"
+          size="sm"
+          @click="onClearFilters"
+        />
       </div>
     </template>
   </EmptyStateLayout>

app/javascript/dashboard/components-next/captain/pageComponents/overview/CoverageBanner.vue

@@ -6,12 +6,7 @@ import { LocalStorage } from 'shared/helpers/localStorage';
 const props = defineProps({
   knowledge: {
     type: Object,
-    default: () => ({
-      approved: 0,
-      suggestions: 0,
-      documents: 0,
-      coverage: 0,
-    }),
+    default: () => ({ approved: 0, pending: 0, documents: 0, coverage: 0 }),
   },
 });
 
@@ -36,16 +31,16 @@ watch(
   { immediate: true }
 );
 
-// Thin coverage paired with a large review backlog: approving FAQ suggestions
+// Thin coverage paired with a large review backlog: approving the pending FAQs
 // is the quickest lever to lift auto-resolution, so nudge the team to act.
 const COVERAGE_THRESHOLD = 85;
-const SUGGESTION_THRESHOLD = 100;
+const PENDING_THRESHOLD = 100;
 
 const showBanner = computed(
   () =>
     !dismissed.value &&
     (props.knowledge?.coverage ?? 0) < COVERAGE_THRESHOLD &&
-    (props.knowledge?.suggestions ?? 0) > SUGGESTION_THRESHOLD
+    (props.knowledge?.pending ?? 0) > PENDING_THRESHOLD
 );
 
 const dismiss = () => {
@@ -53,9 +48,9 @@ const dismiss = () => {
   dismissed.value = true;
 };
 
-const goToSuggestions = () => {
+const goToPending = () => {
   router.push({
-    name: 'captain_assistants_faq_suggestions',
+    name: 'captain_assistants_responses_pending',
     params: {
       accountId: route.params.accountId,
       assistantId: route.params.assistantId,
@@ -66,15 +61,15 @@ const goToSuggestions = () => {
 
 <template>
   <div
+    v-if="showBanner"
     class="flex items-center justify-between gap-3 px-3 py-2 text-sm border rounded-xl bg-n-amber-3 border-n-amber-4 text-n-amber-11"
-    :class="{ hidden: !showBanner }"
   >
     <div class="flex items-center gap-2 min-w-0">
       <span class="shrink-0 i-lucide-triangle-alert size-4" />
       <span class="truncate">
         {{
           $t('CAPTAIN.OVERVIEW.COVERAGE_BANNER.TEXT', {
-            count: knowledge.suggestions,
+            count: knowledge.pending,
             coverage: knowledge.coverage,
           })
         }}
@@ -84,7 +79,7 @@ const goToSuggestions = () => {
       <button
         type="button"
         class="px-3 py-1 rounded-lg bg-n-amber-4 hover:bg-n-amber-5"
-        @click="goToSuggestions"
+        @click="goToPending"
       >
         {{ $t('CAPTAIN.OVERVIEW.COVERAGE_BANNER.ACTION') }}
       </button>

app/javascript/dashboard/components-next/captain/pageComponents/overview/CreditUsageCard.vue

@@ -0,0 +1,167 @@
+<script setup>
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+const props = defineProps({
+  // The credit_usage stat from the overview stats endpoint:
+  // { current, previous, trend, daily: [{ date, value }] }
+  usage: { type: Object, default: null },
+});
+
+const { t } = useI18n();
+
+const daily = computed(() => props.usage?.daily ?? []);
+
+// Long ranges (90 days) get too many daily bars to read, so past this many
+// days the series is bucketed into weeks.
+const WEEKLY_THRESHOLD = 35;
+
+const isWeekly = computed(() => daily.value.length > WEEKLY_THRESHOLD);
+
+// One bucket per day, or per 7 consecutive days on long ranges (the last week
+// may be partial and always includes today). A bucket is unrecorded (null)
+// only when every day in it predates credit tracking.
+const buckets = computed(() => {
+  if (!isWeekly.value) {
+    return daily.value.map(day => ({
+      start: day.date,
+      end: day.date,
+      value: day.value,
+    }));
+  }
+
+  const weeks = [];
+  for (let i = 0; i < daily.value.length; i += 7) {
+    const chunk = daily.value.slice(i, i + 7);
+    const recorded = chunk.filter(day => day.value !== null);
+    weeks.push({
+      start: chunk[0].date,
+      end: chunk[chunk.length - 1].date,
+      value: recorded.length
+        ? +recorded.reduce((sum, day) => sum + day.value, 0).toFixed(2)
+        : null,
+    });
+  }
+  return weeks;
+});
+
+// Bar heights as a percentage of the peak bucket, with a small floor so even
+// the lowest one stays visible. Unrecorded buckets render as muted
+// placeholder bars.
+const bars = computed(() => {
+  const max = Math.max(...buckets.value.map(bucket => bucket.value ?? 0), 0);
+  return buckets.value.map(bucket => ({
+    ...bucket,
+    key: bucket.start,
+    recorded: bucket.value !== null,
+    height:
+      max === 0 || bucket.value === null
+        ? 6
+        : Math.max(6, Math.round((bucket.value / max) * 100)),
+  }));
+});
+
+// Bucket dates arrive as date-only strings ('2026-07-17'), which new Date()
+// would parse as midnight UTC and shift a day back for viewers west of UTC.
+// Parse the parts as a local date so the label matches the server-side bucket.
+const formatDate = date => {
+  const [year, month, day] = date.split('-').map(Number);
+  return new Date(year, month - 1, day).toLocaleDateString(undefined, {
+    month: 'short',
+    day: 'numeric',
+  });
+};
+
+const barTooltip = bar => {
+  const period =
+    bar.start === bar.end
+      ? formatDate(bar.start)
+      : `${formatDate(bar.start)} – ${formatDate(bar.end)}`;
+  const usage = bar.recorded
+    ? `${bar.value} ${t('CAPTAIN.OVERVIEW.CREDITS.UNIT')}`
+    : t('CAPTAIN.OVERVIEW.CREDITS.NO_DATA');
+  return `${period} · ${usage}`;
+};
+
+const total = computed(() =>
+  props.usage ? props.usage.current.toLocaleString() : '—'
+);
+
+const trend = computed(() => {
+  if (!props.usage?.trend) return '';
+  const sign = props.usage.trend > 0 ? '+' : '';
+  return `${sign}${props.usage.trend}%`;
+});
+
+const axisStart = computed(() =>
+  daily.value.length ? formatDate(daily.value[0].date) : ''
+);
+const axisEnd = computed(() =>
+  daily.value.length ? formatDate(daily.value[daily.value.length - 1].date) : ''
+);
+</script>
+
+<template>
+  <section
+    class="flex flex-col gap-4 p-5 border rounded-xl bg-n-solid-1 border-n-weak"
+  >
+    <div class="flex items-start justify-between gap-4">
+      <div class="flex flex-col gap-1">
+        <div class="flex items-center gap-1.5">
+          <h3 class="text-sm font-medium text-n-slate-12">
+            {{ $t('CAPTAIN.OVERVIEW.CREDITS.TITLE') }}
+          </h3>
+          <span
+            v-tooltip="$t('CAPTAIN.OVERVIEW.CREDITS.DISCLAIMER')"
+            class="cursor-help i-lucide-info size-3.5 text-n-slate-9"
+          />
+        </div>
+        <div class="flex items-baseline gap-2">
+          <span class="text-2xl font-semibold tabular-nums text-n-slate-12">
+            {{ total }}
+          </span>
+          <span class="text-sm text-n-slate-11">
+            {{ $t('CAPTAIN.OVERVIEW.CREDITS.UNIT') }}
+          </span>
+          <span
+            v-if="trend"
+            class="text-sm font-medium tabular-nums text-n-slate-11"
+          >
+            {{ trend }}
+          </span>
+        </div>
+      </div>
+      <div class="flex items-center gap-2 mt-1">
+        <span class="rounded-full size-2.5 bg-n-brand" />
+        <span class="text-xs text-n-slate-11">
+          {{
+            isWeekly
+              ? $t('CAPTAIN.OVERVIEW.CREDITS.LEGEND_WEEKLY')
+              : $t('CAPTAIN.OVERVIEW.CREDITS.LEGEND')
+          }}
+        </span>
+      </div>
+    </div>
+
+    <div class="flex flex-col justify-end flex-1">
+      <div class="flex items-end flex-1 gap-1 min-h-24">
+        <div
+          v-for="bar in bars"
+          :key="bar.key"
+          v-tooltip="barTooltip(bar)"
+          class="flex-1 rounded-t transition-colors"
+          :class="
+            bar.recorded
+              ? 'bg-n-brand hover:bg-n-brand/70'
+              : 'bg-n-alpha-2 hover:bg-n-alpha-3'
+          "
+          :style="{ height: `${bar.height}%` }"
+        />
+      </div>
+      <div class="flex items-center justify-between mt-3">
+        <span class="text-xs text-n-slate-10">{{ axisStart }}</span>
+        <span class="text-xs text-n-slate-10">{{ axisEnd }}</span>
+      </div>
+    </div>
+  </section>
+</template>

app/javascript/dashboard/components-next/captain/pageComponents/overview/KnowledgeCard.vue

@@ -6,12 +6,7 @@ import { useI18n } from 'vue-i18n';
 const props = defineProps({
   knowledge: {
     type: Object,
-    default: () => ({
-      approved: 0,
-      suggestions: 0,
-      documents: 0,
-      coverage: 0,
-    }),
+    default: () => ({ approved: 0, pending: 0, documents: 0, coverage: 0 }),
   },
 });
 
@@ -36,10 +31,10 @@ const stats = computed(() => [
     to: linkTo('captain_assistants_responses_index'),
   },
   {
-    key: 'suggestions',
-    value: props.knowledge.suggestions,
-    label: t('CAPTAIN.OVERVIEW.KNOWLEDGE.SUGGESTIONS'),
-    to: linkTo('captain_assistants_faq_suggestions'),
+    key: 'pending',
+    value: props.knowledge.pending,
+    label: t('CAPTAIN.OVERVIEW.KNOWLEDGE.PENDING'),
+    to: linkTo('captain_assistants_responses_pending'),
   },
   {
     key: 'documents',
@@ -62,13 +57,13 @@ const stats = computed(() => [
         {{ $t('CAPTAIN.OVERVIEW.KNOWLEDGE.COVERAGE', { pct: approvedPct }) }}
       </span>
     </div>
-    <div class="w-full h-2 overflow-hidden rounded-full bg-n-alpha-2">
+    <div class="w-full h-2 mt-4 overflow-hidden rounded-full bg-n-alpha-2">
       <div
         class="h-full rounded-full bg-n-brand"
         :style="{ width: `${approvedPct}%` }"
       />
     </div>
-    <div class="grid grid-cols-3 gap-3">
+    <div class="grid grid-cols-3 gap-3 mt-4">
       <RouterLink
         v-for="stat in stats"
         :key="stat.key"

app/javascript/dashboard/components-next/captain/pageComponents/overview/MetricCard.vue

@@ -26,7 +26,7 @@ const onActivate = () => {
 
 <template>
   <div
-    class="flex flex-col gap-3 p-5 group bg-n-solid-1"
+    class="flex flex-col gap-3 p-5 bg-n-solid-1"
     :class="
       clickable
         ? 'cursor-pointer transition-colors hover:bg-n-slate-2/50 focus-visible:outline focus-visible:outline-2 focus-visible:outline-n-brand'
@@ -43,7 +43,7 @@ const onActivate = () => {
       <span
         v-if="hint"
         v-tooltip="hint"
-        class="transition-opacity opacity-0 cursor-help i-lucide-info size-3.5 text-n-slate-10 group-hover:opacity-100"
+        class="cursor-help i-lucide-info size-3.5 text-n-slate-9"
       />
     </div>
     <div v-if="loading" class="flex items-end justify-between gap-2">

app/javascript/dashboard/components-next/captain/pageComponents/response/FaqSuggestionReviewDialog.spec.js

@@ -1,148 +0,0 @@
-import { flushPromises, shallowMount } from '@vue/test-utils';
-import Button from 'dashboard/components-next/button/Button.vue';
-import FaqSuggestionReviewDialog from './FaqSuggestionReviewDialog.vue';
-
-const { dispatch, push, uiFlags } = vi.hoisted(() => ({
-  dispatch: vi.fn(),
-  push: vi.fn(),
-  uiFlags: {
-    value: {
-      fetchingItem: false,
-      updatingItem: false,
-      deletingItem: false,
-    },
-  },
-}));
-
-vi.mock('dashboard/composables/store', () => ({
-  useStore: () => ({ dispatch }),
-  useMapGetter: () => uiFlags,
-}));
-
-vi.mock('dashboard/composables', () => ({ useAlert: vi.fn() }));
-
-vi.mock('vue-i18n', () => ({
-  useI18n: () => ({ t: key => key }),
-}));
-
-vi.mock('vue-router', () => ({
-  useRouter: () => ({ push }),
-}));
-
-const DialogStub = {
-  methods: { close: vi.fn() },
-  template: `
-    <div>
-      <slot name="description" />
-      <slot />
-      <slot name="footer" />
-    </div>
-  `,
-};
-
-describe('FaqSuggestionReviewDialog', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  it('keeps a visible error when source conversations fail to load', async () => {
-    dispatch.mockRejectedValueOnce(new Error('Request failed'));
-
-    const wrapper = shallowMount(FaqSuggestionReviewDialog, {
-      props: {
-        suggestion: {
-          id: 1,
-          question: 'How do I enable the feature?',
-          answer: 'Turn it on in settings.',
-          source_count: 2,
-          assistant: { name: 'Support assistant' },
-          language: 'en',
-        },
-      },
-      global: {
-        mocks: { $t: key => key },
-        stubs: { Dialog: DialogStub },
-      },
-    });
-
-    await flushPromises();
-
-    expect(wrapper.get('[role="alert"]').text()).toContain(
-      'CAPTAIN.FAQ_SUGGESTIONS.ERRORS.LOAD_DETAILS'
-    );
-    expect(wrapper.text()).not.toContain(
-      'CAPTAIN.FAQ_SUGGESTIONS.DETAILS.NO_SOURCES'
-    );
-  });
-
-  it('opens source conversations using their display ID', async () => {
-    dispatch.mockResolvedValueOnce({
-      observations: [
-        {
-          id: 1,
-          generated_question: 'How do I enable the feature?',
-          created_at: 1,
-          conversation: { id: 99, display_id: 42 },
-        },
-      ],
-    });
-
-    const wrapper = shallowMount(FaqSuggestionReviewDialog, {
-      props: {
-        suggestion: {
-          id: 1,
-          question: 'How do I enable the feature?',
-          answer: 'Turn it on in settings.',
-          source_count: 1,
-          assistant: { name: 'Support assistant' },
-          language: 'en',
-        },
-      },
-      global: {
-        mocks: { $t: key => key },
-        stubs: { Dialog: DialogStub },
-      },
-    });
-
-    await flushPromises();
-    await wrapper.get('section button').trigger('click');
-
-    expect(push).toHaveBeenCalledWith({
-      name: 'inbox_conversation',
-      params: { conversation_id: 42 },
-    });
-  });
-
-  it('shows the review actions to users who can open the page', async () => {
-    dispatch.mockResolvedValueOnce({ observations: [] });
-
-    const wrapper = shallowMount(FaqSuggestionReviewDialog, {
-      props: {
-        suggestion: {
-          id: 1,
-          question: 'How do I enable the feature?',
-          answer: 'Turn it on in settings.',
-          source_count: 1,
-          assistant: { name: 'Support assistant' },
-          language: 'en',
-        },
-      },
-      global: {
-        mocks: { $t: key => key },
-        stubs: { Dialog: DialogStub },
-      },
-    });
-
-    await flushPromises();
-
-    expect(
-      wrapper.findAllComponents(Button).map(button => button.props('label'))
-    ).toEqual(
-      expect.arrayContaining([
-        'CAPTAIN.FAQ_SUGGESTIONS.DISMISS',
-        'CAPTAIN.FAQ_SUGGESTIONS.SAVE',
-        'CAPTAIN.FAQ_SUGGESTIONS.APPROVE_FAQ',
-      ])
-    );
-  });
-});

app/javascript/dashboard/components-next/captain/pageComponents/response/FaqSuggestionReviewDialog.vue

@@ -1,321 +0,0 @@
-<script setup>
-import { computed, onMounted, reactive, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import { useAlert } from 'dashboard/composables';
-import { useMapGetter, useStore } from 'dashboard/composables/store';
-import { dynamicTime } from 'shared/helpers/timeHelper';
-
-import Button from 'dashboard/components-next/button/Button.vue';
-import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
-import Icon from 'dashboard/components-next/icon/Icon.vue';
-import Input from 'dashboard/components-next/input/Input.vue';
-import TextArea from 'dashboard/components-next/textarea/TextArea.vue';
-
-const props = defineProps({
-  suggestion: {
-    type: Object,
-    required: true,
-  },
-});
-
-const emit = defineEmits(['close', 'resolved']);
-const { t } = useI18n();
-const router = useRouter();
-const store = useStore();
-const dialogRef = ref(null);
-const details = ref(null);
-const detailsError = ref(false);
-
-const uiFlags = useMapGetter('captainFaqSuggestions/getUIFlags');
-const isFetching = computed(() => uiFlags.value.fetchingItem);
-const isSaving = computed(() => uiFlags.value.updatingItem);
-const isDismissing = computed(() => uiFlags.value.deletingItem);
-
-const state = reactive({
-  question: props.suggestion.question,
-  answer: props.suggestion.answer,
-});
-
-const observations = computed(() => details.value?.observations || []);
-const isInvalid = computed(
-  () => !state.question.trim() || !state.answer.trim()
-);
-
-const loadDetails = async () => {
-  detailsError.value = false;
-
-  try {
-    details.value = await store.dispatch(
-      'captainFaqSuggestions/show',
-      props.suggestion.id
-    );
-  } catch (error) {
-    detailsError.value = true;
-    useAlert(
-      error?.message || t('CAPTAIN.FAQ_SUGGESTIONS.ERRORS.LOAD_DETAILS')
-    );
-  }
-};
-
-const close = () => dialogRef.value.close();
-
-const handleSave = async () => {
-  try {
-    const updatedSuggestion = await store.dispatch(
-      'captainFaqSuggestions/update',
-      {
-        id: props.suggestion.id,
-        question: state.question.trim(),
-        answer: state.answer.trim(),
-      }
-    );
-    details.value = { ...details.value, ...updatedSuggestion };
-    useAlert(t('CAPTAIN.FAQ_SUGGESTIONS.SUCCESS.SAVED'));
-  } catch (error) {
-    useAlert(error?.message || t('CAPTAIN.FAQ_SUGGESTIONS.ERRORS.SAVE'));
-  }
-};
-
-const handleApprove = async () => {
-  try {
-    await store.dispatch('captainFaqSuggestions/approve', {
-      id: props.suggestion.id,
-      question: state.question.trim(),
-      answer: state.answer.trim(),
-    });
-    useAlert(t('CAPTAIN.FAQ_SUGGESTIONS.SUCCESS.APPROVED'));
-    emit('resolved', { id: props.suggestion.id, action: 'approved' });
-    close();
-  } catch (error) {
-    useAlert(error?.message || t('CAPTAIN.FAQ_SUGGESTIONS.ERRORS.APPROVE'));
-  }
-};
-
-const handleDismiss = async () => {
-  try {
-    await store.dispatch('captainFaqSuggestions/dismiss', props.suggestion.id);
-    useAlert(t('CAPTAIN.FAQ_SUGGESTIONS.SUCCESS.DISMISSED'));
-    emit('resolved', { id: props.suggestion.id, action: 'dismissed' });
-    close();
-  } catch (error) {
-    useAlert(error?.message || t('CAPTAIN.FAQ_SUGGESTIONS.ERRORS.DISMISS'));
-  }
-};
-
-const openConversation = conversationId => {
-  close();
-  router.push({
-    name: 'inbox_conversation',
-    params: { conversation_id: conversationId },
-  });
-};
-
-onMounted(loadDetails);
-
-defineExpose({ dialogRef });
-</script>
-
-<template>
-  <Dialog
-    ref="dialogRef"
-    width="3xl"
-    position="top"
-    overflow-y-auto
-    :show-cancel-button="false"
-    :show-confirm-button="false"
-    @close="emit('close')"
-  >
-    <div class="flex items-start justify-between gap-4">
-      <div class="flex flex-col gap-1">
-        <h3 class="text-base font-medium leading-6 text-n-slate-12">
-          {{ $t('CAPTAIN.FAQ_SUGGESTIONS.DETAILS.TITLE') }}
-        </h3>
-        <p class="mb-0 text-sm text-n-slate-11">
-          {{
-            $t('CAPTAIN.FAQ_SUGGESTIONS.DETAILS.DESCRIPTION', {
-              count: suggestion.source_count,
-            })
-          }}
-        </p>
-      </div>
-      <Button
-        icon="i-lucide-x"
-        variant="ghost"
-        color="slate"
-        size="sm"
-        class="-me-1.5 -mt-1.5 shrink-0"
-        :aria-label="$t('DIALOG.BUTTONS.CANCEL')"
-        @click="close"
-      />
-    </div>
-
-    <div
-      class="grid min-h-0 grid-cols-1 gap-6 lg:grid-cols-[minmax(0,1fr)_18rem]"
-    >
-      <div class="flex min-w-0 flex-col gap-4">
-        <Input
-          v-model="state.question"
-          :label="$t('CAPTAIN.RESPONSES.FORM.QUESTION.LABEL')"
-          :placeholder="$t('CAPTAIN.RESPONSES.FORM.QUESTION.PLACEHOLDER')"
-        />
-        <TextArea
-          v-model="state.answer"
-          :label="$t('CAPTAIN.RESPONSES.FORM.ANSWER.LABEL')"
-          :placeholder="$t('CAPTAIN.RESPONSES.FORM.ANSWER.PLACEHOLDER')"
-          auto-height
-          resize
-          min-height="10rem"
-          max-height="20rem"
-        />
-        <div class="flex flex-wrap items-center gap-2 text-xs text-n-slate-10">
-          <span
-            class="inline-flex items-center gap-1.5 rounded-full bg-n-alpha-2 px-2.5 py-1"
-          >
-            <Icon icon="i-lucide-languages" class="size-3.5" />
-            {{ suggestion.language?.replace('_', '-').toUpperCase() }}
-          </span>
-          <span
-            class="inline-flex items-center gap-1.5 rounded-full bg-n-alpha-2 px-2.5 py-1"
-          >
-            <Icon icon="i-woot-captain" class="size-3.5" />
-            {{ suggestion.assistant?.name }}
-          </span>
-        </div>
-      </div>
-
-      <section class="min-h-0 rounded-xl border border-n-weak bg-n-alpha-2 p-3">
-        <div class="mb-3 flex items-center justify-between gap-2 px-1">
-          <h4 class="text-sm font-medium text-n-slate-12">
-            {{ $t('CAPTAIN.FAQ_SUGGESTIONS.DETAILS.SOURCES') }}
-          </h4>
-          <span class="text-xs tabular-nums text-n-slate-10">
-            {{
-              $t('CAPTAIN.FAQ_SUGGESTIONS.DETAILS.SOURCE_PROGRESS', {
-                visible: observations.length,
-                total: suggestion.source_count,
-              })
-            }}
-          </span>
-        </div>
-
-        <div
-          v-if="isFetching"
-          class="flex max-h-96 flex-col gap-2 overflow-hidden"
-          aria-busy="true"
-        >
-          <div
-            v-for="n in Math.min(suggestion.source_count, 6)"
-            :key="n"
-            class="flex w-full animate-pulse flex-col gap-1.5 rounded-lg outline outline-1 -outline-offset-1 outline-n-weak bg-n-solid-2 p-3"
-          >
-            <span class="flex items-center justify-between gap-2">
-              <span class="text-xs font-medium">
-                <span
-                  class="inline-block h-2 w-24 rounded-sm bg-n-alpha-2 align-middle"
-                />
-              </span>
-              <span class="size-3.5 shrink-0 rounded-sm bg-n-alpha-2" />
-            </span>
-            <span class="flex min-h-[2.5rem] flex-col text-xs leading-5">
-              <span class="h-2 w-full rounded-sm bg-n-alpha-2" />
-              <span class="mt-2 h-2 w-4/5 rounded-sm bg-n-alpha-2" />
-            </span>
-            <span class="text-xs">
-              <span
-                class="inline-block h-2 w-16 rounded-sm bg-n-alpha-2 align-middle"
-              />
-            </span>
-          </div>
-        </div>
-        <div
-          v-else-if="detailsError"
-          role="alert"
-          class="flex min-h-[10rem] flex-col items-center justify-center gap-3 px-4 text-center"
-        >
-          <Icon icon="i-lucide-circle-alert" class="size-5 text-n-ruby-10" />
-          <p class="mb-0 text-sm text-n-slate-11">
-            {{ $t('CAPTAIN.FAQ_SUGGESTIONS.ERRORS.LOAD_DETAILS') }}
-          </p>
-          <Button
-            :label="$t('CAPTAIN.FAQ_SUGGESTIONS.DETAILS.RETRY')"
-            variant="faded"
-            color="slate"
-            size="sm"
-            @click="loadDetails"
-          />
-        </div>
-        <div
-          v-else-if="!observations.length"
-          class="flex min-h-[10rem] items-center justify-center px-4 text-center text-sm text-n-slate-10"
-        >
-          {{ $t('CAPTAIN.FAQ_SUGGESTIONS.DETAILS.NO_SOURCES') }}
-        </div>
-        <div v-else class="flex max-h-96 flex-col gap-2 overflow-y-auto">
-          <button
-            v-for="observation in observations"
-            :key="observation.id"
-            type="button"
-            class="flex w-full flex-col gap-1.5 rounded-lg border border-n-weak bg-n-solid-2 p-3 text-start transition-colors hover:border-n-brand"
-            @click="openConversation(observation.conversation.display_id)"
-          >
-            <span class="flex items-center justify-between gap-2">
-              <span class="text-xs font-medium text-n-blue-11">
-                {{
-                  $t('CAPTAIN.RESPONSES.DOCUMENTABLE.CONVERSATION', {
-                    id: observation.conversation.display_id,
-                  })
-                }}
-              </span>
-              <Icon
-                icon="i-lucide-arrow-up-right"
-                class="size-3.5 text-n-slate-10"
-              />
-            </span>
-            <span
-              class="line-clamp-2 min-h-[2.5rem] text-xs leading-5 text-n-slate-11"
-            >
-              {{ observation.generated_question }}
-            </span>
-            <span class="text-xs text-n-slate-10">
-              {{ dynamicTime(observation.created_at) }}
-            </span>
-          </button>
-        </div>
-      </section>
-    </div>
-
-    <template #footer>
-      <div
-        class="flex w-full flex-col-reverse gap-3 sm:flex-row sm:items-center sm:justify-between"
-      >
-        <Button
-          :label="$t('CAPTAIN.FAQ_SUGGESTIONS.DISMISS')"
-          icon="i-lucide-circle-x"
-          variant="ghost"
-          color="ruby"
-          :is-loading="isDismissing"
-          :disabled="isSaving || isDismissing"
-          @click="handleDismiss"
-        />
-        <div class="flex items-center justify-end gap-2">
-          <Button
-            :label="$t('CAPTAIN.FAQ_SUGGESTIONS.SAVE')"
-            variant="faded"
-            color="slate"
-            :is-loading="isSaving"
-            :disabled="isInvalid || isSaving || isDismissing"
-            @click="handleSave"
-          />
-          <Button
-            :label="$t('CAPTAIN.FAQ_SUGGESTIONS.APPROVE_FAQ')"
-            icon="i-lucide-circle-check-big"
-            :is-loading="isSaving"
-            :disabled="isInvalid || isSaving || isDismissing"
-            @click="handleApprove"
-          />
-        </div>
-      </div>
-    </template>
-  </Dialog>
-</template>

app/javascript/dashboard/components-next/captain/pageComponents/switcher/AssistantSwitcher.vue

@@ -24,6 +24,16 @@ const isAssistantActive = assistant => {
 
 const fetchDataForRoute = async (routeName, assistantId) => {
   const dataFetchMap = {
+    captain_assistants_responses_index: async () => {
+      await store.dispatch('captainResponses/get', { assistantId });
+      await store.dispatch('captainResponses/fetchPendingCount', assistantId);
+    },
+    captain_assistants_responses_pending: async () => {
+      await store.dispatch('captainResponses/get', {
+        assistantId,
+        status: 'pending',
+      });
+    },
     captain_assistants_documents_index: async () => {
       await store.dispatch('captainDocuments/get', { assistantId });
     },

app/javascript/dashboard/components-next/sidebar/Sidebar.vue

@@ -511,7 +511,7 @@ const menuItems = computed(() => {
           label: t('SIDEBAR.CAPTAIN_RESPONSES'),
           activeOn: [
             'captain_assistants_responses_index',
-            'captain_assistants_faq_suggestions',
+            'captain_assistants_responses_pending',
           ],
           to: accountScopedRoute('captain_assistants_index', {
             navigationPath: 'captain_assistants_responses_index',

app/javascript/dashboard/components/ui/ContextMenu.vue

@@ -77,15 +77,6 @@ const handleClose = () => {
   emit('close');
 };
 
-const handleFocusOut = event => {
-  // Keep the menu open while focus stays inside it (e.g. the label search
-  // input); close it once focus leaves the menu entirely.
-  if (menuRef.value?.contains(event.relatedTarget)) {
-    return;
-  }
-  handleClose();
-};
-
 onUnmounted(() => {
   isLocked.value = false;
 });
@@ -98,7 +89,7 @@ onUnmounted(() => {
       class="fixed outline-none z-[9999] cursor-pointer"
       :style="position"
       tabindex="0"
-      @focusout="handleFocusOut"
+      @blur="handleClose"
     >
       <slot />
     </div>

app/javascript/dashboard/components/widgets/WootWriter/FullEditor.vue

@@ -8,8 +8,6 @@ import {
   EditorState,
   Selection,
   imageResizeView,
-  toggleMark,
-  wrapInList,
 } from '@chatwoot/prosemirror-schema';
 import {
   suggestionsPlugin,
@@ -19,6 +17,8 @@ import imagePastePlugin from '@chatwoot/prosemirror-schema/src/plugins/image';
 import embedPreviewPlugin from '@chatwoot/prosemirror-schema/src/plugins/embedPreview';
 import trailingParagraphPlugin from '@chatwoot/prosemirror-schema/src/plugins/trailingParagraph';
 import { embeds as markdownEmbeds } from 'dashboard/helper/markdownEmbeds';
+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';

app/javascript/dashboard/components/widgets/conversation/MessagesView.vue

@@ -33,7 +33,9 @@ import {
 // constants
 import { BUS_EVENTS } from 'shared/constants/busEvents';
 import { REPLY_POLICY } from 'shared/constants/links';
-import wootConstants from 'dashboard/constants/globals';
+import wootConstants, {
+  META_RESTRICTION_STATUS_URL,
+} from 'dashboard/constants/globals';
 import { LOCAL_STORAGE_KEYS } from 'dashboard/constants/localStorage';
 import { INBOX_TYPES } from 'dashboard/helper/inbox';
 
@@ -93,6 +95,7 @@ export default {
       currentUserId: 'getCurrentUserID',
       listLoadingStatus: 'getAllMessagesLoaded',
       currentAccountId: 'getCurrentAccountId',
+      isOnChatwootCloud: 'globalConfig/isOnChatwootCloud',
     }),
     isOpen() {
       return this.currentChat?.status === wootConstants.STATUS_TYPE.OPEN;
@@ -170,6 +173,13 @@ export default {
         instagramInbox
       );
     },
+    isInstagramRestrictionBannerVisible() {
+      return this.isOnChatwootCloud && this.isAnInstagramChannel;
+    },
+    instagramRestrictionStatusUrl() {
+      return META_RESTRICTION_STATUS_URL;
+    },
+
     replyWindowBannerMessage() {
       if (this.isAWhatsAppChannel) {
         return this.$t('CONVERSATION.TWILIO_WHATSAPP_CAN_REPLY');
@@ -454,7 +464,15 @@ export default {
   >
     <div ref="topBannerRef">
       <Banner
-        v-if="!currentChat.can_reply"
+        v-if="isInstagramRestrictionBannerVisible"
+        color-scheme="warning"
+        class="mx-2 mt-2 overflow-hidden rounded-lg"
+        :banner-message="$t('CONVERSATION.INSTAGRAM_RESTRICTION_BANNER')"
+        :href-link="instagramRestrictionStatusUrl"
+        :href-link-text="$t('CONVERSATION.INSTAGRAM_RESTRICTION_STATUS_LINK')"
+      />
+      <Banner
+        v-else-if="!currentChat.can_reply"
         color-scheme="alert"
         class="mx-2 mt-2 overflow-hidden rounded-lg"
         :banner-message="replyWindowBannerMessage"

app/javascript/dashboard/components/widgets/conversation/contextMenu/Index.vue

@@ -7,13 +7,10 @@ import {
   getSortedAgentsByAvailability,
   getAgentsByUpdatedPresence,
 } from 'dashboard/helper/agentHelper.js';
-import { picoSearch } from '@scmmishra/pico-search';
 import MenuItem from './menuItem.vue';
 import MenuItemWithSubmenu from './menuItemWithSubmenu.vue';
 import wootConstants from 'dashboard/constants/globals';
 import AgentLoadingPlaceholder from './agentLoadingPlaceholder.vue';
-import NextInput from 'dashboard/components-next/input/Input.vue';
-import Icon from 'dashboard/components-next/icon/Icon.vue';
 
 const MENU = {
   MARK_AS_READ: 'mark-as-read',
@@ -34,8 +31,6 @@ export default {
     MenuItem,
     MenuItemWithSubmenu,
     AgentLoadingPlaceholder,
-    NextInput,
-    Icon,
   },
   props: {
     chatId: {
@@ -92,7 +87,6 @@ export default {
   data() {
     return {
       MENU,
-      labelSearchQuery: '',
       STATUS_TYPE: wootConstants.STATUS_TYPE,
       readOption: {
         label: this.$t('CONVERSATION.CARD_CONTEXT_MENU.MARK_AS_READ'),
@@ -222,14 +216,6 @@ export default {
       // Don't show snooze if the conversation is already snoozed/resolved/pending
       return this.status === wootConstants.STATUS_TYPE.OPEN;
     },
-    filteredLabels() {
-      const labels = this.labelSearchQuery
-        ? picoSearch(this.labels, this.labelSearchQuery, ['title'])
-        : this.labels;
-      // Assigned labels first, keeping each group's existing order.
-      const isAssigned = label => this.conversationLabels.includes(label.title);
-      return [...labels].sort((a, b) => isAssigned(b) - isAssigned(a));
-    },
   },
   mounted() {
     this.$store.dispatch('inboxAssignableAgents/fetch', [this.inboxId]);
@@ -349,49 +335,21 @@ export default {
         :option="labelMenuConfig"
         :sub-menu-available="!!labels.length"
       >
-        <div class="pb-1 w-[12.5rem]">
-          <NextInput
-            v-model="labelSearchQuery"
-            type="search"
-            size="sm"
-            class="w-full"
-            custom-input-class="!ps-8 !text-xs"
-            :placeholder="$t('CONVERSATION.CARD_CONTEXT_MENU.SEARCH_LABELS')"
-            @click.stop
-            @keydown.stop
-          >
-            <template #prefix>
-              <Icon
-                icon="i-lucide-search"
-                class="absolute z-10 -translate-y-1/2 pointer-events-none size-3.5 text-n-slate-10 top-1/2 start-2"
-              />
-            </template>
-          </NextInput>
-        </div>
-        <div class="overflow-x-hidden overflow-y-auto max-h-[12.5rem]">
-          <MenuItem
-            v-for="label in filteredLabels"
-            :key="label.id"
-            :option="generateMenuLabelConfig(label, 'label')"
-            :variant="
-              conversationLabels.includes(label.title)
-                ? 'label-assigned'
-                : 'label'
-            "
-            @mousedown.prevent
-            @click.stop="
-              conversationLabels.includes(label.title)
-                ? $emit('removeLabel', label)
-                : $emit('assignLabel', label)
-            "
-          />
-          <p
-            v-if="!filteredLabels.length"
-            class="px-2 py-2 m-0 text-xs text-center text-n-slate-11"
-          >
-            {{ $t('CONVERSATION.CARD_CONTEXT_MENU.NO_LABELS_FOUND') }}
-          </p>
-        </div>
+        <MenuItem
+          v-for="label in labels"
+          :key="label.id"
+          :option="generateMenuLabelConfig(label, 'label')"
+          :variant="
+            conversationLabels.includes(label.title)
+              ? 'label-assigned'
+              : 'label'
+          "
+          @click.stop="
+            conversationLabels.includes(label.title)
+              ? $emit('removeLabel', label)
+              : $emit('assignLabel', label)
+          "
+        />
       </MenuItemWithSubmenu>
       <MenuItemWithSubmenu
         v-if="isAllowed([MENU.AGENT])"

app/javascript/dashboard/components/widgets/conversation/contextMenu/menuItem.vue

@@ -15,7 +15,7 @@ defineProps({
 </script>
 
 <template>
-  <div class="menu group text-n-slate-12 min-h-7 min-w-0" role="button">
+  <div class="menu text-n-slate-12 min-h-7 min-w-0" role="button">
     <fluent-icon
       v-if="variant === 'icon' && option.icon"
       :icon="option.icon"
@@ -52,7 +52,7 @@ defineProps({
     <Icon
       v-if="variant === 'label-assigned'"
       icon="i-lucide-check"
-      class="flex-shrink-0 size-3.5 text-n-brand group-hover:text-white"
+      class="flex-shrink-0 size-3.5 mr-1"
     />
   </div>
 </template>

app/javascript/dashboard/composables/spec/useAgentsList.spec.js

@@ -1,9 +1,9 @@
-import { useMapGetter } from 'dashboard/composables/store';
-import * as agentHelper from 'dashboard/helper/agentHelper';
-import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { ref } from 'vue';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { useAgentsList } from '../useAgentsList';
+import { useMapGetter } from 'dashboard/composables/store';
 import { allAgentsData, formattedAgentsData } from './fixtures/agentFixtures';
+import * as agentHelper from 'dashboard/helper/agentHelper';
 
 // Mock vue-i18n
 vi.mock('vue-i18n', () => ({
@@ -94,32 +94,6 @@ describe('useAgentsList', () => {
     expect(agentsList.value.length).toBe(formattedAgentsData.slice(1).length);
   });
 
-  it('keeps nameless agent bots and applies a fallback label', () => {
-    const namelessBot = {
-      id: 91,
-      name: null,
-      assignee_type: 'AgentBot',
-      availability_status: 'offline',
-    };
-    mockUseMapGetter({
-      'inboxAssignableAgents/getAssignableAgents': ref(() => [
-        ...allAgentsData,
-        namelessBot,
-      ]),
-    });
-
-    const { agentsList } = useAgentsList();
-    // access the computed to trigger evaluation
-    expect(agentsList.value).toBeDefined();
-
-    const passedAgents =
-      agentHelper.getAgentsByUpdatedPresence.mock.calls[0][0];
-    expect(passedAgents).toContainEqual({
-      ...namelessBot,
-      name: '-',
-    });
-  });
-
   it('handles empty assignable agents', () => {
     mockUseMapGetter({
       'inboxAssignableAgents/getAssignableAgents': ref(() => []),

app/javascript/dashboard/composables/useAgentsList.js

@@ -1,10 +1,10 @@
+import { computed } from 'vue';
 import { useMapGetter } from 'dashboard/composables/store';
+import { useI18n } from 'vue-i18n';
 import {
   getAgentsByUpdatedPresence,
   getSortedAgentsByAvailability,
 } from 'dashboard/helper/agentHelper';
-import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
 
 /**
  * A composable function that provides a list of agents for assignment.
@@ -53,11 +53,7 @@ export function useAgentsList(
    * @type {import('vue').ComputedRef<Array>}
    */
   const agentsList = computed(() => {
-    const agents = (assignableAgents.value || []).map(agent =>
-      !agent.name && agent.assignee_type === 'AgentBot'
-        ? { ...agent, name: '-' }
-        : agent
-    );
+    const agents = assignableAgents.value || [];
     const agentsByUpdatedPresence = getAgentsByUpdatedPresence(
       agents,
       currentUser.value,

app/javascript/dashboard/constants/globals.js

@@ -78,3 +78,5 @@ export default {
   },
 };
 export const DEFAULT_REDIRECT_URL = '/app/';
+export const META_RESTRICTION_STATUS_URL =
+  'https://status.chatwoot.com/incident/948346';

app/javascript/dashboard/helper/agentHelper.js

@@ -7,7 +7,7 @@
 export const getAgentsByAvailability = (agents, availability) => {
   return agents
     .filter(agent => agent.availability_status === availability)
-    .sort((a, b) => (a.name || '').localeCompare(b.name || ''));
+    .sort((a, b) => a.name.localeCompare(b.name));
 };
 
 /**

app/javascript/dashboard/helper/editorHelper.js

@@ -1,6 +1,4 @@
 import {
-  InputRule,
-  inputRules,
   MessageMarkdownSerializer,
   MessageMarkdownTransformer,
   messageSchema,
@@ -11,6 +9,7 @@ import * as Sentry from '@sentry/vue';
 import camelcaseKeys from 'camelcase-keys';
 import { FORMATTING, MARKDOWN_PATTERNS } from 'dashboard/constants/editor';
 import { INBOX_TYPES, TWILIO_CHANNEL_MEDIUM } from 'dashboard/helper/inbox';
+import { InputRule, inputRules } from 'prosemirror-inputrules';
 
 /**
  * Extract text from markdown, and remove all images, code blocks, links, headers, bold, italic, lists etc.

app/javascript/dashboard/helper/specs/agentHelper.spec.js

@@ -26,18 +26,6 @@ describe('agentHelper', () => {
         offlineAgentsData
       );
     });
-
-    it('does not throw when an agent has a null name', () => {
-      const agents = [
-        { id: 1, name: null, availability_status: 'offline' },
-        { id: 2, name: 'Zoe', availability_status: 'offline' },
-      ];
-
-      expect(() => getAgentsByAvailability(agents, 'offline')).not.toThrow();
-      expect(
-        getAgentsByAvailability(agents, 'offline').map(agent => agent.id)
-      ).toEqual([1, 2]);
-    });
   });
 
   describe('getSortedAgentsByAvailability', () => {

app/javascript/dashboard/i18n/locale/en/conversation.json

@@ -44,6 +44,8 @@
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hour message window restriction",
     "OLD_INSTAGRAM_INBOX_REPLY_BANNER": "This Instagram account was migrated to the new Instagram channel inbox. All new messages will show up there. You won’t be able to send messages from this conversation anymore.",
+    "INSTAGRAM_RESTRICTION_BANNER": "Instagram is currently restricted. Some messages or actions may be delayed or unavailable while we restore full support.",
+    "INSTAGRAM_RESTRICTION_STATUS_LINK": "View status update",
     "REPLYING_TO": "You are replying to:",
     "REMOVE_SELECTION": "Remove Selection",
     "DOWNLOAD": "Download",
@@ -193,8 +195,6 @@
       },
       "ASSIGN_AGENT": "Assign agent",
       "ASSIGN_LABEL": "Assign label",
-      "SEARCH_LABELS": "Search labels",
-      "NO_LABELS_FOUND": "No labels found",
       "AGENTS_LOADING": "Loading agents...",
       "ASSIGN_TEAM": "Assign team",
       "DELETE": "Delete conversation",

app/javascript/dashboard/i18n/locale/en/inboxMgmt.json

@@ -58,7 +58,9 @@
         "ERROR_MESSAGE": "There was an error connecting to Instagram, please try again",
         "ERROR_AUTH": "There was an error connecting to Instagram, please try again",
         "NEW_INBOX_SUGGESTION": "This Instagram account was previously linked to a different inbox and has now been migrated here. All new messages will appear here. The old inbox will no longer be able to send or receive messages for this account.",
-        "DUPLICATE_INBOX_BANNER": "This Instagram account was migrated to the new Instagram channel inbox. You won’t be able to send/receive Instagram messages from this inbox anymore."
+        "DUPLICATE_INBOX_BANNER": "This Instagram account was migrated to the new Instagram channel inbox. You won’t be able to send/receive Instagram messages from this inbox anymore.",
+        "SETTINGS_RESTRICTED_WARNING": "Instagram is currently restricted. Some messages or actions may be delayed or unavailable while we restore full support.",
+        "STATUS_LINK": "View status update"
       },
       "TIKTOK": {
         "CONTINUE_WITH_TIKTOK": "Continue with TikTok",

app/javascript/dashboard/i18n/locale/en/integrations.json

@@ -411,8 +411,8 @@
         "DISMISS": "Dismiss"
       },
       "COVERAGE_BANNER": {
-        "TEXT": "{count} FAQ suggestions are ready for review, keeping coverage at {coverage}%. Approve them so your assistant can resolve more on its own.",
-        "ACTION": "Review suggestions",
+        "TEXT": "{count} FAQs are pending review, keeping coverage at {coverage}%. Approve them so your assistant can resolve more on its own.",
+        "ACTION": "Review FAQs",
         "DISMISS": "Dismiss"
       },
       "RANGES": {
@@ -457,9 +457,17 @@
         "TITLE": "Knowledge coverage",
         "COVERAGE": "{pct}% approved",
         "APPROVED": "Approved FAQs",
-        "SUGGESTIONS": "FAQ suggestions",
+        "PENDING": "Pending FAQs",
         "DOCUMENTS": "Documents"
       },
+      "CREDITS": {
+        "TITLE": "Credit usage",
+        "UNIT": "credits",
+        "LEGEND": "Daily credits used",
+        "LEGEND_WEEKLY": "Weekly credits used",
+        "NO_DATA": "No data recorded",
+        "DISCLAIMER": "Shows credits used by this assistant only. Your account's total credit usage also includes other assistants and features."
+      },
       "LINKS": {
         "DOCS": {
           "TITLE": "Captain docs",
@@ -1086,6 +1094,7 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
+      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -1094,10 +1103,12 @@
       "SELECT_ALL": "Select all ({count})",
       "UNSELECT_ALL": "Unselect all ({count})",
       "SEARCH_PLACEHOLDER": "Search FAQs...",
-      "ERRORS": {
-        "LOAD": "There was an error loading FAQs. Please try again."
-      },
+      "BULK_APPROVE_BUTTON": "Approve",
       "BULK_DELETE_BUTTON": "Delete",
+      "BULK_APPROVE": {
+        "SUCCESS_MESSAGE": "FAQs approved successfully",
+        "ERROR_MESSAGE": "There was an error approving the FAQs, please try again."
+      },
       "BULK_DELETE": {
         "TITLE": "Delete FAQs?",
         "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
@@ -1112,9 +1123,20 @@
         "SUCCESS_MESSAGE": "FAQ deleted successfully",
         "ERROR_MESSAGE": "There was an error deleting the FAQ, please try again."
       },
-      "SUGGESTIONS_BANNER": {
-        "TITLE": "Captain grouped recurring customer questions into FAQ suggestions.",
-        "ACTION": "Review suggestions"
+      "FILTER": {
+        "ASSISTANT": "Assistant: {selected}",
+        "STATUS": "Status: {selected}",
+        "ALL_ASSISTANTS": "All"
+      },
+      "STATUS": {
+        "TITLE": "Status",
+        "PENDING": "Pending",
+        "APPROVED": "Approved",
+        "ALL": "All"
+      },
+      "PENDING_BANNER": {
+        "TITLE": "Captain has found some FAQs your customers were looking for.",
+        "ACTION": "Click here to review"
       },
       "FORM_DESCRIPTION": "Add a question and its corresponding answer to the knowledge base and select the assistant it should be associated with.",
       "CREATE": {
@@ -1147,6 +1169,7 @@
       },
       "EMPTY_STATE": {
         "TITLE": "No FAQs Found",
+        "NO_PENDING_TITLE": "There are no more pending FAQs to review",
         "SUBTITLE": "FAQs help your assistant provide quick and accurate answers to questions from your customers. They can be generated automatically from your content or can be added manually.",
         "CLEAR_SEARCH": "Clear active filters",
         "FEATURE_SPOTLIGHT": {
@@ -1155,43 +1178,6 @@
         }
       }
     },
-    "FAQ_SUGGESTIONS": {
-      "HEADER": "FAQ suggestions",
-      "SEARCH_PLACEHOLDER": "Search suggestions...",
-      "QUEUE_COUNT": "{count} suggestion to review | {count} suggestions to review",
-      "QUEUE_HINT": "Ranked by customer demand",
-      "SOURCE_COUNT": "{count} conversation | {count} conversations",
-      "REVIEW": "Review sources",
-      "APPROVE": "Approve",
-      "APPROVE_FAQ": "Approve FAQ",
-      "DISMISS": "Dismiss",
-      "SAVE": "Save changes",
-      "DETAILS": {
-        "TITLE": "Review FAQ suggestion",
-        "DESCRIPTION": "Captain grouped {count} conversation into this suggestion. Review the evidence and refine the FAQ before approval. | Captain grouped {count} conversations into this suggestion. Review the evidence and refine the FAQ before approval.",
-        "SOURCES": "Source conversations",
-        "SOURCE_PROGRESS": "{visible} of {total}",
-        "NO_SOURCES": "No accessible source conversations were found.",
-        "RETRY": "Retry"
-      },
-      "EMPTY_STATE": {
-        "TITLE": "The review queue is clear",
-        "SUBTITLE": "New reusable questions will appear here after Captain groups similar resolved conversations.",
-        "CLEAR_SEARCH": "Clear search"
-      },
-      "SUCCESS": {
-        "APPROVED": "FAQ approved and added to Captain's knowledge.",
-        "DISMISSED": "Suggestion dismissed.",
-        "SAVED": "Suggestion updated."
-      },
-      "ERRORS": {
-        "LOAD": "There was an error loading FAQ suggestions. Please try again.",
-        "LOAD_DETAILS": "There was an error loading the source conversations.",
-        "APPROVE": "There was an error approving the FAQ. Please try again.",
-        "DISMISS": "There was an error dismissing the suggestion. Please try again.",
-        "SAVE": "There was an error saving the suggestion. Please try again."
-      }
-    },
     "INBOXES": {
       "HEADER": "Connected Inboxes",
       "ADD_NEW": "Connect a new inbox",

app/javascript/dashboard/routes/dashboard/captain/assistants/overview/Index.vue

@@ -13,6 +13,7 @@ import WelcomeCard from 'dashboard/components-next/captain/pageComponents/overvi
 import MetricCard from 'dashboard/components-next/captain/pageComponents/overview/MetricCard.vue';
 import AssistantDrilldownDrawer from 'dashboard/components-next/captain/pageComponents/overview/AssistantDrilldownDrawer.vue';
 import KnowledgeCard from 'dashboard/components-next/captain/pageComponents/overview/KnowledgeCard.vue';
+import CreditUsageCard from 'dashboard/components-next/captain/pageComponents/overview/CreditUsageCard.vue';
 import QuickLinks from 'dashboard/components-next/captain/pageComponents/overview/QuickLinks.vue';
 import InboxBanner from 'dashboard/components-next/captain/pageComponents/overview/InboxBanner.vue';
 import CoverageBanner from 'dashboard/components-next/captain/pageComponents/overview/CoverageBanner.vue';
@@ -26,28 +27,25 @@ const canDrilldown = computed(() => checkPermissions(['administrator']));
 const selectedRange = ref('this_month');
 
 const assistantId = computed(() => route.params.assistantId);
-const metricStats = ref(null);
-const faqStats = ref(null);
-const isFetchingMetrics = ref(false);
+const stats = ref(null);
+const isFetching = ref(false);
 
 // Increments on every fetch so a response (or retry) from a superseded
 // range/assistant can't clobber the latest request's state.
-let metricsFetchToken = 0;
-let faqStatsFetchToken = 0;
-let metricsAbortController = null;
-let faqStatsAbortController = null;
+let fetchToken = 0;
+let abortController = null;
 
-const fetchMetrics = async () => {
-  metricsFetchToken += 1;
-  const token = metricsFetchToken;
-  metricsAbortController?.abort();
-  metricsAbortController = new AbortController();
-  const { signal } = metricsAbortController;
-  metricStats.value = null;
-  isFetchingMetrics.value = true;
+const fetchStats = async () => {
+  fetchToken += 1;
+  const token = fetchToken;
+  abortController?.abort();
+  abortController = new AbortController();
+  const { signal } = abortController;
+  stats.value = null;
+  isFetching.value = true;
 
-  const requestMetrics = () =>
-    CaptainAssistant.getMetrics({
+  const requestStats = () =>
+    CaptainAssistant.getStats({
       assistantId: assistantId.value,
       range: selectedRange.value,
       signal,
@@ -55,54 +53,25 @@ const fetchMetrics = async () => {
 
   let data = null;
   try {
-    ({ data } = await requestMetrics());
+    ({ data } = await requestStats());
   } catch {
     // One silent retry before giving up, unless the request was aborted.
     try {
-      if (token === metricsFetchToken && !signal.aborted)
-        ({ data } = await requestMetrics());
+      if (token === fetchToken && !signal.aborted)
+        ({ data } = await requestStats());
     } catch {
       data = null;
     }
   }
 
-  if (token !== metricsFetchToken || signal.aborted) return;
-  metricStats.value = data;
-  isFetchingMetrics.value = false;
+  if (token !== fetchToken || signal.aborted) return;
+  stats.value = data;
+  isFetching.value = false;
 };
 
-const fetchFaqStats = async () => {
-  faqStatsFetchToken += 1;
-  const token = faqStatsFetchToken;
-  faqStatsAbortController?.abort();
-  faqStatsAbortController = new AbortController();
-  const { signal } = faqStatsAbortController;
-  faqStats.value = null;
+onUnmounted(() => abortController?.abort());
 
-  try {
-    const { data } = await CaptainAssistant.getFaqStats({
-      assistantId: assistantId.value,
-      signal,
-    });
-    if (token === faqStatsFetchToken && !signal.aborted) faqStats.value = data;
-  } catch {
-    if (token === faqStatsFetchToken && !signal.aborted) faqStats.value = null;
-  }
-};
-
-const summaryStats = computed(() => {
-  if (!metricStats.value || !faqStats.value) return null;
-
-  return { ...metricStats.value, knowledge: faqStats.value };
-});
-
-onUnmounted(() => {
-  metricsAbortController?.abort();
-  faqStatsAbortController?.abort();
-});
-
-watch([selectedRange, assistantId], fetchMetrics, { immediate: true });
-watch(assistantId, fetchFaqStats, { immediate: true });
+watch([selectedRange, assistantId], fetchStats, { immediate: true });
 
 // `direction` says whether a rising trend is good ('up'), bad ('down'), or
 // neutral, so we can colour the delta independently of its sign.
@@ -122,7 +91,7 @@ const formatDuration = hours =>
   hours >= 100 ? `${Math.round(hours / 24)}d` : `${hours}h`;
 
 const metricFor = (statKey, formatValue, direction, trendKind = 'percent') => {
-  const data = metricStats.value?.[statKey];
+  const data = stats.value?.[statKey];
   if (!data) return { value: '—', trend: '', trendGood: null };
 
   const sign = data.trend > 0 ? '+' : '';
@@ -216,9 +185,9 @@ const closeDrilldown = () => {
       <div class="flex flex-col gap-6 pb-8">
         <InboxBanner />
 
-        <CoverageBanner :knowledge="faqStats ?? undefined" />
+        <CoverageBanner :knowledge="stats?.knowledge" />
 
-        <WelcomeCard :range="selectedRange" :stats="summaryStats" />
+        <WelcomeCard :range="selectedRange" :stats="stats" />
 
         <div
           class="grid grid-cols-1 gap-px overflow-hidden border rounded-xl sm:grid-cols-2 lg:grid-cols-3 bg-n-weak border-n-weak"
@@ -231,15 +200,16 @@ const closeDrilldown = () => {
             :trend="metric.trend"
             :hint="metric.hint"
             :trend-good="metric.trendGood"
-            :loading="isFetchingMetrics"
-            :clickable="
-              canDrilldown && Boolean(metric.metric) && !isFetchingMetrics
-            "
+            :loading="isFetching"
+            :clickable="canDrilldown && Boolean(metric.metric) && !isFetching"
             @click="openDrilldown(metric)"
           />
         </div>
 
-        <KnowledgeCard :knowledge="faqStats ?? undefined" />
+        <div class="grid grid-cols-1 gap-4 lg:grid-cols-2">
+          <KnowledgeCard :knowledge="stats?.knowledge" />
+          <CreditUsageCard :usage="stats?.credit_usage" />
+        </div>
 
         <QuickLinks />
       </div>

app/javascript/dashboard/routes/dashboard/captain/captain.routes.js

@@ -1,9 +1,5 @@
 import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 import { INSTALLATION_TYPES } from 'dashboard/constants/installationTypes';
-import {
-  CONVERSATION_PERMISSIONS,
-  ROLES,
-} from 'dashboard/constants/permissions';
 import { frontendURL } from '../../../helper/URLHelper';
 
 import CaptainPageRouteView from './pages/CaptainPageRouteView.vue';
@@ -19,7 +15,7 @@ import AssistantGuidelinesIndex from './assistants/guidelines/Index.vue';
 import AssistantScenariosIndex from './assistants/scenarios/Index.vue';
 import DocumentsIndex from './documents/Index.vue';
 import ResponsesIndex from './responses/Index.vue';
-import FaqSuggestionsIndex from './responses/FaqSuggestions.vue';
+import ResponsesPendingIndex from './responses/Pending.vue';
 import CustomToolsIndex from './tools/Index.vue';
 
 const meta = {
@@ -28,11 +24,6 @@ const meta = {
   installationTypes: [INSTALLATION_TYPES.CLOUD, INSTALLATION_TYPES.ENTERPRISE],
 };
 
-const faqSuggestionsMeta = {
-  ...meta,
-  permissions: [...ROLES, ...CONVERSATION_PERMISSIONS],
-};
-
 const metaCustomTools = {
   permissions: ['administrator', 'agent'],
   featureFlag: FEATURE_FLAGS.CAPTAIN_CUSTOM_TOOLS,
@@ -88,21 +79,11 @@ const assistantRoutes = [
     name: 'captain_assistants_inboxes_index',
     meta,
   },
-  {
-    path: frontendURL(
-      'accounts/:accountId/captain/:assistantId/faqs/suggestions'
-    ),
-    component: FaqSuggestionsIndex,
-    name: 'captain_assistants_faq_suggestions',
-    meta: faqSuggestionsMeta,
-  },
   {
     path: frontendURL('accounts/:accountId/captain/:assistantId/faqs/pending'),
-    redirect: to => ({
-      name: 'captain_assistants_faq_suggestions',
-      params: to.params,
-      query: to.query,
-    }),
+    component: ResponsesPendingIndex,
+    name: 'captain_assistants_responses_pending',
+    meta,
   },
   {
     path: frontendURL('accounts/:accountId/captain/:assistantId/settings'),

app/javascript/dashboard/routes/dashboard/captain/responses/FaqSuggestions.spec.js

@@ -1,139 +0,0 @@
-import { flushPromises, shallowMount } from '@vue/test-utils';
-import FaqSuggestions from './FaqSuggestions.vue';
-
-const mocks = vi.hoisted(() => ({
-  apiGet: vi.fn(),
-  dispatch: vi.fn(),
-  replace: vi.fn(),
-  route: null,
-  getterValues: null,
-}));
-
-vi.mock('dashboard/api/captain/faqSuggestions', () => ({
-  default: { get: mocks.apiGet },
-}));
-
-vi.mock('dashboard/composables/store', async () => {
-  const { ref } = await import('vue');
-  mocks.getterValues = {
-    'captainFaqSuggestions/getRecords': ref([]),
-    'captainFaqSuggestions/getMeta': ref({ totalCount: 0, page: 1 }),
-    'captainFaqSuggestions/getUIFlags': ref({
-      fetchingList: false,
-      updatingItem: false,
-      deletingItem: false,
-    }),
-  };
-
-  return {
-    useStore: () => ({ dispatch: mocks.dispatch }),
-    useMapGetter: key => mocks.getterValues[key],
-  };
-});
-
-vi.mock('dashboard/composables', () => ({ useAlert: vi.fn() }));
-
-vi.mock('vue-i18n', () => ({
-  useI18n: () => ({ t: key => key }),
-}));
-
-vi.mock('vue-router', async importOriginal => {
-  const actual = await importOriginal();
-  const { reactive } = await import('vue');
-  mocks.route = reactive({
-    params: { accountId: 1, assistantId: 1 },
-    query: {},
-  });
-
-  return {
-    ...actual,
-    useRoute: () => mocks.route,
-    useRouter: () => ({ replace: mocks.replace }),
-  };
-});
-
-const deferred = () => {
-  let resolve;
-  let reject;
-  const promise = new Promise((resolvePromise, rejectPromise) => {
-    resolve = resolvePromise;
-    reject = rejectPromise;
-  });
-  return { promise, resolve, reject };
-};
-
-const PageLayoutStub = {
-  template: '<div><slot name="body" /></div>',
-};
-
-const FaqSuggestionCardStub = {
-  props: ['suggestion'],
-  template: '<div>{{ suggestion.question }}</div>',
-};
-
-describe('FaqSuggestions', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    mocks.route.params.assistantId = 1;
-    mocks.route.query = {};
-    mocks.getterValues['captainFaqSuggestions/getRecords'].value = [];
-    mocks.getterValues['captainFaqSuggestions/getMeta'].value = {
-      totalCount: 0,
-      page: 1,
-    };
-    mocks.dispatch.mockImplementation((action, payload) => {
-      if (action !== 'captainFaqSuggestions/setRecords') return;
-
-      mocks.getterValues['captainFaqSuggestions/getRecords'].value =
-        payload.records;
-      mocks.getterValues['captainFaqSuggestions/getMeta'].value = {
-        totalCount: payload.meta.total_count,
-        page: payload.meta.page,
-      };
-    });
-  });
-
-  it('keeps the latest assistant results when an older request is superseded', async () => {
-    const firstRequest = deferred();
-    const secondRequest = deferred();
-    const queued = [firstRequest, secondRequest];
-
-    mocks.apiGet.mockImplementation(({ signal }) => {
-      const request = queued.shift();
-      signal.addEventListener('abort', () => {
-        const error = new Error('canceled');
-        error.name = 'CanceledError';
-        request.reject(error);
-      });
-      return request.promise;
-    });
-
-    const wrapper = shallowMount(FaqSuggestions, {
-      global: {
-        mocks: { $t: key => key },
-        stubs: {
-          PageLayout: PageLayoutStub,
-          FaqSuggestionCard: FaqSuggestionCardStub,
-        },
-      },
-    });
-
-    await flushPromises();
-    // Switching assistants aborts the first request before it resolves.
-    mocks.route.params.assistantId = 2;
-    await flushPromises();
-
-    secondRequest.resolve({
-      data: {
-        payload: [{ id: 2, question: 'Current assistant' }],
-        meta: { page: 1, total_count: 1 },
-      },
-    });
-    await flushPromises();
-
-    expect(wrapper.text()).toContain('Current assistant');
-    expect(wrapper.text()).not.toContain('Previous assistant');
-
-    wrapper.unmount();
-  });
-});

app/javascript/dashboard/routes/dashboard/captain/responses/FaqSuggestions.vue

@@ -1,259 +0,0 @@
-<script setup>
-import { computed, nextTick, onUnmounted, ref, watch } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
-import { debounce } from '@chatwoot/utils';
-import { useAlert } from 'dashboard/composables';
-import { useMapGetter, useStore } from 'dashboard/composables/store';
-import { useAbortableRequest } from 'dashboard/composables/useAbortableRequest';
-import { FEATURE_FLAGS } from 'dashboard/featureFlags';
-import CaptainFaqSuggestionsAPI from 'dashboard/api/captain/faqSuggestions';
-
-import Button from 'dashboard/components-next/button/Button.vue';
-import CaptainPaywall from 'dashboard/components-next/captain/pageComponents/Paywall.vue';
-import EmptyStateLayout from 'dashboard/components-next/EmptyStateLayout.vue';
-import FaqSuggestionCard from 'dashboard/components-next/captain/assistant/FaqSuggestionCard.vue';
-import FaqSuggestionReviewDialog from 'dashboard/components-next/captain/pageComponents/response/FaqSuggestionReviewDialog.vue';
-import Input from 'dashboard/components-next/input/Input.vue';
-import PageLayout from 'dashboard/components-next/captain/PageLayout.vue';
-
-const route = useRoute();
-const router = useRouter();
-const store = useStore();
-const { t } = useI18n();
-
-const suggestions = useMapGetter('captainFaqSuggestions/getRecords');
-const suggestionMeta = useMapGetter('captainFaqSuggestions/getMeta');
-const uiFlags = useMapGetter('captainFaqSuggestions/getUIFlags');
-
-const searchQuery = ref('');
-const selectedSuggestion = ref(null);
-const reviewDialog = ref(null);
-const activeSuggestionId = ref(null);
-
-const selectedAssistantId = computed(() => Number(route.params.assistantId));
-const isFetching = computed(() => uiFlags.value.fetchingList);
-const isMutating = computed(
-  () => uiFlags.value.updatingItem || uiFlags.value.deletingItem
-);
-const hasActiveFilters = computed(() => Boolean(searchQuery.value));
-
-const backUrl = computed(() => ({
-  name: 'captain_assistants_responses_index',
-  params: {
-    accountId: route.params.accountId,
-    assistantId: selectedAssistantId.value,
-  },
-}));
-
-const updateURL = (page, search) => {
-  const query = { page: page || 1 };
-  if (search) query.search = search;
-  router.replace({ query });
-};
-
-const { run: runListRequest, abort: abortListRequest } = useAbortableRequest();
-
-const fetchSuggestions = async (page = 1) => {
-  updateURL(page, searchQuery.value);
-  store.dispatch('captainFaqSuggestions/setFetchingList', true);
-
-  try {
-    const response = await runListRequest(signal =>
-      CaptainFaqSuggestionsAPI.get({
-        page,
-        search: searchQuery.value,
-        assistantId: selectedAssistantId.value,
-        signal,
-      })
-    );
-
-    if (!response) return;
-
-    store.dispatch('captainFaqSuggestions/setRecords', {
-      records: response.data.payload,
-      meta: response.data.meta,
-    });
-    store.dispatch('captainFaqSuggestions/setFetchingList', false);
-  } catch (error) {
-    useAlert(error?.message || t('CAPTAIN.FAQ_SUGGESTIONS.ERRORS.LOAD'));
-    store.dispatch('captainFaqSuggestions/setFetchingList', false);
-  }
-};
-
-const refreshCurrentPage = () => {
-  const currentPage = suggestionMeta.value.page || 1;
-  const page =
-    suggestions.value.length || currentPage === 1
-      ? currentPage
-      : currentPage - 1;
-  fetchSuggestions(page);
-};
-
-const handleApprove = async suggestion => {
-  activeSuggestionId.value = suggestion.id;
-  try {
-    await store.dispatch('captainFaqSuggestions/approve', {
-      id: suggestion.id,
-      question: suggestion.question,
-      answer: suggestion.answer,
-    });
-    useAlert(t('CAPTAIN.FAQ_SUGGESTIONS.SUCCESS.APPROVED'));
-    refreshCurrentPage();
-  } catch (error) {
-    useAlert(error?.message || t('CAPTAIN.FAQ_SUGGESTIONS.ERRORS.APPROVE'));
-  } finally {
-    activeSuggestionId.value = null;
-  }
-};
-
-const handleDismiss = async suggestion => {
-  activeSuggestionId.value = suggestion.id;
-  try {
-    await store.dispatch('captainFaqSuggestions/dismiss', suggestion.id);
-    useAlert(t('CAPTAIN.FAQ_SUGGESTIONS.SUCCESS.DISMISSED'));
-    refreshCurrentPage();
-  } catch (error) {
-    useAlert(error?.message || t('CAPTAIN.FAQ_SUGGESTIONS.ERRORS.DISMISS'));
-  } finally {
-    activeSuggestionId.value = null;
-  }
-};
-
-const handleReview = suggestion => {
-  selectedSuggestion.value = suggestion;
-  nextTick(() => reviewDialog.value.dialogRef.open());
-};
-
-const handleReviewClose = () => {
-  selectedSuggestion.value = null;
-};
-
-const handleResolved = () => {
-  refreshCurrentPage();
-};
-
-const debouncedSearch = debounce(() => fetchSuggestions(1), 500);
-
-const handleSearchInput = () => {
-  abortListRequest();
-  debouncedSearch();
-};
-
-const clearFilters = () => {
-  searchQuery.value = '';
-  fetchSuggestions(1);
-};
-
-const initializeFromURL = () => {
-  searchQuery.value = route.query.search || '';
-  fetchSuggestions(parseInt(route.query.page, 10) || 1);
-};
-
-watch(
-  selectedAssistantId,
-  () => {
-    selectedSuggestion.value = null;
-    activeSuggestionId.value = null;
-    store.dispatch('captainFaqSuggestions/setRecords', {
-      records: [],
-      meta: { page: 1, total_count: 0 },
-    });
-    initializeFromURL();
-  },
-  { immediate: true }
-);
-
-onUnmounted(() => {
-  store.dispatch('captainFaqSuggestions/setFetchingList', false);
-});
-</script>
-
-<template>
-  <PageLayout
-    :total-count="suggestionMeta.totalCount"
-    :current-page="suggestionMeta.page"
-    :header-title="$t('CAPTAIN.FAQ_SUGGESTIONS.HEADER')"
-    :is-fetching="isFetching"
-    :is-empty="!suggestions.length"
-    :show-pagination-footer="!isFetching && !!suggestions.length"
-    :show-know-more="false"
-    :feature-flag="FEATURE_FLAGS.CAPTAIN"
-    :back-url="backUrl"
-    @update:current-page="fetchSuggestions"
-  >
-    <template #search>
-      <Input
-        v-model="searchQuery"
-        :placeholder="$t('CAPTAIN.FAQ_SUGGESTIONS.SEARCH_PLACEHOLDER')"
-        class="w-64"
-        size="sm"
-        type="search"
-        autofocus
-        @input="handleSearchInput"
-      />
-    </template>
-
-    <template #subHeader>
-      <div
-        v-if="suggestions.length"
-        class="mb-2 flex items-center gap-2 text-sm text-n-slate-11"
-      >
-        <span class="font-medium text-n-slate-12">
-          {{
-            $t('CAPTAIN.FAQ_SUGGESTIONS.QUEUE_COUNT', {
-              count: suggestionMeta.totalCount,
-            })
-          }}
-        </span>
-        <span class="border-s border-n-weak ps-2">
-          {{ $t('CAPTAIN.FAQ_SUGGESTIONS.QUEUE_HINT') }}
-        </span>
-      </div>
-    </template>
-
-    <template #emptyState>
-      <EmptyStateLayout
-        :title="$t('CAPTAIN.FAQ_SUGGESTIONS.EMPTY_STATE.TITLE')"
-        :subtitle="$t('CAPTAIN.FAQ_SUGGESTIONS.EMPTY_STATE.SUBTITLE')"
-        :show-backdrop="false"
-      >
-        <template #actions>
-          <Button
-            v-if="hasActiveFilters"
-            :label="$t('CAPTAIN.FAQ_SUGGESTIONS.EMPTY_STATE.CLEAR_SEARCH')"
-            variant="link"
-            size="sm"
-            @click="clearFilters"
-          />
-        </template>
-      </EmptyStateLayout>
-    </template>
-
-    <template #paywall>
-      <CaptainPaywall />
-    </template>
-
-    <template #body>
-      <div class="flex flex-col gap-4 pb-6">
-        <FaqSuggestionCard
-          v-for="suggestion in suggestions"
-          :key="suggestion.id"
-          :suggestion="suggestion"
-          :is-loading="isMutating && activeSuggestionId === suggestion.id"
-          @approve="handleApprove"
-          @dismiss="handleDismiss"
-          @review="handleReview"
-        />
-      </div>
-    </template>
-
-    <FaqSuggestionReviewDialog
-      v-if="selectedSuggestion"
-      ref="reviewDialog"
-      :suggestion="selectedSuggestion"
-      @close="handleReviewClose"
-      @resolved="handleResolved"
-    />
-  </PageLayout>
-</template>

app/javascript/dashboard/routes/dashboard/captain/responses/Index.vue

@@ -1,14 +1,11 @@
 <script setup>
-import { computed, onUnmounted, ref, nextTick, watch } from 'vue';
+import { computed, onMounted, ref, nextTick } from 'vue';
 import { useMapGetter, useStore } from 'dashboard/composables/store';
-import { useAlert } from 'dashboard/composables';
-import { useAbortableRequest } from 'dashboard/composables/useAbortableRequest';
 import { useI18n } from 'vue-i18n';
 import { useRouter, useRoute } from 'vue-router';
 import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 import { debounce } from '@chatwoot/utils';
 import { useAccount } from 'dashboard/composables/useAccount';
-import CaptainResponseAPI from 'dashboard/api/captain/response';
 
 import Banner from 'dashboard/components-next/banner/Banner.vue';
 import Input from 'dashboard/components-next/input/Input.vue';
@@ -44,7 +41,7 @@ const createDialog = ref(null);
 
 const selectedAssistantId = computed(() => Number(route.params.assistantId));
 
-const suggestionCount = useMapGetter('captainFaqSuggestions/getOpenCount');
+const pendingCount = useMapGetter('captainResponses/getPendingCount');
 
 const handleDelete = () => {
   deleteDialog.value.dialogRef.open();
@@ -98,10 +95,8 @@ const updateURLWithFilters = (page, search) => {
   router.replace({ query });
 };
 
-const { run: runListRequest, abort: abortListRequest } = useAbortableRequest();
-
-const fetchResponses = async (page = 1) => {
-  const filterParams = { page };
+const fetchResponses = (page = 1) => {
+  const filterParams = { page, status: 'approved' };
 
   if (selectedAssistantId.value) {
     filterParams.assistantId = selectedAssistantId.value;
@@ -113,24 +108,7 @@ const fetchResponses = async (page = 1) => {
   // Update URL with current filters
   updateURLWithFilters(page, searchQuery.value);
 
-  store.dispatch('captainResponses/setFetchingList', true);
-
-  try {
-    const response = await runListRequest(signal =>
-      CaptainResponseAPI.get({ ...filterParams, signal })
-    );
-
-    if (!response) return;
-
-    store.dispatch('captainResponses/setRecords', {
-      records: response.data.payload,
-      meta: response.data.meta,
-    });
-    store.dispatch('captainResponses/setFetchingList', false);
-  } catch (error) {
-    useAlert(error?.message || t('CAPTAIN.RESPONSES.ERRORS.LOAD'));
-    store.dispatch('captainResponses/setFetchingList', false);
-  }
+  store.dispatch('captainResponses/get', filterParams);
 };
 
 // Bulk action
@@ -203,47 +181,24 @@ const debouncedSearch = debounce(async () => {
   fetchResponses(1);
 }, 500);
 
-const handleSearchInput = () => {
-  abortListRequest();
-  debouncedSearch();
-};
-
 const initializeFromURL = () => {
-  searchQuery.value = route.query.search || '';
+  if (route.query.search) {
+    searchQuery.value = route.query.search;
+  }
   const pageFromURL = parseInt(route.query.page, 10) || 1;
   fetchResponses(pageFromURL);
 };
 
-const navigateToFaqSuggestions = () => {
-  router.push({
-    name: 'captain_assistants_faq_suggestions',
-    params: {
-      accountId: route.params.accountId,
-      assistantId: selectedAssistantId.value,
-    },
-  });
+const navigateToPendingFAQs = () => {
+  router.push({ name: 'captain_assistants_responses_pending' });
 };
 
-watch(
-  selectedAssistantId,
-  () => {
-    selectedResponse.value = null;
-    bulkSelectedIds.value = new Set();
-    store.dispatch('captainResponses/setRecords', {
-      records: [],
-      meta: { page: 1, total_count: 0 },
-    });
-    initializeFromURL();
-    store.dispatch(
-      'captainFaqSuggestions/fetchOpenCount',
-      selectedAssistantId.value
-    );
-  },
-  { immediate: true }
-);
-
-onUnmounted(() => {
-  store.dispatch('captainResponses/setFetchingList', false);
+onMounted(() => {
+  initializeFromURL();
+  store.dispatch(
+    'captainResponses/fetchPendingCount',
+    selectedAssistantId.value
+  );
 });
 </script>
 
@@ -285,7 +240,7 @@ onUnmounted(() => {
           size="sm"
           type="search"
           autofocus
-          @input="handleSearchInput"
+          @input="debouncedSearch"
         />
       </div>
     </template>
@@ -316,13 +271,13 @@ onUnmounted(() => {
     <template #body>
       <LimitBanner class="mb-5" />
       <Banner
-        v-if="suggestionCount > 0"
+        v-if="pendingCount > 0"
         color="blue"
         class="mb-4 -mt-3"
-        :action-label="$t('CAPTAIN.RESPONSES.SUGGESTIONS_BANNER.ACTION')"
-        @action="navigateToFaqSuggestions"
+        :action-label="$t('CAPTAIN.RESPONSES.PENDING_BANNER.ACTION')"
+        @action="navigateToPendingFAQs"
       >
-        {{ $t('CAPTAIN.RESPONSES.SUGGESTIONS_BANNER.TITLE') }}
+        {{ $t('CAPTAIN.RESPONSES.PENDING_BANNER.TITLE') }}
       </Banner>
 
       <div class="flex flex-col gap-4">

app/javascript/dashboard/routes/dashboard/captain/responses/Pending.vue

@@ -0,0 +1,376 @@
+<script setup>
+import { computed, onMounted, ref, nextTick } from 'vue';
+import { useMapGetter, useStore } from 'dashboard/composables/store';
+import { useAlert } from 'dashboard/composables';
+import { useI18n } from 'vue-i18n';
+import { useRouter, useRoute } from 'vue-router';
+import { FEATURE_FLAGS } from 'dashboard/featureFlags';
+import { debounce } from '@chatwoot/utils';
+import { useAccount } from 'dashboard/composables/useAccount';
+
+import Button from 'dashboard/components-next/button/Button.vue';
+import Input from 'dashboard/components-next/input/Input.vue';
+import BulkSelectBar from 'dashboard/components-next/captain/assistant/BulkSelectBar.vue';
+import DeleteDialog from 'dashboard/components-next/captain/pageComponents/DeleteDialog.vue';
+import BulkDeleteDialog from 'dashboard/components-next/captain/pageComponents/BulkDeleteDialog.vue';
+import PageLayout from 'dashboard/components-next/captain/PageLayout.vue';
+import CaptainPaywall from 'dashboard/components-next/captain/pageComponents/Paywall.vue';
+import ResponseCard from 'dashboard/components-next/captain/assistant/ResponseCard.vue';
+import CreateResponseDialog from 'dashboard/components-next/captain/pageComponents/response/CreateResponseDialog.vue';
+import ResponsePageEmptyState from 'dashboard/components-next/captain/pageComponents/emptyStates/ResponsePageEmptyState.vue';
+import FeatureSpotlightPopover from 'dashboard/components-next/feature-spotlight/FeatureSpotlightPopover.vue';
+import LimitBanner from 'dashboard/components-next/captain/pageComponents/response/LimitBanner.vue';
+
+const router = useRouter();
+const route = useRoute();
+const store = useStore();
+const { isOnChatwootCloud } = useAccount();
+const uiFlags = useMapGetter('captainResponses/getUIFlags');
+const responseMeta = useMapGetter('captainResponses/getMeta');
+const responses = useMapGetter('captainResponses/getRecords');
+const isFetching = computed(() => uiFlags.value.fetchingList);
+
+const selectedResponse = ref(null);
+const deleteDialog = ref(null);
+const bulkDeleteDialog = ref(null);
+
+const selectedAssistantId = computed(() => route.params.assistantId);
+const dialogType = ref('');
+const searchQuery = ref('');
+const { t } = useI18n();
+
+const createDialog = ref(null);
+
+const backUrl = computed(() => ({
+  name: 'captain_assistants_responses_index',
+  params: {
+    accountId: route.params.accountId,
+    assistantId: selectedAssistantId.value,
+  },
+}));
+
+// Filter out approved responses in pending view
+const filteredResponses = computed(() =>
+  responses.value.filter(response => response.status !== 'approved')
+);
+
+const handleDelete = () => {
+  deleteDialog.value.dialogRef.open();
+};
+
+const handleAccept = async () => {
+  try {
+    await store.dispatch('captainResponses/update', {
+      id: selectedResponse.value.id,
+      status: 'approved',
+    });
+    useAlert(t(`CAPTAIN.RESPONSES.EDIT.APPROVE_SUCCESS_MESSAGE`));
+  } catch (error) {
+    const errorMessage =
+      error?.message || t(`CAPTAIN.RESPONSES.EDIT.ERROR_MESSAGE`);
+    useAlert(errorMessage);
+  } finally {
+    selectedResponse.value = null;
+  }
+};
+
+const handleEdit = () => {
+  dialogType.value = 'edit';
+  nextTick(() => createDialog.value.dialogRef.open());
+};
+
+const handleAction = ({ action, id }) => {
+  selectedResponse.value = filteredResponses.value.find(
+    response => id === response.id
+  );
+  nextTick(() => {
+    if (action === 'delete') {
+      handleDelete();
+    }
+    if (action === 'edit') {
+      handleEdit();
+    }
+    if (action === 'approve') {
+      handleAccept();
+    }
+  });
+};
+
+const handleNavigationAction = ({ id, type }) => {
+  if (type === 'Conversation') {
+    router.push({
+      name: 'inbox_conversation',
+      params: { conversation_id: id },
+    });
+  }
+};
+
+const handleCreateClose = () => {
+  dialogType.value = '';
+  selectedResponse.value = null;
+};
+
+const updateURLWithFilters = (page, search) => {
+  const query = {
+    page: page || 1,
+  };
+
+  if (search) {
+    query.search = search;
+  }
+
+  router.replace({ query });
+};
+
+const fetchResponses = (page = 1) => {
+  const filterParams = { page, status: 'pending' };
+
+  if (selectedAssistantId.value) {
+    filterParams.assistantId = selectedAssistantId.value;
+  }
+  if (searchQuery.value) {
+    filterParams.search = searchQuery.value;
+  }
+
+  // Update URL with current filters
+  updateURLWithFilters(page, searchQuery.value);
+
+  store.dispatch('captainResponses/get', filterParams);
+};
+
+// Bulk action
+const bulkSelectedIds = ref(new Set());
+const hoveredCard = ref(null);
+
+const buildSelectedCountLabel = computed(() => {
+  const count = filteredResponses.value?.length || 0;
+  const isAllSelected = bulkSelectedIds.value.size === count && count > 0;
+  return isAllSelected
+    ? t('CAPTAIN.RESPONSES.UNSELECT_ALL', { count })
+    : t('CAPTAIN.RESPONSES.SELECT_ALL', { count });
+});
+
+const selectedCountLabel = computed(() => {
+  return t('CAPTAIN.RESPONSES.SELECTED', {
+    count: bulkSelectedIds.value.size,
+  });
+});
+
+const handleCardHover = (isHovered, id) => {
+  hoveredCard.value = isHovered ? id : null;
+};
+
+const handleCardSelect = id => {
+  const selected = new Set(bulkSelectedIds.value);
+  selected[selected.has(id) ? 'delete' : 'add'](id);
+  bulkSelectedIds.value = selected;
+};
+
+const fetchResponseAfterBulkAction = () => {
+  const hasNoResponsesLeft = filteredResponses.value?.length === 0;
+  const currentPage = responseMeta.value?.page;
+
+  if (hasNoResponsesLeft) {
+    const pageToFetch = currentPage > 1 ? currentPage - 1 : currentPage;
+    fetchResponses(pageToFetch);
+  } else {
+    fetchResponses(currentPage);
+  }
+
+  bulkSelectedIds.value = new Set();
+};
+
+const handleBulkApprove = async () => {
+  try {
+    await store.dispatch(
+      'captainBulkActions/handleBulkApprove',
+      Array.from(bulkSelectedIds.value)
+    );
+
+    fetchResponseAfterBulkAction();
+    useAlert(t('CAPTAIN.RESPONSES.BULK_APPROVE.SUCCESS_MESSAGE'));
+  } catch (error) {
+    useAlert(
+      error?.message || t('CAPTAIN.RESPONSES.BULK_APPROVE.ERROR_MESSAGE')
+    );
+  }
+};
+
+const onPageChange = page => {
+  const hadSelection = bulkSelectedIds.value.size > 0;
+
+  fetchResponses(page);
+
+  if (hadSelection) {
+    bulkSelectedIds.value = new Set();
+  }
+};
+
+const onDeleteSuccess = () => {
+  if (filteredResponses.value?.length === 0 && responseMeta.value?.page > 1) {
+    onPageChange(responseMeta.value.page - 1);
+  }
+};
+
+const onBulkDeleteSuccess = () => {
+  fetchResponseAfterBulkAction();
+};
+
+const debouncedSearch = debounce(async () => {
+  fetchResponses(1);
+}, 500);
+
+const hasActiveFilters = computed(() => {
+  return Boolean(searchQuery.value);
+});
+
+const clearFilters = () => {
+  searchQuery.value = '';
+  fetchResponses(1);
+};
+
+const initializeFromURL = () => {
+  if (route.query.search) {
+    searchQuery.value = route.query.search;
+  }
+  const pageFromURL = parseInt(route.query.page, 10) || 1;
+  fetchResponses(pageFromURL);
+};
+
+onMounted(() => {
+  initializeFromURL();
+});
+</script>
+
+<template>
+  <PageLayout
+    :total-count="responseMeta.totalCount"
+    :current-page="responseMeta.page"
+    :header-title="$t('CAPTAIN.RESPONSES.PENDING_FAQS')"
+    :is-fetching="isFetching"
+    :is-empty="!filteredResponses.length"
+    :show-pagination-footer="!isFetching && !!filteredResponses.length"
+    :show-know-more="false"
+    :feature-flag="FEATURE_FLAGS.CAPTAIN"
+    :back-url="backUrl"
+    @update:current-page="onPageChange"
+  >
+    <template #knowMore>
+      <FeatureSpotlightPopover
+        :button-label="$t('CAPTAIN.HEADER_KNOW_MORE')"
+        :title="$t('CAPTAIN.RESPONSES.EMPTY_STATE.FEATURE_SPOTLIGHT.TITLE')"
+        :note="$t('CAPTAIN.RESPONSES.EMPTY_STATE.FEATURE_SPOTLIGHT.NOTE')"
+        :hide-actions="!isOnChatwootCloud"
+        fallback-thumbnail="/assets/images/dashboard/captain/faqs-popover-light.svg"
+        fallback-thumbnail-dark="/assets/images/dashboard/captain/faqs-popover-dark.svg"
+        learn-more-url="https://chwt.app/captain-faq"
+      />
+    </template>
+
+    <template #search>
+      <div
+        v-if="bulkSelectedIds.size === 0"
+        class="flex gap-3 justify-between w-full items-center"
+      >
+        <Input
+          v-model="searchQuery"
+          :placeholder="$t('CAPTAIN.RESPONSES.SEARCH_PLACEHOLDER')"
+          class="w-64"
+          size="sm"
+          type="search"
+          autofocus
+          @input="debouncedSearch"
+        />
+      </div>
+    </template>
+
+    <template #subHeader>
+      <BulkSelectBar
+        v-model="bulkSelectedIds"
+        :all-items="filteredResponses"
+        :select-all-label="buildSelectedCountLabel"
+        :selected-count-label="selectedCountLabel"
+        :delete-label="$t('CAPTAIN.RESPONSES.BULK_DELETE_BUTTON')"
+        class="w-fit"
+        :class="{
+          'mb-2': bulkSelectedIds.size > 0,
+        }"
+        @bulk-delete="bulkDeleteDialog.dialogRef.open()"
+      >
+        <template #secondaryActions>
+          <Button
+            :label="$t('CAPTAIN.RESPONSES.BULK_APPROVE_BUTTON')"
+            sm
+            ghost
+            icon="i-lucide-check"
+            class="!px-1.5"
+            @click="handleBulkApprove"
+          />
+        </template>
+      </BulkSelectBar>
+    </template>
+
+    <template #emptyState>
+      <ResponsePageEmptyState
+        variant="pending"
+        :has-active-filters="hasActiveFilters"
+        @clear-filters="clearFilters"
+      />
+    </template>
+
+    <template #paywall>
+      <CaptainPaywall />
+    </template>
+
+    <template #body>
+      <LimitBanner class="mb-5" />
+
+      <div class="flex flex-col gap-4">
+        <ResponseCard
+          v-for="response in filteredResponses"
+          :id="response.id"
+          :key="response.id"
+          :question="response.question"
+          :answer="response.answer"
+          :assistant="response.assistant"
+          :documentable="response.documentable"
+          :status="response.status"
+          :created-at="response.created_at"
+          :updated-at="response.updated_at"
+          :is-selected="bulkSelectedIds.has(response.id)"
+          :selectable="hoveredCard === response.id || bulkSelectedIds.size > 0"
+          :show-menu="false"
+          :show-actions="!bulkSelectedIds.has(response.id)"
+          @action="handleAction"
+          @navigate="handleNavigationAction"
+          @select="handleCardSelect"
+          @hover="isHovered => handleCardHover(isHovered, response.id)"
+        />
+      </div>
+    </template>
+
+    <DeleteDialog
+      v-if="selectedResponse"
+      ref="deleteDialog"
+      :entity="selectedResponse"
+      type="Responses"
+      @delete-success="onDeleteSuccess"
+    />
+
+    <BulkDeleteDialog
+      v-if="bulkSelectedIds"
+      ref="bulkDeleteDialog"
+      :bulk-ids="bulkSelectedIds"
+      type="AssistantResponse"
+      @delete-success="onBulkDeleteSuccess"
+    />
+
+    <CreateResponseDialog
+      v-if="dialogType"
+      ref="createDialog"
+      :type="dialogType"
+      :selected-response="selectedResponse"
+      @close="handleCreateClose"
+    />
+  </PageLayout>
+</template>

app/javascript/dashboard/routes/dashboard/settings/agentBots/Index.vue

@@ -135,7 +135,7 @@ onMounted(() => {
               <BaseTableCell class="max-w-0">
                 <div class="flex items-center gap-4 min-w-0">
                   <Avatar
-                    :name="bot.name || ''"
+                    :name="bot.name"
                     :src="bot.thumbnail"
                     :size="40"
                     class="flex-shrink-0"

app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue

@@ -4,6 +4,8 @@ import { shouldBeUrl } from 'shared/helpers/Validators';
 import { useAlert } from 'dashboard/composables';
 import { useVuelidate } from '@vuelidate/core';
 import Avatar from 'next/avatar/Avatar.vue';
+import Banner from 'dashboard/components-next/banner/Banner.vue';
+import Icon from 'dashboard/components-next/icon/Icon.vue';
 import SettingIntroBanner from 'dashboard/components/widgets/SettingIntroBanner.vue';
 import SettingsToggleSection from 'dashboard/components-next/Settings/SettingsToggleSection.vue';
 import SettingsFieldSection from 'dashboard/components-next/Settings/SettingsFieldSection.vue';
@@ -44,9 +46,11 @@ import SelectInput from 'dashboard/components-next/select/Select.vue';
 import Widget from 'dashboard/modules/widget-preview/components/Widget.vue';
 import AccessToken from 'dashboard/routes/dashboard/settings/profile/AccessToken.vue';
 import { copyTextToClipboard } from 'shared/helpers/clipboard';
+import { META_RESTRICTION_STATUS_URL } from 'dashboard/constants/globals';
 
 export default {
   components: {
+    Banner,
     BotConfiguration,
     CollaboratorsPage,
     ConfigurationPage,
@@ -80,6 +84,7 @@ export default {
     WhatsappManualMigrationBanner,
     Widget,
     AccessToken,
+    Icon,
   },
   mixins: [inboxMixin],
   setup() {
@@ -343,6 +348,12 @@ export default {
     instagramUnauthorized() {
       return this.isAnInstagramChannel && this.inbox.reauthorization_required;
     },
+    showInstagramRestrictionSettingsBanner() {
+      return this.isOnChatwootCloud && this.isAnInstagramChannel;
+    },
+    metaRestrictionStatusUrl() {
+      return META_RESTRICTION_STATUS_URL;
+    },
     tiktokUnauthorized() {
       return this.isATiktokChannel && this.inbox.reauthorization_required;
     },
@@ -809,6 +820,29 @@ export default {
           :class="bannerMaxWidth"
           @start="openWhatsAppManualMigrationDialog"
         />
+        <Banner
+          v-if="showInstagramRestrictionSettingsBanner"
+          color="amber"
+          class="mx-6 mb-4 max-w-4xl"
+        >
+          <div class="flex items-start gap-3 text-start">
+            <Icon
+              icon="i-lucide-triangle-alert"
+              class="flex-shrink-0 size-4 mt-0.5"
+            />
+            <span>
+              {{ $t('INBOX_MGMT.ADD.INSTAGRAM.SETTINGS_RESTRICTED_WARNING') }}
+              <a
+                :href="metaRestrictionStatusUrl"
+                class="link underline"
+                rel="noopener noreferrer nofollow"
+                target="_blank"
+              >
+                {{ $t('INBOX_MGMT.ADD.INSTAGRAM.STATUS_LINK') }}
+              </a>
+            </span>
+          </div>
+        </Banner>
 
         <div
           v-if="selectedTabKey === 'inbox-settings'"

app/javascript/dashboard/store/captain/bulkActions.js

@@ -48,6 +48,20 @@ export default createStore({
       return response;
     },
 
+    handleBulkApprove: async function handleBulkApprove({ dispatch }, ids) {
+      const response = await dispatch('processBulkAction', {
+        type: 'AssistantResponse',
+        actionType: 'approve',
+        ids,
+      });
+
+      // Update response store after successful API call
+      await dispatch('captainResponses/updateBulkResponses', response, {
+        root: true,
+      });
+      return response;
+    },
+
     handleBulkSync: async function handleBulkSync({ dispatch }, { ids }) {
       const response = await dispatch('processBulkAction', {
         type: 'AssistantDocument',

app/javascript/dashboard/store/captain/faqSuggestions.js

@@ -1,76 +0,0 @@
-import CaptainFaqSuggestionsAPI from 'dashboard/api/captain/faqSuggestions';
-import { createStore } from '../storeFactory';
-import { throwErrorMessage } from 'dashboard/store/utils/api';
-
-const SET_OPEN_COUNT = 'SET_OPEN_COUNT';
-let openCountRequestId = 0;
-
-export default createStore({
-  name: 'CaptainFaqSuggestion',
-  API: CaptainFaqSuggestionsAPI,
-  getters: {
-    getRecords: state => state.records,
-    getOpenCount: state => state.meta.openCount || 0,
-  },
-  mutations: {
-    [SET_OPEN_COUNT](state, count) {
-      state.meta = {
-        ...state.meta,
-        openCount: Number(count),
-      };
-    },
-  },
-  actions: mutations => ({
-    setFetchingList({ commit }, isFetching) {
-      commit(mutations.SET_UI_FLAG, { fetchingList: isFetching });
-    },
-    setRecords({ commit }, { records, meta }) {
-      commit(mutations.SET, records);
-      commit(mutations.SET_META, meta);
-    },
-    approve: async ({ commit }, { id, question, answer }) => {
-      commit(mutations.SET_UI_FLAG, { updatingItem: true });
-      try {
-        const response = await CaptainFaqSuggestionsAPI.approve(id, {
-          question,
-          answer,
-        });
-        commit(mutations.DELETE, id);
-        return response.data;
-      } catch (error) {
-        return throwErrorMessage(error);
-      } finally {
-        commit(mutations.SET_UI_FLAG, { updatingItem: false });
-      }
-    },
-    dismiss: async ({ commit }, id) => {
-      commit(mutations.SET_UI_FLAG, { deletingItem: true });
-      try {
-        await CaptainFaqSuggestionsAPI.dismiss(id);
-        commit(mutations.DELETE, id);
-        return id;
-      } catch (error) {
-        return throwErrorMessage(error);
-      } finally {
-        commit(mutations.SET_UI_FLAG, { deletingItem: false });
-      }
-    },
-    fetchOpenCount: async ({ commit }, assistantId) => {
-      openCountRequestId += 1;
-      const requestId = openCountRequestId;
-      commit(SET_OPEN_COUNT, 0);
-
-      try {
-        const response = await CaptainFaqSuggestionsAPI.get({
-          assistantId,
-          page: 1,
-        });
-        if (requestId !== openCountRequestId) return;
-
-        commit(SET_OPEN_COUNT, response.data?.meta?.total_count || 0);
-      } catch {
-        if (requestId === openCountRequestId) commit(SET_OPEN_COUNT, 0);
-      }
-    },
-  }),
-});

app/javascript/dashboard/store/captain/response.js

@@ -1,22 +1,58 @@
 import CaptainResponseAPI from 'dashboard/api/captain/response';
 import { createStore } from '../storeFactory';
 
+const SET_PENDING_COUNT = 'SET_PENDING_COUNT';
+
 export default createStore({
   name: 'CaptainResponse',
   API: CaptainResponseAPI,
+  getters: {
+    getPendingCount: state => state.meta.pendingCount || 0,
+  },
+  mutations: {
+    [SET_PENDING_COUNT](state, count) {
+      state.meta = {
+        ...state.meta,
+        pendingCount: Number(count),
+      };
+    },
+  },
   actions: mutations => ({
-    setFetchingList({ commit }, isFetching) {
-      commit(mutations.SET_UI_FLAG, { fetchingList: isFetching });
-    },
-    setRecords({ commit }, { records, meta }) {
-      commit(mutations.SET, records);
-      commit(mutations.SET_META, meta);
-    },
     removeBulkResponses: ({ commit, state }, ids) => {
       const updatedRecords = state.records.filter(
         record => !ids.includes(record.id)
       );
       commit(mutations.SET, updatedRecords);
     },
+    updateBulkResponses: ({ commit, state }, approvedResponses) => {
+      // Create a map of updated responses for faster lookup
+      const updatedResponsesMap = approvedResponses.reduce((map, response) => {
+        map[response.id] = response;
+        return map;
+      }, {});
+
+      // Update existing records with updated data
+      const updatedRecords = state.records.map(record => {
+        if (updatedResponsesMap[record.id]) {
+          return updatedResponsesMap[record.id]; // Replace with the updated response
+        }
+        return record;
+      });
+
+      commit(mutations.SET, updatedRecords);
+    },
+    fetchPendingCount: async ({ commit }, assistantId) => {
+      try {
+        const response = await CaptainResponseAPI.get({
+          status: 'pending',
+          page: 1,
+          assistantId,
+        });
+        const count = response.data?.meta?.total_count || 0;
+        commit(SET_PENDING_COUNT, count);
+      } catch (error) {
+        commit(SET_PENDING_COUNT, 0);
+      }
+    },
   }),
 });

app/javascript/dashboard/store/index.js

@@ -54,7 +54,6 @@ import captainAgentSessions from './captain/agentSessions';
 import captainAssistants from './captain/assistant';
 import captainDocuments from './captain/document';
 import captainResponses from './captain/response';
-import captainFaqSuggestions from './captain/faqSuggestions';
 import captainInboxes from './captain/inboxes';
 import captainBulkActions from './captain/bulkActions';
 import copilotThreads from './captain/copilotThreads';
@@ -121,7 +120,6 @@ export default createStore({
     captainAssistants,
     captainDocuments,
     captainResponses,
-    captainFaqSuggestions,
     captainInboxes,
     captainBulkActions,
     copilotThreads,

app/javascript/shared/components/ui/MultiselectDropdown.vue

@@ -68,10 +68,6 @@ const isAgentBot = computed(
   () => props.selectedItem?.assignee_type === 'AgentBot'
 );
 
-const selectedItemName = computed(() =>
-  !props.selectedItem?.name && isAgentBot.value ? '-' : props.selectedItem?.name
-);
-
 const selectedThumbnail = computed(
   () => props.selectedItem?.thumbnail || props.selectedItem?.avatar_url
 );
@@ -99,16 +95,16 @@ const selectedThumbnail = computed(
           <h4
             v-else
             class="items-center overflow-hidden text-sm leading-tight whitespace-nowrap text-ellipsis text-n-slate-12"
-            :title="selectedItemName"
+            :title="selectedItem.name"
           >
-            {{ selectedItemName }}
+            {{ selectedItem.name }}
           </h4>
         </div>
         <Avatar
           v-if="hasValue && hasThumbnail && (isAgentBot || !hasIcon)"
           :src="selectedThumbnail"
           :status="selectedItem.availability_status"
-          :name="selectedItemName"
+          :name="selectedItem.name"
           :icon-name="isAgentBot ? 'i-lucide-bot' : undefined"
           :size="24"
           hide-offline-status

app/javascript/shared/components/ui/MultiselectDropdownItems.vue

@@ -53,9 +53,7 @@ export default {
   computed: {
     filteredOptions() {
       return this.options.filter(option => {
-        return (option.name || '')
-          .toLowerCase()
-          .includes(this.search.toLowerCase());
+        return option.name.toLowerCase().includes(this.search.toLowerCase());
       });
     },
     noResult() {

app/javascript/widget/components/ChatFooter.vue

@@ -11,8 +11,6 @@ import { IFrameHelper } from '../helpers/utils';
 import { CHATWOOT_ON_START_CONVERSATION } from '../constants/sdkEvents';
 import { emitter } from 'shared/helpers/mitt';
 
-const TRANSCRIPT_COOLDOWN_MS = 15000;
-
 export default {
   components: {
     ChatInputWrap,
@@ -26,9 +24,6 @@ export default {
   data() {
     return {
       inReplyTo: null,
-      isSendingTranscript: false,
-      transcriptCooldown: false,
-      transcriptCooldownTimer: null,
     };
   },
   computed: {
@@ -62,9 +57,6 @@ export default {
   mounted() {
     emitter.on(BUS_EVENTS.TOGGLE_REPLY_TO_MESSAGE, this.toggleReplyTo);
   },
-  beforeUnmount() {
-    clearTimeout(this.transcriptCooldownTimer);
-  },
   methods: {
     ...mapActions('conversation', ['sendMessage', 'sendAttachment']),
     ...mapActions('conversationAttributes', ['getAttributes']),
@@ -98,35 +90,19 @@ export default {
     toggleReplyTo(message) {
       this.inReplyTo = message;
     },
-    startTranscriptCooldown() {
-      this.transcriptCooldown = true;
-      clearTimeout(this.transcriptCooldownTimer);
-      this.transcriptCooldownTimer = setTimeout(() => {
-        this.transcriptCooldown = false;
-      }, TRANSCRIPT_COOLDOWN_MS);
-    },
     async sendTranscript() {
-      if (
-        !this.hasEmail ||
-        this.isSendingTranscript ||
-        this.transcriptCooldown
-      ) {
-        return;
-      }
-      this.isSendingTranscript = true;
-      try {
-        await sendEmailTranscript();
-        this.startTranscriptCooldown();
-        emitter.emit(BUS_EVENTS.SHOW_ALERT, {
-          message: this.$t('EMAIL_TRANSCRIPT.SEND_EMAIL_SUCCESS'),
-          type: 'success',
-        });
-      } catch (error) {
-        emitter.emit(BUS_EVENTS.SHOW_ALERT, {
-          message: this.$t('EMAIL_TRANSCRIPT.SEND_EMAIL_ERROR'),
-        });
-      } finally {
-        this.isSendingTranscript = false;
+      if (this.hasEmail) {
+        try {
+          await sendEmailTranscript();
+          emitter.emit(BUS_EVENTS.SHOW_ALERT, {
+            message: this.$t('EMAIL_TRANSCRIPT.SEND_EMAIL_SUCCESS'),
+            type: 'success',
+          });
+        } catch (error) {
+          emitter.$emit(BUS_EVENTS.SHOW_ALERT, {
+            message: this.$t('EMAIL_TRANSCRIPT.SEND_EMAIL_ERROR'),
+          });
+        }
       }
     },
   },
@@ -168,7 +144,6 @@ export default {
       v-if="showEmailTranscriptButton"
       type="clear"
       class="font-normal"
-      :disabled="isSendingTranscript || transcriptCooldown"
       @click="sendTranscript"
     >
       {{ $t('EMAIL_TRANSCRIPT.BUTTON_TEXT') }}

app/jobs/webhooks/whatsapp_events_job.rb

@@ -153,11 +153,11 @@ class Webhooks::WhatsappEventsJob < MutexApplicationJob
   end
 
   def get_channel_from_wb_payload(wb_params)
-    metadata = wb_params[:entry].first[:changes].first.dig(:value, :metadata) || {}
-    Whatsapp::WebhookChannelFinderService.new(
-      display_phone_number: metadata[:display_phone_number],
-      phone_number_id: metadata[:phone_number_id]
-    ).perform
+    phone_number = "+#{wb_params[:entry].first[:changes].first.dig(:value, :metadata, :display_phone_number)}"
+    phone_number_id = wb_params[:entry].first[:changes].first.dig(:value, :metadata, :phone_number_id)
+    channel = Channel::Whatsapp.find_by(phone_number: phone_number)
+    # validate to ensure the phone number id matches the whatsapp channel
+    return channel if channel && channel.provider_config['phone_number_id'] == phone_number_id
   end
 end
 

app/services/whatsapp/send_on_whatsapp_service.rb

@@ -6,10 +6,12 @@ class Whatsapp::SendOnWhatsappService < Base::SendOnChannelService
   end
 
   def perform_reply
-    return send_template_message if template_params.present?
-    return send_session_message if message.conversation.can_reply?
-
-    message.update!(status: :failed, external_error: I18n.t('errors.whatsapp.message_outside_messaging_window'))
+    should_send_template_message = template_params.present? || !message.conversation.can_reply?
+    if should_send_template_message
+      send_template_message
+    else
+      send_session_message
+    end
   end
 
   def send_template_message

app/services/whatsapp/webhook_channel_finder_service.rb

@@ -1,35 +0,0 @@
-# Resolves the WhatsApp channel for an inbound WhatsApp Cloud webhook. Meta's
-# display_phone_number can arrive formatted or in a country-specific variant (e.g. Brazil
-# omits the mobile 9, Argentina adds a digit after the country code), so we try the
-# raw digits first and then a normalized fallback, accepting only a candidate whose
-# phone_number_id matches.
-class Whatsapp::WebhookChannelFinderService
-  def initialize(display_phone_number:, phone_number_id:)
-    @display_phone_number = display_phone_number
-    @phone_number_id = phone_number_id
-  end
-
-  def perform
-    return if digits.blank?
-
-    candidates = [
-      Channel::Whatsapp.find_by(phone_number: "+#{digits}"),
-      channel_by_normalized_number
-    ]
-    candidates.compact.find { |channel| channel.provider_config['phone_number_id'] == @phone_number_id }
-  end
-
-  private
-
-  def digits
-    @digits ||= @display_phone_number.to_s.gsub(/[^0-9]/, '')
-  end
-
-  def channel_by_normalized_number
-    normalizer = Whatsapp::PhoneNumberNormalizationService::NORMALIZERS
-                 .lazy.map(&:new).find { |n| n.handles_country?(digits) }
-    return unless normalizer
-
-    Channel::Whatsapp.find_by(phone_number: "+#{normalizer.normalize(digits)}")
-  end
-end

config/app.yml

@@ -1,5 +1,5 @@
 shared: &shared
-  version: '4.16.1'
+  version: '4.16.0'
 
 development:
   <<: *shared

config/llm.yml

@@ -143,20 +143,6 @@ features:
         gemini-3-pro,
       ]
     default: gpt-5.2
-  conversation_faq_matching:
-    models:
-      [
-        gpt-4.1-mini,
-        gpt-5-mini,
-        gpt-4.1,
-        gpt-5.1,
-        gpt-5.2,
-        claude-haiku-4.5,
-        claude-sonnet-4.5,
-        gemini-3-flash,
-        gemini-3-pro,
-      ]
-    default: gpt-4.1-mini
   pdf_faq_generation:
     models: [gpt-4.1-mini, gpt-5-mini, gpt-4.1, gpt-5.1, gpt-5.2]
     default: gpt-4.1-mini

config/locales/en.yml

@@ -154,7 +154,6 @@ en:
       invalid_token_permissions: 'The access token does not have the required permissions for WhatsApp.'
       phone_info_fetch_failed: 'Failed to fetch phone number information. Please try again.'
       phone_number_already_exists: 'Channel already exists for this phone number: %{phone_number}, please contact support if the error persists'
-      message_outside_messaging_window: 'Message not sent because the WhatsApp 24-hour customer service window is closed and no template parameters were provided. Send an approved template message instead.'
       reauthorization:
         generic: 'Failed to reauthorize WhatsApp. Please try again.'
         not_supported: 'Reauthorization is not supported for this type of WhatsApp channel.'
@@ -626,7 +625,6 @@ en:
         label_suggestion: 'Label suggestion'
         document_faq_generation: 'Document FAQ generation'
         conversation_faq_generation: 'Conversation FAQ generation'
-        conversation_faq_matching: 'Conversation FAQ matching'
         help_center_article_generation: 'Help center article generation'
         onboarding_content_generation: 'Onboarding content generation'
         help_center_query_translation: 'Help center query translation'

config/routes.rb

@@ -66,8 +66,7 @@ Rails.application.routes.draw do
             resources :assistants do
               member do
                 post :playground
-                get :metrics
-                get :faq_stats
+                get :stats
                 get :summary
                 get :drilldown
               end
@@ -79,10 +78,6 @@ Rails.application.routes.draw do
             end
             resources :agent_sessions, only: [:show]
             resources :assistant_responses
-            resources :faq_suggestions, only: [:index, :show, :update] do
-              post :approve, on: :member
-              post :dismiss, on: :member
-            end
             resources :message_reports, only: [:create]
             resources :bulk_actions, only: [:create]
             resources :copilot_threads, only: [:index, :create] do

db/migrate/20260714123000_purge_pending_captain_assistant_responses.rb

@@ -1,7 +0,0 @@
-class PurgePendingCaptainAssistantResponses < ActiveRecord::Migration[7.1]
-  def up
-    execute('DELETE FROM captain_assistant_responses WHERE status = 0')
-  end
-
-  def down; end
-end

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_07_14_123000) do
+ActiveRecord::Schema[7.1].define(version: 2026_07_13_184351) do
   # These extensions should be enabled to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"

enterprise/app/builders/captain/assistant_credit_usage_builder.rb

@@ -0,0 +1,124 @@
+# Computes per-assistant credit consumption (from agent_sessions) for the
+# Captain Overview page: window totals for the trend plus a per-day series for
+# the usage chart.
+#
+# Days are bucketed on the viewer's calendar day, so a completed day's sum never
+# changes. Those sums are cached per (assistant, timezone, date) with a long TTL
+# and only the still-accruing current day is computed live on every request.
+class Captain::AssistantCreditUsageBuilder
+  CACHE_TTL = 30.days
+
+  # Credit tracking on agent_sessions began on this date. Earlier days are still
+  # returned in `daily` but with a nil value ("no data recorded") and are
+  # excluded from the queried span and the window totals.
+  DATA_EPOCH = Date.new(2026, 7, 17)
+
+  def initialize(assistant, window)
+    @assistant = assistant
+    @window = window
+  end
+
+  # => { current:, previous:, daily: [{ date:, value: }, ...] }
+  # `daily` covers the current window only; `previous` is the total for the
+  # preceding equal-length day span, used for the trend. A nil daily value means
+  # the day predates credit tracking.
+  def build
+    sums = daily_sums(recorded_dates)
+
+    {
+      current: total(sums, current_dates),
+      previous: total(sums, previous_dates),
+      daily: current_dates.map { |date| { date: date, value: sums[date] } }
+    }
+  end
+
+  private
+
+  attr_reader :assistant, :window
+
+  # Credit usage is bucketed on calendar days (unlike the rolling timestamp
+  # windows of the other metrics): a day-count range means exactly N calendar
+  # days ending today in the viewer's timezone, and month ranges follow the
+  # window's calendar boundaries.
+  def current_dates
+    @current_dates ||= if day_range?
+                         (today - (window.range.to_i - 1))..today
+                       else
+                         to_dates(window.current)
+                       end
+  end
+
+  # Day ranges derive the comparison span from the current dates (the N days
+  # right before them), since current_dates redefines the window as N calendar
+  # days ending today. Named month ranges follow window.previous so the trend
+  # compares the same periods as every other overview metric.
+  def previous_dates
+    if day_range?
+      (current_dates.first - current_dates.count)..(current_dates.first - 1)
+    else
+      to_dates(window.previous)
+    end
+  end
+
+  def day_range?
+    window.range.match?(/\A\d+\z/)
+  end
+
+  def to_dates(range)
+    range.first.in_time_zone(timezone).to_date..range.last.in_time_zone(timezone).to_date
+  end
+
+  # Pre-epoch days are never queried or cached; they fall out of the sums hash
+  # and surface as nil daily values / zero contribution to totals. While the
+  # previous span is fully pre-epoch this leaves `previous` at 0, so the
+  # frontend hides the trend.
+  def recorded_dates
+    (previous_dates.to_a + current_dates.to_a).select { |date| date >= DATA_EPOCH }
+  end
+
+  def daily_sums(dates)
+    cacheable = dates.select { |date| date < today }
+    cached = Rails.cache.read_multi(*cacheable.map { |date| cache_key(date) })
+
+    missing = dates.reject { |date| cached.key?(cache_key(date)) }
+    live = live_sums(missing)
+    missing.each do |date|
+      Rails.cache.write(cache_key(date), live[date], expires_in: CACHE_TTL) if date < today
+    end
+
+    dates.index_with { |date| cached.fetch(cache_key(date)) { live[date] } }
+  end
+
+  # One grouped scan covering the span of the requested dates. Zero-filled via
+  # groupdate so cache entries exist even for days without sessions.
+  def live_sums(dates)
+    return {} if dates.empty?
+
+    span = dates.min.in_time_zone(timezone).beginning_of_day..dates.max.in_time_zone(timezone).end_of_day
+    Captain::AgentSession
+      .where(assistant_id: assistant.id, created_at: span)
+      .group_by_day(:created_at, time_zone: timezone, range: span)
+      .sum(:credits_consumed)
+      .to_h { |day, value| [day.to_date, (value || 0).round(2)] }
+  end
+
+  def total(sums, dates)
+    dates.sum { |date| sums[date].to_f }.round(2)
+  end
+
+  def today
+    @today ||= Time.current.in_time_zone(timezone).to_date
+  end
+
+  def timezone
+    window.timezone
+  end
+
+  def cache_key(date)
+    "captain_credit_usage/#{assistant.id}/#{timezone_name}/#{date}"
+  end
+
+  def timezone_name
+    @timezone_name ||= timezone.is_a?(String) ? timezone : timezone.name
+  end
+end

enterprise/app/builders/captain/assistant_stats_builder.rb

@@ -23,11 +23,10 @@ class Captain::AssistantStatsBuilder
   # ('this_month', 'last_month'). `timezone_offset` is the viewer's UTC offset in
   # hours (as the reports API sends it), so month/day boundaries anchor to the
   # viewer's day rather than UTC. Both windows are resolved by AssistantStatsWindow.
-  def initialize(assistant, range = Captain::AssistantStatsWindow::DEFAULT_RANGE, timezone_offset = nil, suggestions_scope: nil)
+  def initialize(assistant, range = Captain::AssistantStatsWindow::DEFAULT_RANGE, timezone_offset = nil)
     @assistant = assistant
     @account = assistant.account
     @window = Captain::AssistantStatsWindow.new(range, timezone_offset)
-    @suggestions_scope = suggestions_scope || assistant.faq_suggestions
   end
 
   def metrics
@@ -38,26 +37,9 @@ class Captain::AssistantStatsBuilder
     build_metrics(current, previous)
   end
 
-  # Approved FAQ, open suggestion, and document counts in a single round trip.
-  def faq_stats
-    approved, suggestions, documents = Captain::AssistantResponse.by_assistant(assistant.id).reorder(nil).pick(
-      Arel.sql("COUNT(*) FILTER (WHERE status = #{Captain::AssistantResponse.statuses['approved']})"),
-      Arel.sql("(#{open_suggestion_count_sql})"),
-      Arel.sql("(SELECT COUNT(*) FROM captain_documents WHERE assistant_id = #{assistant.id.to_i})")
-    )
-    total = approved + suggestions
-
-    {
-      approved: approved,
-      suggestions: suggestions,
-      documents: documents,
-      coverage: total.zero? ? 0 : (approved.to_f / total * 100).round
-    }
-  end
-
   private
 
-  attr_reader :window, :suggestions_scope
+  attr_reader :window
 
   def current_range
     window.current
@@ -74,7 +56,9 @@ class Captain::AssistantStatsBuilder
       handoff_rate: pack(current[:handoff], previous[:handoff], :point),
       hours_saved: pack(current[:hours_saved], previous[:hours_saved], :percent),
       reopen_rate: pack(current[:reopen], previous[:reopen], :point),
-      conversation_depth: pack(current[:depth], previous[:depth], :absolute)
+      conversation_depth: pack(current[:depth], previous[:depth], :absolute),
+      credit_usage: credit_usage,
+      knowledge: knowledge
     }
   end
 
@@ -90,7 +74,7 @@ class Captain::AssistantStatsBuilder
       auto_resolution: rate(resolution[:resolved], handled),
       handoff: rate(resolution[:handoff], handled),
       hours_saved: (public_count * SECONDS_SAVED_PER_REPLY / 3600.0).round,
-      reopen: reopen_rate(range, resolution[:resolved]),
+      reopen: reopen_rate(range),
       depth: depth_conversations.zero? ? 0 : (public_count.to_f / depth_conversations).round(1)
     }
   end
@@ -175,9 +159,7 @@ class Captain::AssistantStatsBuilder
   # derived from the assistant's handled conversations (not current inbox membership) so a later
   # inbox reassignment doesn't drop historical resolves, and covers both the evaluated (inference)
   # and time-based (bot) resolve paths so the denominator matches auto_resolution_rate.
-  def reopen_rate(range, resolved_count)
-    return 0 if resolved_count.zero?
-
+  def reopen_rate(range)
     resolved_scope = account.reporting_events
                             .where(name: RESOLVED_EVENT_NAMES, created_at: range,
                                    conversation_id: handled_scope(range).select(:conversation_id))
@@ -197,11 +179,31 @@ class Captain::AssistantStatsBuilder
                              'ON resolves.conversation_id = reporting_events.conversation_id ' \
                              'AND reporting_events.event_end_time >= resolves.event_end_time')
                       .distinct.count('reporting_events.conversation_id')
-    rate(reopened, resolved_count)
+    rate(reopened, resolved_scope.distinct.count(:conversation_id))
   end
 
-  def open_suggestion_count_sql
-    suggestions_scope.where(assistant_id: assistant.id).open.reorder(nil).select('COUNT(*)').to_sql
+  # Credits consumed by the assistant's agent sessions: window totals packed like
+  # the other trend metrics, plus the per-day series for the usage chart.
+  def credit_usage
+    usage = Captain::AssistantCreditUsageBuilder.new(assistant, window).build
+    pack(usage[:current], usage[:previous], :percent).merge(daily: usage[:daily])
+  end
+
+  # Approved/pending FAQ counts and the document total in a single round trip.
+  def knowledge
+    approved, pending, documents = Captain::AssistantResponse.by_assistant(assistant.id).reorder(nil).pick(
+      Arel.sql("COUNT(*) FILTER (WHERE status = #{Captain::AssistantResponse.statuses['approved']})"),
+      Arel.sql("COUNT(*) FILTER (WHERE status = #{Captain::AssistantResponse.statuses['pending']})"),
+      Arel.sql("(SELECT COUNT(*) FROM captain_documents WHERE assistant_id = #{assistant.id.to_i})")
+    )
+    total = approved + pending
+
+    {
+      approved: approved,
+      pending: pending,
+      documents: documents,
+      coverage: total.zero? ? 0 : (approved.to_f / total * 100).round
+    }
   end
 
   def rate(numerator, denominator)

enterprise/app/builders/captain/assistant_stats_window.rb

@@ -14,7 +14,7 @@ class Captain::AssistantStatsWindow
   DEFAULT_RANGE = '30'.freeze
   ALLOWED_RANGES = %w[7 30 90 this_month last_month].freeze
 
-  attr_reader :range
+  attr_reader :range, :timezone
 
   def initialize(range = DEFAULT_RANGE, timezone_offset = nil)
     @range = ALLOWED_RANGES.include?(range.to_s) ? range.to_s : DEFAULT_RANGE

enterprise/app/controllers/api/v1/accounts/captain/assistant_responses_controller.rb

@@ -43,6 +43,8 @@ class Api::V1::Accounts::Captain::AssistantResponsesController < Api::V1::Accoun
       )
     end
 
+    base_query = base_query.where(status: permitted_params[:status]) if permitted_params[:status].present?
+
     if permitted_params[:search].present?
       search_term = "%#{permitted_params[:search]}%"
       base_query = base_query.where(
@@ -71,14 +73,15 @@ class Api::V1::Accounts::Captain::AssistantResponsesController < Api::V1::Accoun
   end
 
   def permitted_params
-    params.permit(:id, :assistant_id, :page, :document_id, :account_id, :search)
+    params.permit(:id, :assistant_id, :page, :document_id, :account_id, :status, :search)
   end
 
   def response_params
     params.require(:assistant_response).permit(
       :question,
       :answer,
-      :assistant_id
+      :assistant_id,
+      :status
     )
   end
 end

enterprise/app/controllers/api/v1/accounts/captain/assistants_controller.rb

@@ -1,7 +1,7 @@
 class Api::V1::Accounts::Captain::AssistantsController < Api::V1::Accounts::BaseController
   before_action -> { check_authorization(Captain::Assistant) }
 
-  before_action :set_assistant, only: [:show, :update, :destroy, :playground, :metrics, :faq_stats, :summary, :drilldown]
+  before_action :set_assistant, only: [:show, :update, :destroy, :playground, :stats, :summary, :drilldown]
 
   def index
     @assistants = account_assistants.ordered
@@ -42,19 +42,10 @@ class Api::V1::Accounts::Captain::AssistantsController < Api::V1::Accounts::Base
     @tools = assistant.available_agent_tools
   end
 
-  def metrics
+  def stats
     render json: Captain::AssistantStatsBuilder.new(@assistant, params[:range], params[:timezone_offset]).metrics
   end
 
-  def faq_stats
-    builder = Captain::AssistantStatsBuilder.new(
-      @assistant,
-      suggestions_scope: Captain::FaqSuggestionFinder.new(Current.user, Current.account).perform
-    )
-
-    render json: builder.faq_stats
-  end
-
   def summary
     window = Captain::AssistantStatsWindow.new(params[:range], params[:timezone_offset])
     result = cached_or_generated_summary(window, summary_stats)

enterprise/app/controllers/api/v1/accounts/captain/bulk_actions_controller.rb

@@ -39,10 +39,14 @@ class Api::V1::Accounts::Captain::BulkActionsController < Api::V1::Accounts::Bas
     responses = Current.account.captain_assistant_responses.where(id: params[:ids])
     return unless responses.exists?
 
-    return render json: { success: false }, status: :unprocessable_content unless params[:fields][:status] == 'delete'
-
-    responses.destroy_all
-    []
+    case params[:fields][:status]
+    when 'approve'
+      responses.pending.update(status: 'approved')
+      responses
+    when 'delete'
+      responses.destroy_all
+      []
+    end
   end
 
   def handle_documents

enterprise/app/controllers/api/v1/accounts/captain/faq_suggestions_controller.rb

@@ -1,80 +0,0 @@
-class Api::V1::Accounts::Captain::FaqSuggestionsController < Api::V1::Accounts::BaseController
-  before_action :current_account
-  before_action -> { check_authorization(Captain::FaqSuggestion) }
-  before_action :set_accessible_suggestions
-  before_action :set_suggestion, except: [:index]
-
-  RESULTS_PER_PAGE = 25
-  SOURCE_PREVIEW_LIMIT = 50
-
-  def index
-    @current_page = permitted_params[:page] || 1
-    filtered_query = apply_filters(@suggestions)
-    @suggestions_count = filtered_query.count
-    @suggestions = filtered_query.page(@current_page).per(RESULTS_PER_PAGE)
-  end
-
-  def show
-    @observations = @suggestion.observations
-                               .where(conversation_id: accessible_conversations.select(:id))
-                               .includes(:conversation)
-                               .order(created_at: :desc)
-                               .limit(SOURCE_PREVIEW_LIMIT)
-  end
-
-  def update
-    @suggestion.with_lock do
-      raise ActiveRecord::RecordNotFound unless @suggestion.open?
-
-      @suggestion.update!(suggestion_params)
-    end
-  end
-
-  def approve
-    attributes = params[:faq_suggestion].present? ? suggestion_params : {}
-    @response = Captain::FaqSuggestionApprovalService.new(@suggestion, attributes).perform
-  end
-
-  def dismiss
-    @suggestion.with_lock do
-      raise ActiveRecord::RecordNotFound unless @suggestion.open?
-
-      @suggestion.dismissed!
-    end
-  end
-
-  private
-
-  def apply_filters(base_query)
-    base_query = base_query.where(assistant_id: permitted_params[:assistant_id]) if permitted_params[:assistant_id].present?
-    base_query = base_query.where(status: permitted_params[:status]) if permitted_params[:status].present?
-
-    if permitted_params[:search].present?
-      # TODO: Move FAQ suggestion search to Elasticsearch when the records are indexed there.
-      search_term = "%#{permitted_params[:search]}%"
-      base_query = base_query.where('question ILIKE :search OR answer ILIKE :search', search: search_term)
-    end
-
-    base_query
-  end
-
-  def set_accessible_suggestions
-    @suggestions = Captain::FaqSuggestionFinder.new(Current.user, Current.account).perform.includes(:assistant).ordered
-  end
-
-  def set_suggestion
-    @suggestion = @suggestions.find(permitted_params[:id])
-  end
-
-  def accessible_conversations
-    Conversations::PermissionFilterService.new(Current.account.conversations, Current.user, Current.account).perform
-  end
-
-  def permitted_params
-    params.permit(:id, :assistant_id, :page, :status, :search)
-  end
-
-  def suggestion_params
-    params.require(:faq_suggestion).permit(:question, :answer)
-  end
-end

enterprise/app/controllers/enterprise/api/v1/accounts/agents_controller.rb

@@ -1,8 +1,6 @@
 module Enterprise::Api::V1::Accounts::AgentsController
   def create
     super
-    return if @agent.blank?
-
     associate_agent_with_custom_role
   end
 

enterprise/app/finders/captain/faq_suggestion_finder.rb

@@ -1,26 +0,0 @@
-class Captain::FaqSuggestionFinder
-  def initialize(current_user, current_account)
-    @current_user = current_user
-    @current_account = current_account
-  end
-
-  def perform
-    suggestions = @current_account.captain_faq_suggestions
-    return suggestions if account_user&.administrator?
-
-    accessible_suggestion_ids = Captain::FaqObservation
-                                .where(conversation_id: accessible_conversations.select(:id))
-                                .select(:faq_suggestion_id)
-    suggestions.where(id: accessible_suggestion_ids)
-  end
-
-  private
-
-  def accessible_conversations
-    Conversations::PermissionFilterService.new(@current_account.conversations, @current_user, @current_account).perform
-  end
-
-  def account_user
-    @account_user ||= @current_account.account_users.find_by(user_id: @current_user.id)
-  end
-end

enterprise/app/jobs/captain/llm/conversation_faq_job.rb

@@ -1,30 +0,0 @@
-class Captain::Llm::ConversationFaqJob < MutexApplicationJob
-  queue_as :low
-
-  LOCK_TIMEOUT = 10.minutes
-
-  retry_on_lock_conflict wait: 30.seconds, attempts: 30
-
-  def perform(conversation, assistant)
-    inbox = conversation.inbox
-
-    return unless conversation.resolved?
-    return unless inbox.captain_active?
-
-    return if assistant.config['feature_faq'].blank?
-
-    with_lock(lock_key(assistant, conversation), LOCK_TIMEOUT) do
-      Captain::Llm::ConversationFaqService.new(assistant, conversation).generate_suggestions
-    end
-  end
-
-  private
-
-  def lock_key(assistant, conversation)
-    format(
-      ::Redis::Alfred::CAPTAIN_CONVERSATION_FAQ_MUTEX,
-      assistant_id: assistant.id,
-      language: Captain::Llm::ConversationFaqService.language_for(conversation)
-    )
-  end
-end

enterprise/app/listeners/captain_listener.rb

@@ -8,6 +8,6 @@ class CaptainListener < BaseListener
     return unless conversation.inbox.captain_active?
 
     Captain::Llm::ContactNotesService.new(assistant, conversation).generate_and_update_notes if assistant.config['feature_memory'].present?
-    Captain::Llm::ConversationFaqJob.perform_later(conversation, assistant) if assistant.config['feature_faq'].present?
+    Captain::Llm::ConversationFaqService.new(assistant, conversation).generate_and_deduplicate if assistant.config['feature_faq'].present?
   end
 end

enterprise/app/models/captain/assistant_response.rb

@@ -44,7 +44,7 @@ class Captain::AssistantResponse < ApplicationRecord
   scope :by_assistant, ->(assistant_id) { where(assistant_id: assistant_id) }
   scope :with_document, ->(document_id) { where(document_id: document_id) }
 
-  enum status: { approved: 1 }
+  enum status: { pending: 0, approved: 1 }
 
   def self.search(query, account_id: nil)
     embedding = Captain::Llm::EmbeddingService.new(account_id: account_id).get_embedding(query)

enterprise/app/policies/captain/assistant_policy.rb

@@ -7,11 +7,7 @@ class Captain::AssistantPolicy < ApplicationPolicy
     true
   end
 
-  def metrics?
-    true
-  end
-
-  def faq_stats?
+  def stats?
     true
   end
 
@@ -35,14 +31,6 @@ class Captain::AssistantPolicy < ApplicationPolicy
     @account_user.administrator?
   end
 
-  def approve?
-    update?
-  end
-
-  def dismiss?
-    update?
-  end
-
   def destroy?
     @account_user.administrator?
   end

enterprise/app/policies/captain/faq_suggestion_policy.rb

@@ -1,21 +0,0 @@
-class Captain::FaqSuggestionPolicy < ApplicationPolicy
-  def index?
-    true
-  end
-
-  def show?
-    true
-  end
-
-  def update?
-    true
-  end
-
-  def approve?
-    true
-  end
-
-  def dismiss?
-    true
-  end
-end

enterprise/app/services/captain/faq_suggestion_approval_service.rb

@@ -1,26 +0,0 @@
-class Captain::FaqSuggestionApprovalService
-  def initialize(suggestion, attributes = {})
-    @suggestion = suggestion
-    @attributes = attributes
-  end
-
-  def perform
-    suggestion.with_lock do
-      raise ActiveRecord::RecordNotFound unless suggestion.open?
-
-      suggestion.update!(attributes) if attributes.present?
-
-      response = suggestion.assistant.responses.create!(
-        question: suggestion.question,
-        answer: suggestion.answer,
-        status: :approved
-      )
-      suggestion.approved!
-      response
-    end
-  end
-
-  private
-
-  attr_reader :suggestion, :attributes
-end

enterprise/app/services/captain/llm/conversation_faq_content_service.rb

@@ -1,66 +0,0 @@
-class Captain::Llm::ConversationFaqContentService
-  def initialize(assistant, conversation)
-    @assistant = assistant
-    @conversation = conversation
-  end
-
-  def generate
-    [
-      'Business Context:',
-      JSON.pretty_generate(business_context),
-      "Conversation ID: ##{conversation.display_id}",
-      "Channel: #{conversation.inbox.channel.name}",
-      'Message History:',
-      conversation_messages
-    ].join("\n")
-  end
-
-  private
-
-  attr_reader :assistant, :conversation
-
-  def conversation_messages
-    messages = conversation
-               .messages
-               .where(message_type: %i[incoming outgoing], private: false)
-               .order(created_at: :asc)
-
-    return "No messages in this conversation\n" if messages.empty?
-
-    messages.filter_map { |message| format_message(message) }.join
-  end
-
-  def format_message(message)
-    return unless source_message?(message)
-
-    message_content = message.content_for_llm
-    return if message_content.blank?
-
-    sender = human_support_reply?(message) ? 'Support Agent' : 'User'
-    "#{sender}: #{message_content}\n"
-  end
-
-  def source_message?(message)
-    return true if message.incoming? && message.sender_type == 'Contact'
-
-    human_support_reply?(message)
-  end
-
-  def human_support_reply?(message)
-    return false unless message.outgoing?
-    return false if message.content_attributes['automation_rule_id'].present?
-    return false if message.additional_attributes['campaign_id'].present?
-
-    message.sender_type == 'User' || message.content_attributes['external_echo'].present?
-  end
-
-  def business_context
-    {
-      product_name: assistant.config['product_name'],
-      assistant_description: assistant.description,
-      instructions: assistant.config['instructions'],
-      response_guidelines: assistant.response_guidelines,
-      guardrails: assistant.guardrails
-    }.compact
-  end
-end

enterprise/app/services/captain/llm/conversation_faq_prompts_service.rb

@@ -1,75 +0,0 @@
-class Captain::Llm::ConversationFaqPromptsService
-  class << self
-    def generator(language = 'english')
-      <<~PROMPT
-        You create high-quality FAQ candidates from resolved support conversations.
-        Only generate an FAQ when the conversation contains durable, reusable knowledge that would help many future customers.
-
-        ## Source rules
-        - The input starts with trusted business context. Use it to reject conversations about other businesses or topics, but never use it as the source of an FAQ answer.
-        - The conversation history contains only customer messages and human support agent messages.
-        - Base every FAQ strictly on information stated in the human support agent messages. Do not infer, generalize, or add external knowledge.
-        - A human support agent must state every fact used in the FAQ answer. Customer messages cannot supply missing answer facts.
-        - The human support agent must provide the final answer. If the agent only greets, asks clarifying questions, asks for contact details, promises to check, shares an attachment, or transfers the conversation, return: `{"faqs":[]}`.
-        - For each FAQ, identify the human support agent message or messages that together provide a complete public answer to the same question. Combine facts only across related agent messages; never combine separate questions or unrelated topics. If those messages do not provide a complete public answer, remove that FAQ.
-
-        ## Decision gate
-        Return `{"faqs":[]}` unless every generated FAQ can pass all of these checks:
-        1. The answer is fully stated by a human support agent, not by the customer.
-        2. The answer is a public, durable rule or procedure, not a private account action, manual review, troubleshooting session, quote, file, link, or follow-up.
-        3. The answer can be written without private identifiers, customer-specific facts, direct URLs, attachments, invoices, screenshots, or support-ticket steps.
-        4. The question would still make sense in a help center if the original conversation, customer, and agent did not exist.
-        Do not rescue a rejected conversation by rewriting it as a generic support question.
-
-        ## Return no FAQ for
-        - Spam, scams, advertisements, SEO/link-building pitches, adult/gambling/financial promotions, gibberish, abusive content, or conversations unrelated to the business being supported.
-        - Account-specific, order-specific, payment-specific, subscription-specific, login/access, verification, delivery, certificate, or troubleshooting issues, even if they could be rewritten as a general support question.
-        - Conversations that mainly hand off to a human, ask the customer to wait, request private identifiers or contact details, collect screenshots, attachments, or documents, or tell the customer to contact support for case review.
-        - Temporary workarounds, one-off exceptions, unclear answers, unresolved problems, wrong-service conversations, complaints, greetings, or abandoned conversations.
-        - Internal support workflow details, chat session rules, escalation mechanics, ticket-routing instructions, or "someone will get back to you" messages.
-        - Answers that are just a direct/private link, attachment, file, invoice, one-off quote or estimate, account-specific URL, or instructions to open a support ticket.
-        - Questions whose useful answer is "contact support", "wait for the team", "share your details", "we will check", or "this needs manual review".
-        - Questions about whether support can help with a private issue, third-party service, transaction, payment, delivery, or account problem.
-        - Pricing, policy, availability, roadmap, deadline, or legal claims unless the human support agent gives a clear and stable answer in the conversation.
-        - Questions already answered only by asking the customer for more information.
-
-        ## FAQ quality rules
-        - Prefer returning no FAQ over a weak or narrow FAQ.
-        - A good candidate teaches a generally reusable product, service, policy, setup, or process rule that another customer could use without contacting support.
-        - Generate at most one FAQ unless the human agent clearly answered multiple distinct, reusable questions.
-        - Do not create duplicate or overlapping FAQs in the same response.
-        - Questions must be general enough for a help center, not personalized to the current customer.
-        - Remove customer names, order numbers, invoice numbers, IDs, private URLs, phone numbers, emails, screenshots, attachments, and other personal or transaction-specific details.
-        - Answers must be complete, self-contained, and supported by the human agent's messages.
-
-        ## Examples
-        - Customer mentions a price or procedure, then the human agent only greets or says they will check: return `{"faqs":[]}`.
-        - Human agent shares only a private link, file, invoice, quote, screenshot, or attachment: return `{"faqs":[]}`.
-        - Human agent clearly states a public rule, such as which purchases are allowed for a program or service: generate one general FAQ.
-
-        Generate the FAQs only in the #{language}, use no other language.
-        If no suitable reusable FAQ is available, return: `{"faqs":[]}`.
-
-        Return only valid JSON in this exact structure:
-        ```json
-        { "faqs": [ { "question": "", "answer": "" } ] }
-        ```
-      PROMPT
-    end
-
-    def same_faq
-      <<~PROMPT
-        Decide whether the new FAQ and existing FAQ are the same.
-
-        Return `same_faq` as true only when both questions ask the same thing and both answers give the same guidance.
-        Wording, grammar, level of detail, and examples may differ. Return false when either FAQ adds, removes, contradicts, or changes a condition,
-        policy, procedure, audience, product, plan, time frame, or outcome. Related FAQs are not the same FAQ. When uncertain, return false.
-
-        Return only valid JSON in this exact structure:
-        ```json
-        { "same_faq": true }
-        ```
-      PROMPT
-    end
-  end
-end

enterprise/app/services/captain/llm/conversation_faq_service.rb

@@ -1,208 +1,167 @@
 class Captain::Llm::ConversationFaqService < Llm::BaseAiService
   include Integrations::LlmInstrumentation
 
-  class SuggestionChangedError < StandardError; end
-
   DISTANCE_THRESHOLD = 0.3
-  MATCH_LIMIT = 5
   LLM_FEATURE = 'conversation_faq_generation'.freeze
 
-  def self.language_for(conversation)
-    language = conversation.language.presence || conversation.account.locale.presence || I18n.default_locale.to_s
-    normalize_language(language)
-  end
-
-  def self.normalize_language(language)
-    language.to_s.tr('-', '_').split('_').first.downcase
-  end
-
-  private_class_method :normalize_language
-
   def initialize(assistant, conversation)
     super(feature: LLM_FEATURE, account: conversation.account, fallback_model: Llm::Models.default_model_for(LLM_FEATURE))
     @assistant = assistant
     @conversation = conversation
-    @content = Captain::Llm::ConversationFaqContentService.new(assistant, conversation).generate
-    @embedding_service = Captain::Llm::EmbeddingService.new(account_id: conversation.account_id)
+    @content = conversation_faq_content
   end
 
-  def generate_suggestions
+  # Generates and deduplicates FAQs from conversation content
+  # Skips processing if there was no human interaction
+  def generate_and_deduplicate
     return [] if no_human_interaction?
 
-    generate.map { |faq| route_candidate(faq) }
+    new_faqs = generate
+    return [] if new_faqs.empty?
+
+    duplicate_faqs, unique_faqs = find_and_separate_duplicates(new_faqs)
+    save_new_faqs(unique_faqs)
+    log_duplicate_faqs(duplicate_faqs) if Rails.env.development?
   end
 
   private
 
-  attr_reader :content, :conversation, :assistant, :embedding_service
+  attr_reader :content, :conversation, :assistant
+
+  def conversation_faq_content
+    [
+      "Conversation ID: ##{conversation.display_id}",
+      "Channel: #{conversation.inbox.channel.name}",
+      'Message History:',
+      conversation_faq_messages
+    ].join("\n")
+  end
+
+  def conversation_faq_messages
+    messages = conversation
+               .messages
+               .where(message_type: %i[incoming outgoing], private: false)
+               .order(created_at: :asc)
+
+    return "No messages in this conversation\n" if messages.empty?
+
+    messages.filter_map { |message| format_conversation_faq_message(message) }.join
+  end
+
+  def format_conversation_faq_message(message)
+    return unless faq_source_message?(message)
+
+    content = message.content_for_llm
+    return if content.blank?
+
+    sender = human_support_reply?(message) ? 'Support Agent' : 'User'
+    "#{sender}: #{content}\n"
+  end
+
+  def faq_source_message?(message)
+    return true if message.incoming? && message.sender_type == 'Contact'
+
+    human_support_reply?(message)
+  end
+
+  def human_support_reply?(message)
+    return false unless message.outgoing?
+    return false if message.content_attributes['automation_rule_id'].present?
+    return false if message.additional_attributes['campaign_id'].present?
+
+    message.sender_type == 'User' || message.content_attributes['external_echo'].present?
+  end
 
   def no_human_interaction?
     conversation.first_reply_created_at.nil?
   end
 
-  def route_candidate(faq)
-    embedding = embedding_service.get_embedding(candidate_text(faq))
+  def find_and_separate_duplicates(faqs)
+    duplicate_faqs = []
+    unique_faqs = []
 
-    return discard_observation(faq) if matching_record(approved_faqs, faq, embedding)
-    return discard_observation(faq) if matching_record(dismissed_suggestions_for_language, faq, embedding)
+    faqs.each do |faq|
+      combined_text = "#{faq['question']}: #{faq['answer']}"
+      embedding = Captain::Llm::EmbeddingService.new(account_id: @conversation.account_id).get_embedding(combined_text)
+      similar_faqs = find_similar_faqs(embedding)
 
-    suggestion = matching_record(open_suggestions_for_language, faq, embedding)
-    matched_content = suggestion&.slice('question', 'answer')
-    suggestion ||= assistant.faq_suggestions.create!(
-      question: faq.fetch('question'),
-      answer: faq.fetch('answer'),
-      embedding: embedding,
-      language: faq_language
-    )
-
-    attach_observation(suggestion, faq, matched_content)
-  end
-
-  def matching_record(relation, faq, embedding)
-    likely_matches(relation, embedding).find { |record| same_faq?(faq, record) }
-  end
-
-  def likely_matches(relation, embedding)
-    return [] unless relation.exists?
-
-    ApplicationRecord.transaction do
-      # Force an exact search because IVFFlat can miss matches after relation filters.
-      # SET LOCAL keeps the planner change scoped to this transaction.
-      ApplicationRecord.connection.execute('SET LOCAL enable_indexscan = off')
-      relation
-        .nearest_neighbors(:embedding, embedding, distance: 'cosine')
-        .limit(MATCH_LIMIT)
-        .select { |record| record.neighbor_distance < DISTANCE_THRESHOLD }
-    end
-  end
-
-  def same_faq?(candidate, existing_record)
-    comparison = {
-      candidate: candidate.slice('question', 'answer'),
-      existing: { question: existing_record.question, answer: existing_record.answer }
-    }
-    prompt = Captain::Llm::ConversationFaqPromptsService.same_faq
-    faq_match_model = Llm::FeatureRouter.resolve(feature: 'conversation_faq_matching', account: conversation.account)[:model]
-    response = instrument_llm_call(match_instrumentation_params(prompt, comparison, faq_match_model)) do
-      chat(model: faq_match_model)
-        .with_params(response_format: { type: 'json_object' })
-        .with_instructions(prompt)
-        .ask(comparison.to_json)
+      if similar_faqs.any?
+        duplicate_faqs << { faq: faq, similar_faqs: similar_faqs }
+      else
+        unique_faqs << faq
+      end
     end
 
-    same_faq = JSON.parse(sanitize_json_response(response.content)).fetch('same_faq')
-    raise TypeError, 'same_faq must be a boolean' unless [true, false].include?(same_faq)
-
-    same_faq
-  rescue JSON::ParserError, KeyError, TypeError, RubyLLM::Error => e
-    Rails.logger.error "FAQ match failed: #{e.message}"
-    raise
+    [duplicate_faqs, unique_faqs]
   end
 
-  def attach_observation(suggestion, faq, matched_content)
-    suggestion.with_lock do
-      next unless suggestion.open?
-      raise SuggestionChangedError if matched_content && suggestion.slice('question', 'answer') != matched_content
+  def find_similar_faqs(embedding)
+    similar_faqs = assistant
+                   .responses
+                   .nearest_neighbors(:embedding, embedding, distance: 'cosine')
+    Rails.logger.debug(similar_faqs.map { |faq| [faq.question, faq.neighbor_distance] })
+    similar_faqs.select { |record| record.neighbor_distance < DISTANCE_THRESHOLD }
+  end
 
-      existing_observation = suggestion.observations.find_by(conversation: conversation)
-      next existing_observation if existing_observation
-
-      observation = suggestion.observations.create!(
-        conversation: conversation,
-        generated_question: faq.fetch('question'),
-        generated_answer: faq.fetch('answer'),
-        language: faq_language,
-        status: :attached
+  def save_new_faqs(faqs)
+    faqs.map do |faq|
+      assistant.responses.create!(
+        question: faq['question'],
+        answer: faq['answer'],
+        status: 'pending',
+        documentable: conversation
       )
-      suggestion.update!(source_count: suggestion.source_count + 1)
-      observation
     end
   end
 
-  def discard_observation(faq)
-    Captain::FaqObservation.find_or_create_by!(
-      conversation: conversation,
-      generated_question: faq.fetch('question'),
-      generated_answer: faq.fetch('answer'),
-      language: faq_language,
-      status: :discarded
-    )
-  end
+  def log_duplicate_faqs(duplicate_faqs)
+    return if duplicate_faqs.empty?
 
-  def open_suggestions_for_language
-    assistant.faq_suggestions.where(account_id: conversation.account_id).open.by_language(faq_language)
-  end
-
-  def dismissed_suggestions_for_language
-    assistant.faq_suggestions.where(account_id: conversation.account_id).dismissed.by_language(faq_language)
-  end
-
-  def approved_faqs
-    assistant.responses.approved
-  end
-
-  def candidate_text(faq)
-    "#{faq.fetch('question')}: #{faq.fetch('answer')}"
+    Rails.logger.info "Found #{duplicate_faqs.length} duplicate FAQs:"
+    duplicate_faqs.each do |duplicate|
+      Rails.logger.info(
+        "Q: #{duplicate[:faq]['question']}\n" \
+        "A: #{duplicate[:faq]['answer']}\n\n" \
+        "Similar existing FAQs: #{duplicate[:similar_faqs].map { |f| "Q: #{f.question} A: #{f.answer}" }.join(', ')}"
+      )
+    end
   end
 
   def generate
-    response = instrument_llm_call(generation_instrumentation_params) do
+    response = instrument_llm_call(instrumentation_params) do
       chat
         .with_params(response_format: { type: 'json_object' })
         .with_instructions(system_prompt)
-        .ask(content)
+        .ask(@content)
     end
-    parse_generation_response(response.content)
+    parse_response(response.content)
   rescue RubyLLM::Error => e
     Rails.logger.error "LLM API Error: #{e.message}"
     []
   end
 
-  def generation_instrumentation_params
+  def instrumentation_params
     {
       span_name: 'llm.captain.conversation_faq',
-      model: model,
-      temperature: temperature,
-      account_id: conversation.account_id,
-      conversation_id: conversation.display_id,
+      model: @model,
+      temperature: @temperature,
+      account_id: @conversation.account_id,
+      conversation_id: @conversation.display_id,
       feature_name: 'conversation_faq',
       messages: [
         { role: 'system', content: system_prompt },
-        { role: 'user', content: content }
+        { role: 'user', content: @content }
       ],
-      metadata: { assistant_id: assistant.id, language: faq_language }
-    }
-  end
-
-  def match_instrumentation_params(prompt, comparison, faq_match_model)
-    {
-      span_name: 'llm.captain.faq_match',
-      model: faq_match_model,
-      temperature: temperature,
-      account_id: conversation.account_id,
-      conversation_id: conversation.display_id,
-      feature_name: 'conversation_faq_match',
-      messages: [
-        { role: 'system', content: prompt },
-        { role: 'user', content: comparison.to_json }
-      ],
-      metadata: { assistant_id: assistant.id, language: faq_language }
+      metadata: { assistant_id: @assistant.id }
     }
   end
 
   def system_prompt
-    Captain::Llm::ConversationFaqPromptsService.generator(language_name(faq_language))
+    account_language = @conversation.account.locale_english_name
+    Captain::Llm::SystemPromptsService.conversation_faq_generator(account_language)
   end
 
-  def faq_language
-    @faq_language ||= self.class.language_for(conversation)
-  end
-
-  def language_name(language)
-    ISO_639.find(language)&.english_name&.downcase || 'english'
-  end
-
-  def parse_generation_response(response)
+  def parse_response(response)
     return [] if response.nil?
 
     JSON.parse(sanitize_json_response(response)).fetch('faqs', [])

enterprise/app/services/captain/llm/system_prompts_service.rb

@@ -51,6 +51,62 @@ class Captain::Llm::SystemPromptsService
       PROMPT
     end
 
+    def conversation_faq_generator(language = 'english')
+      <<~SYSTEM_PROMPT_MESSAGE
+        You create high-quality FAQ candidates from resolved support conversations.
+        Only generate an FAQ when the conversation contains durable, reusable knowledge that would help many future customers.
+
+        ## Source rules
+        - The conversation history contains only customer messages and human support agent messages.
+        - Base every FAQ strictly on information stated in the human support agent messages. Do not infer, generalize, or add external knowledge.
+        - A human support agent must state every fact used in the FAQ answer. Customer messages cannot supply missing answer facts.
+        - The human support agent must provide the final answer. If the agent only greets, asks clarifying questions, asks for contact details, promises to check, shares an attachment, or transfers the conversation, return: `{"faqs":[]}`.
+        - For each FAQ, first identify the exact human support agent message that fully answers it. If no single human agent message gives a complete public answer, remove that FAQ.
+
+        ## Decision gate
+        Return `{"faqs":[]}` unless every generated FAQ can pass all of these checks:
+        1. The answer is fully stated by a human support agent, not by the customer.
+        2. The answer is a public, durable rule or procedure, not a private account action, manual review, troubleshooting session, quote, file, link, or follow-up.
+        3. The answer can be written without private identifiers, customer-specific facts, direct URLs, attachments, invoices, screenshots, or support-ticket steps.
+        4. The question would still make sense in a help center if the original conversation, customer, and agent did not exist.
+        Do not rescue a rejected conversation by rewriting it as a generic support question.
+
+        ## Return no FAQ for
+        - Spam, scams, advertisements, SEO/link-building pitches, adult/gambling/financial promotions, gibberish, abusive content, or conversations unrelated to the business being supported.
+        - Account-specific, order-specific, payment-specific, subscription-specific, login/access, verification, delivery, certificate, or troubleshooting issues, even if they could be rewritten as a general support question.
+        - Conversations that mainly hand off to a human, ask the customer to wait, request private identifiers or contact details, collect screenshots, attachments, or documents, or tell the customer to contact support for case review.
+        - Temporary workarounds, one-off exceptions, unclear answers, unresolved problems, wrong-service conversations, complaints, greetings, or abandoned conversations.
+        - Internal support workflow details, chat session rules, escalation mechanics, ticket-routing instructions, or "someone will get back to you" messages.
+        - Answers that are just a direct/private link, attachment, file, invoice, one-off quote or estimate, account-specific URL, or instructions to open a support ticket.
+        - Questions whose useful answer is "contact support", "wait for the team", "share your details", "we will check", or "this needs manual review".
+        - Questions about whether support can help with a private issue, third-party service, transaction, payment, delivery, or account problem.
+        - Pricing, policy, availability, roadmap, deadline, or legal claims unless the human support agent gives a clear and stable answer in the conversation.
+        - Questions already answered only by asking the customer for more information.
+
+        ## FAQ quality rules
+        - Prefer returning no FAQ over a weak or narrow FAQ.
+        - A good candidate teaches a generally reusable product, service, policy, setup, or process rule that another customer could use without contacting support.
+        - Generate at most one FAQ unless the human agent clearly answered multiple distinct, reusable questions.
+        - Do not create duplicate or overlapping FAQs in the same response.
+        - Questions must be general enough for a help center, not personalized to the current customer.
+        - Remove customer names, order numbers, invoice numbers, IDs, private URLs, phone numbers, emails, screenshots, attachments, and other personal or transaction-specific details.
+        - Answers must be complete, self-contained, and supported by the human agent's messages.
+
+        ## Examples
+        - Customer mentions a price or procedure, then the human agent only greets or says they will check: return `{"faqs":[]}`.
+        - Human agent shares only a private link, file, invoice, quote, screenshot, or attachment: return `{"faqs":[]}`.
+        - Human agent clearly states a public rule, such as which purchases are allowed for a program or service: generate one general FAQ.
+
+        Generate the FAQs only in the #{language}, use no other language.
+        If no suitable reusable FAQ is available, return: `{"faqs":[]}`.
+
+        Return only valid JSON in this exact structure:
+        ```json
+        { "faqs": [ { "question": "", "answer": "" } ] }
+        ```
+      SYSTEM_PROMPT_MESSAGE
+    end
+
     def notes_generator(language = 'english')
       <<~SYSTEM_PROMPT_MESSAGE
         You are a note taker looking to convert the conversation with a contact into actionable notes for the CRM.

enterprise/app/views/api/v1/accounts/captain/faq_suggestions/approve.json.jbuilder

@@ -1 +0,0 @@
-json.partial! 'api/v1/models/captain/assistant_response', formats: [:json], resource: @response

enterprise/app/views/api/v1/accounts/captain/faq_suggestions/dismiss.json.jbuilder

@@ -1 +0,0 @@
-json.partial! 'api/v1/models/captain/faq_suggestion', formats: [:json], resource: @suggestion

enterprise/app/views/api/v1/accounts/captain/faq_suggestions/index.json.jbuilder

@@ -1,10 +0,0 @@
-json.payload do
-  json.array! @suggestions do |suggestion|
-    json.partial! 'api/v1/models/captain/faq_suggestion', formats: [:json], resource: suggestion
-  end
-end
-
-json.meta do
-  json.total_count @suggestions_count
-  json.page @current_page
-end

enterprise/app/views/api/v1/accounts/captain/faq_suggestions/show.json.jbuilder

@@ -1,6 +0,0 @@
-json.partial! 'api/v1/models/captain/faq_suggestion', formats: [:json], resource: @suggestion
-json.observations do
-  json.array! @observations do |observation|
-    json.partial! 'api/v1/models/captain/faq_observation', formats: [:json], resource: observation
-  end
-end

enterprise/app/views/api/v1/accounts/captain/faq_suggestions/update.json.jbuilder

@@ -1 +0,0 @@
-json.partial! 'api/v1/models/captain/faq_suggestion', formats: [:json], resource: @suggestion

enterprise/app/views/api/v1/models/captain/_faq_observation.json.jbuilder

@@ -1,10 +0,0 @@
-json.id resource.id
-json.generated_question resource.generated_question
-json.generated_answer resource.generated_answer
-json.language resource.language
-json.status resource.status
-json.created_at resource.created_at.to_i
-json.conversation do
-  json.id resource.conversation.id
-  json.display_id resource.conversation.display_id
-end

enterprise/app/views/api/v1/models/captain/_faq_suggestion.json.jbuilder

@@ -1,12 +0,0 @@
-json.id resource.id
-json.account_id resource.account_id
-json.question resource.question
-json.answer resource.answer
-json.language resource.language
-json.source_count resource.source_count
-json.status resource.status
-json.created_at resource.created_at.to_i
-json.updated_at resource.updated_at.to_i
-json.assistant do
-  json.partial! 'api/v1/models/captain/assistant', formats: [:json], resource: resource.assistant
-end

lib/redis/redis_keys.rb

@@ -89,7 +89,6 @@ module Redis::RedisKeys
   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
-  CAPTAIN_CONVERSATION_FAQ_MUTEX = 'CAPTAIN_CONVERSATION_FAQ_LOCK::%<assistant_id>s::%<language>s'.freeze
 
   ## Auto Assignment Keys
   # Track conversation assignments to agents for rate limiting

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "4.16.1",
+  "version": "4.16.0",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/**/*.{js,vue}",
@@ -34,7 +34,7 @@
     "@amplitude/analytics-browser": "^2.11.10",
     "@breezystack/lamejs": "^1.2.7",
     "@chatwoot/ninja-keys": "1.2.3",
-    "@chatwoot/prosemirror-schema": "1.3.23",
+    "@chatwoot/prosemirror-schema": "1.3.22",
     "@chatwoot/utils": "^0.0.56",
     "@formkit/core": "^1.7.2",
     "@formkit/vue": "^1.7.2",
@@ -86,6 +86,9 @@
     "mitt": "^3.0.1",
     "opus-recorder": "^8.0.5",
     "pinia": "^3.0.4",
+    "prosemirror-commands": "^1.7.1",
+    "prosemirror-inputrules": "^1.4.0",
+    "prosemirror-schema-list": "^1.5.1",
     "qrcode": "^1.5.4",
     "semver": "7.6.3",
     "snakecase-keys": "^8.0.1",

pnpm-lock.yaml

@@ -25,8 +25,8 @@ importers:
         specifier: 1.2.3
         version: 1.2.3
       '@chatwoot/prosemirror-schema':
-        specifier: 1.3.23
-        version: 1.3.23
+        specifier: 1.3.22
+        version: 1.3.22
       '@chatwoot/utils':
         specifier: ^0.0.56
         version: 0.0.56
@@ -180,6 +180,15 @@ importers:
       pinia:
         specifier: ^3.0.4
         version: 3.0.4(typescript@5.6.2)(vue@3.5.12(typescript@5.6.2))
+      prosemirror-commands:
+        specifier: ^1.7.1
+        version: 1.7.1
+      prosemirror-inputrules:
+        specifier: ^1.4.0
+        version: 1.4.0
+      prosemirror-schema-list:
+        specifier: ^1.5.1
+        version: 1.5.1
       qrcode:
         specifier: ^1.5.4
         version: 1.5.4
@@ -452,8 +461,8 @@ packages:
   '@chatwoot/ninja-keys@1.2.3':
     resolution: {integrity: sha512-xM8d9P5ikDMZm2WbaCTk/TW5HFauylrU3cJ75fq5je6ixKwyhl/0kZbVN/vbbZN4+AUX/OaSIn6IJbtCgIF67g==}
 
-  '@chatwoot/prosemirror-schema@1.3.23':
-    resolution: {integrity: sha512-jGxbWELCdlVI64BJiE1wT84ekJHYDXXKiluQIKT3aKPEjPwMR48umKF3A0yHjKoR7IIxCC9oM77TvXOA0ebLtw==}
+  '@chatwoot/prosemirror-schema@1.3.22':
+    resolution: {integrity: sha512-0r+PT8xhQLCKCpoV9k9XVTTRECs/0Nr37wbcLsRS7yvc7WkF9FY05z2hGCRJReWmTOcmmshHtb042LVP+MyB/w==}
 
   '@chatwoot/utils@0.0.56':
     resolution: {integrity: sha512-A6dmPLfTSrW4qYNY73btyi4PqpfzcXRSaucscZTQdzNqF6G/QUdgnBmHtho8HeiYby/kSHXaSxLJj+0dx3yEQQ==}
@@ -3992,6 +4001,9 @@ packages:
   prosemirror-tables@1.5.0:
     resolution: {integrity: sha512-VMx4zlYWm7aBlZ5xtfJHpqa3Xgu3b7srV54fXYnXgsAcIGRqKSrhiK3f89omzzgaAgAtDOV4ImXnLKhVfheVNQ==}
 
+  prosemirror-transform@1.10.0:
+    resolution: {integrity: sha512-9UOgFSgN6Gj2ekQH5CTDJ8Rp/fnKR2IkYfGdzzp5zQMFsS4zDllLVx/+jGcX86YlACpG7UR5fwAXiWzxqWtBTg==}
+
   prosemirror-transform@1.12.0:
     resolution: {integrity: sha512-GxboyN4AMIsoHNtz5uf2r2Ru551i5hWeCMD6E2Ib4Eogqoub0NflniaBPVQ4MrGE5yZ8JV9tUHg9qcZTTrcN4w==}
 
@@ -5124,7 +5136,7 @@ snapshots:
       hotkeys-js: 3.8.7
       lit: 2.2.6
 
-  '@chatwoot/prosemirror-schema@1.3.23':
+  '@chatwoot/prosemirror-schema@1.3.22':
     dependencies:
       markdown-it-sup: 2.0.0
       prosemirror-commands: 1.7.1
@@ -9023,7 +9035,7 @@ snapshots:
     dependencies:
       prosemirror-model: 1.22.3
       prosemirror-state: 1.4.3
-      prosemirror-transform: 1.12.0
+      prosemirror-transform: 1.10.0
 
   prosemirror-state@1.4.3:
     dependencies:
@@ -9039,6 +9051,10 @@ snapshots:
       prosemirror-transform: 1.12.0
       prosemirror-view: 1.34.1
 
+  prosemirror-transform@1.10.0:
+    dependencies:
+      prosemirror-model: 1.22.3
+
   prosemirror-transform@1.12.0:
     dependencies:
       prosemirror-model: 1.22.3

spec/builders/agent_builder_spec.rb

@@ -23,12 +23,6 @@ RSpec.describe AgentBuilder, type: :model do
   end
 
   describe '#perform' do
-    it 'locks the account while checking and creating the agent' do
-      expect(account).to receive(:with_lock).and_call_original
-
-      agent_builder.perform
-    end
-
     context 'when user does not exist' do
       it 'creates a new user' do
         expect { agent_builder.perform }.to change(User, :count).by(1)
@@ -73,17 +67,5 @@ RSpec.describe AgentBuilder, type: :model do
         expect(user.encrypted_password).not_to be_empty
       end
     end
-
-    context 'when the account has reached its agent limit' do
-      before do
-        allow(account).to receive(:usage_limits).and_return({ agents: account.account_users.count })
-      end
-
-      it 'raises a limit exceeded error without creating a user' do
-        expect { agent_builder.perform }.to raise_error(described_class::LimitExceededError, described_class::LIMIT_EXCEEDED_MESSAGE)
-
-        expect(User.from_email(email)).to be_nil
-      end
-    end
   end
 end

spec/controllers/api/v1/accounts/integrations/linear_controller_spec.rb

@@ -13,9 +13,7 @@ RSpec.describe 'Linear Integration API', type: :request do
   end
 
   describe 'DELETE /api/v1/accounts/:account_id/integrations/linear' do
-    let(:admin) { create(:user, account: account, role: :administrator) }
-
-    it 'deletes the linear integration when the user is an administrator' do
+    it 'deletes the linear integration' do
       # Stub the HTTP call to Linear's revoke endpoint
       allow(HTTParty).to receive(:post).with(
         'https://api.linear.app/oauth/revoke',
@@ -23,19 +21,11 @@ RSpec.describe 'Linear Integration API', type: :request do
       ).and_return(instance_double(HTTParty::Response, success?: true))
 
       delete "/api/v1/accounts/#{account.id}/integrations/linear",
-             headers: admin.create_new_auth_token,
+             headers: agent.create_new_auth_token,
              as: :json
       expect(response).to have_http_status(:ok)
       expect(account.hooks.count).to eq(0)
     end
-
-    it 'returns unauthorized for an agent and keeps the integration' do
-      delete "/api/v1/accounts/#{account.id}/integrations/linear",
-             headers: agent.create_new_auth_token,
-             as: :json
-      expect(response).to have_http_status(:unauthorized)
-      expect(account.hooks.count).to eq(1)
-    end
   end
 
   describe 'GET /api/v1/accounts/:account_id/integrations/linear/teams' do

spec/controllers/api/v1/accounts/integrations/shopify_controller_spec.rb

@@ -159,33 +159,19 @@ RSpec.describe 'Shopify Integration API', type: :request do
   end
 
   describe 'DELETE /api/v1/accounts/:account_id/integrations/shopify' do
-    let(:admin) { create(:user, account: account, role: :administrator) }
-
     before do
       create(:integrations_hook, :shopify, account: account)
     end
 
-    context 'when it is an administrator' do
+    context 'when it is an authenticated user' do
       it 'deletes the shopify integration' do
-        expect do
-          delete "/api/v1/accounts/#{account.id}/integrations/shopify",
-                 headers: admin.create_new_auth_token,
-                 as: :json
-        end.to change { account.hooks.count }.by(-1)
-
-        expect(response).to have_http_status(:ok)
-      end
-    end
-
-    context 'when it is an agent' do
-      it 'returns unauthorized and keeps the integration' do
         expect do
           delete "/api/v1/accounts/#{account.id}/integrations/shopify",
                  headers: agent.create_new_auth_token,
                  as: :json
-        end.not_to(change { account.hooks.count })
+        end.to change { account.hooks.count }.by(-1)
 
-        expect(response).to have_http_status(:unauthorized)
+        expect(response).to have_http_status(:ok)
       end
     end
 

spec/enterprise/builders/captain/assistant_stats_builder_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe Captain::AssistantStatsBuilder do
 
       expect(metrics.keys).to contain_exactly(
         :conversations_handled, :auto_resolution_rate, :handoff_rate,
-        :hours_saved, :reopen_rate, :conversation_depth
+        :hours_saved, :reopen_rate, :conversation_depth, :credit_usage, :knowledge
       )
       expect(metrics[:conversations_handled]).to include(:current, :previous, :trend)
     end
@@ -229,29 +229,25 @@ RSpec.describe Captain::AssistantStatsBuilder do
     end
   end
 
-  describe '#faq_stats' do
+  describe '#metrics knowledge' do
     before do
       create_list(:captain_assistant_response, 3, assistant: assistant, account: account, status: :approved)
-      assistant.faq_suggestions.create!(
-        question: 'How do I enable the feature?',
-        answer: 'Turn it on in settings.'
-      )
+      create(:captain_assistant_response, assistant: assistant, account: account, status: :pending)
       create_list(:captain_document, 2, assistant: assistant, account: account)
     end
 
-    it 'returns approved FAQ, open suggestion, document counts and coverage' do
-      stats = described_class.new(assistant).faq_stats
+    it 'returns approved, pending, document counts and coverage' do
+      knowledge = described_class.new(assistant, '30').metrics[:knowledge]
 
-      expect(stats).to eq(approved: 3, suggestions: 1, documents: 2, coverage: 75)
+      expect(knowledge).to eq(approved: 3, pending: 1, documents: 2, coverage: 75)
     end
 
-    it 'reports zero coverage when there are no FAQs or suggestions' do
+    it 'reports zero coverage when there are no responses' do
       Captain::AssistantResponse.where(assistant: assistant).delete_all
-      Captain::FaqSuggestion.where(assistant: assistant).delete_all
 
-      stats = described_class.new(assistant).faq_stats
+      knowledge = described_class.new(assistant, '30').metrics[:knowledge]
 
-      expect(stats).to eq(approved: 0, suggestions: 0, documents: 2, coverage: 0)
+      expect(knowledge[:coverage]).to eq(0)
     end
   end
 

spec/enterprise/controllers/api/v1/accounts/agents_controller_spec.rb

@@ -21,27 +21,6 @@ RSpec.describe 'Agents API', type: :request do
         expect(response).to have_http_status(:payment_required)
         expect(response.body).to include('Account limit exceeded. Please purchase more licenses')
       end
-
-      it 'prevents adding an agent if the last seat is consumed before creation' do
-        account.update!(limits: { agents: account.account_users.count + 1 })
-        competing_agent_created = false
-
-        allow(AgentBuilder).to receive(:new).and_wrap_original do |method, *args|
-          unless competing_agent_created
-            create(:user, account: account, role: :agent)
-            competing_agent_created = true
-          end
-
-          method.call(*args)
-        end
-
-        post "/api/v1/accounts/#{account.id}/agents", params: params, headers: admin.create_new_auth_token, as: :json
-
-        expect(response).to have_http_status(:payment_required)
-        expect(response.body).to include('Account limit exceeded. Please purchase more licenses')
-        expect(User.from_email(params[:email])).to be_nil
-        expect(account.account_users.count).to eq(account.usage_limits[:agents])
-      end
     end
   end
 

spec/enterprise/controllers/api/v1/accounts/captain/assistant_responses_controller_spec.rb

@@ -177,19 +177,6 @@ RSpec.describe 'Api::V1::Accounts::Captain::AssistantResponses', type: :request
 
       expect(json_response[:question]).to eq('Test question?')
       expect(json_response[:answer]).to eq('Test answer')
-      expect(json_response[:status]).to eq('approved')
-    end
-
-    it 'does not accept the removed pending status' do
-      params = valid_params.deep_merge(assistant_response: { status: 'pending' })
-
-      post "/api/v1/accounts/#{account.id}/captain/assistant_responses",
-           params: params,
-           headers: admin.create_new_auth_token,
-           as: :json
-
-      expect(response).to have_http_status(:success)
-      expect(Captain::AssistantResponse.last).to be_approved
     end
 
     context 'with invalid params' do

spec/enterprise/controllers/api/v1/accounts/captain/assistants_controller_spec.rb

@@ -252,61 +252,6 @@ RSpec.describe 'Api::V1::Accounts::Captain::Assistants', type: :request do
     end
   end
 
-  describe 'GET /api/v1/accounts/{account.id}/captain/assistants/{id}/faq_stats' do
-    let(:assistant) { create(:captain_assistant, account: account) }
-
-    it 'returns approved FAQ, open suggestion, document counts and coverage' do
-      create_list(:captain_assistant_response, 3, assistant: assistant, account: account, status: :approved)
-      assistant.faq_suggestions.create!(question: 'How do I enable the feature?', answer: 'Turn it on in settings.')
-      create_list(:captain_document, 2, assistant: assistant, account: account)
-
-      get "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/faq_stats",
-          headers: admin.create_new_auth_token,
-          as: :json
-
-      expect(response).to have_http_status(:success)
-      expect(json_response).to eq(approved: 3, suggestions: 1, documents: 2, coverage: 75)
-    end
-
-    it 'returns zero coverage when there are no FAQs or suggestions' do
-      get "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/faq_stats",
-          headers: admin.create_new_auth_token,
-          as: :json
-
-      expect(response).to have_http_status(:success)
-      expect(json_response).to include(approved: 0, suggestions: 0, coverage: 0)
-    end
-
-    it 'counts only suggestions backed by conversations the agent can access' do
-      accessible_inbox = create(:inbox, account: account)
-      hidden_inbox = create(:inbox, account: account)
-      create(:inbox_member, user: agent, inbox: accessible_inbox)
-      create(:captain_assistant_response, assistant: assistant, account: account, status: :approved)
-
-      accessible_suggestion = assistant.faq_suggestions.create!(question: 'Visible question', answer: 'Visible answer')
-      accessible_suggestion.observations.create!(
-        conversation: create(:conversation, account: account, inbox: accessible_inbox),
-        generated_question: accessible_suggestion.question,
-        generated_answer: accessible_suggestion.answer,
-        language: accessible_suggestion.language
-      )
-      hidden_suggestion = assistant.faq_suggestions.create!(question: 'Hidden question', answer: 'Hidden answer')
-      hidden_suggestion.observations.create!(
-        conversation: create(:conversation, account: account, inbox: hidden_inbox),
-        generated_question: hidden_suggestion.question,
-        generated_answer: hidden_suggestion.answer,
-        language: hidden_suggestion.language
-      )
-
-      get "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/faq_stats",
-          headers: agent.create_new_auth_token,
-          as: :json
-
-      expect(response).to have_http_status(:success)
-      expect(json_response).to include(approved: 1, suggestions: 1, coverage: 50)
-    end
-  end
-
   describe 'GET /api/v1/accounts/{account.id}/captain/assistants/{id}/summary' do
     let(:assistant) { create(:captain_assistant, account: account) }
     let(:alice) { create(:user, account: account, role: :administrator, name: 'Alice Adams') }

spec/enterprise/controllers/api/v1/accounts/captain/bulk_actions_controller_spec.rb

@@ -5,12 +5,13 @@ RSpec.describe 'Api::V1::Accounts::Captain::BulkActions', type: :request do
   let(:assistant) { create(:captain_assistant, account: account) }
   let(:admin) { create(:user, account: account, role: :administrator) }
   let(:agent) { create(:user, account: account, role: :agent) }
-  let!(:responses) do
+  let!(:pending_responses) do
     create_list(
       :captain_assistant_response,
       2,
       assistant: assistant,
-      account: account
+      account: account,
+      status: 'pending'
     )
   end
   let!(:documents) do
@@ -28,20 +29,29 @@ RSpec.describe 'Api::V1::Accounts::Captain::BulkActions', type: :request do
   end
 
   describe 'POST /api/v1/accounts/:account_id/captain/bulk_actions' do
-    context 'when using the removed bulk approval action' do
-      it 'returns unprocessable content without changing responses' do
+    context 'when approving responses' do
+      let(:valid_params) do
+        {
+          type: 'AssistantResponse',
+          ids: pending_responses.map(&:id),
+          fields: { status: 'approve' }
+        }
+      end
+
+      it 'approves the responses and returns the updated records' do
         post "/api/v1/accounts/#{account.id}/captain/bulk_actions",
-             params: {
-               type: 'AssistantResponse',
-               ids: responses.map(&:id),
-               fields: { status: 'approve' }
-             },
+             params: valid_params,
              headers: admin.create_new_auth_token,
              as: :json
 
-        expect(response).to have_http_status(:unprocessable_content)
-        expect(json_response[:success]).to be(false)
-        expect(responses.map(&:reload)).to all(be_approved)
+        expect(response).to have_http_status(:ok)
+        expect(json_response).to be_an(Array)
+        expect(json_response.length).to eq(2)
+
+        # Verify responses were approved
+        pending_responses.each do |response|
+          expect(response.reload.status).to eq('approved')
+        end
       end
     end
 
@@ -49,7 +59,7 @@ RSpec.describe 'Api::V1::Accounts::Captain::BulkActions', type: :request do
       let(:delete_params) do
         {
           type: 'AssistantResponse',
-          ids: responses.map(&:id),
+          ids: pending_responses.map(&:id),
           fields: { status: 'delete' }
         }
       end
@@ -66,7 +76,7 @@ RSpec.describe 'Api::V1::Accounts::Captain::BulkActions', type: :request do
         expect(json_response).to eq([])
 
         # Verify responses were deleted
-        responses.each do |response|
+        pending_responses.each do |response|
           expect { response.reload }.to raise_error(ActiveRecord::RecordNotFound)
         end
       end
@@ -76,8 +86,8 @@ RSpec.describe 'Api::V1::Accounts::Captain::BulkActions', type: :request do
       let(:invalid_params) do
         {
           type: 'InvalidType',
-          ids: responses.map(&:id),
-          fields: { status: 'delete' }
+          ids: pending_responses.map(&:id),
+          fields: { status: 'approve' }
         }
       end
 
@@ -90,7 +100,10 @@ RSpec.describe 'Api::V1::Accounts::Captain::BulkActions', type: :request do
         expect(response).to have_http_status(:unprocessable_entity)
         expect(json_response[:success]).to be(false)
 
-        expect(responses.map(&:reload)).to all(be_approved)
+        # Verify no changes were made
+        pending_responses.each do |response|
+          expect(response.reload.status).to eq('pending')
+        end
       end
     end
 
@@ -232,7 +245,7 @@ RSpec.describe 'Api::V1::Accounts::Captain::BulkActions', type: :request do
       let(:missing_params) do
         {
           type: 'AssistantResponse',
-          fields: { status: 'delete' }
+          fields: { status: 'approve' }
         }
       end
 
@@ -245,7 +258,10 @@ RSpec.describe 'Api::V1::Accounts::Captain::BulkActions', type: :request do
         expect(response).to have_http_status(:unprocessable_entity)
         expect(json_response[:success]).to be(false)
 
-        expect(responses.map(&:reload)).to all(be_approved)
+        # Verify no changes were made
+        pending_responses.each do |response|
+          expect(response.reload.status).to eq('pending')
+        end
       end
     end
 
@@ -254,13 +270,16 @@ RSpec.describe 'Api::V1::Accounts::Captain::BulkActions', type: :request do
 
       it 'returns unauthorized status' do
         post "/api/v1/accounts/#{account.id}/captain/bulk_actions",
-             params: { type: 'AssistantResponse', ids: [1], fields: { status: 'delete' } },
+             params: { type: 'AssistantResponse', ids: [1], fields: { status: 'approve' } },
              headers: unauthorized_user.create_new_auth_token,
              as: :json
 
         expect(response).to have_http_status(:unauthorized)
 
-        expect(responses.map(&:reload)).to all(be_approved)
+        # Verify no changes were made
+        pending_responses.each do |response|
+          expect(response.reload.status).to eq('pending')
+        end
       end
     end
   end

spec/enterprise/controllers/api/v1/accounts/captain/faq_suggestions_controller_spec.rb

@@ -1,216 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe 'Api::V1::Accounts::Captain::FaqSuggestions', type: :request do
-  let(:account) { create(:account, locale: 'en') }
-  let(:assistant) { create(:captain_assistant, account: account) }
-  let(:admin) { create(:user, account: account, role: :administrator) }
-  let(:agent) { create(:user, account: account, role: :agent) }
-  let(:inbox) { create(:inbox, account: account) }
-  let(:conversation) { create(:conversation, account: account, inbox: inbox) }
-  let(:suggestion) do
-    assistant.faq_suggestions.create!(
-      question: 'How do I enable the feature?',
-      answer: 'Turn it on in settings.',
-      source_count: 1
-    )
-  end
-
-  before do
-    suggestion.observations.create!(
-      conversation: conversation,
-      generated_question: suggestion.question,
-      generated_answer: suggestion.answer,
-      language: suggestion.language
-    )
-  end
-
-  describe 'GET /api/v1/accounts/:account_id/captain/faq_suggestions' do
-    it 'returns suggestions and their count to an administrator' do
-      get "/api/v1/accounts/#{account.id}/captain/faq_suggestions",
-          params: { assistant_id: assistant.id },
-          headers: admin.create_new_auth_token,
-          as: :json
-
-      expect(response).to have_http_status(:success)
-      expect(response.parsed_body['payload']).to contain_exactly(
-        include('id' => suggestion.id, 'question' => suggestion.question, 'status' => 'open')
-      )
-      expect(response.parsed_body['meta']).to include('total_count' => 1)
-    end
-
-    it 'returns only suggestions backed by conversations the agent can access' do
-      create(:inbox_member, user: agent, inbox: inbox)
-      hidden_inbox = create(:inbox, account: account)
-      hidden_conversation = create(:conversation, account: account, inbox: hidden_inbox)
-      hidden_suggestion = assistant.faq_suggestions.create!(question: 'Hidden question', answer: 'Hidden answer')
-      hidden_suggestion.observations.create!(
-        conversation: hidden_conversation,
-        generated_question: hidden_suggestion.question,
-        generated_answer: hidden_suggestion.answer,
-        language: hidden_suggestion.language
-      )
-
-      get "/api/v1/accounts/#{account.id}/captain/faq_suggestions",
-          params: { assistant_id: assistant.id },
-          headers: agent.create_new_auth_token,
-          as: :json
-
-      expect(response).to have_http_status(:success)
-      expect(response.parsed_body['payload'].pluck('id')).to contain_exactly(suggestion.id)
-      expect(response.parsed_body['meta']).to include('total_count' => 1)
-    end
-  end
-
-  describe 'GET /api/v1/accounts/:account_id/captain/faq_suggestions/:id' do
-    it 'returns the suggestion with its source conversation' do
-      get "/api/v1/accounts/#{account.id}/captain/faq_suggestions/#{suggestion.id}",
-          headers: admin.create_new_auth_token,
-          as: :json
-
-      expect(response).to have_http_status(:success)
-      expect(response.parsed_body).to include('id' => suggestion.id, 'question' => suggestion.question)
-      expect(response.parsed_body['observations']).to contain_exactly(
-        include('conversation' => include('id' => conversation.id, 'display_id' => conversation.display_id))
-      )
-    end
-
-    it 'returns only source conversations the agent can access' do
-      create(:inbox_member, user: agent, inbox: inbox)
-      hidden_conversation = create(:conversation, account: account, inbox: create(:inbox, account: account))
-      suggestion.observations.create!(
-        conversation: hidden_conversation,
-        generated_question: suggestion.question,
-        generated_answer: suggestion.answer,
-        language: suggestion.language
-      )
-
-      get "/api/v1/accounts/#{account.id}/captain/faq_suggestions/#{suggestion.id}",
-          headers: agent.create_new_auth_token,
-          as: :json
-
-      expect(response).to have_http_status(:success)
-      expect(response.parsed_body['observations'].pluck('conversation').pluck('id')).to contain_exactly(conversation.id)
-    end
-  end
-
-  describe 'PATCH /api/v1/accounts/:account_id/captain/faq_suggestions/:id' do
-    it 'lets an administrator edit an open suggestion' do
-      patch "/api/v1/accounts/#{account.id}/captain/faq_suggestions/#{suggestion.id}",
-            params: { faq_suggestion: { question: 'Updated question' } },
-            headers: admin.create_new_auth_token,
-            as: :json
-
-      expect(response).to have_http_status(:success)
-      expect(response.parsed_body['question']).to eq('Updated question')
-      expect(suggestion.reload.question).to eq('Updated question')
-    end
-
-    it 'lets an agent edit an accessible suggestion' do
-      create(:inbox_member, user: agent, inbox: inbox)
-
-      patch "/api/v1/accounts/#{account.id}/captain/faq_suggestions/#{suggestion.id}",
-            params: { faq_suggestion: { question: 'Updated question' } },
-            headers: agent.create_new_auth_token,
-            as: :json
-
-      expect(response).to have_http_status(:success)
-      expect(suggestion.reload.question).to eq('Updated question')
-    end
-
-    it 'does not let an agent edit an inaccessible suggestion' do
-      patch "/api/v1/accounts/#{account.id}/captain/faq_suggestions/#{suggestion.id}",
-            params: { faq_suggestion: { question: 'Updated question' } },
-            headers: agent.create_new_auth_token,
-            as: :json
-
-      expect(response).to have_http_status(:not_found)
-      expect(suggestion.reload.question).to eq('How do I enable the feature?')
-    end
-  end
-
-  describe 'POST /api/v1/accounts/:account_id/captain/faq_suggestions/:id/approve' do
-    it 'lets an administrator approve an edited suggestion as an FAQ' do
-      expect do
-        post "/api/v1/accounts/#{account.id}/captain/faq_suggestions/#{suggestion.id}/approve",
-             params: { faq_suggestion: { answer: 'Enable it in account settings.' } },
-             headers: admin.create_new_auth_token,
-             as: :json
-      end.to change(assistant.responses.approved, :count).by(1)
-
-      expect(response).to have_http_status(:success)
-      expect(response.parsed_body['answer']).to eq('Enable it in account settings.')
-      expect(suggestion.reload).to be_approved
-      expect(suggestion.observations.pluck(:conversation_id)).to contain_exactly(conversation.id)
-    end
-
-    it 'lets an agent approve an accessible suggestion' do
-      create(:inbox_member, user: agent, inbox: inbox)
-
-      expect do
-        post "/api/v1/accounts/#{account.id}/captain/faq_suggestions/#{suggestion.id}/approve",
-             headers: agent.create_new_auth_token,
-             as: :json
-      end.to change(assistant.responses.approved, :count).by(1)
-
-      expect(response).to have_http_status(:success)
-      expect(suggestion.reload).to be_approved
-    end
-
-    it 'approves a suggestion written in a language other than the account locale' do
-      suggestion.update!(language: 'pt')
-
-      expect do
-        post "/api/v1/accounts/#{account.id}/captain/faq_suggestions/#{suggestion.id}/approve",
-             headers: admin.create_new_auth_token,
-             as: :json
-      end.to change(assistant.responses.approved, :count).by(1)
-
-      expect(response).to have_http_status(:success)
-      expect(suggestion.reload).to be_approved
-    end
-
-    it 'does not let an agent approve an inaccessible suggestion' do
-      expect do
-        post "/api/v1/accounts/#{account.id}/captain/faq_suggestions/#{suggestion.id}/approve",
-             headers: agent.create_new_auth_token,
-             as: :json
-      end.not_to change(assistant.responses, :count)
-
-      expect(response).to have_http_status(:not_found)
-      expect(suggestion.reload).to be_open
-    end
-  end
-
-  describe 'POST /api/v1/accounts/:account_id/captain/faq_suggestions/:id/dismiss' do
-    it 'lets an administrator dismiss an open suggestion without creating an FAQ' do
-      expect do
-        post "/api/v1/accounts/#{account.id}/captain/faq_suggestions/#{suggestion.id}/dismiss",
-             headers: admin.create_new_auth_token,
-             as: :json
-      end.not_to change(assistant.responses, :count)
-
-      expect(response).to have_http_status(:success)
-      expect(suggestion.reload).to be_dismissed
-    end
-
-    it 'lets an agent dismiss an accessible suggestion' do
-      create(:inbox_member, user: agent, inbox: inbox)
-
-      post "/api/v1/accounts/#{account.id}/captain/faq_suggestions/#{suggestion.id}/dismiss",
-           headers: agent.create_new_auth_token,
-           as: :json
-
-      expect(response).to have_http_status(:success)
-      expect(suggestion.reload).to be_dismissed
-    end
-
-    it 'does not let an agent dismiss an inaccessible suggestion' do
-      post "/api/v1/accounts/#{account.id}/captain/faq_suggestions/#{suggestion.id}/dismiss",
-           headers: agent.create_new_auth_token,
-           as: :json
-
-      expect(response).to have_http_status(:not_found)
-      expect(suggestion.reload).to be_open
-    end
-  end
-end

spec/enterprise/jobs/captain/llm/conversation_faq_job_spec.rb

@@ -1,57 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe Captain::Llm::ConversationFaqJob, type: :job do
-  let(:account) { create(:account) }
-  let(:inbox) { create(:inbox, account: account) }
-  let(:assistant) { create(:captain_assistant, account: account, config: { feature_faq: true }) }
-  let(:conversation) { create(:conversation, account: account, inbox: inbox, first_reply_created_at: Time.zone.now) }
-  let(:faq_service) { instance_double(Captain::Llm::ConversationFaqService, generate_suggestions: []) }
-  let(:lock_manager) { instance_double(Redis::LockManager, lock: true, unlock: true) }
-  let(:lock_key) { "CAPTAIN_CONVERSATION_FAQ_LOCK::#{assistant.id}::en" }
-
-  before do
-    create(:captain_inbox, inbox: inbox, captain_assistant: assistant)
-    conversation.update!(status: :resolved)
-    allow(Redis::LockManager).to receive(:new).and_return(lock_manager)
-    allow(Captain::Llm::ConversationFaqService).to receive(:new).and_return(faq_service)
-  end
-
-  describe '#perform' do
-    it 'uses the assistant captured when the job was enqueued' do
-      replacement_assistant = create(:captain_assistant, account: account, config: { feature_faq: true })
-      inbox.captain_inbox.update!(captain_assistant: replacement_assistant)
-
-      expect(inbox.reload.captain_assistant).to eq(replacement_assistant)
-      expect(Captain::Llm::ConversationFaqService).to receive(:new)
-        .with(assistant, conversation)
-        .and_return(faq_service)
-      expect(faq_service).to receive(:generate_suggestions)
-
-      described_class.perform_now(conversation, assistant)
-    end
-
-    it 'locks FAQ grouping for the assistant and normalized language' do
-      conversation.update!(additional_attributes: { conversation_language: 'pt-BR' })
-      expected_key = "CAPTAIN_CONVERSATION_FAQ_LOCK::#{assistant.id}::pt"
-
-      expect(lock_manager).to receive(:lock).with(expected_key, described_class::LOCK_TIMEOUT).and_return(true)
-      expect(lock_manager).to receive(:unlock).with(expected_key)
-
-      described_class.perform_now(conversation, assistant)
-    end
-
-    context 'when another job holds the grouping lock' do
-      before do
-        allow(lock_manager).to receive(:lock).with(lock_key, described_class::LOCK_TIMEOUT).and_return(false)
-      end
-
-      it 'does not generate suggestions concurrently' do
-        expect(Captain::Llm::ConversationFaqService).not_to receive(:new)
-
-        expect do
-          described_class.new.perform(conversation, assistant)
-        end.to raise_error(MutexApplicationJob::LockAcquisitionError)
-      end
-    end
-  end
-end

spec/enterprise/listeners/captain_listener_spec.rb

@@ -29,7 +29,7 @@ describe CaptainListener do
           .to receive(:new)
           .with(assistant, conversation)
           .and_return(instance_double(Captain::Llm::ContactNotesService, generate_and_update_notes: nil))
-        expect(Captain::Llm::ConversationFaqJob).not_to receive(:perform_later)
+        expect(Captain::Llm::ConversationFaqService).not_to receive(:new)
 
         listener.conversation_resolved(event)
       end
@@ -42,8 +42,11 @@ describe CaptainListener do
         assistant.save!
       end
 
-      it 'enqueues FAQ suggestion generation' do
-        expect(Captain::Llm::ConversationFaqJob).to receive(:perform_later).with(conversation, assistant)
+      it 'generates and deduplicates FAQs' do
+        expect(Captain::Llm::ConversationFaqService)
+          .to receive(:new)
+          .with(assistant, conversation)
+          .and_return(instance_double(Captain::Llm::ConversationFaqService, generate_and_deduplicate: false))
         expect(Captain::Llm::ContactNotesService).not_to receive(:new)
 
         listener.conversation_resolved(event)