From 2485bc242d9e0c44e5e5f5f9c7473f939c31ae63 Mon Sep 17 00:00:00 2001
From: aakashb95 <aakashbakhle@gmail.com>
Date: Tue, 21 Jul 2026 12:11:55 +0530
Subject: [PATCH] fix(captain): clean up FAQ suggestion review flow

---
 .../dashboard/api/captain/response.js         |   3 +-
 .../emptyStates/ResponsePageEmptyState.vue    |  44 +-----
 .../overview/CoverageBanner.vue               |  23 ++--
 .../pageComponents/overview/KnowledgeCard.vue |  15 +-
 .../FaqSuggestionReviewDialog.spec.js         |  74 ++++++++++
 .../response/FaqSuggestionReviewDialog.vue    |  21 +++
 .../switcher/AssistantSwitcher.vue            |  10 --
 .../components-next/sidebar/Sidebar.vue       |   2 +-
 .../i18n/locale/en/integrations.json          |  32 ++---
 .../dashboard/captain/captain.routes.js       |  18 ++-
 .../captain/responses/FaqSuggestions.spec.js  | 129 ++++++++++++++++++
 .../{Pending.vue => FaqSuggestions.vue}       |  66 ++++++++-
 .../dashboard/captain/responses/Index.vue     | 101 +++++++++++---
 .../dashboard/store/captain/bulkActions.js    |  14 --
 .../dashboard/store/captain/faqSuggestions.js |  18 ++-
 .../store/captain/faqSuggestions.spec.js      |  47 +++++++
 .../dashboard/store/captain/response.js       |  50 +------
 .../captain/assistant_stats_builder.rb        |  11 +-
 .../captain/assistant_responses_controller.rb |   7 +-
 .../captain/bulk_actions_controller.rb        |  12 +-
 .../app/models/captain/assistant_response.rb  |   2 +-
 .../captain/assistant_stats_builder_spec.rb   |   9 +-
 .../assistant_responses_controller_spec.rb    |  13 ++
 .../captain/bulk_actions_controller_spec.rb   |  61 +++------
 .../assistant_migration/draft_applier_spec.rb |  18 ---
 25 files changed, 541 insertions(+), 259 deletions(-)
 create mode 100644 app/javascript/dashboard/components-next/captain/pageComponents/response/FaqSuggestionReviewDialog.spec.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/captain/responses/FaqSuggestions.spec.js
 rename app/javascript/dashboard/routes/dashboard/captain/responses/{Pending.vue => FaqSuggestions.vue} (78%)
 create mode 100644 app/javascript/dashboard/store/captain/faqSuggestions.spec.js

diff --git a/app/javascript/dashboard/api/captain/response.js b/app/javascript/dashboard/api/captain/response.js
index d48bd81c7..114bde67d 100644
--- a/app/javascript/dashboard/api/captain/response.js
+++ b/app/javascript/dashboard/api/captain/response.js
@@ -6,14 +6,13 @@ class CaptainResponses extends ApiClient {
     super('captain/assistant_responses', { accountScoped: true });
   }
 
-  get({ page = 1, search, assistantId, documentId, status } = {}) {
+  get({ page = 1, search, assistantId, documentId } = {}) {
     return axios.get(this.url, {
       params: {
         page,
         search,
         assistant_id: assistantId,
         document_id: documentId,
-        status,
       },
     });
   }
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/emptyStates/ResponsePageEmptyState.vue b/app/javascript/dashboard/components-next/captain/pageComponents/emptyStates/ResponsePageEmptyState.vue
index 2941e1f44..41ca6b60b 100644
--- a/app/javascript/dashboard/components-next/captain/pageComponents/emptyStates/ResponsePageEmptyState.vue
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/emptyStates/ResponsePageEmptyState.vue
@@ -7,24 +7,7 @@ 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';
 
-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 emit = defineEmits(['click']);
 
 const { isOnChatwootCloud } = useAccount();
 const { replaceInstallationName } = useBranding();
@@ -32,15 +15,10 @@ 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"
@@ -50,16 +28,12 @@ const onClearFilters = () => {
     class="mb-8"
   />
   <EmptyStateLayout
-    :title="
-      isPending
-        ? $t('CAPTAIN.RESPONSES.EMPTY_STATE.NO_PENDING_TITLE')
-        : $t('CAPTAIN.RESPONSES.EMPTY_STATE.TITLE')
-    "
-    :subtitle="isApproved ? $t('CAPTAIN.RESPONSES.EMPTY_STATE.SUBTITLE') : ''"
+    :title="$t('CAPTAIN.RESPONSES.EMPTY_STATE.TITLE')"
+    :subtitle="$t('CAPTAIN.RESPONSES.EMPTY_STATE.SUBTITLE')"
     :action-perms="['administrator']"
-    :show-backdrop="isApproved"
+    show-backdrop
   >
-    <template v-if="isApproved" #empty-state-item>
+    <template #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)"
@@ -77,18 +51,10 @@ const onClearFilters = () => {
     <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>
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/overview/CoverageBanner.vue b/app/javascript/dashboard/components-next/captain/pageComponents/overview/CoverageBanner.vue
index e832bc0b1..c06f7a6e1 100644
--- a/app/javascript/dashboard/components-next/captain/pageComponents/overview/CoverageBanner.vue
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/overview/CoverageBanner.vue
@@ -6,7 +6,12 @@ import { LocalStorage } from 'shared/helpers/localStorage';
 const props = defineProps({
   knowledge: {
     type: Object,
-    default: () => ({ approved: 0, pending: 0, documents: 0, coverage: 0 }),
+    default: () => ({
+      approved: 0,
+      suggestions: 0,
+      documents: 0,
+      coverage: 0,
+    }),
   },
 });
 
@@ -31,16 +36,16 @@ watch(
   { immediate: true }
 );
 
-// Thin coverage paired with a large review backlog: approving the pending FAQs
+// Thin coverage paired with a large review backlog: approving FAQ suggestions
 // is the quickest lever to lift auto-resolution, so nudge the team to act.
 const COVERAGE_THRESHOLD = 85;
-const PENDING_THRESHOLD = 100;
+const SUGGESTION_THRESHOLD = 100;
 
 const showBanner = computed(
   () =>
     !dismissed.value &&
     (props.knowledge?.coverage ?? 0) < COVERAGE_THRESHOLD &&
-    (props.knowledge?.pending ?? 0) > PENDING_THRESHOLD
+    (props.knowledge?.suggestions ?? 0) > SUGGESTION_THRESHOLD
 );
 
 const dismiss = () => {
@@ -48,9 +53,9 @@ const dismiss = () => {
   dismissed.value = true;
 };
 
-const goToPending = () => {
+const goToSuggestions = () => {
   router.push({
-    name: 'captain_assistants_responses_pending',
+    name: 'captain_assistants_faq_suggestions',
     params: {
       accountId: route.params.accountId,
       assistantId: route.params.assistantId,
@@ -61,15 +66,15 @@ const goToPending = () => {
 
 <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.pending,
+            count: knowledge.suggestions,
             coverage: knowledge.coverage,
           })
         }}
@@ -79,7 +84,7 @@ const goToPending = () => {
       <button
         type="button"
         class="px-3 py-1 rounded-lg bg-n-amber-4 hover:bg-n-amber-5"
-        @click="goToPending"
+        @click="goToSuggestions"
       >
         {{ $t('CAPTAIN.OVERVIEW.COVERAGE_BANNER.ACTION') }}
       </button>
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/overview/KnowledgeCard.vue b/app/javascript/dashboard/components-next/captain/pageComponents/overview/KnowledgeCard.vue
index 80c7ae69d..f5e272ea9 100644
--- a/app/javascript/dashboard/components-next/captain/pageComponents/overview/KnowledgeCard.vue
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/overview/KnowledgeCard.vue
@@ -6,7 +6,12 @@ import { useI18n } from 'vue-i18n';
 const props = defineProps({
   knowledge: {
     type: Object,
-    default: () => ({ approved: 0, pending: 0, documents: 0, coverage: 0 }),
+    default: () => ({
+      approved: 0,
+      suggestions: 0,
+      documents: 0,
+      coverage: 0,
+    }),
   },
 });
 
@@ -31,10 +36,10 @@ const stats = computed(() => [
     to: linkTo('captain_assistants_responses_index'),
   },
   {
-    key: 'pending',
-    value: props.knowledge.pending,
-    label: t('CAPTAIN.OVERVIEW.KNOWLEDGE.PENDING'),
-    to: linkTo('captain_assistants_responses_pending'),
+    key: 'suggestions',
+    value: props.knowledge.suggestions,
+    label: t('CAPTAIN.OVERVIEW.KNOWLEDGE.SUGGESTIONS'),
+    to: linkTo('captain_assistants_faq_suggestions'),
   },
   {
     key: 'documents',
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/response/FaqSuggestionReviewDialog.spec.js b/app/javascript/dashboard/components-next/captain/pageComponents/response/FaqSuggestionReviewDialog.spec.js
new file mode 100644
index 000000000..6a0f59ac6
--- /dev/null
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/response/FaqSuggestionReviewDialog.spec.js
@@ -0,0 +1,74 @@
+import { flushPromises, shallowMount } from '@vue/test-utils';
+import FaqSuggestionReviewDialog from './FaqSuggestionReviewDialog.vue';
+
+const { dispatch, uiFlags } = vi.hoisted(() => ({
+  dispatch: 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: vi.fn() }),
+}));
+
+const DialogStub = {
+  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'
+    );
+  });
+});
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/response/FaqSuggestionReviewDialog.vue b/app/javascript/dashboard/components-next/captain/pageComponents/response/FaqSuggestionReviewDialog.vue
index 6b3102460..256448240 100644
--- a/app/javascript/dashboard/components-next/captain/pageComponents/response/FaqSuggestionReviewDialog.vue
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/response/FaqSuggestionReviewDialog.vue
@@ -27,6 +27,7 @@ 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);
@@ -44,12 +45,15 @@ const isInvalid = computed(
 );
 
 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')
     );
@@ -187,6 +191,23 @@ defineExpose({ dialogRef });
         <div v-if="isFetching" class="flex h-40 items-center justify-center">
           <Spinner />
         </div>
+        <div
+          v-else-if="detailsError"
+          role="alert"
+          class="flex h-40 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 h-40 items-center justify-center px-4 text-center text-sm text-n-slate-10"
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/switcher/AssistantSwitcher.vue b/app/javascript/dashboard/components-next/captain/pageComponents/switcher/AssistantSwitcher.vue
index 01562385f..36cefdd1e 100644
--- a/app/javascript/dashboard/components-next/captain/pageComponents/switcher/AssistantSwitcher.vue
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/switcher/AssistantSwitcher.vue
@@ -24,16 +24,6 @@ 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 });
     },
diff --git a/app/javascript/dashboard/components-next/sidebar/Sidebar.vue b/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
index 294e0dd5d..0bd45408f 100644
--- a/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
+++ b/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
@@ -503,7 +503,7 @@ const menuItems = computed(() => {
           label: t('SIDEBAR.CAPTAIN_RESPONSES'),
           activeOn: [
             'captain_assistants_responses_index',
-            'captain_assistants_responses_pending',
+            'captain_assistants_faq_suggestions',
           ],
           to: accountScopedRoute('captain_assistants_index', {
             navigationPath: 'captain_assistants_responses_index',
diff --git a/app/javascript/dashboard/i18n/locale/en/integrations.json b/app/javascript/dashboard/i18n/locale/en/integrations.json
index f47b991c1..25ee9f703 100644
--- a/app/javascript/dashboard/i18n/locale/en/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/en/integrations.json
@@ -411,8 +411,8 @@
         "DISMISS": "Dismiss"
       },
       "COVERAGE_BANNER": {
-        "TEXT": "{count} FAQs are pending review, keeping coverage at {coverage}%. Approve them so your assistant can resolve more on its own.",
-        "ACTION": "Review FAQs",
+        "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",
         "DISMISS": "Dismiss"
       },
       "RANGES": {
@@ -457,7 +457,7 @@
         "TITLE": "Knowledge coverage",
         "COVERAGE": "{pct}% approved",
         "APPROVED": "Approved FAQs",
-        "PENDING": "Pending FAQs",
+        "SUGGESTIONS": "FAQ suggestions",
         "DOCUMENTS": "Documents"
       },
       "LINKS": {
@@ -1086,7 +1086,6 @@
     },
     "RESPONSES": {
       "HEADER": "FAQs",
-      "PENDING_FAQS": "Pending FAQs",
       "ADD_NEW": "Create new FAQ",
       "DOCUMENTABLE": {
         "CONVERSATION": "Conversation #{id}"
@@ -1095,12 +1094,10 @@
       "SELECT_ALL": "Select all ({count})",
       "UNSELECT_ALL": "Unselect all ({count})",
       "SEARCH_PLACEHOLDER": "Search FAQs...",
-      "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."
+      "ERRORS": {
+        "LOAD": "There was an error loading FAQs. Please try again."
       },
+      "BULK_DELETE_BUTTON": "Delete",
       "BULK_DELETE": {
         "TITLE": "Delete FAQs?",
         "DESCRIPTION": "Are you sure you want to delete the selected FAQs? This action cannot be undone.",
@@ -1115,18 +1112,7 @@
         "SUCCESS_MESSAGE": "FAQ deleted successfully",
         "ERROR_MESSAGE": "There was an error deleting the FAQ, please try again."
       },
-      "FILTER": {
-        "ASSISTANT": "Assistant: {selected}",
-        "STATUS": "Status: {selected}",
-        "ALL_ASSISTANTS": "All"
-      },
-      "STATUS": {
-        "TITLE": "Status",
-        "PENDING": "Pending",
-        "APPROVED": "Approved",
-        "ALL": "All"
-      },
-      "PENDING_BANNER": {
+      "SUGGESTIONS_BANNER": {
         "TITLE": "Captain grouped recurring customer questions into FAQ suggestions.",
         "ACTION": "Review suggestions"
       },
@@ -1161,7 +1147,6 @@
       },
       "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": {
@@ -1186,7 +1171,8 @@
         "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."
+        "NO_SOURCES": "No accessible source conversations were found.",
+        "RETRY": "Retry"
       },
       "EMPTY_STATE": {
         "TITLE": "The review queue is clear",
diff --git a/app/javascript/dashboard/routes/dashboard/captain/captain.routes.js b/app/javascript/dashboard/routes/dashboard/captain/captain.routes.js
index 8448f32cf..eedc9f6d6 100644
--- a/app/javascript/dashboard/routes/dashboard/captain/captain.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/captain/captain.routes.js
@@ -15,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 ResponsesPendingIndex from './responses/Pending.vue';
+import FaqSuggestionsIndex from './responses/FaqSuggestions.vue';
 import CustomToolsIndex from './tools/Index.vue';
 
 const meta = {
@@ -80,11 +80,21 @@ const assistantRoutes = [
     meta,
   },
   {
-    path: frontendURL('accounts/:accountId/captain/:assistantId/faqs/pending'),
-    component: ResponsesPendingIndex,
-    name: 'captain_assistants_responses_pending',
+    path: frontendURL(
+      'accounts/:accountId/captain/:assistantId/faqs/suggestions'
+    ),
+    component: FaqSuggestionsIndex,
+    name: 'captain_assistants_faq_suggestions',
     meta,
   },
+  {
+    path: frontendURL('accounts/:accountId/captain/:assistantId/faqs/pending'),
+    redirect: to => ({
+      name: 'captain_assistants_faq_suggestions',
+      params: to.params,
+      query: to.query,
+    }),
+  },
   {
     path: frontendURL('accounts/:accountId/captain/:assistantId/settings'),
     component: AssistantSettingsIndex,
diff --git a/app/javascript/dashboard/routes/dashboard/captain/responses/FaqSuggestions.spec.js b/app/javascript/dashboard/routes/dashboard/captain/responses/FaqSuggestions.spec.js
new file mode 100644
index 000000000..561b4f668
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/captain/responses/FaqSuggestions.spec.js
@@ -0,0 +1,129 @@
+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;
+  const promise = new Promise(resolvePromise => {
+    resolve = resolvePromise;
+  });
+  return { promise, resolve };
+};
+
+describe('FaqSuggestions', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mocks.route.params.assistantId = 1;
+    mocks.route.query = {};
+  });
+
+  it('keeps the latest assistant results when requests finish in the wrong order', async () => {
+    const firstRequest = deferred();
+    const secondRequest = deferred();
+    mocks.apiGet
+      .mockReturnValueOnce(firstRequest.promise)
+      .mockReturnValueOnce(secondRequest.promise);
+
+    const wrapper = shallowMount(FaqSuggestions, {
+      global: {
+        mocks: { $t: key => key },
+      },
+    });
+
+    await flushPromises();
+    mocks.route.params.assistantId = 2;
+    await flushPromises();
+
+    secondRequest.resolve({
+      data: {
+        payload: [{ id: 2, question: 'Current assistant' }],
+        meta: { page: 1, total_count: 1 },
+      },
+    });
+    await flushPromises();
+
+    firstRequest.resolve({
+      data: {
+        payload: [{ id: 1, question: 'Previous assistant' }],
+        meta: { page: 1, total_count: 1 },
+      },
+    });
+    await flushPromises();
+
+    expect(mocks.apiGet).toHaveBeenNthCalledWith(1, {
+      page: 1,
+      search: '',
+      assistantId: 1,
+    });
+    expect(mocks.apiGet).toHaveBeenNthCalledWith(2, {
+      page: 1,
+      search: '',
+      assistantId: 2,
+    });
+    expect(mocks.dispatch).toHaveBeenCalledWith(
+      'captainFaqSuggestions/setRecords',
+      {
+        records: [{ id: 2, question: 'Current assistant' }],
+        meta: { page: 1, total_count: 1 },
+      }
+    );
+    expect(mocks.dispatch).not.toHaveBeenCalledWith(
+      'captainFaqSuggestions/setRecords',
+      expect.objectContaining({
+        records: [{ id: 1, question: 'Previous assistant' }],
+      })
+    );
+
+    wrapper.unmount();
+  });
+});
diff --git a/app/javascript/dashboard/routes/dashboard/captain/responses/Pending.vue b/app/javascript/dashboard/routes/dashboard/captain/responses/FaqSuggestions.vue
similarity index 78%
rename from app/javascript/dashboard/routes/dashboard/captain/responses/Pending.vue
rename to app/javascript/dashboard/routes/dashboard/captain/responses/FaqSuggestions.vue
index 1edee3b78..7cd7d2aa0 100644
--- a/app/javascript/dashboard/routes/dashboard/captain/responses/Pending.vue
+++ b/app/javascript/dashboard/routes/dashboard/captain/responses/FaqSuggestions.vue
@@ -1,11 +1,12 @@
 <script setup>
-import { computed, nextTick, onMounted, ref } from 'vue';
+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 { 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';
@@ -50,16 +51,47 @@ const updateURL = (page, search) => {
   router.replace({ query });
 };
 
+let suggestionsRequestId = 0;
+let fetchingListRequestId = null;
+
+const isCurrentSuggestionRequest = (requestId, assistantId) =>
+  requestId === suggestionsRequestId &&
+  assistantId === selectedAssistantId.value;
+
 const fetchSuggestions = async (page = 1) => {
+  suggestionsRequestId += 1;
+  const requestId = suggestionsRequestId;
+  const assistantId = selectedAssistantId.value;
+
   updateURL(page, searchQuery.value);
+  fetchingListRequestId = requestId;
+  store.dispatch('captainFaqSuggestions/setFetchingList', true);
+
   try {
-    await store.dispatch('captainFaqSuggestions/get', {
+    const response = await CaptainFaqSuggestionsAPI.get({
       page,
       search: searchQuery.value,
-      assistantId: selectedAssistantId.value,
+      assistantId,
     });
+
+    if (!isCurrentSuggestionRequest(requestId, assistantId)) return [];
+
+    const { payload, meta } = response.data;
+    store.dispatch('captainFaqSuggestions/setRecords', {
+      records: payload,
+      meta,
+    });
+    return payload;
   } catch (error) {
-    useAlert(error?.message || t('CAPTAIN.FAQ_SUGGESTIONS.ERRORS.LOAD'));
+    if (isCurrentSuggestionRequest(requestId, assistantId)) {
+      useAlert(error?.message || t('CAPTAIN.FAQ_SUGGESTIONS.ERRORS.LOAD'));
+    }
+    return [];
+  } finally {
+    if (fetchingListRequestId === requestId) {
+      fetchingListRequestId = null;
+      store.dispatch('captainFaqSuggestions/setFetchingList', false);
+    }
   }
 };
 
@@ -117,6 +149,11 @@ const handleResolved = () => {
 
 const debouncedSearch = debounce(() => fetchSuggestions(1), 500);
 
+const handleSearchInput = () => {
+  suggestionsRequestId += 1;
+  debouncedSearch();
+};
+
 const clearFilters = () => {
   searchQuery.value = '';
   fetchSuggestions(1);
@@ -127,7 +164,24 @@ const initializeFromURL = () => {
   fetchSuggestions(parseInt(route.query.page, 10) || 1);
 };
 
-onMounted(initializeFromURL);
+watch(
+  selectedAssistantId,
+  () => {
+    selectedSuggestion.value = null;
+    activeSuggestionId.value = null;
+    store.dispatch('captainFaqSuggestions/setRecords', {
+      records: [],
+      meta: { page: 1, total_count: 0 },
+    });
+    initializeFromURL();
+  },
+  { immediate: true }
+);
+
+onUnmounted(() => {
+  suggestionsRequestId += 1;
+  store.dispatch('captainFaqSuggestions/setFetchingList', false);
+});
 </script>
 
 <template>
@@ -151,7 +205,7 @@ onMounted(initializeFromURL);
         size="sm"
         type="search"
         autofocus
-        @input="debouncedSearch"
+        @input="handleSearchInput"
       />
     </template>
 
diff --git a/app/javascript/dashboard/routes/dashboard/captain/responses/Index.vue b/app/javascript/dashboard/routes/dashboard/captain/responses/Index.vue
index 2201e7bbd..197fdf717 100644
--- a/app/javascript/dashboard/routes/dashboard/captain/responses/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/captain/responses/Index.vue
@@ -1,11 +1,13 @@
 <script setup>
-import { computed, onMounted, ref, nextTick } from 'vue';
+import { computed, onUnmounted, ref, nextTick, watch } 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 CaptainResponseAPI from 'dashboard/api/captain/response';
 
 import Banner from 'dashboard/components-next/banner/Banner.vue';
 import Input from 'dashboard/components-next/input/Input.vue';
@@ -95,11 +97,20 @@ const updateURLWithFilters = (page, search) => {
   router.replace({ query });
 };
 
-const fetchResponses = (page = 1) => {
-  const filterParams = { page, status: 'approved' };
+let responsesRequestId = 0;
+let fetchingListRequestId = null;
 
-  if (selectedAssistantId.value) {
-    filterParams.assistantId = selectedAssistantId.value;
+const isCurrentResponseRequest = (requestId, assistantId) =>
+  requestId === responsesRequestId && assistantId === selectedAssistantId.value;
+
+const fetchResponses = async (page = 1) => {
+  responsesRequestId += 1;
+  const requestId = responsesRequestId;
+  const assistantId = selectedAssistantId.value;
+  const filterParams = { page };
+
+  if (assistantId) {
+    filterParams.assistantId = assistantId;
   }
   if (searchQuery.value) {
     filterParams.search = searchQuery.value;
@@ -108,7 +119,31 @@ const fetchResponses = (page = 1) => {
   // Update URL with current filters
   updateURLWithFilters(page, searchQuery.value);
 
-  store.dispatch('captainResponses/get', filterParams);
+  fetchingListRequestId = requestId;
+  store.dispatch('captainResponses/setFetchingList', true);
+
+  try {
+    const response = await CaptainResponseAPI.get(filterParams);
+
+    if (!isCurrentResponseRequest(requestId, assistantId)) return [];
+
+    const { payload, meta } = response.data;
+    store.dispatch('captainResponses/setRecords', {
+      records: payload,
+      meta,
+    });
+    return payload;
+  } catch (error) {
+    if (isCurrentResponseRequest(requestId, assistantId)) {
+      useAlert(error?.message || t('CAPTAIN.RESPONSES.ERRORS.LOAD'));
+    }
+    return [];
+  } finally {
+    if (fetchingListRequestId === requestId) {
+      fetchingListRequestId = null;
+      store.dispatch('captainResponses/setFetchingList', false);
+    }
+  }
 };
 
 // Bulk action
@@ -181,24 +216,48 @@ const debouncedSearch = debounce(async () => {
   fetchResponses(1);
 }, 500);
 
+const handleSearchInput = () => {
+  responsesRequestId += 1;
+  debouncedSearch();
+};
+
 const initializeFromURL = () => {
-  if (route.query.search) {
-    searchQuery.value = route.query.search;
-  }
+  searchQuery.value = route.query.search || '';
   const pageFromURL = parseInt(route.query.page, 10) || 1;
   fetchResponses(pageFromURL);
 };
 
-const navigateToPendingFAQs = () => {
-  router.push({ name: 'captain_assistants_responses_pending' });
+const navigateToFaqSuggestions = () => {
+  router.push({
+    name: 'captain_assistants_faq_suggestions',
+    params: {
+      accountId: route.params.accountId,
+      assistantId: selectedAssistantId.value,
+    },
+  });
 };
 
-onMounted(() => {
-  initializeFromURL();
-  store.dispatch(
-    'captainFaqSuggestions/fetchOpenCount',
-    selectedAssistantId.value
-  );
+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(() => {
+  responsesRequestId += 1;
+  store.dispatch('captainResponses/setFetchingList', false);
 });
 </script>
 
@@ -240,7 +299,7 @@ onMounted(() => {
           size="sm"
           type="search"
           autofocus
-          @input="debouncedSearch"
+          @input="handleSearchInput"
         />
       </div>
     </template>
@@ -274,10 +333,10 @@ onMounted(() => {
         v-if="suggestionCount > 0"
         color="blue"
         class="mb-4 -mt-3"
-        :action-label="$t('CAPTAIN.RESPONSES.PENDING_BANNER.ACTION')"
-        @action="navigateToPendingFAQs"
+        :action-label="$t('CAPTAIN.RESPONSES.SUGGESTIONS_BANNER.ACTION')"
+        @action="navigateToFaqSuggestions"
       >
-        {{ $t('CAPTAIN.RESPONSES.PENDING_BANNER.TITLE') }}
+        {{ $t('CAPTAIN.RESPONSES.SUGGESTIONS_BANNER.TITLE') }}
       </Banner>
 
       <div class="flex flex-col gap-4">
diff --git a/app/javascript/dashboard/store/captain/bulkActions.js b/app/javascript/dashboard/store/captain/bulkActions.js
index 1fab006f6..938ff45d1 100644
--- a/app/javascript/dashboard/store/captain/bulkActions.js
+++ b/app/javascript/dashboard/store/captain/bulkActions.js
@@ -48,20 +48,6 @@ 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',
diff --git a/app/javascript/dashboard/store/captain/faqSuggestions.js b/app/javascript/dashboard/store/captain/faqSuggestions.js
index 1d48e821f..14e662807 100644
--- a/app/javascript/dashboard/store/captain/faqSuggestions.js
+++ b/app/javascript/dashboard/store/captain/faqSuggestions.js
@@ -3,6 +3,7 @@ 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',
@@ -20,6 +21,13 @@ export default createStore({
     },
   },
   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 {
@@ -48,14 +56,20 @@ export default createStore({
       }
     },
     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 (error) {
-        commit(SET_OPEN_COUNT, 0);
+      } catch {
+        if (requestId === openCountRequestId) commit(SET_OPEN_COUNT, 0);
       }
     },
   }),
diff --git a/app/javascript/dashboard/store/captain/faqSuggestions.spec.js b/app/javascript/dashboard/store/captain/faqSuggestions.spec.js
new file mode 100644
index 000000000..afd15da1a
--- /dev/null
+++ b/app/javascript/dashboard/store/captain/faqSuggestions.spec.js
@@ -0,0 +1,47 @@
+import CaptainFaqSuggestionsAPI from 'dashboard/api/captain/faqSuggestions';
+import faqSuggestions from './faqSuggestions';
+
+vi.mock('dashboard/api/captain/faqSuggestions', () => ({
+  default: {
+    get: vi.fn(),
+    approve: vi.fn(),
+    dismiss: vi.fn(),
+  },
+}));
+
+const deferred = () => {
+  let resolve;
+  const promise = new Promise(resolvePromise => {
+    resolve = resolvePromise;
+  });
+  return { promise, resolve };
+};
+
+describe('captainFaqSuggestions', () => {
+  it('keeps the latest assistant count when requests finish in the wrong order', async () => {
+    const firstRequest = deferred();
+    const secondRequest = deferred();
+    CaptainFaqSuggestionsAPI.get
+      .mockReturnValueOnce(firstRequest.promise)
+      .mockReturnValueOnce(secondRequest.promise);
+    const commit = vi.fn();
+
+    const firstAction = faqSuggestions.actions.fetchOpenCount({ commit }, 1);
+    const secondAction = faqSuggestions.actions.fetchOpenCount({ commit }, 2);
+
+    secondRequest.resolve({ data: { meta: { total_count: 4 } } });
+    await secondAction;
+    firstRequest.resolve({ data: { meta: { total_count: 9 } } });
+    await firstAction;
+
+    expect(CaptainFaqSuggestionsAPI.get).toHaveBeenNthCalledWith(1, {
+      assistantId: 1,
+      page: 1,
+    });
+    expect(CaptainFaqSuggestionsAPI.get).toHaveBeenNthCalledWith(2, {
+      assistantId: 2,
+      page: 1,
+    });
+    expect(commit).toHaveBeenLastCalledWith('SET_OPEN_COUNT', 4);
+  });
+});
diff --git a/app/javascript/dashboard/store/captain/response.js b/app/javascript/dashboard/store/captain/response.js
index a818fe9fd..c51fc3042 100644
--- a/app/javascript/dashboard/store/captain/response.js
+++ b/app/javascript/dashboard/store/captain/response.js
@@ -1,58 +1,22 @@
 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);
-      }
-    },
   }),
 });
diff --git a/enterprise/app/builders/captain/assistant_stats_builder.rb b/enterprise/app/builders/captain/assistant_stats_builder.rb
index d162406ad..d06c80633 100644
--- a/enterprise/app/builders/captain/assistant_stats_builder.rb
+++ b/enterprise/app/builders/captain/assistant_stats_builder.rb
@@ -181,18 +181,19 @@ class Captain::AssistantStatsBuilder
     rate(reopened, resolved_scope.distinct.count(:conversation_id))
   end
 
-  # Approved/pending FAQ counts and the document total in a single round trip.
+  # Approved FAQ, open suggestion, and document counts in a single round trip.
   def knowledge
-    approved, pending, documents = Captain::AssistantResponse.by_assistant(assistant.id).reorder(nil).pick(
+    approved, suggestions, 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_faq_suggestions WHERE assistant_id = #{assistant.id.to_i} " \
+               "AND status = #{Captain::FaqSuggestion.statuses['open']})"),
       Arel.sql("(SELECT COUNT(*) FROM captain_documents WHERE assistant_id = #{assistant.id.to_i})")
     )
-    total = approved + pending
+    total = approved + suggestions
 
     {
       approved: approved,
-      pending: pending,
+      suggestions: suggestions,
       documents: documents,
       coverage: total.zero? ? 0 : (approved.to_f / total * 100).round
     }
diff --git a/enterprise/app/controllers/api/v1/accounts/captain/assistant_responses_controller.rb b/enterprise/app/controllers/api/v1/accounts/captain/assistant_responses_controller.rb
index 151cf279c..b6e4e5f9b 100644
--- a/enterprise/app/controllers/api/v1/accounts/captain/assistant_responses_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/captain/assistant_responses_controller.rb
@@ -44,8 +44,6 @@ 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(
@@ -74,15 +72,14 @@ class Api::V1::Accounts::Captain::AssistantResponsesController < Api::V1::Accoun
   end
 
   def permitted_params
-    params.permit(:id, :assistant_id, :page, :document_id, :account_id, :status, :search)
+    params.permit(:id, :assistant_id, :page, :document_id, :account_id, :search)
   end
 
   def response_params
     params.require(:assistant_response).permit(
       :question,
       :answer,
-      :assistant_id,
-      :status
+      :assistant_id
     )
   end
 end
diff --git a/enterprise/app/controllers/api/v1/accounts/captain/bulk_actions_controller.rb b/enterprise/app/controllers/api/v1/accounts/captain/bulk_actions_controller.rb
index 7e2817f69..25d84c50b 100644
--- a/enterprise/app/controllers/api/v1/accounts/captain/bulk_actions_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/captain/bulk_actions_controller.rb
@@ -40,14 +40,10 @@ class Api::V1::Accounts::Captain::BulkActionsController < Api::V1::Accounts::Bas
     responses = Current.account.captain_assistant_responses.where(id: params[:ids])
     return unless responses.exists?
 
-    case params[:fields][:status]
-    when 'approve'
-      responses.pending.update(status: 'approved')
-      responses
-    when 'delete'
-      responses.destroy_all
-      []
-    end
+    return render json: { success: false }, status: :unprocessable_content unless params[:fields][:status] == 'delete'
+
+    responses.destroy_all
+    []
   end
 
   def handle_documents
diff --git a/enterprise/app/models/captain/assistant_response.rb b/enterprise/app/models/captain/assistant_response.rb
index db2ac058a..d2dd031a8 100644
--- a/enterprise/app/models/captain/assistant_response.rb
+++ b/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: { pending: 0, approved: 1 }
+  enum status: { approved: 1 }
 
   def self.search(query, account_id: nil)
     embedding = Captain::Llm::EmbeddingService.new(account_id: account_id).get_embedding(query)
diff --git a/spec/enterprise/builders/captain/assistant_stats_builder_spec.rb b/spec/enterprise/builders/captain/assistant_stats_builder_spec.rb
index 6575c9856..471f2ed28 100644
--- a/spec/enterprise/builders/captain/assistant_stats_builder_spec.rb
+++ b/spec/enterprise/builders/captain/assistant_stats_builder_spec.rb
@@ -232,14 +232,17 @@ RSpec.describe Captain::AssistantStatsBuilder do
   describe '#metrics knowledge' do
     before do
       create_list(:captain_assistant_response, 3, assistant: assistant, account: account, status: :approved)
-      create(:captain_assistant_response, assistant: assistant, account: account, status: :pending)
+      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)
     end
 
-    it 'returns approved, pending, document counts and coverage' do
+    it 'returns approved FAQ, open suggestion, document counts and coverage' do
       knowledge = described_class.new(assistant, '30').metrics[:knowledge]
 
-      expect(knowledge).to eq(approved: 3, pending: 1, documents: 2, coverage: 75)
+      expect(knowledge).to eq(approved: 3, suggestions: 1, documents: 2, coverage: 75)
     end
 
     it 'reports zero coverage when there are no responses' do
diff --git a/spec/enterprise/controllers/api/v1/accounts/captain/assistant_responses_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/captain/assistant_responses_controller_spec.rb
index 038ee5e8d..e4086314b 100644
--- a/spec/enterprise/controllers/api/v1/accounts/captain/assistant_responses_controller_spec.rb
+++ b/spec/enterprise/controllers/api/v1/accounts/captain/assistant_responses_controller_spec.rb
@@ -177,6 +177,19 @@ 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
diff --git a/spec/enterprise/controllers/api/v1/accounts/captain/bulk_actions_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/captain/bulk_actions_controller_spec.rb
index 31a0bc36f..394b6c4ad 100644
--- a/spec/enterprise/controllers/api/v1/accounts/captain/bulk_actions_controller_spec.rb
+++ b/spec/enterprise/controllers/api/v1/accounts/captain/bulk_actions_controller_spec.rb
@@ -5,13 +5,12 @@ 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!(:pending_responses) do
+  let!(:responses) do
     create_list(
       :captain_assistant_response,
       2,
       assistant: assistant,
-      account: account,
-      status: 'pending'
+      account: account
     )
   end
   let!(:documents) do
@@ -29,29 +28,20 @@ RSpec.describe 'Api::V1::Accounts::Captain::BulkActions', type: :request do
   end
 
   describe 'POST /api/v1/accounts/:account_id/captain/bulk_actions' 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
+    context 'when using the removed bulk approval action' do
+      it 'returns unprocessable content without changing responses' do
         post "/api/v1/accounts/#{account.id}/captain/bulk_actions",
-             params: valid_params,
+             params: {
+               type: 'AssistantResponse',
+               ids: responses.map(&:id),
+               fields: { status: 'approve' }
+             },
              headers: admin.create_new_auth_token,
              as: :json
 
-        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
+        expect(response).to have_http_status(:unprocessable_content)
+        expect(json_response[:success]).to be(false)
+        expect(responses.map(&:reload)).to all(be_approved)
       end
     end
 
@@ -59,7 +49,7 @@ RSpec.describe 'Api::V1::Accounts::Captain::BulkActions', type: :request do
       let(:delete_params) do
         {
           type: 'AssistantResponse',
-          ids: pending_responses.map(&:id),
+          ids: responses.map(&:id),
           fields: { status: 'delete' }
         }
       end
@@ -76,7 +66,7 @@ RSpec.describe 'Api::V1::Accounts::Captain::BulkActions', type: :request do
         expect(json_response).to eq([])
 
         # Verify responses were deleted
-        pending_responses.each do |response|
+        responses.each do |response|
           expect { response.reload }.to raise_error(ActiveRecord::RecordNotFound)
         end
       end
@@ -86,8 +76,8 @@ RSpec.describe 'Api::V1::Accounts::Captain::BulkActions', type: :request do
       let(:invalid_params) do
         {
           type: 'InvalidType',
-          ids: pending_responses.map(&:id),
-          fields: { status: 'approve' }
+          ids: responses.map(&:id),
+          fields: { status: 'delete' }
         }
       end
 
@@ -100,10 +90,7 @@ 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)
 
-        # Verify no changes were made
-        pending_responses.each do |response|
-          expect(response.reload.status).to eq('pending')
-        end
+        expect(responses.map(&:reload)).to all(be_approved)
       end
     end
 
@@ -245,7 +232,7 @@ RSpec.describe 'Api::V1::Accounts::Captain::BulkActions', type: :request do
       let(:missing_params) do
         {
           type: 'AssistantResponse',
-          fields: { status: 'approve' }
+          fields: { status: 'delete' }
         }
       end
 
@@ -258,10 +245,7 @@ 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)
 
-        # Verify no changes were made
-        pending_responses.each do |response|
-          expect(response.reload.status).to eq('pending')
-        end
+        expect(responses.map(&:reload)).to all(be_approved)
       end
     end
 
@@ -270,16 +254,13 @@ 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: 'approve' } },
+             params: { type: 'AssistantResponse', ids: [1], fields: { status: 'delete' } },
              headers: unauthorized_user.create_new_auth_token,
              as: :json
 
         expect(response).to have_http_status(:unauthorized)
 
-        # Verify no changes were made
-        pending_responses.each do |response|
-          expect(response.reload.status).to eq('pending')
-        end
+        expect(responses.map(&:reload)).to all(be_approved)
       end
     end
   end
diff --git a/spec/enterprise/services/captain/assistant_migration/draft_applier_spec.rb b/spec/enterprise/services/captain/assistant_migration/draft_applier_spec.rb
index b92a1a6a6..79342cfe5 100644
--- a/spec/enterprise/services/captain/assistant_migration/draft_applier_spec.rb
+++ b/spec/enterprise/services/captain/assistant_migration/draft_applier_spec.rb
@@ -80,24 +80,6 @@ RSpec.describe Captain::AssistantMigration::DraftApplier do
       end.not_to(change { assistant.responses.count })
     end
 
-    it 'leaves pending FAQ responses untouched' do
-      pending_response = assistant.responses.create!(
-        question: faq_document_candidate['question'],
-        answer: faq_document_candidate['answer'],
-        status: :pending
-      )
-
-      described_class.new(assistant: assistant, draft: draft, dry_run: false).perform
-
-      expect(pending_response.reload).to be_pending
-      expect(assistant.responses.approved).to contain_exactly(
-        have_attributes(
-          question: faq_document_candidate['question'],
-          answer: faq_document_candidate['answer']
-        )
-      )
-    end
-
     it 'rejects conflicting FAQ answers within the same draft' do
       conflicting_draft = draft.merge(
         faq_document_candidates: [