From 0e7dc282c40a6845aba4992585f2bf3cc335d3b9 Mon Sep 17 00:00:00 2001
From: Rodrigo Borba <rodrigobm10@me.com>
Date: Wed, 25 Feb 2026 15:01:48 -0300
Subject: [PATCH] chore(style): fix rubocop offenses and update typing
 indicators

---
 .env.example                                  | 352 ++------
 .github/workflows/deploy_ghcr.yml             | 120 +++
 .gitignore                                    |  25 +
 .husky/pre-commit                             |  14 +-
 .rubocop.yml                                  |   9 +-
 .rubocop_todo.yml                             | 158 ++++
 AGENTS.md                                     | 259 ++++--
 Procfile.dev                                  |   4 +-
 .../v1/accounts/captain/units_controller.rb   | 101 +++
 .../v1/accounts/inboxes/wuzapi_controller.rb  | 133 +++
 .../api/v1/accounts/inboxes_controller.rb     |  30 +-
 .../v1/captain/inter_webhooks_controller.rb   |  92 ++
 .../api/v1/captain/payments_controller.rb     |  13 +
 app/controllers/webhooks/wuzapi_controller.rb |  37 +
 .../dashboard/api/captain/galleryItems.js     |  35 +
 .../dashboard/api/captain/reservations.js     |  26 +
 app/javascript/dashboard/api/captain/units.js |  29 +
 app/javascript/dashboard/api/inbox/jasmine.js |  96 ++
 .../captain/assistant/InboxCard.vue           |   7 +
 .../pageComponents/customTool/AuthConfig.vue  | 100 ++-
 .../customTool/CustomToolForm.vue             |   4 +
 .../components-next/sidebar/Sidebar.vue       |  41 +-
 .../widgets/conversation/ConversationCard.vue |   6 +
 .../conversation/ConversationHeader.vue       |  18 +
 .../conversation/ReservationMarker.vue        |  76 ++
 .../dashboard/composables/useUISettings.js    |   1 +
 app/javascript/dashboard/featureFlags.js      |   7 +-
 .../dashboard/i18n/locale/en/captain.json     | 281 ++++++
 .../i18n/locale/en/conversation.json          |   1 +
 .../dashboard/i18n/locale/en/inboxMgmt.json   | 291 +++---
 .../dashboard/i18n/locale/en/index.js         |   4 +
 .../i18n/locale/en/integrations.json          |  12 +-
 .../dashboard/i18n/locale/en/jasmine.json     |  81 ++
 .../dashboard/i18n/locale/en/settings.json    |  81 ++
 .../dashboard/i18n/locale/pt_BR/captain.json  | 281 ++++++
 .../i18n/locale/pt_BR/conversation.json       |   1 +
 .../i18n/locale/pt_BR/inboxMgmt.json          | 267 +++---
 .../dashboard/i18n/locale/pt_BR/index.js      |   4 +
 .../dashboard/i18n/locale/pt_BR/jasmine.json  |  84 ++
 .../dashboard/i18n/locale/pt_BR/settings.json |   3 +
 .../dashboard/captain/captain.routes.js       |   7 +
 .../dashboard/captain/reservations/Index.vue  | 626 +++++++++++++
 .../dashboard/conversation/ContactPanel.vue   |  16 +
 .../reservation/ReservationSummary.vue        | 163 ++++
 .../settings/captain/captain.routes.js        |  36 +
 .../settings/captain/gallery/Edit.vue         | 303 +++++++
 .../settings/captain/gallery/Index.vue        | 196 ++++
 .../dashboard/settings/captain/units/Edit.vue | 433 +++++++++
 .../settings/captain/units/Index.vue          | 234 +++++
 .../settings/captain/units/TestIndex.vue      |  29 +
 .../settings/inbox/JasmineConfiguration.vue   | 214 +++++
 .../dashboard/settings/inbox/Settings.vue     | 113 ++-
 .../settings/inbox/channels/EvolutionGo.vue   | 448 +++++++++
 .../settings/inbox/channels/Whatsapp.vue      |  95 +-
 .../settings/inbox/channels/Wuzapi.vue        | 159 ++++
 .../evolution_go/EvolutionGoConfiguration.vue | 211 +++++
 .../channels/wuzapi/WuzapiConfiguration.vue   | 296 ++++++
 .../inbox/components/InboxAutoResolve.vue     |  86 ++
 .../inbox/components/JasmineKnowledgeBase.vue | 363 ++++++++
 .../inbox/settingsPage/CollaboratorsPage.vue  | 759 +++-------------
 .../inbox/settingsPage/ConfigurationPage.vue  | 417 +--------
 .../settingsPage/CustomerSatisfactionPage.vue | 585 +-----------
 .../dashboard/store/captain/reservations.js   |  29 +
 app/javascript/dashboard/store/index.js       |   6 +
 .../store/modules/captainGalleryItems.js      |  85 ++
 .../dashboard/store/modules/captainUnits.js   |  83 ++
 .../dashboard/store/mutation-types.js         |  14 +
 app/jobs/webhooks/whatsapp_events_job.rb      |   2 +
 app/models/account.rb                         |   3 +
 app/models/campaign.rb                        |   2 +-
 app/models/captain/unit.rb                    |  69 ++
 app/models/channel/whatsapp.rb                | 353 ++++++--
 app/models/concerns/featurable.rb             |   6 +-
 app/models/conversation.rb                    |  58 +-
 app/models/csat_survey_response.rb            |  34 +-
 app/models/inbox.rb                           |   3 +
 app/models/message.rb                         |  22 +-
 app/models/reporting_event.rb                 |  15 +-
 app/models/super_admin.rb                     |   2 +-
 app/models/user.rb                            |   2 +-
 app/services/evolution_api/client.rb          | 156 ++++
 app/services/whatsapp/decryption_service.rb   | 145 +++
 .../incoming_message_wuzapi_service.rb        | 322 +++++++
 .../providers/evolution_api/payload_parser.rb | 161 ++++
 .../whatsapp/providers/evolution_service.rb   | 103 +++
 .../providers/wuzapi/payload_parser.rb        | 276 ++++++
 .../whatsapp/providers/wuzapi_service.rb      | 187 ++++
 app/services/wuzapi/client.rb                 | 286 ++++++
 app/services/wuzapi/provisioning_service.rb   |  34 +
 app/views/api/v1/models/_inbox.json.jbuilder  |   3 +
 .../api/v1/captain/payments/show.html.erb     | 104 +++
 config/agents/tools.yml                       |  15 +
 config/application.yml                        |  15 +
 config/routes.rb                              |  28 +
 config/schedule.yml                           |   7 +
 .../20250213190934_add_name_to_webhooks.rb    |   5 -
 ...ypted_wuzapi_tokens_to_channel_whatsapp.rb |   8 +
 .../20251227230000_rename_wuzapi_tokens.rb    |   8 +
 ...30832_add_cert_content_to_captain_units.rb |   6 +
 ..._webhook_configured_at_to_captain_units.rb |   5 +
 ...60223142442_add_typing_delay_to_inboxes.rb |   5 +
 ..._proactive_pix_polling_to_captain_units.rb |   5 +
 ...0225160000_create_captain_gallery_items.rb |  19 +
 ...cope_and_inbox_to_captain_gallery_items.rb |  69 ++
 db/schema.rb                                  | 848 ++++++++++++++++--
 docker-compose.production.yaml                |   2 +-
 .../captain/gallery_items_controller.rb       | 128 +++
 .../v1/accounts/captain/inboxes_controller.rb |  25 +-
 .../captain/reservations_controller.rb        | 156 ++++
 .../conversation/response_builder_job.rb      |  83 +-
 .../app/jobs/captain/documents/crawl_job.rb   |  14 +-
 .../captain/documents/response_builder_job.rb |  14 +-
 .../payments/poll_pix_charge_status_job.rb    |  92 ++
 .../proactive_pix_polling_scheduler_job.rb    |  28 +
 enterprise/app/models/captain/assistant.rb    |  26 +-
 enterprise/app/models/captain/brand.rb        |  44 +
 enterprise/app/models/captain/custom_tool.rb  |   2 +-
 enterprise/app/models/captain/document.rb     |   4 +-
 enterprise/app/models/captain/gallery_item.rb | 114 +++
 enterprise/app/models/captain/pix_charge.rb   |  68 ++
 enterprise/app/models/captain/reservation.rb  | 128 +++
 enterprise/app/models/captain/scenario.rb     |  36 +-
 enterprise/app/models/captain/unit.rb         | 109 +++
 enterprise/app/models/captain_inbox.rb        |  18 +-
 enterprise/app/models/company.rb              |   2 +-
 enterprise/app/models/concerns/toolable.rb    |   7 +
 .../enterprise/concerns/conversation.rb       |  11 +
 .../app/policies/captain/assistant_policy.rb  |   8 +
 .../captain/assistant/agent_runner_service.rb | 205 ++++-
 .../services/captain/inter/auth_service.rb    |  60 ++
 .../app/services/captain/inter/cob_service.rb |  89 ++
 .../captain/inter/cob_status_service.rb       |  89 ++
 .../captain/inter/webhook_setup_service.rb    |  70 ++
 .../captain/llm/system_prompts_service.rb     |   4 +-
 .../open_ai_message_builder_service.rb        |  37 +-
 .../captain/payments/confirmation_service.rb  |  80 ++
 .../conversation_marker_sync_service.rb       |  27 +
 .../captain/reservations/marker_builder.rb    |  84 ++
 .../reservations/revenue_summary_service.rb   |  72 ++
 .../captain/tools/check_pix_payment_tool.rb   | 238 +++++
 .../captain/tools/generate_pix_tool.rb        | 722 +++++++++++++++
 .../captain/tools/send_suite_images_tool.rb   | 252 ++++++
 .../hook_execution_service.rb                 |  11 +-
 .../captain/inboxes/index.json.jbuilder       |   8 +-
 .../captain/reservations/index.json.jbuilder  |  10 +
 .../captain/reservations/show.json.jbuilder   |   1 +
 .../models/captain/_reservation.json.jbuilder |  36 +
 .../partials/_conversation.json.jbuilder      |   2 +
 .../captain/conversation/reaction_policy.rb   |  52 ++
 .../lib/captain/prompts/assistant.liquid      |  33 +-
 .../lib/captain/prompts/scenario.liquid       |  28 +
 enterprise/lib/captain/response_schema.rb     |   4 +
 .../lib/captain/tools/faq_lookup_tool.rb      |   4 +
 get_error.js                                  |  27 +
 informacoes/inter_api                         |  95 ++
 lib/integrations/llm_instrumentation.rb       |  12 +-
 package.json                                  |   4 +-
 ..._migracao_dos_canais_wuzapi_e_evolution.md |  59 ++
 ...2026-02-24_faq_guardrail_e_orquestracao.md |  74 ++
 progresso/como-criar-pagina-settings.md       | 204 +++++
 progresso/leitura-de-imagem-llm-v2.md         |  21 +
 progresso/plano-novo-projeto-ia.md            |  35 +
 proposito/PROPOSITO.md                        | 208 +++++
 reference/chatwoot-develop                    |   1 +
 scripts/create_fake_pix.rb                    |  45 +
 .../captain/gallery_items_controller_spec.rb  |  79 ++
 .../captain/inboxes_controller_spec.rb        |  48 +
 .../captain/reservations_controller_spec.rb   | 236 +++++
 .../accounts/captain/units_controller_spec.rb |  57 ++
 .../conversation/response_builder_job_spec.rb |  47 +
 .../poll_pix_charge_status_job_spec.rb        | 126 +++
 ...roactive_pix_polling_scheduler_job_spec.rb | 124 +++
 .../models/captain/reservation_spec.rb        | 108 +++
 .../models/captain/scenario_spec.rb           |  43 +
 .../assistant/agent_runner_service_spec.rb    | 159 +++-
 .../captain/inter/cob_status_service_spec.rb  |  97 ++
 .../reservations/marker_builder_spec.rb       |  93 ++
 .../tools/check_pix_payment_tool_spec.rb      | 131 +++
 .../captain/tools/generate_pix_tool_spec.rb   | 269 ++++++
 .../tools/send_suite_images_tool_spec.rb      | 109 +++
 spec/factories/captain/brand.rb               |   6 +
 spec/factories/captain/gallery_item.rb        |  37 +
 spec/factories/captain/unit.rb                |   9 +
 183 files changed, 15842 insertions(+), 2639 deletions(-)
 create mode 100644 .github/workflows/deploy_ghcr.yml
 create mode 100644 .rubocop_todo.yml
 create mode 100644 app/controllers/api/v1/accounts/captain/units_controller.rb
 create mode 100644 app/controllers/api/v1/accounts/inboxes/wuzapi_controller.rb
 create mode 100644 app/controllers/public/api/v1/captain/inter_webhooks_controller.rb
 create mode 100644 app/controllers/public/api/v1/captain/payments_controller.rb
 create mode 100644 app/controllers/webhooks/wuzapi_controller.rb
 create mode 100644 app/javascript/dashboard/api/captain/galleryItems.js
 create mode 100644 app/javascript/dashboard/api/captain/reservations.js
 create mode 100644 app/javascript/dashboard/api/captain/units.js
 create mode 100644 app/javascript/dashboard/api/inbox/jasmine.js
 create mode 100644 app/javascript/dashboard/components/widgets/conversation/ReservationMarker.vue
 create mode 100644 app/javascript/dashboard/i18n/locale/en/captain.json
 create mode 100644 app/javascript/dashboard/i18n/locale/en/jasmine.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pt_BR/captain.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pt_BR/jasmine.json
 create mode 100644 app/javascript/dashboard/routes/dashboard/captain/reservations/Index.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/conversation/reservation/ReservationSummary.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/captain/gallery/Edit.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/captain/gallery/Index.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/captain/units/Edit.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/captain/units/Index.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/captain/units/TestIndex.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/inbox/JasmineConfiguration.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/inbox/channels/EvolutionGo.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Wuzapi.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/inbox/channels/evolution_go/EvolutionGoConfiguration.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/inbox/channels/wuzapi/WuzapiConfiguration.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/inbox/components/InboxAutoResolve.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/inbox/components/JasmineKnowledgeBase.vue
 create mode 100644 app/javascript/dashboard/store/captain/reservations.js
 create mode 100644 app/javascript/dashboard/store/modules/captainGalleryItems.js
 create mode 100644 app/javascript/dashboard/store/modules/captainUnits.js
 create mode 100644 app/models/captain/unit.rb
 create mode 100644 app/services/evolution_api/client.rb
 create mode 100644 app/services/whatsapp/decryption_service.rb
 create mode 100644 app/services/whatsapp/incoming_message_wuzapi_service.rb
 create mode 100644 app/services/whatsapp/providers/evolution_api/payload_parser.rb
 create mode 100644 app/services/whatsapp/providers/evolution_service.rb
 create mode 100644 app/services/whatsapp/providers/wuzapi/payload_parser.rb
 create mode 100644 app/services/whatsapp/providers/wuzapi_service.rb
 create mode 100644 app/services/wuzapi/client.rb
 create mode 100644 app/services/wuzapi/provisioning_service.rb
 create mode 100644 app/views/public/api/v1/captain/payments/show.html.erb
 create mode 100644 config/application.yml
 delete mode 100644 db/migrate/20250213190934_add_name_to_webhooks.rb
 create mode 100644 db/migrate/20251227223543_add_encrypted_wuzapi_tokens_to_channel_whatsapp.rb
 create mode 100644 db/migrate/20251227230000_rename_wuzapi_tokens.rb
 create mode 100644 db/migrate/20260222230832_add_cert_content_to_captain_units.rb
 create mode 100644 db/migrate/20260223035055_add_webhook_configured_at_to_captain_units.rb
 create mode 100644 db/migrate/20260223142442_add_typing_delay_to_inboxes.rb
 create mode 100644 db/migrate/20260225003000_add_proactive_pix_polling_to_captain_units.rb
 create mode 100644 db/migrate/20260225160000_create_captain_gallery_items.rb
 create mode 100644 db/migrate/20260226002000_add_scope_and_inbox_to_captain_gallery_items.rb
 create mode 100644 enterprise/app/controllers/api/v1/accounts/captain/gallery_items_controller.rb
 create mode 100644 enterprise/app/controllers/api/v1/accounts/captain/reservations_controller.rb
 create mode 100644 enterprise/app/jobs/captain/payments/poll_pix_charge_status_job.rb
 create mode 100644 enterprise/app/jobs/captain/payments/proactive_pix_polling_scheduler_job.rb
 create mode 100644 enterprise/app/models/captain/brand.rb
 create mode 100644 enterprise/app/models/captain/gallery_item.rb
 create mode 100644 enterprise/app/models/captain/pix_charge.rb
 create mode 100644 enterprise/app/models/captain/reservation.rb
 create mode 100644 enterprise/app/models/captain/unit.rb
 create mode 100644 enterprise/app/services/captain/inter/auth_service.rb
 create mode 100644 enterprise/app/services/captain/inter/cob_service.rb
 create mode 100644 enterprise/app/services/captain/inter/cob_status_service.rb
 create mode 100644 enterprise/app/services/captain/inter/webhook_setup_service.rb
 create mode 100644 enterprise/app/services/captain/payments/confirmation_service.rb
 create mode 100644 enterprise/app/services/captain/reservations/conversation_marker_sync_service.rb
 create mode 100644 enterprise/app/services/captain/reservations/marker_builder.rb
 create mode 100644 enterprise/app/services/captain/reservations/revenue_summary_service.rb
 create mode 100644 enterprise/app/services/captain/tools/check_pix_payment_tool.rb
 create mode 100644 enterprise/app/services/captain/tools/generate_pix_tool.rb
 create mode 100644 enterprise/app/services/captain/tools/send_suite_images_tool.rb
 create mode 100644 enterprise/app/views/api/v1/accounts/captain/reservations/index.json.jbuilder
 create mode 100644 enterprise/app/views/api/v1/accounts/captain/reservations/show.json.jbuilder
 create mode 100644 enterprise/app/views/api/v1/models/captain/_reservation.json.jbuilder
 create mode 100644 enterprise/lib/captain/conversation/reaction_policy.rb
 create mode 100644 get_error.js
 create mode 100644 informacoes/inter_api
 create mode 100644 progresso/2026-02-22_migracao_dos_canais_wuzapi_e_evolution.md
 create mode 100644 progresso/2026-02-24_faq_guardrail_e_orquestracao.md
 create mode 100644 progresso/como-criar-pagina-settings.md
 create mode 100644 progresso/leitura-de-imagem-llm-v2.md
 create mode 100644 progresso/plano-novo-projeto-ia.md
 create mode 100644 proposito/PROPOSITO.md
 create mode 160000 reference/chatwoot-develop
 create mode 100755 scripts/create_fake_pix.rb
 create mode 100644 spec/enterprise/controllers/api/v1/accounts/captain/gallery_items_controller_spec.rb
 create mode 100644 spec/enterprise/controllers/api/v1/accounts/captain/reservations_controller_spec.rb
 create mode 100644 spec/enterprise/controllers/api/v1/accounts/captain/units_controller_spec.rb
 create mode 100644 spec/enterprise/jobs/captain/payments/poll_pix_charge_status_job_spec.rb
 create mode 100644 spec/enterprise/jobs/captain/payments/proactive_pix_polling_scheduler_job_spec.rb
 create mode 100644 spec/enterprise/models/captain/reservation_spec.rb
 create mode 100644 spec/enterprise/services/captain/inter/cob_status_service_spec.rb
 create mode 100644 spec/enterprise/services/captain/reservations/marker_builder_spec.rb
 create mode 100644 spec/enterprise/services/captain/tools/check_pix_payment_tool_spec.rb
 create mode 100644 spec/enterprise/services/captain/tools/generate_pix_tool_spec.rb
 create mode 100644 spec/enterprise/services/captain/tools/send_suite_images_tool_spec.rb
 create mode 100644 spec/factories/captain/brand.rb
 create mode 100644 spec/factories/captain/gallery_item.rb
 create mode 100644 spec/factories/captain/unit.rb

diff --git a/.env.example b/.env.example
index 0158c1f0f..adeda3705 100644
--- a/.env.example
+++ b/.env.example
@@ -1,297 +1,101 @@
-# Learn about the various environment variables at
-# https://www.chatwoot.com/docs/self-hosted/configuration/environment-variables/#rails-production-variables
+# ============================================
+# Synkra AIOS Environment Configuration
+# ============================================
+# Copy this file to .env and fill in your actual values
+# DO NOT commit .env with real credentials
+# ============================================
 
-# Used to verify the integrity of signed cookies. so ensure a secure value is set
-# SECRET_KEY_BASE should be alphanumeric. Avoid special characters or symbols.
-# Use `rake secret` to generate this variable
-SECRET_KEY_BASE=replace_with_lengthy_secure_hex
+# --------------------------------------------
+# LLM Providers
+# --------------------------------------------
 
-# Active Record Encryption keys (required for MFA/2FA functionality)
-# Generate these keys by running: rails db:encryption:init
-# IMPORTANT: Use different keys for each environment (development, staging, production)
-# ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=
-# ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=
-# ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=
+# DeepSeek API (for claude-free command)
+# Get your key at: https://platform.deepseek.com/api_keys
+# Cost: ~$0.14/M tokens with tool calling support
+DEEPSEEK_API_KEY=
 
-# Replace with the URL you are planning to use for your app
-FRONTEND_URL=http://0.0.0.0:3000
-# To use a dedicated URL for help center pages
-# HELPCENTER_URL=http://0.0.0.0:3000
+# OpenRouter API (for multi-model routing)
+# Get your key at: https://openrouter.ai/keys
+OPENROUTER_API_KEY=
 
-# If the variable is set, all non-authenticated pages would fallback to the default locale.
-# Whenever a new account is created, the default language will be DEFAULT_LOCALE instead of en
-# DEFAULT_LOCALE=en
+# Anthropic API (direct, if not using Claude Max subscription)
+# Get your key at: https://console.anthropic.com/
+ANTHROPIC_API_KEY=
 
-# If you plan to use CDN for your assets, set Asset CDN Host
-ASSET_CDN_HOST=
+# OpenAI API Key - Get yours at: https://platform.openai.com/api-keys
+OPENAI_API_KEY=
 
-# Force all access to the app over SSL, default is set to false
-FORCE_SSL=false
+# --------------------------------------------
+# Search & Research Tools
+# --------------------------------------------
 
-# This lets you control new sign ups on your chatwoot installation
-# true : default option, allows sign ups
-# false : disables all the end points related to sign ups
-# api_only: disables the UI for signup, but you can create sign ups via the account apis
-ENABLE_ACCOUNT_SIGNUP=false
+# Exa Search API (web search for agents)
+# Get your key at: https://exa.ai/
+EXA_API_KEY=
 
-# Redis config
-# specify the configs via single URL or individual variables
-# ref: https://www.iana.org/assignments/uri-schemes/prov/redis
-# You can also use the following format for the URL: redis://:password@host:port/db_number
-REDIS_URL=redis://redis:6379
-# If you are using docker-compose, set this variable's value to be any string,
-# which will be the password for the redis service running inside the docker-compose
-# to make it secure
-REDIS_PASSWORD=
-# Redis Sentinel can be used by passing list of sentinel host and ports e,g. sentinel_host1:port1,sentinel_host2:port2
-REDIS_SENTINELS=
-# Redis sentinel master name is required when using sentinel, default value is "mymaster".
-# You can find list of master using "SENTINEL masters" command
-REDIS_SENTINEL_MASTER_NAME=
+# Context7 (library documentation lookup)
+# Usually free, no key required for basic usage
+CONTEXT7_API_KEY=
 
-# By default Chatwoot will pass REDIS_PASSWORD as the password value for sentinels
-# Use the following environment variable to customize passwords for sentinels.
-# Use empty string if sentinels are configured with out passwords
-# REDIS_SENTINEL_PASSWORD=
+# --------------------------------------------
+# Database & Backend
+# --------------------------------------------
 
-# Redis premium breakage in heroku fix
-# enable the following configuration
-# ref: https://github.com/chatwoot/chatwoot/issues/2420
-# REDIS_OPENSSL_VERIFY_MODE=none
+# Supabase (database, auth, storage)
+# Get from your Supabase project settings
+SUPABASE_URL=
+SUPABASE_ANON_KEY=
+SUPABASE_SERVICE_ROLE_KEY=
 
-# Postgres Database config variables
-# You can leave POSTGRES_DATABASE blank. The default name of
-# the database in the production environment is chatwoot_production
-# POSTGRES_DATABASE=
-POSTGRES_HOST=postgres
-POSTGRES_USERNAME=postgres
-POSTGRES_PASSWORD=
-RAILS_ENV=development
-# Changes the Postgres query timeout limit. The default is 14 seconds. Modify only when required.
-# POSTGRES_STATEMENT_TIMEOUT=14s
-RAILS_MAX_THREADS=5
+# --------------------------------------------
+# Version Control & CI/CD
+# --------------------------------------------
 
-# The email from which all outgoing emails are sent
-# could user either  `email@yourdomain.com` or `BrandName <email@yourdomain.com>`
-MAILER_SENDER_EMAIL=Chatwoot <accounts@chatwoot.com>
+# GitHub Token (for GitHub CLI and API access)
+# Create at: https://github.com/settings/tokens
+GITHUB_TOKEN=
 
-#SMTP domain key is set up for HELO checking
-SMTP_DOMAIN=chatwoot.com
-# Set the value to "mailhog" if using docker-compose for development environments,
-# Set the value as "localhost" or your SMTP address in other environments
-# If SMTP_ADDRESS is empty, Chatwoot would try to use sendmail(postfix)
-SMTP_ADDRESS=
-SMTP_PORT=1025
-SMTP_USERNAME=
-SMTP_PASSWORD=
-# plain,login,cram_md5
-SMTP_AUTHENTICATION=
-SMTP_ENABLE_STARTTLS_AUTO=true
-# Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert', see http://api.rubyonrails.org/classes/ActionMailer/Base.html
-SMTP_OPENSSL_VERIFY_MODE=peer
-# Comment out the following environment variables if required by your SMTP server
-# SMTP_TLS=
-# SMTP_SSL=
-# SMTP_OPEN_TIMEOUT
-# SMTP_READ_TIMEOUT
+# --------------------------------------------
+# Project Management
+# --------------------------------------------
 
-# Mail Incoming
-# This is the domain set for the reply emails when conversation continuity is enabled
-MAILER_INBOUND_EMAIL_DOMAIN=
-# Set this to the appropriate ingress channel with regards to incoming emails
-# Possible values are :
-# relay for Exim, Postfix, Qmail
-# mailgun for Mailgun
-# mandrill for Mandrill
-# postmark for Postmark
-# sendgrid for Sendgrid
-# ses for Amazon SES
-RAILS_INBOUND_EMAIL_SERVICE=
-# Use one of the following based on the email ingress service
-# Ref: https://edgeguides.rubyonrails.org/action_mailbox_basics.html
-# Set this to a password of your choice and use it in the Inbound webhook
-RAILS_INBOUND_EMAIL_PASSWORD=
+# ClickUp API (if using ClickUp integration)
+# Get from: ClickUp Settings > Apps > API Token
+CLICKUP_API_KEY=
 
-MAILGUN_INGRESS_SIGNING_KEY=
-MANDRILL_INGRESS_API_KEY=
+# --------------------------------------------
+# Automation & Workflows
+# --------------------------------------------
 
-# SNS topic ARN for ActionMailbox (format: arn:aws:sns:region:account-id:topic-name)
-# Configure only if the rails_inbound_email_service = ses
-ACTION_MAILBOX_SES_SNS_TOPIC=
+# N8N (workflow automation)
+# From your N8N instance settings
+N8N_API_KEY=
+N8N_WEBHOOK_URL=
 
-# Creating Your Inbound Webhook Instructions for Postmark and Sendgrid:
-# Inbound webhook URL format:
-#    https://actionmailbox:[YOUR_RAILS_INBOUND_EMAIL_PASSWORD]@[YOUR_CHATWOOT_DOMAIN.COM]/rails/action_mailbox/[RAILS_INBOUND_EMAIL_SERVICE]/inbound_emails
-# Note: Replace the values inside the brackets; do not include the brackets themselves.
-# Example: https://actionmailbox:mYRandomPassword3@chatwoot.example.com/rails/action_mailbox/postmark/inbound_emails
-# For Postmark
-# Ensure the 'Include raw email content in JSON payload' checkbox is selected in the inbound webhook section.
+# --------------------------------------------
+# Monitoring & Analytics
+# --------------------------------------------
 
-# Storage
-ACTIVE_STORAGE_SERVICE=local
+# Sentry (error tracking)
+SENTRY_DSN=
 
-# Amazon S3
-# documentation: https://www.chatwoot.com/docs/configuring-s3-bucket-as-cloud-storage
-S3_BUCKET_NAME=
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-AWS_REGION=
+# --------------------------------------------
+# Cloud Providers
+# --------------------------------------------
 
-# S3-compatible storage (e.g., Cloudflare R2, MinIO, DigitalOcean Spaces)
-# Set ACTIVE_STORAGE_SERVICE=s3_compatible to use this
-# STORAGE_ACCESS_KEY_ID=
-# STORAGE_SECRET_ACCESS_KEY=
-# STORAGE_REGION=
-# STORAGE_BUCKET_NAME=
-# STORAGE_ENDPOINT=
-# STORAGE_FORCE_PATH_STYLE=true
-# STORAGE_REQUEST_CHECKSUM_CALCULATION=when_required
-# STORAGE_RESPONSE_CHECKSUM_VALIDATION=when_required
+# Railway (deployment)
+RAILWAY_TOKEN=
 
-# Log settings
-# Disable if you want to write logs to a file
-RAILS_LOG_TO_STDOUT=true
-LOG_LEVEL=info
-LOG_SIZE=500
-# Configure this environment variable if you want to use lograge instead of rails logger
-#LOGRAGE_ENABLED=true
+# Vercel (deployment)
+VERCEL_TOKEN=
 
-### This environment variables are only required if you are setting up social media channels
+# --------------------------------------------
+# AIOS Core Configuration
+# --------------------------------------------
+NODE_ENV=development
+AIOS_VERSION=2.2.0
 
-# Facebook
-# documentation: https://www.chatwoot.com/docs/facebook-setup
-FB_VERIFY_TOKEN=
-FB_APP_SECRET=
-FB_APP_ID=
-
-# https://developers.facebook.com/docs/messenger-platform/instagram/get-started#app-dashboard
-IG_VERIFY_TOKEN=
-
-# Twitter
-# documentation: https://www.chatwoot.com/docs/twitter-app-setup
-TWITTER_APP_ID=
-TWITTER_CONSUMER_KEY=
-TWITTER_CONSUMER_SECRET=
-TWITTER_ENVIRONMENT=
-
-#slack integration
-SLACK_CLIENT_ID=
-SLACK_CLIENT_SECRET=
-
-# Google OAuth
-GOOGLE_OAUTH_CLIENT_ID=
-GOOGLE_OAUTH_CLIENT_SECRET=
-GOOGLE_OAUTH_CALLBACK_URL=
-
-### Change this env variable only if you are using a custom build mobile app
-## Mobile app env variables
-IOS_APP_ID=L7YLMN4634.com.chatwoot.app
-ANDROID_BUNDLE_ID=com.chatwoot.app
-
-# https://developers.google.com/android/guides/client-auth (use keytool to print the fingerprint in the first section)
-ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:D4:5D:D4:53:F8:3B:FB:D3:C6:28:64:1D:AA:08:1E:D8
-
-### Smart App Banner
-# https://developer.apple.com/library/archive/documentation/AppleApplications/Reference/SafariWebContent/PromotingAppswithAppBanners/PromotingAppswithAppBanners.html
-# You can find your app-id in https://itunesconnect.apple.com
-#IOS_APP_IDENTIFIER=1495796682
-
-## Push Notification
-## generate a new key value here : https://d3v.one/vapid-key-generator/
-# VAPID_PUBLIC_KEY=
-# VAPID_PRIVATE_KEY=
-#
-# for mobile apps
-# FCM_SERVER_KEY=
-
-### APM and Error Monitoring configurations
-## Elastic APM
-## https://www.elastic.co/guide/en/apm/agent/ruby/current/getting-started-rails.html
-# ELASTIC_APM_SERVER_URL=
-# ELASTIC_APM_SECRET_TOKEN=
-
-## Sentry
-# SENTRY_DSN=
-
-
-## Scout
-## https://scoutapm.com/docs/ruby/configuration
-# SCOUT_KEY=YOURKEY
-# SCOUT_NAME=YOURAPPNAME (Production)
-# SCOUT_MONITOR=true
-
-## NewRelic
-# https://docs.newrelic.com/docs/agents/ruby-agent/configuration/ruby-agent-configuration/
-# NEW_RELIC_LICENSE_KEY=
-# Set this to true to allow newrelic apm to send logs.
-# This is turned off by default.
-# NEW_RELIC_APPLICATION_LOGGING_ENABLED=
-
-## Datadog
-## https://github.com/DataDog/dd-trace-rb/blob/master/docs/GettingStarted.md#environment-variables
-# DD_TRACE_AGENT_URL=
-
-
-# MaxMindDB API key to download GeoLite2 City database
-# IP_LOOKUP_API_KEY=
-
-## Rack Attack configuration
-## To prevent and throttle abusive requests
-# ENABLE_RACK_ATTACK=true
-# RACK_ATTACK_LIMIT=300
-# ENABLE_RACK_ATTACK_WIDGET_API=true
-# Comma-separated list of trusted IPs that bypass Rack Attack throttling rules
-# RACK_ATTACK_ALLOWED_IPS=127.0.0.1,::1,192.168.0.10
-
-## Running chatwoot as an API only server
-## setting this value to true will disable the frontend dashboard endpoints
-# CW_API_ONLY_SERVER=false
-
-## Development Only Config
-# if you want to use letter_opener for local emails
-# LETTER_OPENER=true
-# meant to be used in github codespaces
-# WEBPACKER_DEV_SERVER_PUBLIC=
-
-# If you want to use official mobile app,
-# the notifications would be relayed via a Chatwoot server
-ENABLE_PUSH_RELAY_SERVER=true
-
-# Stripe API key
-STRIPE_SECRET_KEY=
-STRIPE_WEBHOOK_SECRET=
-
-# Set to true if you want to upload files to cloud storage using the signed url
-# Make sure to follow https://edgeguides.rubyonrails.org/active_storage_overview.html#cross-origin-resource-sharing-cors-configuration on the cloud storage after setting this to true.
-DIRECT_UPLOADS_ENABLED=
-
-#MS OAUTH creds
-AZURE_APP_ID=
-AZURE_APP_SECRET=
-
-## Advanced configurations
-## Change these values to fine tune performance
-# control the concurrency setting of sidekiq
-# SIDEKIQ_CONCURRENCY=10
-# Enable verbose logging each time a job is dequeued in Sidekiq
-# ENABLE_SIDEKIQ_DEQUEUE_LOGGER=false
-
-
-# AI powered features
-## OpenAI key
-# OPENAI_API_KEY=
-
-# Housekeeping/Performance related configurations
-# Set to true if you want to remove stale contact inboxes
-# contact_inboxes with no conversation older than 90 days will be removed
-# REMOVE_STALE_CONTACT_INBOX_JOB_STATUS=false
-
-# REDIS_ALFRED_SIZE=10
-# REDIS_VELMA_SIZE=10
-
-# Baileys API Whatsapp provider
-BAILEYS_PROVIDER_DEFAULT_CLIENT_NAME=Chatwoot
-BAILEYS_PROVIDER_DEFAULT_URL=http://localhost:3025
-BAILEYS_PROVIDER_DEFAULT_API_KEY=
-
-RESEND_API_KEY=
+# --------------------------------------------
+# Custom Configuration
+# --------------------------------------------
+# Add your custom API keys below
diff --git a/.github/workflows/deploy_ghcr.yml b/.github/workflows/deploy_ghcr.yml
new file mode 100644
index 000000000..0cd1f64d3
--- /dev/null
+++ b/.github/workflows/deploy_ghcr.yml
@@ -0,0 +1,120 @@
+name: Build and Push to GHCR (multi-arch)
+
+on:
+  push:
+    branches:
+      - chatwoot-jasmine
+      - main
+  workflow_dispatch:
+
+env:
+  IMAGE_NAME: ghcr.io/${{ github.repository }}
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - platform: linux/amd64
+            runner: ubuntu-latest
+          - platform: linux/arm64
+            runner: ubuntu-22.04-arm
+    runs-on: ${{ matrix.runner }}
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Prepare
+        run: |
+          platform="${{ matrix.platform }}"
+          echo "PLATFORM_PAIR=${platform//\//-}" >> "$GITHUB_ENV"
+          echo "CACHE_SCOPE=${platform//\//-}-${GITHUB_REF_NAME}" >> "$GITHUB_ENV"
+          echo "CACHE_SCOPE_FALLBACK=${platform//\//-}-main" >> "$GITHUB_ENV"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push by digest
+        id: build
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          platforms: ${{ matrix.platform }}
+          push: true
+          build-args: |
+            RAILS_ENV=production
+            NODE_ENV=production
+          outputs: type=image,name=${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true
+          cache-from: |
+            type=gha,scope=${{ env.CACHE_SCOPE }}
+            type=gha,scope=${{ env.CACHE_SCOPE_FALLBACK }}
+            type=registry,ref=${{ env.IMAGE_NAME }}:buildcache-${{ env.PLATFORM_PAIR }}
+          cache-to: |
+            type=gha,mode=max,scope=${{ env.CACHE_SCOPE }}
+            type=registry,ref=${{ env.IMAGE_NAME }}:buildcache-${{ env.PLATFORM_PAIR }},mode=max
+
+      - name: Export digest
+        run: |
+          mkdir -p "${{ runner.temp }}/digests"
+          digest="${{ steps.build.outputs.digest }}"
+          touch "${{ runner.temp }}/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v4
+        with:
+          name: digests-${{ env.PLATFORM_PAIR }}
+          path: ${{ runner.temp }}/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    runs-on: ubuntu-latest
+    needs: [build]
+    permissions:
+      packages: write
+
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v4
+        with:
+          path: ${{ runner.temp }}/digests
+          pattern: digests-*
+          merge-multiple: true
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Create manifest list and push
+        working-directory: ${{ runner.temp }}/digests
+        run: |
+          docker buildx imagetools create \
+            -t "${{ env.IMAGE_NAME }}:latest" \
+            -t "${{ env.IMAGE_NAME }}:v${{ github.run_number }}" \
+            $(printf '${{ env.IMAGE_NAME }}@sha256:%s ' *)
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect "${{ env.IMAGE_NAME }}:latest"
diff --git a/.gitignore b/.gitignore
index dbdd35bcd..0ecc74c91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,3 +103,28 @@ CLAUDE.local.md
 .pnpm-store/*
 local/
 Procfile.worktree
+
+# Environment & Secrets (AIOS)
+.env.local
+.env.*.local
+*.key
+*.pem
+
+# Dependencies (AIOS)
+node_modules/
+
+# Build & Logs (AIOS)
+dist/
+build/
+logs/
+
+# IDE & OS (AIOS)
+Thumbs.db
+.idea/
+
+# AIOS Local (AIOS)
+.aios-core/
+.aios/
+.claude/
+.env.aios
+.env.backup*
diff --git a/.husky/pre-commit b/.husky/pre-commit
index 9c350db88..a9f6aec56 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,11 +1,23 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
+# Ensure hooks always use project Ruby (rbenv + .ruby-version), not system Ruby.
+export PATH="$HOME/.rbenv/bin:$PATH"
+if command -v rbenv >/dev/null 2>&1; then
+  eval "$(rbenv init -)"
+  if [ -f .ruby-version ]; then
+    rbenv shell "$(cat .ruby-version)"
+  fi
+fi
+
 # lint js and vue files
 npx --no-install lint-staged
 
 # lint only staged ruby files
-git diff --name-only --cached | xargs ls -1 2>/dev/null | grep '\.rb$' | xargs bundle exec rubocop --force-exclusion
+STAGED_RB_FILES=$(git diff --name-only --cached --diff-filter=ACMR -- '*.rb')
+if [ -n "$STAGED_RB_FILES" ]; then
+  echo "$STAGED_RB_FILES" | xargs bundle exec rubocop --force-exclusion
+fi
 
 # stage rubocop changes to files
 # git diff --name-only --cached | xargs git add
diff --git a/.rubocop.yml b/.rubocop.yml
index 246f503bb..dc8de3cbe 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,3 +1,5 @@
+inherit_from: .rubocop_todo.yml
+
 plugins:
   - rubocop-performance
   - rubocop-rails
@@ -18,11 +20,13 @@ Metrics/ClassLength:
   Exclude:
     - 'app/models/message.rb'
     - 'app/models/conversation.rb'
+    - 'enterprise/app/services/captain/tools/generate_pix_tool.rb'
 
 Metrics/MethodLength:
   Max: 19
   Exclude:
     - 'enterprise/lib/captain/agent.rb'
+    - 'enterprise/app/services/captain/tools/generate_pix_tool.rb'
 
 RSpec/ExampleLength:
   Max: 50
@@ -177,10 +181,10 @@ Metrics/AbcSize:
   Max: 26
   Exclude:
     - 'app/controllers/concerns/auth_helper.rb'
-
     - 'app/models/integrations/hook.rb'
     - 'app/models/canned_response.rb'
     - 'app/models/telegram_bot.rb'
+    - 'enterprise/app/services/captain/tools/generate_pix_tool.rb'
 
 Rails/RenderInline:
   Exclude:
@@ -231,6 +235,9 @@ AllCops:
     - 'tmp/**/*'
     - 'storage/**/*'
     - 'db/migrate/20230426130150_init_schema.rb'
+    - 'reference/**/*'
+    - '.aios-core/**/*'
+    - '.claude/**/*'
 
 FactoryBot/SyntaxMethods:
   Enabled: false
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
new file mode 100644
index 000000000..b6c68f115
--- /dev/null
+++ b/.rubocop_todo.yml
@@ -0,0 +1,158 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2026-02-25 17:56:28 UTC using RuboCop version 1.75.6.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+Chatwoot/AttachmentDownload:
+  Exclude:
+    - 'app/services/whatsapp/providers/evolution_service.rb'
+    - 'app/services/whatsapp/providers/wuzapi_service.rb'
+
+# Offense count: 8
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
+# URISchemes: http, https
+Layout/LineLength:
+  Exclude:
+    - 'app/controllers/public/api/v1/captain/inter_webhooks_controller.rb'
+    - 'app/models/channel/whatsapp.rb'
+    - 'app/services/whatsapp/providers/wuzapi_service.rb'
+    - 'app/services/wuzapi/client.rb'
+    - 'enterprise/app/services/captain/assistant/agent_runner_service.rb'
+
+# Offense count: 2
+# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches, IgnoreDuplicateElseBranch.
+Lint/DuplicateBranch:
+  Exclude:
+    - 'app/services/whatsapp/providers/wuzapi/payload_parser.rb'
+    - 'app/services/whatsapp/providers/wuzapi_service.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AutoCorrect, AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions.
+# NotImplementedExceptions: NotImplementedError
+Lint/UnusedMethodArgument:
+  Exclude:
+    - 'app/services/whatsapp/providers/evolution_service.rb'
+
+# Offense count: 29
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
+Metrics/AbcSize:
+  Exclude:
+    - 'app/models/channel/whatsapp.rb'
+    - 'app/services/evolution_api/client.rb'
+    - 'app/services/whatsapp/decryption_service.rb'
+    - 'app/services/whatsapp/incoming_message_wuzapi_service.rb'
+    - 'app/services/whatsapp/providers/evolution_api/payload_parser.rb'
+    - 'app/services/whatsapp/providers/wuzapi/payload_parser.rb'
+    - 'app/services/whatsapp/providers/wuzapi_service.rb'
+    - 'app/services/wuzapi/client.rb'
+    - 'enterprise/app/services/captain/inter/auth_service.rb'
+    - 'enterprise/app/services/captain/inter/cob_service.rb'
+    - 'enterprise/app/services/captain/inter/webhook_setup_service.rb'
+    - 'enterprise/app/services/captain/reservations/marker_builder.rb'
+    - 'enterprise/app/services/captain/tools/generate_pix_tool.rb'
+
+# Offense count: 6
+# Configuration parameters: CountComments, Max, CountAsOne.
+Metrics/ClassLength:
+  Exclude:
+    - 'app/models/channel/whatsapp.rb'
+    - 'app/services/whatsapp/incoming_message_wuzapi_service.rb'
+    - 'app/services/whatsapp/providers/wuzapi/payload_parser.rb'
+    - 'app/services/wuzapi/client.rb'
+    - 'enterprise/app/services/captain/assistant/agent_runner_service.rb'
+    - 'enterprise/app/services/captain/tools/generate_pix_tool.rb'
+
+# Offense count: 41
+# Configuration parameters: AllowedMethods, AllowedPatterns.
+Metrics/CyclomaticComplexity:
+  Max: 23
+
+# Offense count: 29
+# Configuration parameters: CountComments, Max, CountAsOne, AllowedMethods, AllowedPatterns.
+Metrics/MethodLength:
+  Exclude:
+    - 'app/controllers/public/api/v1/captain/inter_webhooks_controller.rb'
+    - 'app/models/channel/whatsapp.rb'
+    - 'app/services/evolution_api/client.rb'
+    - 'app/services/whatsapp/decryption_service.rb'
+    - 'app/services/whatsapp/incoming_message_wuzapi_service.rb'
+    - 'app/services/whatsapp/providers/evolution_api/payload_parser.rb'
+    - 'app/services/whatsapp/providers/wuzapi/payload_parser.rb'
+    - 'app/services/whatsapp/providers/wuzapi_service.rb'
+    - 'app/services/wuzapi/client.rb'
+    - 'enterprise/app/services/captain/assistant/agent_runner_service.rb'
+    - 'enterprise/app/services/captain/inter/webhook_setup_service.rb'
+    - 'enterprise/app/services/captain/reservations/marker_builder.rb'
+    - 'enterprise/app/services/captain/tools/generate_pix_tool.rb'
+
+# Offense count: 1
+# Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
+Metrics/ParameterLists:
+  Max: 6
+
+# Offense count: 29
+# Configuration parameters: AllowedMethods, AllowedPatterns.
+Metrics/PerceivedComplexity:
+  Max: 25
+
+# Offense count: 2
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+# AllowedNames: as, at, by, cc, db, id, if, in, io, ip, of, on, os, pp, to
+Naming/MethodParameterName:
+  Exclude:
+    - 'app/services/whatsapp/decryption_service.rb'
+
+# Offense count: 13
+# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
+RSpec/VerifiedDoubles:
+  Exclude:
+    - 'spec/enterprise/services/captain/assistant/agent_runner_service_spec.rb'
+
+# Offense count: 1
+Rails/AfterCommitOverride:
+  Exclude:
+    - 'app/models/channel/whatsapp.rb'
+
+# Offense count: 1
+# Configuration parameters: Include.
+# Include: **/app/models/**/*.rb
+Rails/HasManyOrHasOneDependent:
+  Exclude:
+    - 'enterprise/app/models/captain/brand.rb'
+
+# Offense count: 5
+# Configuration parameters: IgnoreScopes, Include.
+# Include: **/app/models/**/*.rb
+Rails/InverseOf:
+  Exclude:
+    - 'enterprise/app/models/captain/brand.rb'
+    - 'enterprise/app/models/captain/reservation.rb'
+
+# Offense count: 5
+# Configuration parameters: ForbiddenMethods, AllowedMethods.
+# ForbiddenMethods: decrement!, decrement_counter, increment!, increment_counter, insert, insert!, insert_all, insert_all!, toggle!, touch, touch_all, update_all, update_attribute, update_column, update_columns, update_counters, upsert, upsert_all
+Rails/SkipsModelValidations:
+  Exclude:
+    - 'app/controllers/api/v1/accounts/inboxes_controller.rb'
+    - 'enterprise/app/controllers/api/v1/accounts/captain/inboxes_controller.rb'
+    - 'enterprise/app/services/captain/payments/confirmation_service.rb'
+    - 'enterprise/app/services/captain/tools/generate_pix_tool.rb'
+
+# Offense count: 3
+# Configuration parameters: TransactionMethods.
+Rails/TransactionExitStatement:
+  Exclude:
+    - 'app/services/whatsapp/incoming_message_wuzapi_service.rb'
+
+# Offense count: 2
+# Configuration parameters: MinBranchesCount.
+Style/HashLikeCase:
+  Exclude:
+    - 'app/services/whatsapp/providers/evolution_api/payload_parser.rb'
+    - 'app/services/whatsapp/providers/wuzapi/payload_parser.rb'
diff --git a/AGENTS.md b/AGENTS.md
index 301633d7f..92a16bdd3 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,104 +1,197 @@
-# Chatwoot Development Guidelines
+# CLAUDE.md
 
-## Build / Test / Lint
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
 
-- **Setup**: `bundle install && pnpm install`
-- **Run Dev**: `pnpm dev` or `overmind start -f ./Procfile.dev`
-- **Seed Local Test Data**: `bundle exec rails db:seed` (quickly populates minimal data for standard feature verification)
-- **Seed Search Test Data**: `bundle exec rails search:setup_test_data` (bulk fixture generation for search/performance/manual load scenarios)
-- **Seed Account Sample Data (richer test data)**: `Seeders::AccountSeeder` is available as an internal utility and is exposed through Super Admin `Accounts#seed`, but can be used directly in dev workflows too:
-  - UI path: Super Admin → Accounts → Seed (enqueues `Internal::SeedAccountJob`).
-  - CLI path: `bundle exec rails runner "Internal::SeedAccountJob.perform_now(Account.find(<id>))"` (or call `Seeders::AccountSeeder.new(account: Account.find(<id>)).perform!` directly).
-- **Lint JS/Vue**: `pnpm eslint` / `pnpm eslint:fix`
-- **Lint Ruby**: `bundle exec rubocop -a`
-- **Test JS**: `pnpm test` or `pnpm test:watch`
-- **Test Ruby**: `bundle exec rspec spec/path/to/file_spec.rb`
-- **Single Test**: `bundle exec rspec spec/path/to/file_spec.rb:LINE_NUMBER`
-- **Run Project**: `overmind start -f Procfile.dev`
-- **Ruby Version**: Manage Ruby via `rbenv` and install the version listed in `.ruby-version` (e.g., `rbenv install $(cat .ruby-version)`)
-- **rbenv setup**: Before running any `bundle` or `rspec` commands, init rbenv in your shell (`eval "$(rbenv init -)"`) so the correct Ruby/Bundler versions are used
-- Always prefer `bundle exec` for Ruby CLI tasks (rspec, rake, rubocop, etc.)
+## Project Overview
 
-## Code Style
+This is a **Chatwoot** customer engagement platform (open-source alternative to Intercom/Zendesk), customized for **fazer.ai**. It includes the **Synkra AIOS** framework overlay for AI-orchestrated development workflows.
 
-- **Ruby**: Follow RuboCop rules (150 character max line length)
-- **Vue/JS**: Use ESLint (Airbnb base + Vue 3 recommended)
-- **Vue Components**: Use PascalCase
-- **Events**: Use camelCase
-- **I18n**: No bare strings in templates; use i18n
-- **Error Handling**: Use custom exceptions (`lib/custom_exceptions/`)
-- **Models**: Validate presence/uniqueness, add proper indexes
-- **Type Safety**: Use PropTypes in Vue, strong params in Rails
-- **Naming**: Use clear, descriptive names with consistent casing
-- **Vue API**: Always use Composition API with `<script setup>` at the top
+**Tech Stack:**
+- Backend: Ruby 3.4.4 + Rails 7.1
+- Frontend: Vue 3 + Vite
+- Database: PostgreSQL with pgvector
+- Background Jobs: Sidekiq
+- Package Manager: **pnpm** (required, not npm/yarn)
+- Testing: RSpec (backend), Vitest (frontend)
 
-## Styling
+## Development Commands
 
-- **Tailwind Only**:  
-  - Do not write custom CSS  
-  - Do not use scoped CSS  
-  - Do not use inline styles  
-  - Always use Tailwind utility classes  
-- **Colors**: Refer to `tailwind.config.js` for color definitions
+### Starting the Application
 
-## General Guidelines
+```bash
+# Development server (Rails backend + Sidekiq + Vite)
+pnpm run dev
 
-- MVP focus: Least code change, happy-path only
-- No unnecessary defensive programming
-- Ship the happy path first: limit guards/fallbacks to what production has proven necessary, then iterate
-- Prefer minimal, readable code over elaborate abstractions; clarity beats cleverness
-- Break down complex tasks into small, testable units
-- Iterate after confirmation
-- Avoid writing specs unless explicitly asked
-- Remove dead/unreachable/unused code
-- Don’t write multiple versions or backups for the same logic — pick the best approach and implement it
-- Prefer `with_modified_env` (from spec helpers) over stubbing `ENV` directly in specs
-- Specs in parallel/reloading environments: prefer comparing `error.class.name` over constant class equality when asserting raised errors
+# Individual processes:
+# - Rails backend: http://localhost:3001
+# - Sidekiq: background worker
+# - Vite: frontend dev server
+```
 
-## Codex Worktree Workflow
+### Testing
 
-- Use a separate git worktree + branch per task to keep changes isolated.
-- Keep Codex-specific local setup under `.codex/` and use `Procfile.worktree` for worktree process orchestration.
-- The setup workflow in `.codex/environments/environment.toml` should dynamically generate per-worktree DB/port values (Rails, Vite, Redis DB index) to avoid collisions.
-- Start each worktree with its own Overmind socket/title so multiple instances can run at the same time.
+```bash
+# Frontend (Vitest) - CRITICAL: NO -- flag with pnpm test!
+pnpm test                    # Run all tests
+pnpm test <file>             # Run specific file (NOT pnpm test -- <file>)
+pnpm test:watch              # Watch mode
+pnpm test:coverage           # Coverage report
 
-## Commit Messages
+# Backend (RSpec)
+bundle exec rspec                           # All specs
+bundle exec rspec spec/models/user_spec.rb  # Specific file
+bundle exec rspec spec/models/user_spec.rb:42  # Specific line
+```
 
-- Prefer Conventional Commits: `type(scope): subject` (scope optional)
-- Example: `feat(auth): add user authentication`
-- Don't reference Claude in commit messages
+### Code Quality
 
-## Project-Specific
+```bash
+# JavaScript/Vue linting
+pnpm run eslint              # Check
+pnpm run eslint:fix          # Auto-fix
 
-- **Translations**:
-  - Only update `en.yml` and `en.json`
-  - Other languages are handled by the community
-  - Backend i18n → `en.yml`, Frontend i18n → `en.json`
-- **Frontend**:
-  - Use `components-next/` for message bubbles (the rest is being deprecated)
+# Ruby linting
+bundle exec rubocop          # Check
+bundle exec rubocop -a       # Auto-fix
+pnpm run ruby:prettier       # Same as rubocop -a
+```
 
-## Ruby Best Practices
+### Database
 
-- Use compact `module/class` definitions; avoid nested styles
+```bash
+bin/rails db:migrate
+bin/rails db:rollback
+bin/rails db:reset
+bin/rails db:seed
+```
 
-## Enterprise Edition Notes
+## Architecture Overview
 
-- Chatwoot has an Enterprise overlay under `enterprise/` that extends/overrides OSS code.
-- When you add or modify core functionality, always check for corresponding files in `enterprise/` and keep behavior compatible.
-- Follow the Enterprise development practices documented here:
-  - https://chatwoot.help/hc/handbook/articles/developing-enterprise-edition-features-38
+### Backend Structure
 
-Practical checklist for any change impacting core logic or public APIs
-- Search for related files in both trees before editing (e.g., `rg -n "FooService|ControllerName|ModelName" app enterprise`).
-- If adding new endpoints, services, or models, consider whether Enterprise needs:
-  - An override (e.g., `enterprise/app/...`), or
-  - An extension point (e.g., `prepend_mod_with`, hooks, configuration) to avoid hard forks.
-- Avoid hardcoding instance- or plan-specific behavior in OSS; prefer configuration, feature flags, or extension points consumed by Enterprise.
-- Keep request/response contracts stable across OSS and Enterprise; update both sets of routes/controllers when introducing new APIs.
-- When renaming/moving shared code, mirror the change in `enterprise/` to prevent drift.
-- Tests: Add Enterprise-specific specs under `spec/enterprise`, mirroring OSS spec layout where applicable.
-- When modifying existing OSS features for Enterprise-only behavior, add an Enterprise module (via `prepend_mod_with`/`include_mod_with`) instead of editing OSS files directly—especially for policies, controllers, and services. For Enterprise-exclusive features, place code directly under `enterprise/`.
+```
+app/
+├── controllers/       # API endpoints (API::V1::Accounts::*)
+├── models/            # ActiveRecord models
+├── services/          # Business logic (Whatsapp::Providers::*, etc.)
+├── jobs/              # Sidekiq background jobs
+├── listeners/         # Wisper event subscribers (pub/sub)
+├── builders/          # Complex object construction
+├── finders/           # Query objects
+├── policies/          # Pundit authorization
+└── javascript/        # Vue.js frontend
 
-## Branding / White-labeling note
+enterprise/app/        # Enterprise features (Captain AI, billing)
+```
 
-- For user-facing strings that currently contain "Chatwoot" but should adapt to branded/self-hosted installs, prefer applying `replaceInstallationName` from `shared/composables/useBranding` in the UI layer (for example tooltip and suggestion labels) instead of adding hardcoded brand-specific copy.
+**Key Patterns:**
+- **Services:** Business logic extracted from models
+- **Builders:** Construct complex objects
+- **Finders:** Encapsulate complex queries
+- **Listeners:** Event-driven using Wisper
+- **Policies:** Pundit for authorization
+- **Jobs:** All async work in Sidekiq
+
+### Frontend Structure
+
+```
+app/javascript/
+├── dashboard/         # Agent dashboard (Vue 3 + Vue Router + Vuex)
+│   ├── routes/       # Page components
+│   ├── store/        # Vuex state
+│   ├── components/   # Reusable components
+│   ├── api/          # API clients
+│   └── i18n/         # Translations (en, pt_BR required!)
+├── widget/           # Customer chat widget
+├── sdk/              # Embeddable JavaScript SDK
+├── portal/           # Public help center
+└── shared/           # Shared utilities
+```
+
+**Vite Import Aliases:**
+- `components` → `app/javascript/dashboard/components`
+- `dashboard` → `app/javascript/dashboard`
+- `helpers` → `app/javascript/shared/helpers`
+- `shared`, `widget`, `survey`, `v3` → respective directories
+
+## Critical Conventions
+
+### fazer.ai Branding
+**ALWAYS** style as `fazer.ai` (lowercase with dot), **NEVER** `Fazer.ai` or `FAZER.AI`
+
+### Internationalization
+**ALWAYS include pt_BR translations** for any new user-facing text
+- Location: `app/javascript/dashboard/i18n/locale/{en,pt_BR}/`
+
+### Testing Philosophy
+- Add specs when modifying code (use judgment)
+- Test behavior, not implementation
+- Consider cross-stack impacts (backend ↔ frontend)
+
+---
+
+# AIOS Framework Integration
+
+This repository includes **Synkra AIOS** - an AI-orchestrated development system.
+
+<!-- AIOS-MANAGED-START: core -->
+## Core Rules
+
+1. Siga a Constitution em `.aios-core/constitution.md`
+2. Priorize `CLI First -> Observability Second -> UI Third`
+3. Trabalhe por stories em `docs/stories/`
+4. Nao invente requisitos fora dos artefatos existentes
+<!-- AIOS-MANAGED-END: core -->
+
+<!-- AIOS-MANAGED-START: quality -->
+## Quality Gates
+
+- Rode `npm run lint`
+- Rode `npm run typecheck`
+- Rode `npm test`
+- Atualize checklist e file list da story antes de concluir
+<!-- AIOS-MANAGED-END: quality -->
+
+<!-- AIOS-MANAGED-START: codebase -->
+## Project Map
+
+- Core framework: `.aios-core/`
+- CLI entrypoints: `bin/`
+- Shared packages: `packages/`
+- Tests: `tests/`
+- Docs: `docs/`
+<!-- AIOS-MANAGED-END: codebase -->
+
+<!-- AIOS-MANAGED-START: commands -->
+## Common Commands
+
+- `npm run sync:ide`
+- `npm run sync:ide:check`
+- `npm run sync:skills:codex`
+- `npm run sync:skills:codex:global` (opcional; neste repo o padrao e local-first)
+- `npm run validate:structure`
+- `npm run validate:agents`
+<!-- AIOS-MANAGED-END: commands -->
+
+<!-- AIOS-MANAGED-START: shortcuts -->
+## Agent Shortcuts
+
+Preferencia de ativacao no Codex CLI:
+1. Use `/skills` e selecione `aios-<agent-id>` vindo de `.codex/skills` (ex.: `aios-architect`)
+2. Se preferir, use os atalhos abaixo (`@architect`, `/architect`, etc.)
+
+Interprete os atalhos abaixo carregando o arquivo correspondente em `.aios-core/development/agents/` (fallback: `.codex/agents/`), renderize o greeting via `generate-greeting.js` e assuma a persona ate `*exit`:
+
+- `@architect`, `/architect`, `/architect.md` -> `.aios-core/development/agents/architect.md`
+- `@dev`, `/dev`, `/dev.md` -> `.aios-core/development/agents/dev.md`
+- `@qa`, `/qa`, `/qa.md` -> `.aios-core/development/agents/qa.md`
+- `@pm`, `/pm`, `/pm.md` -> `.aios-core/development/agents/pm.md`
+- `@po`, `/po`, `/po.md` -> `.aios-core/development/agents/po.md`
+- `@sm`, `/sm`, `/sm.md` -> `.aios-core/development/agents/sm.md`
+- `@analyst`, `/analyst`, `/analyst.md` -> `.aios-core/development/agents/analyst.md`
+- `@devops`, `/devops`, `/devops.md` -> `.aios-core/development/agents/devops.md`
+- `@data-engineer`, `/data-engineer`, `/data-engineer.md` -> `.aios-core/development/agents/data-engineer.md`
+- `@ux-design-expert`, `/ux-design-expert`, `/ux-design-expert.md` -> `.aios-core/development/agents/ux-design-expert.md`
+- `@squad-creator`, `/squad-creator`, `/squad-creator.md` -> `.aios-core/development/agents/squad-creator.md`
+- `@aios-master`, `/aios-master`, `/aios-master.md` -> `.aios-core/development/agents/aios-master.md`
+<!-- AIOS-MANAGED-END: shortcuts -->
diff --git a/Procfile.dev b/Procfile.dev
index 651b84edd..e9e9a62cc 100644
--- a/Procfile.dev
+++ b/Procfile.dev
@@ -1,4 +1,4 @@
-backend: bin/rails s -p 3000
+backend: bin/rails s -p 3001
 # https://github.com/mperham/sidekiq/issues/3090#issuecomment-389748695
-worker: dotenv bundle exec sidekiq -C config/sidekiq.yml
+worker: bundle exec sidekiq -C config/sidekiq.yml
 vite: bin/vite dev
diff --git a/app/controllers/api/v1/accounts/captain/units_controller.rb b/app/controllers/api/v1/accounts/captain/units_controller.rb
new file mode 100644
index 000000000..30b37efaf
--- /dev/null
+++ b/app/controllers/api/v1/accounts/captain/units_controller.rb
@@ -0,0 +1,101 @@
+class Api::V1::Accounts::Captain::UnitsController < Api::V1::Accounts::BaseController
+  before_action :ensure_captain_enabled
+  before_action :set_unit, only: [:show, :update, :destroy]
+
+  def index
+    @units = Current.account.captain_units
+    render json: @units.map { |u| format_unit(u) }
+  end
+
+  def show
+    render json: format_unit(@unit)
+  end
+
+  def create
+    @unit = Current.account.captain_units.build(unit_params)
+    @unit.captain_brand_id ||= Captain::Brand.where(account_id: Current.account.id).first&.id
+    ActiveRecord::Base.transaction do
+      @unit.save!
+      sync_inbox_link!(@unit)
+    end
+    render json: format_unit(@unit), status: :created
+  rescue ActiveRecord::RecordInvalid
+    render json: { errors: @unit.errors.full_messages }, status: :unprocessable_entity
+  end
+
+  def update
+    ActiveRecord::Base.transaction do
+      @unit.update!(unit_params)
+      sync_inbox_link!(@unit)
+    end
+    render json: format_unit(@unit)
+  rescue ActiveRecord::RecordInvalid
+    render json: { errors: @unit.errors.full_messages }, status: :unprocessable_entity
+  end
+
+  def destroy
+    @unit.destroy!
+    head :no_content
+  end
+
+  private
+
+  def ensure_captain_enabled
+    # Dependendo da regra de negócio, pode-se verificar as features da conta aqui original
+  end
+
+  def set_unit
+    @unit = Current.account.captain_units.find(params[:id])
+  end
+
+  def unit_params
+    params.require(:captain_unit).permit(
+      :name,
+      :inter_client_id,
+      :inter_client_secret,
+      :inter_pix_key,
+      :inter_account_number,
+      :inbox_id,
+      :inter_cert_content,
+      :inter_key_content,
+      :proactive_pix_polling_enabled
+    )
+  end
+
+  def format_unit(unit)
+    {
+      id: unit.id,
+      name: unit.name,
+      inter_client_id: unit.inter_client_id,
+      inter_pix_key: unit.inter_pix_key,
+      inter_account_number: unit.inter_account_number,
+      inbox_id: unit.inbox_id,
+      inbox_name: unit.inbox_id.present? ? Inbox.find_by(id: unit.inbox_id)&.name : nil,
+      has_cert: unit.inter_cert_content.present? || unit.resolved_inter_cert_path.present?,
+      has_key: unit.inter_key_content.present? || unit.resolved_inter_key_path.present?,
+      has_client_secret: unit.inter_client_secret.present?,
+      proactive_pix_polling_enabled: unit.proactive_pix_polling_enabled
+      # Obviamente não enviando secrets ou contents aqui!
+    }
+  end
+
+  def sync_inbox_link!(unit)
+    if unit.inbox_id.present?
+      Current.account.captain_units
+             .where(inbox_id: unit.inbox_id)
+             .where.not(id: unit.id)
+             .find_each { |existing_unit| existing_unit.update!(inbox_id: nil) }
+    end
+
+    return unless defined?(CaptainInbox)
+
+    CaptainInbox.where(captain_unit_id: unit.id).find_each do |existing_link|
+      existing_link.update!(captain_unit_id: nil)
+    end
+
+    return if unit.inbox_id.blank?
+
+    inbox_link = CaptainInbox.find_by(inbox_id: unit.inbox_id)
+    inbox_link&.update!(captain_unit_id: unit.id)
+  end
+end
diff --git a/app/controllers/api/v1/accounts/inboxes/wuzapi_controller.rb b/app/controllers/api/v1/accounts/inboxes/wuzapi_controller.rb
new file mode 100644
index 000000000..0007f1276
--- /dev/null
+++ b/app/controllers/api/v1/accounts/inboxes/wuzapi_controller.rb
@@ -0,0 +1,133 @@
+class Api::V1::Accounts::Inboxes::WuzapiController < Api::V1::Accounts::BaseController
+  before_action :fetch_inbox
+  before_action :ensure_wuzapi_provider
+
+  def show
+    # Session Status
+
+    status_data = client.session_status(user_token)
+    # Wuzapi returns nested data: { data: { connected: true, jid: "..." } }
+    # Pass it through to frontend for validation
+    render json: status_data
+  rescue Wuzapi::Client::Error => e
+    Rails.logger.error "Wuzapi Status Error: #{e.message}"
+    render json: { error: e.message }, status: :unprocessable_entity
+  rescue StandardError => e
+    Rails.logger.error "Wuzapi Status Critical Error: #{e.message}"
+    render json: { error: e.message }, status: :internal_server_error
+  end
+
+  def qr
+    # Get QR Code
+
+    # Check status first to avoid error if already connected
+    status_data = client.session_status(user_token)
+    # Wuzapi status can be string or object with 'status'/'state'
+    status = status_data['status'] || status_data['state'] || status_data
+    Rails.logger.info "Wuzapi Connect/QR Flow - Current Status: #{status}"
+
+    return if already_connected?(status)
+
+    qr_data = client.get_qr_code(user_token)
+    log_qr_data_keys(qr_data)
+    render json: qr_data
+  rescue Wuzapi::Client::Error => e
+    Rails.logger.error "Wuzapi QR Error: #{e.message}"
+    render json: { error: e.message }, status: :unprocessable_entity
+  rescue StandardError => e
+    Rails.logger.error "Wuzapi QR Critical Error: #{e.message}"
+    render json: { error: e.message }, status: :internal_server_error
+  end
+
+  def connect
+    # Trigger connection (if needed by Wuzapi flow)
+
+    result = client.session_connect(user_token)
+    render json: result
+  rescue Wuzapi::Client::Error => e
+    # Idempotency: "already connected" is a success state
+    if e.message.include?('already connected')
+      render json: { success: true, message: 'Already connected' }, status: :ok
+    else
+      Rails.logger.error "Wuzapi Connect Error: #{e.message}"
+      render json: { error: e.message }, status: :unprocessable_entity
+    end
+  rescue StandardError => e
+    Rails.logger.error "Wuzapi Connect Critical Error: #{e.message}"
+    render json: { error: e.message }, status: :internal_server_error
+  end
+
+  def disconnect
+    # Disconnect session
+
+    result = client.session_logout(user_token) || client.session_disconnect(user_token)
+    render json: result
+  rescue Wuzapi::Client::Error => e
+    render json: { error: e.message }, status: :unprocessable_entity
+  rescue StandardError => e
+    render json: { error: e.message }, status: :internal_server_error
+  end
+
+  def webhook_info
+    info = client.get_webhook(user_token)
+    render json: info
+  rescue Wuzapi::Client::Error => e
+    render json: { error: e.message }, status: :unprocessable_entity
+  rescue StandardError => e
+    render json: { error: e.message }, status: :internal_server_error
+  end
+
+  def update_webhook
+    # Re-calculate correct webhook URL from model
+    url = @inbox.channel.webhook_url
+    client.update_webhook(user_token, url)
+    render json: { success: true, message: 'Webhook updated successfully', webhook_url: url }
+  rescue Wuzapi::Client::Error => e
+    render json: { error: e.message }, status: :unprocessable_entity
+  rescue StandardError => e
+    render json: { error: e.message }, status: :internal_server_error
+  end
+
+  private
+
+  def fetch_inbox
+    @inbox = Current.account.inboxes.find(params[:inbox_id])
+  end
+
+  def ensure_wuzapi_provider
+    return if @inbox.channel.provider == 'wuzapi'
+
+    render json: { error: 'Not a Wuzapi inbox' }, status: :bad_request
+  end
+
+  def client
+    @client ||= Wuzapi::Client.new(@inbox.channel.provider_config['wuzapi_base_url'])
+  end
+
+  def user_token
+    token = @inbox.channel.wuzapi_user_token
+    if token.blank?
+      Rails.logger.error "Wuzapi Token Missing for Inbox #{@inbox.id}"
+      raise 'Token Wuzapi ausente; reprovisionar usuário'
+    else
+      Rails.logger.info "Wuzapi Request using Token (last 6): ******#{token.to_s[-6..]}"
+    end
+    token
+  end
+
+  def already_connected?(status)
+    if %w[CONNECTED inChat success].include?(status)
+      Rails.logger.info 'Wuzapi is already connected. Skipping QR.'
+      render json: { qrcode: nil, status: 'CONNECTED', message: 'Already connected' }
+      true
+    else
+      false
+    end
+  end
+
+  def log_qr_data_keys(qr_data)
+    Rails.logger.info "Wuzapi QR Data Response keys: #{qr_data.keys}"
+  rescue StandardError
+    Rails.logger.info 'Wuzapi QR Data Response keys: nil'
+  end
+end
diff --git a/app/controllers/api/v1/accounts/inboxes_controller.rb b/app/controllers/api/v1/accounts/inboxes_controller.rb
index 265debd2f..f647667c6 100644
--- a/app/controllers/api/v1/accounts/inboxes_controller.rb
+++ b/app/controllers/api/v1/accounts/inboxes_controller.rb
@@ -43,9 +43,12 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController #
   end
 
   def update
-    inbox_params = permitted_params.except(:channel, :csat_config)
+    captain_unit_param_present = params.key?(:captain_unit_id) || params.key?('captain_unit_id')
+    inbox_params = permitted_params.except(:channel, :csat_config, :captain_unit_id)
+    captain_unit_id = permitted_params[:captain_unit_id] if captain_unit_param_present
     inbox_params[:csat_config] = format_csat_config(permitted_params[:csat_config]) if permitted_params[:csat_config].present?
     @inbox.update!(inbox_params)
+    sync_captain_unit_link(captain_unit_id) if captain_unit_param_present
     update_inbox_working_hours
     update_channel if channel_update_required?
   end
@@ -211,7 +214,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController #
   def inbox_attributes
     [:name, :avatar, :greeting_enabled, :greeting_message, :enable_email_collect, :csat_survey_enabled,
      :enable_auto_assignment, :working_hours_enabled, :out_of_office_message, :timezone, :allow_messages_after_resolved,
-     :lock_to_single_conversation, :portal_id, :sender_name_type, :business_name,
+     :lock_to_single_conversation, :portal_id, :sender_name_type, :business_name, :captain_unit_id, :typing_delay,
      { csat_config: [:display_type, :message, :button_text, :language,
                      { survey_rules: [:operator, { values: [] }],
                        template: [:name, :template_id, :friendly_name, :content_sid, :approval_sid,
@@ -251,6 +254,29 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController #
       Channels::Twilio::TemplatesSyncJob.perform_later(@inbox.channel)
     end
   end
+
+  def sync_captain_unit_link(captain_unit_id)
+    return unless defined?(Captain::Unit)
+
+    account_units = Current.account.captain_units
+    account_units.where(inbox_id: @inbox.id).update_all(inbox_id: nil)
+
+    selected_unit_id = captain_unit_id.presence
+    if selected_unit_id
+      selected_unit = account_units.find(selected_unit_id)
+      selected_unit.update!(inbox_id: @inbox.id)
+    end
+
+    return unless defined?(CaptainInbox)
+
+    if selected_unit_id
+      CaptainInbox.where(captain_unit_id: selected_unit_id)
+                  .where.not(inbox_id: @inbox.id)
+                  .update_all(captain_unit_id: nil)
+    end
+
+    @inbox.captain_inbox&.update!(captain_unit_id: selected_unit_id)
+  end
 end
 
 Api::V1::Accounts::InboxesController.prepend_mod_with('Api::V1::Accounts::InboxesController')
diff --git a/app/controllers/public/api/v1/captain/inter_webhooks_controller.rb b/app/controllers/public/api/v1/captain/inter_webhooks_controller.rb
new file mode 100644
index 000000000..dde946367
--- /dev/null
+++ b/app/controllers/public/api/v1/captain/inter_webhooks_controller.rb
@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+# Recebe callbacks do Banco Inter quando um PIX é pago
+# Documentação: https://developers.inter.co/references/pix#tag/Webhook-de-Pix-Cobranca
+class Public::Api::V1::Captain::InterWebhooksController < ActionController::API
+  def create
+    # Parse payload - Inter envia array direto, não objeto { pix: [...] }
+    payload = JSON.parse(request.body.read)
+
+    # Normaliza: aceita tanto array direto quanto objeto { pix: [...] }
+    pix_array = payload.is_a?(Array) ? payload : payload['pix']
+
+    if pix_array.blank?
+      Rails.logger.warn '[InterWebhook] Payload sem dados PIX, ignorando'
+      render json: { message: 'No PIX data' }, status: :ok
+      return
+    end
+
+    # Processa primeira transação do array
+    pix_data = pix_array.first
+    process_pix_payment(pix_data)
+
+    render json: { message: 'Webhook processado com sucesso' }, status: :ok
+  rescue JSON::ParserError => e
+    Rails.logger.error "[InterWebhook] JSON inválido: #{e.message}"
+    render json: { error: 'Invalid JSON' }, status: :bad_request
+  rescue StandardError => e
+    Rails.logger.error "[InterWebhook] Erro ao processar: #{e.class} - #{e.message}\n#{e.backtrace.first(5).join("\n")}"
+    render json: { error: 'Internal error' }, status: :unprocessable_entity
+  end
+
+  private
+
+  def process_pix_payment(pix_data)
+    txid = pix_data['txid']
+    e2eid = pix_data['endToEndId']
+    valor = pix_data['valor']
+
+    Rails.logger.info "[InterWebhook] Recebido: txid=#{txid}, e2eid=#{e2eid}, valor=#{valor}"
+
+    # Idempotência: verifica se já processamos este PIX
+    existing = Captain::PixCharge.find_by(e2eid: e2eid)
+    if existing
+      Rails.logger.info "[InterWebhook] PIX já processado (e2eid: #{e2eid})"
+      return
+    end
+
+    # Busca cobrança pelo txid
+    charge = Captain::PixCharge.find_by(txid: txid)
+    unless charge
+      Rails.logger.warn "[InterWebhook] Cobrança não encontrada (txid: #{txid})"
+      return
+    end
+
+    # Atualiza cobrança
+    charge.update!(
+      status: 'paid',
+      e2eid: e2eid,
+      paid_at: Time.current,
+      raw_webhook_payload: pix_data
+    )
+
+    Rails.logger.info "[InterWebhook] PixCharge #{charge.id} marcado como pago"
+
+    # Confirma reserva
+    Captain::Payments::ConfirmationService.new(
+      reservation: charge.reservation,
+      source: 'webhook_inter_pix',
+      payload: pix_data
+    ).perform
+
+    # Notifica chat
+    notify_chat(charge.reservation)
+  end
+
+  def notify_chat(reservation)
+    return unless reservation.conversation_id
+
+    conversation = Conversation.find(reservation.conversation_id)
+
+    conversation.messages.create!(
+      content: "✅ *Pagamento confirmado!*\n\nSua reserva ##{reservation.id} está garantida. Em breve você receberá mais informações sobre sua estadia!",
+      message_type: :outgoing,
+      account: conversation.account,
+      inbox: conversation.inbox
+    )
+
+    Rails.logger.info "[InterWebhook] Notificação enviada para conversa #{conversation.id}"
+  rescue StandardError => e
+    Rails.logger.error "[InterWebhook] Falha ao notificar chat: #{e.message}"
+  end
+end
diff --git a/app/controllers/public/api/v1/captain/payments_controller.rb b/app/controllers/public/api/v1/captain/payments_controller.rb
new file mode 100644
index 000000000..43b0c96c5
--- /dev/null
+++ b/app/controllers/public/api/v1/captain/payments_controller.rb
@@ -0,0 +1,13 @@
+class Public::Api::V1::Captain::PaymentsController < ApplicationController
+  layout false
+  skip_before_action :authenticate_user!, raise: false
+  skip_before_action :check_current_user_is_active, raise: false
+
+  def show
+    @charge = GlobalID::Locator.locate_signed(params[:token], purpose: :pix_payment)
+
+    return if @charge.present?
+
+    render plain: 'Link de pagamento inválido ou expirado.', status: :not_found
+  end
+end
diff --git a/app/controllers/webhooks/wuzapi_controller.rb b/app/controllers/webhooks/wuzapi_controller.rb
new file mode 100644
index 000000000..b517d94b0
--- /dev/null
+++ b/app/controllers/webhooks/wuzapi_controller.rb
@@ -0,0 +1,37 @@
+class Webhooks::WuzapiController < ApplicationController
+  skip_before_action :verify_authenticity_token, raise: false
+  before_action :fetch_inbox
+  before_action :verify_secret
+
+  def process_payload
+    Rails.logger.info "Wuzapi Webhook Received for Inbox #{@inbox.id}: #{params.inspect}"
+
+    Whatsapp::IncomingMessageWuzapiService.new(inbox: @inbox, params: params.to_unsafe_hash).perform
+
+    head :ok
+  rescue StandardError => e
+    Rails.logger.error "Error processing Wuzapi webhook: #{e.message}"
+    Rails.logger.error e.backtrace.join("\n")
+    head :internal_server_error
+  end
+
+  private
+
+  def fetch_inbox
+    @inbox = Inbox.find(params[:inbox_id])
+  rescue ActiveRecord::RecordNotFound
+    head :not_found
+  end
+
+  def verify_secret
+    return if @inbox.blank?
+
+    secret = params[:secret]
+    stored_secret = @inbox.channel&.provider_config&.dig('webhook_secret')
+
+    return unless secret.blank? || secret != stored_secret
+
+    Rails.logger.warn "Wuzapi Webhook: Invalid secret for Inbox #{@inbox.id}"
+    head :unauthorized
+  end
+end
diff --git a/app/javascript/dashboard/api/captain/galleryItems.js b/app/javascript/dashboard/api/captain/galleryItems.js
new file mode 100644
index 000000000..1c544edf4
--- /dev/null
+++ b/app/javascript/dashboard/api/captain/galleryItems.js
@@ -0,0 +1,35 @@
+/* global axios */
+
+import ApiClient from '../../api/ApiClient';
+
+class CaptainGalleryItemsAPI extends ApiClient {
+  constructor() {
+    super('captain/gallery_items', { accountScoped: true });
+  }
+
+  getItems(params = {}) {
+    return axios.get(this.url, { params });
+  }
+
+  getItem(id) {
+    return this.show(id);
+  }
+
+  createItem(formData) {
+    return axios.post(this.url, formData, {
+      headers: { 'Content-Type': 'multipart/form-data' },
+    });
+  }
+
+  updateItem(id, formData) {
+    return axios.patch(`${this.url}/${id}`, formData, {
+      headers: { 'Content-Type': 'multipart/form-data' },
+    });
+  }
+
+  deleteItem(id) {
+    return this.delete(id);
+  }
+}
+
+export default new CaptainGalleryItemsAPI();
diff --git a/app/javascript/dashboard/api/captain/reservations.js b/app/javascript/dashboard/api/captain/reservations.js
new file mode 100644
index 000000000..f37e78612
--- /dev/null
+++ b/app/javascript/dashboard/api/captain/reservations.js
@@ -0,0 +1,26 @@
+/* global axios */
+import ApiClient from '../ApiClient';
+
+class CaptainReservations extends ApiClient {
+  constructor() {
+    super('captain/reservations', { accountScoped: true });
+  }
+
+  get(params = {}) {
+    return axios.get(this.url, { params });
+  }
+
+  show(id) {
+    return axios.get(`${this.url}/${id}`);
+  }
+
+  revenue(params = {}) {
+    return axios.get(`${this.url}/revenue`, { params });
+  }
+
+  pix(id) {
+    return axios.get(`${this.url}/${id}/pix`);
+  }
+}
+
+export default new CaptainReservations();
diff --git a/app/javascript/dashboard/api/captain/units.js b/app/javascript/dashboard/api/captain/units.js
new file mode 100644
index 000000000..6fab3a671
--- /dev/null
+++ b/app/javascript/dashboard/api/captain/units.js
@@ -0,0 +1,29 @@
+import ApiClient from '../../api/ApiClient';
+
+class CaptainUnitsAPI extends ApiClient {
+  constructor() {
+    super('captain/units', { accountScoped: true });
+  }
+
+  getUnits() {
+    return this.get();
+  }
+
+  getUnit(id) {
+    return this.show(id);
+  }
+
+  createUnit(data) {
+    return this.create({ captain_unit: data });
+  }
+
+  updateUnit(id, data) {
+    return this.update(id, { captain_unit: data });
+  }
+
+  deleteUnit(id) {
+    return this.delete(id);
+  }
+}
+
+export default new CaptainUnitsAPI();
diff --git a/app/javascript/dashboard/api/inbox/jasmine.js b/app/javascript/dashboard/api/inbox/jasmine.js
new file mode 100644
index 000000000..bc9aac7d1
--- /dev/null
+++ b/app/javascript/dashboard/api/inbox/jasmine.js
@@ -0,0 +1,96 @@
+/* global axios */
+import ApiClient from '../ApiClient';
+
+class JasmineAPI extends ApiClient {
+  constructor() {
+    super('inboxes', { accountScoped: true });
+  }
+
+  // Helper to get account-scoped jasmine base URL
+  get jasmineUrl() {
+    return `${this.apiVersion}/accounts/${this.accountIdFromRoute}/jasmine`;
+  }
+
+  // Inbox Settings
+  getSettings(inboxId) {
+    return axios.get(`${this.url}/${inboxId}/jasmine/config`);
+  }
+
+  updateSettings(inboxId, data) {
+    return axios.patch(`${this.url}/${inboxId}/jasmine/config`, data);
+  }
+
+  // Collections (Account-scoped)
+  getCollections(params = {}) {
+    return axios.get(`${this.jasmineUrl}/collections`, { params });
+  }
+
+  createCollection(data) {
+    return axios.post(`${this.jasmineUrl}/collections`, data);
+  }
+
+  deleteCollection(collectionId) {
+    return axios.delete(`${this.jasmineUrl}/collections/${collectionId}`);
+  }
+
+  // Links (Inbox Collections)
+  getInboxCollections(inboxId) {
+    return axios.get(`${this.url}/${inboxId}/jasmine/collections`);
+  }
+
+  linkCollection(inboxId, collectionId, priority = 0) {
+    return axios.post(`${this.url}/${inboxId}/jasmine/collections`, {
+      collection_id: collectionId,
+      priority,
+    });
+  }
+
+  unlinkCollection(inboxId, collectionId) {
+    return axios.delete(
+      `${this.url}/${inboxId}/jasmine/collections/${collectionId}`
+    );
+  }
+
+  // Documents
+  getDocuments(collectionId) {
+    return axios.get(
+      `${this.jasmineUrl}/collections/${collectionId}/documents`
+    );
+  }
+
+  uploadDocument(collectionId, content, title) {
+    return axios.post(
+      `${this.jasmineUrl}/collections/${collectionId}/documents`,
+      {
+        title,
+        content,
+      }
+    );
+  }
+
+  deleteDocument(collectionId, documentId) {
+    return axios.delete(
+      `${this.jasmineUrl}/collections/${collectionId}/documents/${documentId}`
+    );
+  }
+
+  // Playground
+  testPlayground(inboxId, message) {
+    return axios.post(`${this.url}/${inboxId}/jasmine/playground`, { message });
+  }
+
+  // Tools
+  getTools(inboxId) {
+    return axios.get(`${this.url}/${inboxId}/jasmine/tools`);
+  }
+
+  updateTool(inboxId, toolKey, data) {
+    return axios.patch(`${this.url}/${inboxId}/jasmine/tools/${toolKey}`, data);
+  }
+
+  testTool(inboxId, toolKey) {
+    return axios.post(`${this.url}/${inboxId}/jasmine/tools/${toolKey}/test`);
+  }
+}
+
+export default new JasmineAPI();
diff --git a/app/javascript/dashboard/components-next/captain/assistant/InboxCard.vue b/app/javascript/dashboard/components-next/captain/assistant/InboxCard.vue
index f349720b0..4b5bf1b74 100644
--- a/app/javascript/dashboard/components-next/captain/assistant/InboxCard.vue
+++ b/app/javascript/dashboard/components-next/captain/assistant/InboxCard.vue
@@ -77,6 +77,13 @@ const handleAction = ({ action, value }) => {
         <span :class="icon" />
         {{ inboxName }}
       </span>
+      <div
+        v-if="inbox.captain_unit_name"
+        class="flex items-center gap-1.5 px-2 py-0.5 rounded-full bg-n-blue-2 text-n-blue-11 text-xs font-medium border border-n-blue-4"
+      >
+        <span class="i-lucide-wallet h-3 w-3" />
+        {{ inbox.captain_unit_name }}
+      </div>
       <div class="flex items-center gap-2">
         <Policy
           v-on-clickaway="() => toggleDropdown(false)"
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/customTool/AuthConfig.vue b/app/javascript/dashboard/components-next/captain/pageComponents/customTool/AuthConfig.vue
index 208a94dba..c689d74fe 100644
--- a/app/javascript/dashboard/components-next/captain/pageComponents/customTool/AuthConfig.vue
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/customTool/AuthConfig.vue
@@ -1,13 +1,15 @@
 <script setup>
-import { defineModel, watch } from 'vue';
+import { defineModel, watch, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import Input from 'dashboard/components-next/input/Input.vue';
+import Button from 'dashboard/components-next/button/Button.vue';
 
 const props = defineProps({
   authType: {
     type: String,
     required: true,
-    validator: value => ['none', 'bearer', 'basic', 'api_key'].includes(value),
+    validator: value =>
+      ['none', 'bearer', 'basic', 'api_key', 'custom_headers'].includes(value),
   },
 });
 
@@ -24,10 +26,34 @@ watch(
     authConfig.value = {};
   }
 );
+
+// custom_headers: lista de { name, value }
+const customHeaders = computed({
+  get: () => authConfig.value.headers || [],
+  set: val => {
+    authConfig.value = { ...authConfig.value, headers: val };
+  },
+});
+
+const addHeader = () => {
+  customHeaders.value = [...customHeaders.value, { name: '', value: '' }];
+};
+
+const removeHeader = index => {
+  customHeaders.value = customHeaders.value.filter((_, i) => i !== index);
+};
+
+const updateHeader = (index, field, val) => {
+  const updated = customHeaders.value.map((h, i) =>
+    i === index ? { ...h, [field]: val } : h
+  );
+  customHeaders.value = updated;
+};
 </script>
 
 <template>
   <div class="flex flex-col gap-2">
+    <!-- Bearer Token -->
     <Input
       v-if="authType === 'bearer'"
       v-model="authConfig.token"
@@ -36,6 +62,8 @@ watch(
         t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_CONFIG.BEARER_TOKEN_PLACEHOLDER')
       "
     />
+
+    <!-- Basic Auth -->
     <template v-else-if="authType === 'basic'">
       <Input
         v-model="authConfig.username"
@@ -53,6 +81,8 @@ watch(
         "
       />
     </template>
+
+    <!-- Single API Key -->
     <template v-else-if="authType === 'api_key'">
       <Input
         v-model="authConfig.name"
@@ -69,5 +99,71 @@ watch(
         "
       />
     </template>
+
+    <!-- Custom Headers: múltiplos pares nome/valor configurados pelo usuário -->
+    <template v-else-if="authType === 'custom_headers'">
+      <div class="flex flex-col gap-2">
+        <label class="text-sm font-medium text-n-slate-12">
+          {{ t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_CONFIG.CUSTOM_HEADERS') }}
+        </label>
+        <p class="text-xs text-n-slate-11 -mt-1">
+          {{ t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_CONFIG.CUSTOM_HEADERS_HELP') }}
+        </p>
+
+        <div
+          v-for="(header, index) in customHeaders"
+          :key="index"
+          class="flex gap-2 items-end"
+        >
+          <Input
+            :model-value="header.name"
+            :label="
+              index === 0
+                ? t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_CONFIG.HEADER_NAME')
+                : ''
+            "
+            :placeholder="
+              t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_CONFIG.HEADER_NAME_PLACEHOLDER')
+            "
+            class="flex-1 [&_input]:font-mono"
+            @update:model-value="val => updateHeader(index, 'name', val)"
+          />
+          <Input
+            :model-value="header.value"
+            :label="
+              index === 0
+                ? t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_CONFIG.HEADER_VALUE')
+                : ''
+            "
+            :placeholder="
+              t(
+                'CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_CONFIG.HEADER_VALUE_PLACEHOLDER'
+              )
+            "
+            class="flex-1 [&_input]:font-mono"
+            @update:model-value="val => updateHeader(index, 'value', val)"
+          />
+          <Button
+            type="button"
+            ghost
+            sm
+            slate
+            icon="i-lucide-trash-2"
+            class="mb-0.5 text-n-ruby-9"
+            @click="removeHeader(index)"
+          />
+        </div>
+
+        <Button
+          type="button"
+          ghost
+          sm
+          blue
+          icon="i-lucide-plus"
+          :label="t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_CONFIG.ADD_HEADER')"
+          @click="addHeader"
+        />
+      </div>
+    </template>
   </div>
 </template>
diff --git a/app/javascript/dashboard/components-next/captain/pageComponents/customTool/CustomToolForm.vue b/app/javascript/dashboard/components-next/captain/pageComponents/customTool/CustomToolForm.vue
index 5c4ea9d5b..b7079ca36 100644
--- a/app/javascript/dashboard/components-next/captain/pageComponents/customTool/CustomToolForm.vue
+++ b/app/javascript/dashboard/components-next/captain/pageComponents/customTool/CustomToolForm.vue
@@ -92,6 +92,10 @@ const authTypeOptions = computed(() => [
     value: 'api_key',
     label: t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_TYPES.API_KEY'),
   },
+  {
+    value: 'custom_headers',
+    label: t('CAPTAIN.CUSTOM_TOOLS.FORM.AUTH_TYPES.CUSTOM_HEADERS'),
+  },
 ]);
 
 const v$ = useVuelidate(validationRules, state);
diff --git a/app/javascript/dashboard/components-next/sidebar/Sidebar.vue b/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
index a4a63ea18..6822182c6 100644
--- a/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
+++ b/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
@@ -288,7 +288,7 @@ const menuItems = computed(() => {
           children: sortedInboxes.value.map(inbox => ({
             name: `${inbox.name}-${inbox.id}`,
             label: inbox.name,
-            icon: h(ChannelIcon, { inbox, class: 'size-[12px]' }),
+            icon: () => h(ChannelIcon, { inbox, class: 'size-[12px]' }),
             to: accountScopedRoute('inbox_dashboard', { inbox_id: inbox.id }),
             component: leafProps =>
               h(ChannelLeaf, {
@@ -306,10 +306,11 @@ const menuItems = computed(() => {
           children: labels.value.map(label => ({
             name: `${label.title}-${label.id}`,
             label: label.title,
-            icon: h('span', {
-              class: `size-[8px] rounded-sm`,
-              style: { backgroundColor: label.color },
-            }),
+            icon: () =>
+              h('span', {
+                class: `size-[8px] rounded-sm`,
+                style: { backgroundColor: label.color },
+              }),
             to: accountScopedRoute('label_conversations', {
               label: label.title,
             }),
@@ -386,6 +387,27 @@ const menuItems = computed(() => {
             navigationPath: 'captain_assistants_settings_index',
           }),
         },
+        {
+          name: 'Pix Units',
+          label: t('SIDEBAR.CAPTAIN_PIX_UNITS'),
+          activeOn: ['captain_settings_units', 'captain_settings_units_edit'],
+          to: accountScopedRoute('captain_settings_units'),
+        },
+        {
+          name: 'Gallery',
+          label: t('SIDEBAR.CAPTAIN_GALLERY'),
+          activeOn: [
+            'captain_settings_gallery',
+            'captain_settings_gallery_edit',
+          ],
+          to: accountScopedRoute('captain_settings_gallery'),
+        },
+        {
+          name: 'Reservations',
+          label: t('SIDEBAR.CAPTAIN_RESERVATIONS'),
+          activeOn: ['captain_reservations_index'],
+          to: accountScopedRoute('captain_reservations_index'),
+        },
       ],
     },
     {
@@ -434,10 +456,11 @@ const menuItems = computed(() => {
           children: labels.value.map(label => ({
             name: `${label.title}-${label.id}`,
             label: label.title,
-            icon: h('span', {
-              class: `size-[8px] rounded-sm`,
-              style: { backgroundColor: label.color },
-            }),
+            icon: () =>
+              h('span', {
+                class: `size-[8px] rounded-sm`,
+                style: { backgroundColor: label.color },
+              }),
             to: accountScopedRoute(
               'contacts_dashboard_labels_index',
               { label: label.title },
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index 9f7805b4e..ded0841fd 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -14,6 +14,7 @@ import PriorityMark from './PriorityMark.vue';
 import SLACardLabel from './components/SLACardLabel.vue';
 import ContextMenu from 'dashboard/components/ui/ContextMenu.vue';
 import VoiceCallStatus from './VoiceCallStatus.vue';
+import ReservationMarker from './ReservationMarker.vue';
 
 const props = defineProps({
   activeLabel: { type: String, default: '' },
@@ -112,6 +113,8 @@ const showMetaSection = computed(() => {
 });
 
 const hasSlaPolicyId = computed(() => props.chat?.sla_policy_id);
+const reservationMarker = computed(() => props.chat?.reservation_marker || {});
+const hasReservationMarker = computed(() => reservationMarker.value?.visible);
 
 const showLabelsSection = computed(() => {
   return props.chat.labels?.length > 0 || hasSlaPolicyId.value;
@@ -370,6 +373,9 @@ const deleteConversation = () => {
           <SLACardLabel :chat="chat" class="ltr:mr-1 rtl:ml-1" />
         </template>
       </CardLabels>
+      <div v-if="hasReservationMarker" class="mx-2 mt-1">
+        <ReservationMarker :marker="reservationMarker" compact />
+      </div>
     </div>
     <ContextMenu
       v-if="showContextMenu"
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
index 55252d6da..9aa5099f6 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
@@ -13,6 +13,8 @@ import { conversationListPageURL } from 'dashboard/helper/URLHelper';
 import { snoozedReopenTime } from 'dashboard/helper/snoozeHelpers';
 import { useInbox } from 'dashboard/composables/useInbox';
 import { useI18n } from 'vue-i18n';
+import { useUISettings } from 'dashboard/composables/useUISettings';
+import ReservationMarker from './ReservationMarker.vue';
 
 const props = defineProps({
   chat: {
@@ -31,6 +33,7 @@ const route = useRoute();
 const conversationHeader = ref(null);
 const { width } = useElementSize(conversationHeader);
 const { isAWebWidgetInbox } = useInbox();
+const { updateUISettings } = useUISettings();
 
 const currentChat = computed(() => store.getters.getSelectedChat);
 const accountId = computed(() => store.getters.getCurrentAccountId);
@@ -90,6 +93,15 @@ const hasMultipleInboxes = computed(
 );
 
 const hasSlaPolicyId = computed(() => props.chat?.sla_policy_id);
+const reservationMarker = computed(() => props.chat?.reservation_marker || {});
+const hasReservationMarker = computed(() => reservationMarker.value?.visible);
+
+const openReservationSummary = () => {
+  updateUISettings({
+    is_contact_sidebar_open: true,
+    is_reservation_summary_open: true,
+  });
+};
 </script>
 
 <template>
@@ -151,6 +163,12 @@ const hasSlaPolicyId = computed(() => props.chat?.sla_policy_id);
         :parent-width="width"
         class="hidden md:flex"
       />
+      <ReservationMarker
+        v-if="hasReservationMarker"
+        :marker="reservationMarker"
+        clickable
+        @click="openReservationSummary"
+      />
       <MoreActions :conversation-id="currentChat.id" />
     </div>
   </div>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReservationMarker.vue b/app/javascript/dashboard/components/widgets/conversation/ReservationMarker.vue
new file mode 100644
index 000000000..d46d272b5
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/ReservationMarker.vue
@@ -0,0 +1,76 @@
+<script setup>
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+const props = defineProps({
+  marker: {
+    type: Object,
+    default: () => ({}),
+  },
+  compact: {
+    type: Boolean,
+    default: false,
+  },
+  clickable: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const emit = defineEmits(['click']);
+const { t } = useI18n();
+
+const markerStatus = computed(() => props.marker?.status || 'draft');
+
+const statusLabel = computed(() => {
+  const key = `CAPTAIN_RESERVATIONS.STATUS.${markerStatus.value.toUpperCase()}`;
+  const translated = t(key);
+  return translated === key
+    ? props.marker?.status_label || markerStatus.value
+    : translated;
+});
+
+const amountLabel = computed(() =>
+  new Intl.NumberFormat('pt-BR', { style: 'currency', currency: 'BRL' }).format(
+    Number(props.marker?.amount || 0)
+  )
+);
+
+const checkInLabel = computed(() => {
+  if (!props.marker?.check_in_at) return null;
+  return new Intl.DateTimeFormat('pt-BR', {
+    day: '2-digit',
+    month: '2-digit',
+  }).format(new Date(props.marker.check_in_at));
+});
+
+const stateClass = computed(() => {
+  const map = {
+    draft: 'bg-n-slate-3 text-n-slate-12',
+    pending_payment: 'bg-n-amber-3 text-n-amber-11',
+    confirmed: 'bg-n-teal-3 text-n-teal-11',
+    cancelled: 'bg-n-ruby-3 text-n-ruby-11',
+  };
+
+  return map[markerStatus.value] || map.draft;
+});
+</script>
+
+<template>
+  <button
+    type="button"
+    class="inline-flex items-center max-w-full gap-1 px-2 py-1 text-xs font-medium rounded-full"
+    :class="[
+      stateClass,
+      { 'cursor-pointer': clickable, 'cursor-default': !clickable },
+    ]"
+    @click.stop="emit('click')"
+  >
+    <span class="truncate">{{ statusLabel }}</span>
+    <span v-if="!compact" class="opacity-80">•</span>
+    <span v-if="!compact" class="opacity-80">{{ amountLabel }}</span>
+    <span v-if="!compact && checkInLabel" class="opacity-80">
+      • {{ checkInLabel }}
+    </span>
+  </button>
+</template>
diff --git a/app/javascript/dashboard/composables/useUISettings.js b/app/javascript/dashboard/composables/useUISettings.js
index 9ebfa6e6f..d199483a0 100644
--- a/app/javascript/dashboard/composables/useUISettings.js
+++ b/app/javascript/dashboard/composables/useUISettings.js
@@ -6,6 +6,7 @@ export const DEFAULT_CONVERSATION_SIDEBAR_ITEMS_ORDER = Object.freeze([
   { name: 'conversation_actions' },
   { name: 'macros' },
   { name: 'conversation_info' },
+  { name: 'reservation_summary' },
   { name: 'contact_attributes' },
   { name: 'contact_notes' },
   { name: 'previous_conversation' },
diff --git a/app/javascript/dashboard/featureFlags.js b/app/javascript/dashboard/featureFlags.js
index 353bed96e..ef055eaaa 100644
--- a/app/javascript/dashboard/featureFlags.js
+++ b/app/javascript/dashboard/featureFlags.js
@@ -2,7 +2,6 @@ export const FEATURE_FLAGS = {
   AGENT_BOTS: 'agent_bots',
   AGENT_MANAGEMENT: 'agent_management',
   ASSIGNMENT_V2: 'assignment_v2',
-  ADVANCED_ASSIGNMENT: 'advanced_assignment',
   AUTO_RESOLVE_CONVERSATIONS: 'auto_resolve_conversations',
   AUTOMATIONS: 'automations',
   CAMPAIGNS: 'campaigns',
@@ -34,6 +33,7 @@ export const FEATURE_FLAGS = {
   IP_LOOKUP: 'ip_lookup',
   LINEAR: 'linear_integration',
   CAPTAIN: 'captain_integration',
+  CAPTAIN_TASKS: 'captain_tasks',
   CUSTOM_ROLES: 'custom_roles',
   CHATWOOT_V4: 'chatwoot_v4',
   REPORT_V4: 'report_v4',
@@ -41,12 +41,9 @@ export const FEATURE_FLAGS = {
   CHANNEL_TIKTOK: 'channel_tiktok',
   CONTACT_CHATWOOT_SUPPORT_TEAM: 'contact_chatwoot_support_team',
   CAPTAIN_V2: 'captain_integration_v2',
-  CAPTAIN_TASKS: 'captain_tasks',
   SAML: 'saml',
   QUOTED_EMAIL_REPLY: 'quoted_email_reply',
   COMPANIES: 'companies',
-  ADVANCED_SEARCH: 'advanced_search',
-  CONVERSATION_REQUIRED_ATTRIBUTES: 'conversation_required_attributes',
 };
 
 export const PREMIUM_FEATURES = [
@@ -56,6 +53,4 @@ export const PREMIUM_FEATURES = [
   FEATURE_FLAGS.AUDIT_LOGS,
   FEATURE_FLAGS.HELP_CENTER,
   FEATURE_FLAGS.SAML,
-  FEATURE_FLAGS.CONVERSATION_REQUIRED_ATTRIBUTES,
-  FEATURE_FLAGS.ADVANCED_ASSIGNMENT,
 ];
diff --git a/app/javascript/dashboard/i18n/locale/en/captain.json b/app/javascript/dashboard/i18n/locale/en/captain.json
new file mode 100644
index 000000000..e150633f9
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/en/captain.json
@@ -0,0 +1,281 @@
+{
+  "CAPTAIN_RESERVATIONS": {
+    "HEADER": "Reservations",
+    "EMPTY": "No reservations found.",
+    "VIEW": {
+      "LIST": "List",
+      "KANBAN": "Kanban",
+      "REVENUE": "Revenue"
+    },
+    "FILTERS": {
+      "SEARCH": "Search by name, CPF, or phone",
+      "STATUS": "Status",
+      "STATUS_ALL": "All statuses",
+      "UNIT": "Unit",
+      "UNIT_ALL": "All units",
+      "SUITE": "Suite",
+      "DATE_FROM": "From",
+      "DATE_TO": "To",
+      "SORT": "Sort",
+      "SORT_DEFAULT": "Operational priority",
+      "SORT_CHECK_IN": "Check-in date",
+      "SORT_UPDATED": "Last update",
+      "SORT_CREATED": "Created at",
+      "APPLY": "Apply filters",
+      "CLEAR": "Clear filters"
+    },
+    "TABLE": {
+      "CUSTOMER": "Customer",
+      "UNIT": "Unit",
+      "SUITE": "Suite",
+      "CHECK_IN": "Check-in",
+      "AMOUNT": "Amount",
+      "STATUS": "Status",
+      "UPDATED_AT": "Updated",
+      "ACTIONS": "Actions"
+    },
+    "STATUS": {
+      "DRAFT": "Draft",
+      "PENDING_PAYMENT": "Awaiting payment",
+      "CONFIRMED": "Confirmed",
+      "CANCELLED": "Cancelled"
+    },
+    "ACTIONS": {
+      "OPEN_CONVERSATION": "Open conversation",
+      "COPY_PIX": "Copy Pix"
+    },
+    "KANBAN": {
+      "EMPTY_COLUMN": "No reservations in this status."
+    },
+    "REVENUE": {
+      "ONLY_CONFIRMED": "Revenue includes only reservations with confirmed status.",
+      "SUMMARY": {
+        "TOTAL_REVENUE": "Total revenue",
+        "CONFIRMED_COUNT": "Confirmed reservations",
+        "AVERAGE_TICKET": "Average ticket"
+      },
+      "CHARTS": {
+        "BY_UNIT": "Revenue by unit",
+        "BY_SUITE": "Revenue by suite"
+      },
+      "API": {
+        "ERROR": "Unable to load revenue."
+      }
+    },
+    "SIDEBAR": {
+      "NO_RESERVATION": "No reservation linked to this conversation.",
+      "LOADING": "Loading reservation details...",
+      "STATUS": "Status",
+      "SUITE": "Suite",
+      "CHECK_IN": "Check-in",
+      "CHECK_OUT": "Check-out",
+      "AMOUNT": "Amount",
+      "UPDATED_AT": "Updated at"
+    },
+    "API": {
+      "PIX_EXPIRED": "Pix for this reservation is expired.",
+      "PIX_NOT_GENERATED": "Pix has not been generated yet.",
+      "PIX_COPIED": "Pix copied successfully.",
+      "PIX_COPY_FAILED": "Unable to copy Pix."
+    }
+  },
+  "CAPTAIN_SETTINGS": {
+    "TITLE": "Captain Settings",
+    "UNITS": {
+      "TITLE": "Pix Units",
+      "DESC": "Manage the settings of different Pix units integrated with Banco Inter.",
+      "ADD_UNIT": "Add Unit",
+      "EDIT_UNIT": "Edit Unit",
+      "DELETE_UNIT": "Delete Unit",
+      "LIST": {
+        "TABLE_HEADER": [
+          "Pix Key",
+          "Account",
+          "Certificates",
+          "Monitoring",
+          "Actions"
+        ],
+        "CERT": "Cert",
+        "KEY": "Key",
+        "PROACTIVE_ON": "Auto-check on",
+        "PROACTIVE_OFF": "Auto-check off",
+        "SEPARATOR": "|",
+        "ADD_NEW_UNIT": "Add a Pix Unit",
+        "NO_UNITS_MESSAGE": "There are no pix units entered yet. Create one now to start receiving by Banco Inter pix."
+      },
+      "DELETE": {
+        "BUTTON_TEXT": "Delete",
+        "TITLE": "Delete Pix Unit",
+        "DESC": "Are you sure you want to delete this pix unit? This action cannot be undone.",
+        "CONFIRM": {
+          "TITLE": "Confirm Deletion",
+          "MESSAGE": "Are you sure you want to delete the Unit?",
+          "YES": "Delete",
+          "NO": "Cancel"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Unit deleted successfully.",
+          "ERROR_MESSAGE": "There was an error trying to delete the unit."
+        }
+      },
+      "ADD": {
+        "TITLE": "New Pix Unit",
+        "DESC": "Add your Banco Inter app credentials",
+        "CANCEL_BUTTON_TEXT": "Cancel",
+        "SUBMIT_BUTTON_TEXT": "Create unit",
+        "API": {
+          "SUCCESS_MESSAGE": "Unit created successfully!",
+          "ERROR_MESSAGE": "There was an error trying to create the unit."
+        }
+      },
+      "EDIT": {
+        "TITLE": "Edit Pix Unit",
+        "DESC": "Update Banco Inter credentials",
+        "CANCEL_BUTTON_TEXT": "Cancel",
+        "SUBMIT_BUTTON_TEXT": "Save unit",
+        "API": {
+          "SUCCESS_MESSAGE": "Unit updated successfully!",
+          "ERROR_MESSAGE": "There was an error trying to update."
+        }
+      },
+      "FORM": {
+        "NAME": {
+          "LABEL": "Unit Name",
+          "PLACEHOLDER": "Ex: Headquaters",
+          "ERROR": "Name is required"
+        },
+        "INTER_PIX_KEY": {
+          "LABEL": "Pix Key (from Inter app)",
+          "PLACEHOLDER": "Ex: 12.345.678/0001-90",
+          "ERROR": "Pix key is required",
+          "HELP_TEXT": "Your Pix key that will receive the charges"
+        },
+        "INTER_ACCOUNT_NUMBER": {
+          "LABEL": "Inter account number",
+          "PLACEHOLDER": "Ex: 1234567-8",
+          "ERROR": "Account number is required"
+        },
+        "INTER_CLIENT_ID": {
+          "LABEL": "Inter App Client ID",
+          "PLACEHOLDER": ""
+        },
+        "INTER_CLIENT_SECRET": {
+          "LABEL": "Inter App Client Secret",
+          "PLACEHOLDER": ""
+        },
+        "INTER_CERT_CONTENT": {
+          "LABEL": "Certificate Content (.crt)",
+          "PLACEHOLDER": "Paste the text contained in the .crt file here...",
+          "UPLOAD_BUTTON": "Import .crt file"
+        },
+        "INTER_KEY_CONTENT": {
+          "LABEL": "Key Content (.key)",
+          "PLACEHOLDER": "Paste the text contained in the .key file here...",
+          "UPLOAD_BUTTON": "Import .key file"
+        },
+        "PROACTIVE_PIX_POLLING": {
+          "LABEL": "Proactive payment confirmation (Banco Inter)",
+          "CHECKBOX_LABEL": "Check payment automatically every 10 minutes for up to 1 hour",
+          "HELP_TEXT": "When enabled, the system proactively queries Inter to confirm pending Pix payments.",
+          "DISABLED_HELP_TEXT": "Complete Banco Inter credentials (Client ID/Secret, account, Pix key, certificate and key) to enable."
+        },
+        "CERT_PRESENT_HELP": "Certificate already configured.",
+        "CANCEL": "Cancel",
+        "SAVE": "Save"
+      },
+      "INBOX": {
+        "LABEL": "Pix Unit",
+        "PLACEHOLDER": "Select a unit",
+        "NO_UNIT": "No unit linked",
+        "CONNECT_UNIT_LABEL": "Link Pix Unit",
+        "CONNECT_UNIT_PLACEHOLDER": "Choose the Inter unit for this inbox",
+        "CONNECT_UNIT_HELP": "Select which Pix Unit should be used by this inbox."
+      },
+      "TEST": {
+        "HEADER_TITLE": "Header validation",
+        "HEADER_DESCRIPTION": "Visual test to validate page rendering.",
+        "BODY_TEXT": "If this screen appears, the issue is likely in the table or Vuex, not in the base layout."
+      }
+    },
+    "GALLERY": {
+      "TITLE": "Gallery",
+      "DESC": "Manage suite photos that subagents can send to customers.",
+      "ADD_ITEM": "Add Photo",
+      "EDIT_ITEM": "Edit",
+      "DELETE_ITEM": "Delete",
+      "LIST": {
+        "TABLE_HEADER": [
+          "Image",
+          "Inbox and description",
+          "Category",
+          "Suite",
+          "Actions"
+        ],
+        "ADD_NEW_ITEM": "Add gallery photos",
+        "NO_ITEMS_MESSAGE": "There are no photos available yet for automatic customer sending."
+      },
+      "DELETE": {
+        "CONFIRM": {
+          "TITLE": "Delete photo",
+          "MESSAGE": "Are you sure you want to delete this photo from the gallery?",
+          "YES": "Delete"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Photo deleted successfully.",
+          "ERROR_MESSAGE": "Unable to delete the photo."
+        }
+      },
+      "ADD": {
+        "TITLE": "New gallery photo",
+        "DESC": "Upload a suite photo and metadata for agent search.",
+        "SUBMIT_BUTTON_TEXT": "Save photo",
+        "API": {
+          "SUCCESS_MESSAGE": "Photo created successfully!",
+          "ERROR_MESSAGE": "Unable to create the photo."
+        }
+      },
+      "EDIT": {
+        "TITLE": "Edit gallery photo",
+        "DESC": "Update gallery metadata and image.",
+        "SUBMIT_BUTTON_TEXT": "Save changes",
+        "API": {
+          "SUCCESS_MESSAGE": "Photo updated successfully!",
+          "ERROR_MESSAGE": "Unable to update the photo."
+        }
+      },
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Inbox",
+          "GLOBAL_OPTION": "Global (all inboxes)",
+          "HELP": "Select which inbox can use these photos.",
+          "GLOBAL_HELP": "These photos can be used by agents in any inbox.",
+          "SPECIFIC_HELP": "These photos will be used only in inbox {inbox}."
+        },
+        "SUITE_CATEGORY": {
+          "LABEL": "Suite category",
+          "PLACEHOLDER": "Ex: Hydromassage",
+          "ERROR": "Suite category is required"
+        },
+        "SUITE_NUMBER": {
+          "LABEL": "Suite number/identifier",
+          "PLACEHOLDER": "Ex: 101",
+          "ERROR": "Suite identifier is required"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Photo description",
+          "PLACEHOLDER": "Describe what appears in this photo",
+          "ERROR": "Description is required"
+        },
+        "IMAGE": {
+          "LABEL": "Image",
+          "HELP_TEXT": "Use clear photos. Recommended formats: PNG/JPG.",
+          "ERROR": "Image is required",
+          "PREVIEW_ALT": "Photo preview"
+        },
+        "ACTIVE": {
+          "LABEL": "Available for agent sending"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index a38c9dc2f..db52f6344 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -383,6 +383,7 @@
       "CONTACT_NOTES": "Contact Notes",
       "CONTACT_ATTRIBUTES": "Contact Attributes",
       "PREVIOUS_CONVERSATION": "Previous Conversations",
+      "RESERVATION": "Reservation",
       "MACROS": "Macros",
       "LINEAR_ISSUES": "Linked Linear Issues",
       "SHOPIFY_ORDERS": "Shopify Orders"
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 6cbd12e65..08025a961 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -237,19 +237,95 @@
           "WHATSAPP_CLOUD_DESC": "Quick setup through Meta",
           "TWILIO_DESC": "Connect via Twilio credentials",
           "360_DIALOG": "360Dialog",
-          "BAILEYS": "Baileys",
-          "BAILEYS_DESC": "Connect via non-official API Baileys",
-          "ZAPI": "Z-API",
-          "ZAPI_DESC": "Connect via non-official API Z-API"
+          "WUZAPI": "Wuzapi",
+          "WUZAPI_DESC": "Connect your Wuzapi instance",
+          "EVOLUTION": "Evolution Go",
+          "EVOLUTION_DESC": "WhatsApp channel for customer service"
+        },
+        "CANCEL": "Cancel",
+        "WUZAPI": {
+          "BASE_URL": {
+            "LABEL": "Wuzapi Base URL",
+            "PLACEHOLDER": "https://wuzapi.yourdomain.com",
+            "HELP_TEXT": "The base URL where your Wuzapi instance is hosted"
+          },
+          "ADMIN_TOKEN": {
+            "LABEL": "Admin Token",
+            "PLACEHOLDER": "Your Wuzapi Admin Token"
+          },
+          "AUTO_CREATE_USER": {
+            "LABEL": "Auto-create Wuzapi User"
+          }
+        },
+        "EVOLUTION": {
+          "TITLE": "Evolution Go Configuration",
+          "ASTERISK": "*",
+          "API_URL": {
+            "LABEL": "API URL",
+            "PLACEHOLDER": "e.g. https://api.yourcompany.com"
+          },
+          "API_TOKEN": {
+            "LABEL": "API Token (Admin)",
+            "PLACEHOLDER": "Enter global or instance token"
+          },
+          "DISPLAY_NAME": {
+            "LABEL": "Display Name",
+            "PLACEHOLDER": "e.g. Customer Support",
+            "HELP_TEXT": "Friendly name for identification"
+          },
+          "CHANNEL_NAME": {
+            "LABEL": "Channel Name",
+            "PLACEHOLDER": "e.g. whatsapp-support",
+            "HELP_TEXT": "Automatically generated from display name"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "WhatsApp Number",
+            "PLACEHOLDER": "e.g. 11999999999"
+          },
+          "TEST_CONNECTION": "Test Connection",
+          "TEST_CONNECTION_BANNER": "Please test the connection before proceeding.",
+          "CONNECT_SUCCESS": "Connected successfully!",
+          "CONNECT_ERROR": "Connection error. Please check your credentials.",
+          "STATUS": {
+            "TITLE": "Connection Status",
+            "CONNECTED": "Connected",
+            "DISCONNECTED": "Disconnected",
+            "CONNECTING": "Connecting...",
+            "WAITING_QR": "Waiting for QR Code...",
+            "SCAN_QR": "Scan the QR Code below"
+          },
+          "ACTIONS": {
+            "RECONNECT": "Reconnect",
+            "DISCONNECT": "Disconnect"
+          },
+          "INSTANCE_SETTINGS": {
+            "TITLE": "Instance Settings",
+            "ALWAYS_ONLINE": "Always Online",
+            "REJECT_CALLS": "Reject Calls",
+            "READ_MESSAGES": "Mark as Read",
+            "IGNORE_GROUPS": "Ignore Groups",
+            "IGNORE_STATUS": "Ignore Status"
+          },
+          "HELP": {
+            "TITLE": "How does it work?",
+            "HELP_TEXT_1": "Evolution API is a premium provider that offers high stability for WhatsApp connections.",
+            "BRAZIL_FLAG": "🇧🇷",
+            "ICON_INFO": "ℹ️",
+            "ICON_STAR": "⭐",
+            "ICON_ROCKET": "🚀",
+            "ICON_SHIELD": "🛡️",
+            "ICON_SYNC": "🔄",
+            "ICON_CHART": "📊",
+            "ICON_WARNING": "⚠️",
+            "FEATURE_1": "Ultra fast and stable connection",
+            "FEATURE_2": "End-to-end encryption",
+            "FEATURE_3": "Real-time automatic sync",
+            "FEATURE_4": "Delivery status reporting"
+          }
         },
         "SELECT_PROVIDER": {
           "TITLE": "Select your API provider",
-          "DESCRIPTION": "Choose your WhatsApp provider. You can connect directly through Meta which requires no setup, or connect through Twilio using your account credentials.",
-          "ZAPI_PROMO": {
-            "TITLE": "Looking for a reliable WhatsApp solution?",
-            "DESCRIPTION": "Z-API offers superior stability compared to Baileys and is much simpler to set up than Cloud or Twilio - no complex configuration required. Perfect for businesses that want to get started quickly.",
-            "CTA": "Use Z-API"
-          }
+          "DESCRIPTION": "Choose your WhatsApp provider. You can connect directly through Meta which requires no setup, or connect through Twilio using your account credentials."
         },
         "INBOX_NAME": {
           "LABEL": "Inbox Name",
@@ -288,43 +364,6 @@
           "WEBHOOK_URL": "Webhook URL",
           "WEBHOOK_VERIFICATION_TOKEN": "Webhook Verification Token"
         },
-        "PROVIDER_URL": {
-          "LABEL": "Provider URL",
-          "PLACEHOLDER": "If provider is not running locally, please provide the URL",
-          "ERROR": "Please enter a valid URL"
-        },
-        "MARK_AS_READ": {
-          "LABEL": "Send read receipts"
-        },
-        "INSTANCE_ID": {
-          "LABEL": "Instance ID",
-          "PLACEHOLDER": "Please enter your instance ID",
-          "ERROR": "This field is required"
-        },
-        "TOKEN": {
-          "LABEL": "Token",
-          "PLACEHOLDER": "Please enter your instance Token",
-          "ERROR": "This field is required"
-        },
-        "CLIENT_TOKEN": {
-          "LABEL": "Security Token",
-          "PLACEHOLDER": "Please enter your Security Token (see Security tab on Z-API dashboard)",
-          "ERROR": "This field is required"
-        },
-        "ADVANCED_OPTIONS": "Advanced options",
-        "EXTERNAL_PROVIDER": {
-          "SUBTITLE": "Click below to setup the WhatsApp channel.",
-          "LINK_BUTTON": "Link device",
-          "LINK_DEVICE_MODAL": {
-            "TITLE": "Link your device",
-            "SUBTITLE": "Scan the QR code to link your device. Make sure the phone number is correct before scanning.",
-            "LOADING_QRCODE": "Loading QR code...",
-            "RECONNECTING": "Connecting...",
-            "LINK_DEVICE": "Link device",
-            "DISCONNECT": "Disconnect",
-            "CONNECTED": "Your device has been connected successfully. You can now start sending and receiving messages."
-          }
-        },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "EMBEDDED_SIGNUP": {
           "TITLE": "Quick setup with Meta",
@@ -354,13 +393,6 @@
           "MANUAL_FALLBACK": "If your number is already connected to the WhatsApp Business Platform (API), or if you’re a tech provider onboarding your own number, please use the {link} flow",
           "MANUAL_LINK_TEXT": "manual setup flow"
         },
-        "ZAPI_PROMO": {
-          "SETUP_BANNER": {
-            "TITLE": "Get 10% off your Z-API subscription",
-            "DESCRIPTION": "Create your Z-API account using our affiliate link and receive 10% off. Simple setup, reliable connections, and great support.",
-            "CTA": "Create Z-API Account"
-          }
-        },
         "API": {
           "ERROR_MESSAGE": "We were not able to save the WhatsApp channel"
         }
@@ -582,7 +614,8 @@
       "ERROR_FB_UNAUTHORIZED_HELP": "Please ensure you have access to the Facebook page with full control. You can read more about Facebook roles <a href=\" https://www.facebook.com/help/187316341316631\">here</a>.",
       "CREATING_CHANNEL": "Creating your Inbox...",
       "TITLE": "Configure Inbox Details",
-      "DESC": ""
+      "DESC": "",
+      "MESSENGER_CONFIG": "Configuration"
     },
     "AGENTS": {
       "BUTTON_TEXT": "Add agents",
@@ -633,10 +666,29 @@
           "SAVE_BUTTON_TEXT": "Save"
         }
       },
+      "WUZAPI": {
+        "CONNECTED": "Wuzapi Connected",
+        "CONNECTED_DESC": "Your Wuzapi inbox is connected and ready to send/receive messages.",
+        "DISCONNECT": "Disconnect",
+        "DISCONNECT_SUCCESS": "Disconnected successfully",
+        "DISCONNECT_ERROR": "Error disconnecting",
+        "SCAN_QR": "Scan the QR Code to connect",
+        "LOADING_QR": "Loading QR Code...",
+        "CONNECT": "Connect WhatsApp",
+        "CONNECT_DESC": "Click below to start the connection process"
+      },
+      "EVOLUTION": {
+        "CONNECTED": "Evolution Go Connected",
+        "CONNECTED_DESC": "Your Evolution Go inbox is connected and ready to send/receive messages.",
+        "DISCONNECT": "Disconnect",
+        "DISCONNECT_SUCCESS": "Disconnected successfully",
+        "DISCONNECT_ERROR": "Error disconnecting"
+      },
       "ALLOW_MESSAGES_AFTER_RESOLVED": {
         "ENABLED": "Enabled",
         "DISABLED": "Disabled"
       },
+
       "ENABLE_CONTINUITY_VIA_EMAIL": {
         "ENABLED": "Enabled",
         "DISABLED": "Disabled"
@@ -805,29 +857,7 @@
       "WHATSAPP_TEMPLATES_SYNC_SUBHEADER": "Manually sync message templates from WhatsApp to update your available templates.",
       "WHATSAPP_TEMPLATES_SYNC_BUTTON": "Sync Templates",
       "WHATSAPP_TEMPLATES_SYNC_SUCCESS": "Templates sync initiated successfully. It may take a couple of minutes to update.",
-      "WHATSAPP_MANAGE_PROVIDER_CONNECTION_TITLE": "Manage Provider Connection",
-      "WHATSAPP_MANAGE_PROVIDER_CONNECTION_SUBHEADER": "Link your device and manage the provider connection.",
-      "WHATSAPP_MANAGE_PROVIDER_CONNECTION_BUTTON": "Manage connection",
-      "WHATSAPP_PROVIDER_URL_TITLE": "Provider URL",
-      "WHATSAPP_PROVIDER_URL_SUBHEADER": "If the provider is not running locally, please provide the URL.",
-      "WHATSAPP_PROVIDER_URL_PLACEHOLDER": "Enter the provider URL",
-      "WHATSAPP_PROVIDER_URL_ERROR": "Please enter a valid URL",
-      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings",
-      "WHATSAPP_MARK_AS_READ_TITLE": "Read receipts",
-      "WHATSAPP_MARK_AS_READ_SUBHEADER": "If turned off, when a message is viewed in Chatwoot, a read receipt will not be sent to the sender. Your messages will still be able to receive read receipts from the sender.",
-      "WHATSAPP_MARK_AS_READ_LABEL": "Send read receipts",
-      "WHATSAPP_INSTANCE_ID_TITLE": "Instance ID",
-      "WHATSAPP_INSTANCE_ID_SUBHEADER": "Your Z-API Instance ID.",
-      "WHATSAPP_INSTANCE_ID_UPDATE_TITLE": "Update Instance ID",
-      "WHATSAPP_INSTANCE_ID_UPDATE_SUBHEADER": "Enter the new Instance ID here",
-      "WHATSAPP_TOKEN_TITLE": "Token",
-      "WHATSAPP_TOKEN_SUBHEADER": "Your Z-API instance Token.",
-      "WHATSAPP_TOKEN_UPDATE_TITLE": "Update Token",
-      "WHATSAPP_TOKEN_UPDATE_SUBHEADER": "Enter the new instance Token here",
-      "WHATSAPP_CLIENT_TOKEN_TITLE": "Security Token",
-      "WHATSAPP_CLIENT_TOKEN_SUBHEADER": "Your Z-API Client Token (see Security tab on Z-API dashboard).",
-      "WHATSAPP_CLIENT_TOKEN_UPDATE_TITLE": "Update Security Token",
-      "WHATSAPP_CLIENT_TOKEN_UPDATE_SUBHEADER": "Enter the new Security Token here"
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Update Pre Chat Form Settings"
     },
     "HELP_CENTER": {
       "LABEL": "Help Center",
@@ -841,53 +871,6 @@
       "MAX_ASSIGNMENT_LIMIT_RANGE_ERROR": "Please enter a value greater than 0",
       "MAX_ASSIGNMENT_LIMIT_SUB_TEXT": "Limit the maximum number of conversations from this inbox that can be auto assigned to an agent"
     },
-    "ASSIGNMENT": {
-      "TITLE": "Conversation Assignment",
-      "DESCRIPTION": "Automatically assign incoming conversations to available agents based on assignment policies",
-      "ENABLE_AUTO_ASSIGNMENT": "Enable automatic conversation assignment",
-      "DEFAULT_RULES_TITLE": "Default assignment rules",
-      "DEFAULT_RULES_DESCRIPTION": "Using the default assignment behavior for all conversations",
-      "DEFAULT_RULE_1": "Earliest created conversations first",
-      "DEFAULT_RULE_2": "Round robin distribution",
-      "CUSTOMIZE_WITH_POLICY": "Customize with assignment policy",
-      "USING_POLICY": "Using custom assignment policy for this inbox",
-      "CUSTOMIZE_POLICY": "Customize with assignment policy",
-      "DELETE_POLICY": "Delete policy",
-      "POLICY_LABEL": "Assignment policy",
-      "ASSIGNMENT_ORDER_LABEL": "Assignment Order",
-      "ASSIGNMENT_METHOD_LABEL": "Assignment Method",
-      "POLICY_STATUS": {
-        "ACTIVE": "Active",
-        "INACTIVE": "Inactive"
-      },
-      "PRIORITY": {
-        "EARLIEST_CREATED": "Earliest created",
-        "LONGEST_WAITING": "Longest waiting"
-      },
-      "METHOD": {
-        "ROUND_ROBIN": "Round robin",
-        "BALANCED": "Balanced assignment"
-      },
-      "UPGRADE_PROMPT": "Custom assignment policies are available on the Business plan",
-      "UPGRADE_TO_BUSINESS": "Upgrade to Business",
-      "DEFAULT_POLICY_LINKED": "Default policy linked",
-      "DEFAULT_POLICY_DESCRIPTION": "Link a custom assignment policy to customize how conversations are assigned to agents in this inbox.",
-      "LINK_EXISTING_POLICY": "Link existing policy",
-      "CREATE_NEW_POLICY": "Create new policy",
-      "NO_POLICIES": "No assignment policies found",
-      "VIEW_ALL_POLICIES": "View all policies",
-      "CURRENT_BEHAVIOR": "Currently using default assignment behavior:",
-      "LINK_SUCCESS": "Assignment policy linked successfully",
-      "LINK_ERROR": "Failed to link assignment policy"
-    },
-    "ASSIGNMENT_POLICY": {
-      "DELETE_CONFIRM_TITLE": "Delete assignment policy?",
-      "DELETE_CONFIRM_MESSAGE": "Are you sure you want to remove this assignment policy from this inbox? The inbox will revert to default assignment rules.",
-      "CANCEL": "Cancel",
-      "CONFIRM_DELETE": "Delete",
-      "DELETE_SUCCESS": "Assignment policy removed successfully",
-      "DELETE_ERROR": "Failed to remove assignment policy"
-    },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Reauthorize",
       "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
@@ -930,61 +913,6 @@
         "LABEL": "Message",
         "PLACEHOLDER": "Please enter a message to show users with the form"
       },
-      "BUTTON_TEXT": {
-        "LABEL": "Button text",
-        "PLACEHOLDER": "Please rate us"
-      },
-      "LANGUAGE": {
-        "LABEL": "Language",
-        "PLACEHOLDER": "Select template language"
-      },
-      "MESSAGE_PREVIEW": {
-        "LABEL": "Message preview",
-        "TOOLTIP": "This may vary slightly when rendered on WhatsApp's platform."
-      },
-      "TEMPLATE_STATUS": {
-        "APPROVED": "Approved by WhatsApp",
-        "PENDING": "Pending WhatsApp approval",
-        "REJECTED": "Meta rejected the template",
-        "DEFAULT": "Needs WhatsApp approval",
-        "NOT_FOUND": "The template does not exist in the Meta platform."
-      },
-      "TEMPLATE_CREATION": {
-        "SUCCESS_MESSAGE": "WhatsApp template created successfully and sent for approval",
-        "ERROR_MESSAGE": "Failed to create WhatsApp template"
-      },
-      "TEMPLATE_MODE": {
-        "LABEL": "Template source",
-        "CREATE_NEW": "Create new template",
-        "USE_EXISTING": "Use existing template"
-      },
-      "EXISTING_TEMPLATE": {
-        "LABEL": "Select template",
-        "PLACEHOLDER": "Select an approved template",
-        "SYNC_BUTTON": "Sync templates",
-        "SYNCING": "Syncing...",
-        "EMPTY_STATE": "No compatible templates found. Templates must have a URL button with a dynamic parameter.",
-        "LINK_SUCCESS": "Template linked successfully",
-        "LINK_ERROR": "Failed to link template",
-        "LOADING": "Loading templates...",
-        "USING_LABEL": "Using existing template: {name}",
-        "SYNC_ERROR": "Failed to sync templates. Please try again."
-      },
-      "TEMPLATE_VARIABLES": {
-        "TITLE": "Template variables",
-        "DESCRIPTION": "Set values for the template body variables. You can use dynamic variables like {'{{'} contact.name {'}}'} that will be resolved at send time.",
-        "VARIABLE_LABEL": "Variable {variable}",
-        "VARIABLE_PLACEHOLDER": "Enter value for {variable}",
-        "VARIABLE_REQUIRED": "This variable is required",
-        "VALIDATION_ERROR": "Please set all template variables before saving.",
-        "INSERT_VARIABLE": "Insert variable"
-      },
-      "TEMPLATE_UPDATE_DIALOG": {
-        "TITLE": "Edit survey details",
-        "DESCRIPTION": "We will delete the previous template and make a new one which will be sent again for WhatsApp approval",
-        "CONFIRM": "Create new template",
-        "CANCEL": "Go back"
-      },
       "SURVEY_RULE": {
         "LABEL": "Survey rule",
         "DESCRIPTION_PREFIX": "Send the survey if the conversation",
@@ -996,7 +924,6 @@
         "SELECT_PLACEHOLDER": "select labels"
       },
       "NOTE": "Note: CSAT surveys are sent only once per conversation",
-      "WHATSAPP_NOTE": "Note: You can create a new template (which will be sent for WhatsApp approval) or use an existing approved template from your Meta template manager. Surveys are sent only once per conversation as per the survey rule.",
       "API": {
         "SUCCESS_MESSAGE": "CSAT settings updated successfully",
         "ERROR_MESSAGE": "We couldn't update CSAT settings. Please try again later."
@@ -1192,8 +1119,6 @@
       "TWITTER_PROFILE": "Twitter",
       "TWILIO_SMS": "Twilio SMS",
       "WHATSAPP": "WhatsApp",
-      "WHATSAPP_BAILEYS": "WhatsApp - Baileys",
-      "WHATSAPP_ZAPI": "WhatsApp - Z-API",
       "SMS": "SMS",
       "EMAIL": "Email",
       "TELEGRAM": "Telegram",
diff --git a/app/javascript/dashboard/i18n/locale/en/index.js b/app/javascript/dashboard/i18n/locale/en/index.js
index a55f54165..93009fc6c 100644
--- a/app/javascript/dashboard/i18n/locale/en/index.js
+++ b/app/javascript/dashboard/i18n/locale/en/index.js
@@ -7,6 +7,7 @@ import automation from './automation.json';
 import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
+import captain from './captain.json';
 import chatlist from './chatlist.json';
 import companies from './companies.json';
 import components from './components.json';
@@ -24,6 +25,7 @@ import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
+import jasmine from './jasmine.json';
 import labelsMgmt from './labelsMgmt.json';
 import login from './login.json';
 import macros from './macros.json';
@@ -50,6 +52,7 @@ export default {
   ...bulkActions,
   ...campaign,
   ...cannedMgmt,
+  ...captain,
   ...chatlist,
   ...companies,
   ...components,
@@ -67,6 +70,7 @@ export default {
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
+  ...jasmine,
   ...labelsMgmt,
   ...login,
   ...macros,
diff --git a/app/javascript/dashboard/i18n/locale/en/integrations.json b/app/javascript/dashboard/i18n/locale/en/integrations.json
index 3f78b06ff..f0c0ab817 100644
--- a/app/javascript/dashboard/i18n/locale/en/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/en/integrations.json
@@ -840,7 +840,8 @@
           "NONE": "None",
           "BEARER": "Bearer Token",
           "BASIC": "Basic Auth",
-          "API_KEY": "API Key"
+          "API_KEY": "API Key",
+          "CUSTOM_HEADERS": "Custom Headers"
         },
         "AUTH_CONFIG": {
           "BEARER_TOKEN": "Bearer Token",
@@ -852,7 +853,14 @@
           "API_KEY": "Header Name",
           "API_KEY_PLACEHOLDER": "X-API-Key",
           "API_VALUE": "Header Value",
-          "API_VALUE_PLACEHOLDER": "Enter API key value"
+          "API_VALUE_PLACEHOLDER": "Enter API key value",
+          "CUSTOM_HEADERS": "Custom Headers",
+          "CUSTOM_HEADERS_HELP": "Add one or more HTTP headers sent with every request (e.g. API IDs, tokens).",
+          "HEADER_NAME": "Header Name",
+          "HEADER_NAME_PLACEHOLDER": "e.g. PLUG-PLAY-ID",
+          "HEADER_VALUE": "Header Value",
+          "HEADER_VALUE_PLACEHOLDER": "e.g. 198",
+          "ADD_HEADER": "Add Header"
         },
         "PARAMETERS": {
           "LABEL": "Parameters",
diff --git a/app/javascript/dashboard/i18n/locale/en/jasmine.json b/app/javascript/dashboard/i18n/locale/en/jasmine.json
new file mode 100644
index 000000000..dae39ed7f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/en/jasmine.json
@@ -0,0 +1,81 @@
+{
+  "JASMINE": {
+    "HEADER": {
+      "TITLE": "Jasmine AI Agents",
+      "DESCRIPTION": "Manage your AI SDR agents. Select an inbox to configure your knowledge base.",
+      "EMPTY": "No inboxes found"
+    },
+    "CONFIG": {
+      "TITLE": "Jasmine AI Configuration",
+      "DESCRIPTION": "Configure the AI agent for this inbox.",
+      "ENABLE": "Enable Jasmine AI Agent",
+      "SYSTEM_PROMPT": "System Prompt",
+      "SYSTEM_PROMPT_HELP": "Define the persona and behavioral rules for the agent.",
+      "UPDATE_BUTTON": "Update Configuration"
+    },
+    "KNOWLEDGE_BASE": {
+      "TITLE": "Knowledge Base",
+      "DESCRIPTION": "Manage knowledge collections for this inbox",
+      "ADD_BUTTON": "+ New Collection",
+      "DOCUMENTS": "Documents",
+      "LOADING_DOCS": "Loading documents...",
+      "UNTITLED_DOC": "Untitled Document",
+      "NO_DOCS": "No documents yet. Add your first document below.",
+      "ADD_DOC_HEADER": "Add New Document",
+      "DOC_TITLE_PLACEHOLDER": "Document title (optional)",
+      "DOC_CONTENT_PLACEHOLDER": "Paste or type your knowledge content here...",
+      "ADD_DOC_BUTTON": "Add Document",
+      "NO_COLLECTIONS": "No collections yet. Create one to get started.",
+      "CREATE_MODAL": {
+        "TITLE": "Create Collection",
+        "NAME_PLACEHOLDER": "Collection name",
+        "VISIBILITY_PRIVATE": "Private (This inbox only)",
+        "VISIBILITY_SHARED": "Shared (All inboxes)",
+        "CANCEL": "Cancel",
+        "CREATE": "Create"
+      },
+      "DELETE_CONFIRM": "Are you sure you want to delete this document?",
+      "DOCUMENT_DELETE_SUCCESS": "Document deleted successfully",
+      "COLLECTION_DELETE_SUCCESS": "Collection deleted successfully",
+      "SAVE_SUCCESS": "Changes saved successfully",
+      "DOCUMENT_CREATE_SUCCESS": "Document created successfully",
+      "COLLECTION_CREATE_SUCCESS": "Collection created successfully"
+    },
+    "PLAYGROUND": {
+      "TITLE": "Jasmine AI Playground",
+      "DESCRIPTION": "Test Jasmine responses in real-time before enabling for customers.",
+      "SELECT_INBOX": "Select an Inbox to test",
+      "CHOOSE_INBOX": "Choose an inbox...",
+      "WARNING": "Make sure Jasmine is enabled and configured for this inbox",
+      "EMPTY_STATE_TITLE": "Send a message to test Jasmine",
+      "EMPTY_STATE_EXAMPLES": "Try: \"Hello\", \"How much does it cost?\", \"How does it work?\"",
+      "LOADING": "Jasmine is thinking...",
+      "INPUT_PLACEHOLDER": "Type a test message...",
+      "CLEAR_TOOLTIP": "Clear conversation",
+      "NO_INBOX_SELECTED": "Select an inbox above to start testing"
+    },
+    "INBOX_LIST": {
+      "ACTIVE": "Active",
+      "CONFIGURE": "Configure",
+      "DESCRIPTION": "Channel {channel} configured for Jasmine AI"
+    },
+    "WUZAPI": {
+      "STATUS": "Status: {status}",
+      "ACCOUNT_ERROR": "Error: Account ID not loaded. Please refresh the page.",
+      "CONNECT_FALLBACK": "Click to initiate connection",
+      "CONNECT_BUTTON_FALLBACK": "Connect WhatsApp",
+      "WEBHOOK_SECTION": "Webhook Configuration",
+      "GET_WEBHOOK_INFO": "Get Webhook Info",
+      "UPDATE_WEBHOOK": "Update Webhook Connection"
+    },
+    "EVOLUTION": {
+      "STATUS": "Status: {status}",
+      "ACCOUNT_ERROR": "Error: Instance ID not found. Please check your configuration.",
+      "CONNECT_FALLBACK": "Click to initiate connection",
+      "CONNECT_BUTTON_FALLBACK": "Connect WhatsApp",
+      "WEBHOOK_SECTION": "Webhook Configuration",
+      "GET_WEBHOOK_INFO": "Get Webhook Info",
+      "UPDATE_WEBHOOK": "Update Webhook Connection"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index ec0cccff1..8d417d797 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -340,6 +340,9 @@
     "CAPTAIN_PLAYGROUND": "Playground",
     "CAPTAIN_INBOXES": "Inboxes",
     "CAPTAIN_SETTINGS": "Settings",
+    "CAPTAIN_PIX_UNITS": "Pix Units",
+    "CAPTAIN_GALLERY": "Gallery",
+    "CAPTAIN_RESERVATIONS": "Reservations",
     "HOME": "Home",
     "AGENTS": "Agents",
     "AGENT_BOTS": "Bots",
@@ -411,6 +414,84 @@
     "LOADING": "Loading Captain configuration...",
     "LINK_TEXT": "Learn more about Captain Credits",
     "NOT_ENABLED": "Captain is not enabled for your account. Please upgrade your plan to access Captain features.",
+    "UNITS": {
+      "TITLE": "Pix Units",
+      "DESC": "Manage settings for different Pix units integrated with Banco Inter.",
+      "ADD_UNIT": "Add Unit",
+      "LIST": {
+        "LOADING": "Loading Pix units...",
+        "TABLE_HEADER": ["Pix Key", "Account", "Certificates", "Actions"],
+        "CERT": "Cert",
+        "KEY": "Key",
+        "SEPARATOR": "|",
+        "ADD_NEW_UNIT": "Add a Pix Unit",
+        "NO_UNITS_MESSAGE": "No Pix units added yet. Create one to start receiving payments via Pix from Banco Inter."
+      },
+      "DELETE": {
+        "TITLE": "Delete Pix Unit",
+        "DESC": "Are you sure you want to delete this Pix unit?",
+        "CONFIRM": { "YES": "Delete", "NO": "Cancel" },
+        "API": {
+          "SUCCESS_MESSAGE": "Unit deleted successfully.",
+          "ERROR_MESSAGE": "There was an error deleting the unit."
+        }
+      },
+      "ADD": {
+        "TITLE": "New Pix Unit",
+        "DESC": "Add your Banco Inter app credentials",
+        "API": {
+          "SUCCESS_MESSAGE": "Unit created successfully!",
+          "ERROR_MESSAGE": "There was an error creating the unit."
+        }
+      },
+      "EDIT": {
+        "TITLE": "Edit Pix Unit",
+        "DESC": "Update your Banco Inter credentials",
+        "API": {
+          "SUCCESS_MESSAGE": "Unit updated successfully!",
+          "ERROR_MESSAGE": "There was an error updating the unit."
+        }
+      },
+      "FORM": {
+        "NAME": {
+          "LABEL": "Unit Name",
+          "PLACEHOLDER": "e.g. Headquarters",
+          "ERROR": "Name is required"
+        },
+        "INTER_PIX_KEY": {
+          "LABEL": "Pix Key (Inter app)",
+          "PLACEHOLDER": "e.g. 12.345.678/0001-90",
+          "ERROR": "Pix key is required",
+          "HELP_TEXT": "Your Pix key that will receive charges"
+        },
+        "INTER_ACCOUNT_NUMBER": {
+          "LABEL": "Inter Account Number",
+          "PLACEHOLDER": "e.g. 1234567-8",
+          "ERROR": "Account number is required"
+        },
+        "INTER_CLIENT_ID": {
+          "LABEL": "Inter App Client ID",
+          "PLACEHOLDER": ""
+        },
+        "INTER_CLIENT_SECRET": {
+          "LABEL": "Inter App Client Secret",
+          "PLACEHOLDER": ""
+        },
+        "INTER_CERT_CONTENT": {
+          "LABEL": "Certificate Content (.crt)",
+          "PLACEHOLDER": "Paste the .crt file content here...",
+          "UPLOAD_BUTTON": "Import .crt file"
+        },
+        "INTER_KEY_CONTENT": {
+          "LABEL": "Key Content (.key)",
+          "PLACEHOLDER": "Paste the .key file content here...",
+          "UPLOAD_BUTTON": "Import .key file"
+        },
+        "CERT_PRESENT_HELP": "Certificate already configured.",
+        "CANCEL": "Cancel",
+        "SAVE": "Save"
+      }
+    },
     "MODEL_CONFIG": {
       "TITLE": "Model Configuration",
       "DESCRIPTION": "Select AI models for different features.",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/captain.json b/app/javascript/dashboard/i18n/locale/pt_BR/captain.json
new file mode 100644
index 000000000..dc7e77c72
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/captain.json
@@ -0,0 +1,281 @@
+{
+  "CAPTAIN_RESERVATIONS": {
+    "HEADER": "Reservas",
+    "EMPTY": "Nenhuma reserva encontrada.",
+    "VIEW": {
+      "LIST": "Lista",
+      "KANBAN": "Kanban",
+      "REVENUE": "Faturamento"
+    },
+    "FILTERS": {
+      "SEARCH": "Buscar por nome, CPF ou telefone",
+      "STATUS": "Status",
+      "STATUS_ALL": "Todos os status",
+      "UNIT": "Unidade",
+      "UNIT_ALL": "Todas as unidades",
+      "SUITE": "Suíte",
+      "DATE_FROM": "De",
+      "DATE_TO": "Até",
+      "SORT": "Ordenação",
+      "SORT_DEFAULT": "Prioridade operacional",
+      "SORT_CHECK_IN": "Data de check-in",
+      "SORT_UPDATED": "Última atualização",
+      "SORT_CREATED": "Data de criação",
+      "APPLY": "Aplicar filtros",
+      "CLEAR": "Limpar filtros"
+    },
+    "TABLE": {
+      "CUSTOMER": "Cliente",
+      "UNIT": "Unidade",
+      "SUITE": "Suíte",
+      "CHECK_IN": "Check-in",
+      "AMOUNT": "Valor",
+      "STATUS": "Status",
+      "UPDATED_AT": "Atualização",
+      "ACTIONS": "Ações"
+    },
+    "STATUS": {
+      "DRAFT": "Rascunho",
+      "PENDING_PAYMENT": "Aguardando pagamento",
+      "CONFIRMED": "Confirmada",
+      "CANCELLED": "Cancelada"
+    },
+    "ACTIONS": {
+      "OPEN_CONVERSATION": "Abrir conversa",
+      "COPY_PIX": "Copiar Pix"
+    },
+    "KANBAN": {
+      "EMPTY_COLUMN": "Nenhuma reserva neste status."
+    },
+    "REVENUE": {
+      "ONLY_CONFIRMED": "O faturamento considera apenas reservas com status confirmado.",
+      "SUMMARY": {
+        "TOTAL_REVENUE": "Faturamento total",
+        "CONFIRMED_COUNT": "Reservas confirmadas",
+        "AVERAGE_TICKET": "Ticket médio"
+      },
+      "CHARTS": {
+        "BY_UNIT": "Faturamento por unidade",
+        "BY_SUITE": "Faturamento por suíte"
+      },
+      "API": {
+        "ERROR": "Não foi possível carregar o faturamento."
+      }
+    },
+    "SIDEBAR": {
+      "NO_RESERVATION": "Nenhuma reserva vinculada a esta conversa.",
+      "LOADING": "Carregando detalhes da reserva...",
+      "STATUS": "Status",
+      "SUITE": "Suíte",
+      "CHECK_IN": "Check-in",
+      "CHECK_OUT": "Check-out",
+      "AMOUNT": "Valor",
+      "UPDATED_AT": "Atualizado em"
+    },
+    "API": {
+      "PIX_EXPIRED": "O Pix desta reserva expirou.",
+      "PIX_NOT_GENERATED": "O Pix ainda não foi gerado.",
+      "PIX_COPIED": "Pix copiado com sucesso.",
+      "PIX_COPY_FAILED": "Não foi possível copiar o Pix."
+    }
+  },
+  "CAPTAIN_SETTINGS": {
+    "TITLE": "Configurações do Captain",
+    "UNITS": {
+      "TITLE": "Unidades Pix",
+      "DESC": "Gerencie as configurações de diferentes unidades Pix Integradas com Banco Inter.",
+      "ADD_UNIT": "Adicionar Unidade",
+      "EDIT_UNIT": "Editar Unidade",
+      "DELETE_UNIT": "Deletar Unidade",
+      "LIST": {
+        "TABLE_HEADER": [
+          "Pix Key",
+          "Conta",
+          "Certificados",
+          "Monitoramento",
+          "Ações"
+        ],
+        "CERT": "Cert",
+        "KEY": "Key",
+        "PROACTIVE_ON": "Auto-check ligado",
+        "PROACTIVE_OFF": "Auto-check desligado",
+        "SEPARATOR": "|",
+        "ADD_NEW_UNIT": "Adicione uma Unidade Pix",
+        "NO_UNITS_MESSAGE": "Ainda não há nenhuma unidade pix inserida. Crie uma agora para começar a receber pelo pix do Banco Inter."
+      },
+      "DELETE": {
+        "BUTTON_TEXT": "Excluir",
+        "TITLE": "Excluir Unidade Pix",
+        "DESC": "Tem certeza de que deseja excluir esta unidade pix? Esta ação não pode ser desfeita.",
+        "CONFIRM": {
+          "TITLE": "Confirmar Exclusão",
+          "MESSAGE": "Tem certeza que deseja apagar a Unidade?",
+          "YES": "Excluir",
+          "NO": "Cancelar"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Unidade excluída com sucesso.",
+          "ERROR_MESSAGE": "Houve um erro ao tentar excluir a unidade."
+        }
+      },
+      "ADD": {
+        "TITLE": "Nova Unidade Pix",
+        "DESC": "Adicione as credenciais do seu app Banco Inter",
+        "CANCEL_BUTTON_TEXT": "Cancelar",
+        "SUBMIT_BUTTON_TEXT": "Criar unidade",
+        "API": {
+          "SUCCESS_MESSAGE": "Unidade criada com sucesso!",
+          "ERROR_MESSAGE": "Houve um erro ao tentar criar a unidade."
+        }
+      },
+      "EDIT": {
+        "TITLE": "Editar Unidade Pix",
+        "DESC": "Atualize as credenciais do Banco Inter",
+        "CANCEL_BUTTON_TEXT": "Cancelar",
+        "SUBMIT_BUTTON_TEXT": "Salvar unidade",
+        "API": {
+          "SUCCESS_MESSAGE": "Unidade atualizada com sucesso!",
+          "ERROR_MESSAGE": "Houve um erro ao tentar atualizar."
+        }
+      },
+      "FORM": {
+        "NAME": {
+          "LABEL": "Nome da Unidade",
+          "PLACEHOLDER": "Ex: Matriz",
+          "ERROR": "O nome é obrigatório"
+        },
+        "INTER_PIX_KEY": {
+          "LABEL": "Chave Pix (do app Inter)",
+          "PLACEHOLDER": "Ex: 12.345.678/0001-90",
+          "ERROR": "A chave Pix é obrigatória",
+          "HELP_TEXT": "Sua chave Pix que receberá as cobranças"
+        },
+        "INTER_ACCOUNT_NUMBER": {
+          "LABEL": "Número da conta Inter",
+          "PLACEHOLDER": "Ex: 1234567-8",
+          "ERROR": "O número da conta é obrigatório"
+        },
+        "INTER_CLIENT_ID": {
+          "LABEL": "Client ID do App Inter",
+          "PLACEHOLDER": ""
+        },
+        "INTER_CLIENT_SECRET": {
+          "LABEL": "Client Secret do App Inter",
+          "PLACEHOLDER": ""
+        },
+        "INTER_CERT_CONTENT": {
+          "LABEL": "Conteúdo do Certificado (.crt)",
+          "PLACEHOLDER": "Cole o texto contido no arquivo .crt aqui...",
+          "UPLOAD_BUTTON": "Importar arquivo .crt"
+        },
+        "INTER_KEY_CONTENT": {
+          "LABEL": "Conteúdo da Chave (.key)",
+          "PLACEHOLDER": "Cole o texto contido no arquivo .key aqui...",
+          "UPLOAD_BUTTON": "Importar arquivo .key"
+        },
+        "PROACTIVE_PIX_POLLING": {
+          "LABEL": "Confirmação proativa de pagamento (Banco Inter)",
+          "CHECKBOX_LABEL": "Verificar pagamento automaticamente a cada 10 minutos por até 1 hora",
+          "HELP_TEXT": "Quando habilitado, o sistema consulta o Inter de forma proativa para confirmar pagamentos Pix pendentes.",
+          "DISABLED_HELP_TEXT": "Complete as credenciais do Banco Inter (Client ID/Secret, conta, chave Pix, certificado e chave) para habilitar."
+        },
+        "CERT_PRESENT_HELP": "Certificado já configurado.",
+        "CANCEL": "Cancelar",
+        "SAVE": "Salvar"
+      },
+      "INBOX": {
+        "LABEL": "Unidade Pix",
+        "PLACEHOLDER": "Selecione uma unidade",
+        "NO_UNIT": "Nenhuma unidade vinculada",
+        "CONNECT_UNIT_LABEL": "Vincular Unidade Pix",
+        "CONNECT_UNIT_PLACEHOLDER": "Escolha a unidade Inter para este inbox",
+        "CONNECT_UNIT_HELP": "Selecione qual Unidade Pix deve ser usada nesta caixa de entrada."
+      },
+      "TEST": {
+        "HEADER_TITLE": "Validação de Header",
+        "HEADER_DESCRIPTION": "Teste visual para validar carregamento da página.",
+        "BODY_TEXT": "Se esta tela abrir, o problema não está no layout base e sim na tabela ou no Vuex."
+      }
+    },
+    "GALLERY": {
+      "TITLE": "Galeria",
+      "DESC": "Gerencie as fotos de suítes que os subagentes podem enviar para os clientes.",
+      "ADD_ITEM": "Adicionar Foto",
+      "EDIT_ITEM": "Editar",
+      "DELETE_ITEM": "Excluir",
+      "LIST": {
+        "TABLE_HEADER": [
+          "Imagem",
+          "Caixa de entrada e descrição",
+          "Categoria",
+          "Suíte",
+          "Ações"
+        ],
+        "ADD_NEW_ITEM": "Adicione fotos na galeria",
+        "NO_ITEMS_MESSAGE": "Ainda não há fotos cadastradas para envio automático aos clientes."
+      },
+      "DELETE": {
+        "CONFIRM": {
+          "TITLE": "Excluir foto",
+          "MESSAGE": "Tem certeza que deseja excluir esta foto da galeria?",
+          "YES": "Excluir"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Foto excluída com sucesso.",
+          "ERROR_MESSAGE": "Não foi possível excluir a foto."
+        }
+      },
+      "ADD": {
+        "TITLE": "Nova foto da galeria",
+        "DESC": "Cadastre uma foto de suíte e os metadados para busca pelo agente.",
+        "SUBMIT_BUTTON_TEXT": "Salvar foto",
+        "API": {
+          "SUCCESS_MESSAGE": "Foto cadastrada com sucesso!",
+          "ERROR_MESSAGE": "Não foi possível cadastrar a foto."
+        }
+      },
+      "EDIT": {
+        "TITLE": "Editar foto da galeria",
+        "DESC": "Atualize os dados e a imagem da galeria.",
+        "SUBMIT_BUTTON_TEXT": "Salvar alterações",
+        "API": {
+          "SUCCESS_MESSAGE": "Foto atualizada com sucesso!",
+          "ERROR_MESSAGE": "Não foi possível atualizar a foto."
+        }
+      },
+      "FORM": {
+        "INBOX": {
+          "LABEL": "Caixa de entrada",
+          "GLOBAL_OPTION": "Global (todas as caixas)",
+          "HELP": "Selecione a caixa de entrada onde essas fotos podem ser usadas.",
+          "GLOBAL_HELP": "Essas fotos podem ser usadas por agentes em qualquer caixa de entrada.",
+          "SPECIFIC_HELP": "Essas fotos serão usadas somente na caixa de entrada {inbox}."
+        },
+        "SUITE_CATEGORY": {
+          "LABEL": "Categoria da suíte",
+          "PLACEHOLDER": "Ex: Hidromassagem",
+          "ERROR": "A categoria é obrigatória"
+        },
+        "SUITE_NUMBER": {
+          "LABEL": "Número/identificador da suíte",
+          "PLACEHOLDER": "Ex: 101",
+          "ERROR": "O identificador da suíte é obrigatório"
+        },
+        "DESCRIPTION": {
+          "LABEL": "Descrição da foto",
+          "PLACEHOLDER": "Descreva rapidamente o que aparece na imagem",
+          "ERROR": "A descrição é obrigatória"
+        },
+        "IMAGE": {
+          "LABEL": "Imagem",
+          "HELP_TEXT": "Use imagens nítidas. Formatos recomendados: PNG/JPG.",
+          "ERROR": "A imagem é obrigatória",
+          "PREVIEW_ALT": "Pré-visualização da foto"
+        },
+        "ACTIVE": {
+          "LABEL": "Disponível para envio pelos agentes"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
index 99fa128f7..3ab27ef19 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
@@ -372,6 +372,7 @@
       "CONTACT_NOTES": "Notas do contato",
       "CONTACT_ATTRIBUTES": "Atributos do contato",
       "PREVIOUS_CONVERSATION": "Conversas anteriores",
+      "RESERVATION": "Reserva",
       "MACROS": "Macros",
       "LINEAR_ISSUES": "Problemas do Linear vinculados",
       "SHOPIFY_ORDERS": "Shopify Orders"
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
index af22eba1c..b2494fbe6 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
@@ -34,6 +34,9 @@
         "PLACEHOLDER": "Digite o nome da caixa de entrada (ex: Acme Inc)",
         "ERROR": "Por favor, insira um nome completo válido"
       },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Assinar Mensagens"
+      },
       "WEBSITE_NAME": {
         "LABEL": "Nome do site",
         "PLACEHOLDER": "Informe o nome do seu site (por exemplo: Acme Inc)"
@@ -58,11 +61,11 @@
         "DUPLICATE_INBOX_BANNER": "Esta conta do Instagram foi migrada para a nova caixa de entrada de canal do Instagram. Você não poderá mais enviar/receber mensagens do Instagram desta caixa de entrada."
       },
       "TIKTOK": {
-        "CONTINUE_WITH_TIKTOK": "Continuar com TikTok",
-        "CONNECT_YOUR_TIKTOK_PROFILE": "Conecte seu perfil do TikTok",
-        "HELP": "Para adicionar seu perfil do TikTok como um canal, é necessário autenticar seu perfil clicando em 'Continuar com TikTok'. ",
-        "ERROR_MESSAGE": "Ocorreu um erro ao conectar com o TikTok. Tente novamente",
-        "ERROR_AUTH": "Ocorreu um erro ao conectar com o TikTok. Tente novamente"
+        "CONTINUE_WITH_TIKTOK": "Continue with TikTok",
+        "CONNECT_YOUR_TIKTOK_PROFILE": "Connect your TikTok Profile",
+        "HELP": "To add your TikTok profile as a channel, you need to authenticate your TikTok Profile by clicking on 'Continue with TikTok' ",
+        "ERROR_MESSAGE": "There was an error connecting to TikTok, please try again",
+        "ERROR_AUTH": "There was an error connecting to TikTok, please try again"
       },
       "TWITTER": {
         "HELP": "Para adicionar seu perfil do Twitter como um canal, você precisa autenticar seu perfil do Twitter clicando em 'Entrar com o Twitter' ",
@@ -237,10 +240,96 @@
           "WHATSAPP_CLOUD_DESC": "Configuração rápida via Meta",
           "TWILIO_DESC": "Conectar através de credenciais Twilio",
           "360_DIALOG": "360Dialog",
+          "WUZAPI": "Wuzapi",
+          "WUZAPI_DESC": "Conecte sua instância Wuzapi",
           "BAILEYS": "Baileys",
           "BAILEYS_DESC": "Conectar via API não-oficial Baileys",
           "ZAPI": "Z-API",
-          "ZAPI_DESC": "Conectar via API não-oficial Z-API"
+          "ZAPI_DESC": "Conectar via API não-oficial Z-API",
+          "EVOLUTION": "Evolution Go",
+          "EVOLUTION_DESC": "Canal do WhatsApp para atendimento ao cliente"
+        },
+        "CANCEL": "Cancelar",
+        "SUBMIT_BUTTON": "Criar Canal WhatsApp",
+        "WUZAPI": {
+          "BASE_URL": {
+            "LABEL": "URL Base do Wuzapi",
+            "PLACEHOLDER": "https://wuzapi.seudominio.com",
+            "HELP_TEXT": "A URL base onde sua instância Wuzapi está hospedada"
+          },
+          "ADMIN_TOKEN": {
+            "LABEL": "Token de Admin",
+            "PLACEHOLDER": "Seu Token de Admin do Wuzapi"
+          },
+          "AUTO_CREATE_USER": {
+            "LABEL": "Criar usuário Wuzapi automaticamente"
+          }
+        },
+        "EVOLUTION": {
+          "TITLE": "Configuração Evolution Go",
+          "ASTERISK": "*",
+          "API_URL": {
+            "LABEL": "URL da API",
+            "PLACEHOLDER": "Ex: https://api.suaempresa.com"
+          },
+          "API_TOKEN": {
+            "LABEL": "Token da API (Admin)",
+            "PLACEHOLDER": "Insira o token global ou da instância"
+          },
+          "DISPLAY_NAME": {
+            "LABEL": "Nome de Exibição",
+            "PLACEHOLDER": "Ex: Suporte ao Cliente",
+            "HELP_TEXT": "Nome amigável para identificação"
+          },
+          "CHANNEL_NAME": {
+            "LABEL": "Nome do Canal",
+            "PLACEHOLDER": "Ex: suporte-whatsapp",
+            "HELP_TEXT": "Gerado automaticamente do nome de exibição"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Número do WhatsApp",
+            "PLACEHOLDER": "Ex: 11999999999"
+          },
+          "TEST_CONNECTION": "Testar Conexão",
+          "TEST_CONNECTION_BANNER": "Por favor, teste a conexão antes de prosseguir.",
+          "CONNECT_SUCCESS": "Conectado com sucesso!",
+          "CONNECT_ERROR": "Erro ao conectar. Verifique as credenciais.",
+          "STATUS": {
+            "TITLE": "Status da Conexão",
+            "CONNECTED": "Conectado",
+            "DISCONNECTED": "Desconectado",
+            "CONNECTING": "Conectando...",
+            "WAITING_QR": "Aguardando QR Code...",
+            "SCAN_QR": "Escaneie o QR Code abaixo"
+          },
+          "ACTIONS": {
+            "RECONNECT": "Reconectar",
+            "DISCONNECT": "Desconectar"
+          },
+          "INSTANCE_SETTINGS": {
+            "TITLE": "Configurações da Instância",
+            "ALWAYS_ONLINE": "Sempre Online",
+            "REJECT_CALLS": "Rejeitar Chamadas",
+            "READ_MESSAGES": "Marcar como Lida",
+            "IGNORE_GROUPS": "Ignorar Grupos",
+            "IGNORE_STATUS": "Ignorar Status"
+          },
+          "HELP": {
+            "TITLE": "Como funciona?",
+            "HELP_TEXT_1": "O Evolution API é um provedor premium que oferece alta estabilidade para conexões de WhatsApp.",
+            "BRAZIL_FLAG": "🇧🇷",
+            "ICON_INFO": "ℹ️",
+            "ICON_STAR": "⭐",
+            "ICON_ROCKET": "🚀",
+            "ICON_SHIELD": "🛡️",
+            "ICON_SYNC": "🔄",
+            "ICON_CHART": "📊",
+            "ICON_WARNING": "⚠️",
+            "FEATURE_1": "Conexão ultra rápida e estável",
+            "FEATURE_2": "Criptografia de ponta a ponta",
+            "FEATURE_3": "Sincronização automática em tempo real",
+            "FEATURE_4": "Relatórios de status de entrega"
+          }
         },
         "SELECT_PROVIDER": {
           "TITLE": "Selecione seu provedor de API",
@@ -248,7 +337,17 @@
           "ZAPI_PROMO": {
             "TITLE": "Procurando uma solução WhatsApp confiável?",
             "DESCRIPTION": "Z-API oferece estabilidade superior comparado ao Baileys e é muito mais simples de configurar que Cloud ou Twilio - sem necessidade de configuração complexa. Perfeito para empresas que querem começar rapidamente.",
-            "CTA": "Usar Z-API"
+            "CTA": "Usar Z-API",
+            "SWITCH_BANNER": {
+              "TITLE": "Considere mudar para Z-API para configuração mais fácil",
+              "DESCRIPTION": "Z-API fornece uma conexão mais estável que Baileys e requer menos configuração que Cloud/Twilio. Mude para uma integração WhatsApp sem complicações.",
+              "CTA": "Mudar para Z-API"
+            },
+            "SETUP_BANNER": {
+              "TITLE": "Ganhe 10% de desconto na sua assinatura Z-API",
+              "DESCRIPTION": "Crie sua conta Z-API usando nosso link de afiliado e receba 10% de desconto. Configuração simples, conexões confiáveis e ótimo suporte.",
+              "CTA": "Criar Conta Z-API"
+            }
           }
         },
         "INBOX_NAME": {
@@ -324,45 +423,6 @@
             "DISCONNECT": "Desconectar",
             "CONNECTED": "Seu dispositivo foi conectado com sucesso. Agora você pode começar a enviar e receber mensagens."
           }
-        },
-        "SUBMIT_BUTTON": "Criar canal do WhatsApp",
-        "EMBEDDED_SIGNUP": {
-          "TITLE": "Configuração rápida com Meta",
-          "DESC": "Use o fluxo de inscrição incorporada do WhatsApp para conectar rapidamente novos números. Você será redirecionado para a Meta para entrar na sua conta do WhatsApp Business. Ter acesso de administrador ajudará a tornar a configuração simples e fácil.",
-          "BENEFITS": {
-            "TITLE": "Benefícios da inscrição incorporada:",
-            "EASY_SETUP": "Nenhuma configuração manual é necessária",
-            "SECURE_AUTH": "Autenticação segura baseada em OAuth",
-            "AUTO_CONFIG": "Configuração automática de webhook e número de telefone"
-          },
-          "LEARN_MORE": {
-            "TEXT": "Para saber mais sobre a inscrição integrada, preços e limitações, visite {link}.",
-            "LINK_TEXT": "este link"
-          },
-          "SUBMIT_BUTTON": "Conecte-se com WhatsApp Business",
-          "AUTH_PROCESSING": "Autenticando com Meta",
-          "WAITING_FOR_BUSINESS_INFO": "Por favor, complete a configuração do negócio na janela da Meta...",
-          "PROCESSING": "Configurando sua conta do WhatsApp Business",
-          "LOADING_SDK": "Carregando SDK do Facebook...",
-          "CANCELLED": "A inscrição no WhatsApp foi cancelada",
-          "SUCCESS_TITLE": "Conta do WhatsApp Business conectada!",
-          "WAITING_FOR_AUTH": "Aguardando autenticação...",
-          "INVALID_BUSINESS_DATA": "Dados de negócio inválidos recebidos do Facebook. Por favor, tente novamente.",
-          "SIGNUP_ERROR": "Ocorreu um erro no cadastro",
-          "AUTH_NOT_COMPLETED": "Autenticação não concluída. Por favor, reinicie o processo.",
-          "SUCCESS_FALLBACK": "A conta do WhatsApp Business foi configurada com sucesso",
-          "MANUAL_FALLBACK": "Se o seu número já estiver conectado à Plataforma WhatsApp Business (API) ou se você for um provedor de tecnologia integrando o seu próprio número, use o fluxo de {link}",
-          "MANUAL_LINK_TEXT": "fluxo de configuração manual"
-        },
-        "ZAPI_PROMO": {
-          "SETUP_BANNER": {
-            "TITLE": "Ganhe 10% de desconto na sua assinatura Z-API",
-            "DESCRIPTION": "Crie sua conta Z-API usando nosso link de afiliado e receba 10% de desconto. Configuração simples, conexões confiáveis e ótimo suporte.",
-            "CTA": "Criar Conta Z-API"
-          }
-        },
-        "API": {
-          "ERROR_MESSAGE": "Não foi possível salvar o canal do WhatsApp"
         }
       },
       "VOICE": {
@@ -442,10 +502,10 @@
           "ERROR_MESSAGE": "Não foi possível salvar o canal de e-mail"
         },
         "FINISH_MESSAGE": "Comece a encaminhar seus e-mails para o seguinte endereço de e-mail.",
-        "FINISH_MESSAGE_NO_FORWARDING": "Sua caixa de entrada de e-mail foi criada com sucesso! É necessário configurar as credenciais de SMTP e IMAP para enviar e receber e-mails. Sem essas configurações, nenhum e-mail será processado.",
-        "FORWARDING_ADDRESS_LABEL": "Encaminhe os e-mails para este endereço:",
+        "FINISH_MESSAGE_NO_FORWARDING": "Your email inbox has been created successfully! You need to configure SMTP and IMAP credentials to send and receive emails. Without these settings, no emails will be processed.",
+        "FORWARDING_ADDRESS_LABEL": "Forward emails to this address:",
         "CONFIGURE_SMTP_IMAP_LINK": "Clique aqui",
-        "CONFIGURE_SMTP_IMAP_TEXT": " para configurar IMAP e SMTP"
+        "CONFIGURE_SMTP_IMAP_TEXT": " to configure IMAP and SMTP settings"
       },
       "LINE_CHANNEL": {
         "TITLE": "Canal LINE",
@@ -533,7 +593,7 @@
           },
           "TIKTOK": {
             "TITLE": "TikTok",
-            "DESCRIPTION": "Conecte sua conta do TikTok"
+            "DESCRIPTION": "Connect your TikTok account"
           },
           "VOICE": {
             "TITLE": "Voz",
@@ -637,6 +697,28 @@
         "ENABLED": "Ativado",
         "DISABLED": "Desativado"
       },
+      "WUZAPI": {
+        "CONNECTED": "Wuzapi Conectado",
+        "CONNECTED_DESC": "Sua caixa de entrada Wuzapi está conectada e pronta para enviar/receber mensagens.",
+        "DISCONNECT": "Desconectar",
+        "DISCONNECT_SUCCESS": "Desconectado com sucesso",
+        "DISCONNECT_ERROR": "Erro ao desconectar",
+        "SCAN_QR": "Escaneie o QR Code com seu WhatsApp",
+        "LOADING_QR": "Carregando QR Code...",
+        "CONNECT": "Conectar WhatsApp",
+        "CONNECT_DESC": "Clique abaixo para iniciar o processo de conexão"
+      },
+      "EVOLUTION": {
+        "CONNECTED": "Evolution Go Conectado",
+        "CONNECTED_DESC": "Sua caixa de entrada Evolution Go está conectada e pronta para enviar/receber mensagens.",
+        "DISCONNECT": "Desconectar",
+        "DISCONNECT_SUCCESS": "Desconectado com sucesso",
+        "DISCONNECT_ERROR": "Erro ao desconectar",
+        "SCAN_QR": "Escaneie o QR Code com seu WhatsApp",
+        "LOADING_QR": "Carregando QR Code...",
+        "CONNECT": "Conectar WhatsApp",
+        "CONNECT_DESC": "Clique abaixo para iniciar o processo de conexão"
+      },
       "ENABLE_CONTINUITY_VIA_EMAIL": {
         "ENABLED": "Ativado",
         "DISABLED": "Desativado"
@@ -742,6 +824,7 @@
       "USE_INBOX_AVATAR_FOR_BOT": "Use o nome da caixa de entrada e avatar do bot"
     },
     "SETTINGS_POPUP": {
+      "MESSENGER_CONFIG": "Configuração do Messenger",
       "MESSENGER_HEADING": "Código Menssageiro <scripit>",
       "MESSENGER_SUB_HEAD": "Favor, insira essse código <script> dentro da tag Body de sua página html",
       "ALLOWED_DOMAINS": {
@@ -775,7 +858,7 @@
       "INBOX_IDENTIFIER_SUB_TEXT": "Use o token 'inbox_identifier' mostrado aqui para autenticar os seus clientes API.",
       "FORWARD_EMAIL_TITLE": "Encaminhar para o E-mail",
       "FORWARD_EMAIL_SUB_TEXT": "Comece a encaminhar seus e-mails para o seguinte endereço de e-mail.",
-      "FORWARD_EMAIL_NOT_CONFIGURED": "O encaminhamento de e-mails para sua caixa de entrada está desativado nesta instalação. Para utilizar esse recurso, ele deve ser habilitado pelo administrador. Entre em contato com um para prosseguir.",
+      "FORWARD_EMAIL_NOT_CONFIGURED": "Forwarding emails to your inbox is currently disabled on this installation. To use this feature, it must be enabled by your administrator. Please get in touch with them to proceed.",
       "ALLOW_MESSAGES_AFTER_RESOLVED": "Permitir mensagens após a resolução da conversa",
       "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Permite que os usuários finais enviem mensagens mesmo depois que a conversa for resolvida.",
       "WHATSAPP_SECTION_SUBHEADER": "Esta chave de API é usada para a integração com as APIs do WhatsApp.",
@@ -805,29 +888,7 @@
       "WHATSAPP_TEMPLATES_SYNC_SUBHEADER": "Sincronize manualmente os modelos de mensagens do WhatsApp para atualizar seus modelos disponíveis.",
       "WHATSAPP_TEMPLATES_SYNC_BUTTON": "Sincronizar Modelos",
       "WHATSAPP_TEMPLATES_SYNC_SUCCESS": "Sincronização de modelos iniciada com sucesso. Pode demorar alguns minutos para atualizar.",
-      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Atualizar configurações do Formulário Pre Chat",
-      "WHATSAPP_MANAGE_PROVIDER_CONNECTION_TITLE": "Gerenciar Conexão do Provedor",
-      "WHATSAPP_MANAGE_PROVIDER_CONNECTION_SUBHEADER": "Conecte o seu dispositivo e gerencie a conexão do provedor.",
-      "WHATSAPP_MANAGE_PROVIDER_CONNECTION_BUTTON": "Gerenciar conexão",
-      "WHATSAPP_PROVIDER_URL_TITLE": "URL do provedor",
-      "WHATSAPP_PROVIDER_URL_SUBHEADER": "Se o provedor não estiver rodando localmente, por favor, forneça a URL.",
-      "WHATSAPP_PROVIDER_URL_PLACEHOLDER": "Digite a URL do provedor",
-      "WHATSAPP_PROVIDER_URL_ERROR": "Por favor, insira uma URL válida",
-      "WHATSAPP_MARK_AS_READ_TITLE": "Confirmações de leitura",
-      "WHATSAPP_MARK_AS_READ_SUBHEADER": "Se essa opção estiver desativada, ao visualizar uma mensagem pelo Chatwoot, não será enviada uma confirmação de leitura para o remetente. As suas mensagens ainda poderão receber confirmações de leitura.",
-      "WHATSAPP_MARK_AS_READ_LABEL": "Enviar confirmações de leitura",
-      "WHATSAPP_INSTANCE_ID_TITLE": "ID da Instância",
-      "WHATSAPP_INSTANCE_ID_SUBHEADER": "Seu ID da Instância Z-API.",
-      "WHATSAPP_INSTANCE_ID_UPDATE_TITLE": "Atualizar ID da Instância",
-      "WHATSAPP_INSTANCE_ID_UPDATE_SUBHEADER": "Digite o novo ID da Instância aqui",
-      "WHATSAPP_TOKEN_TITLE": "Token",
-      "WHATSAPP_TOKEN_SUBHEADER": "Seu Token da Instância Z-API.",
-      "WHATSAPP_TOKEN_UPDATE_TITLE": "Atualizar Token",
-      "WHATSAPP_TOKEN_UPDATE_SUBHEADER": "Digite o novo Token aqui",
-      "WHATSAPP_CLIENT_TOKEN_TITLE": "Token de Segurança",
-      "WHATSAPP_CLIENT_TOKEN_SUBHEADER": "Seu Token de Segurança Z-API (veja a aba Segurança no painel do Z-API).",
-      "WHATSAPP_CLIENT_TOKEN_UPDATE_TITLE": "Atualizar Token de Segurança",
-      "WHATSAPP_CLIENT_TOKEN_UPDATE_SUBHEADER": "Digite o novo Token de Segurança aqui"
+      "UPDATE_PRE_CHAT_FORM_SETTINGS": "Atualizar configurações do Formulário Pre Chat"
     },
     "HELP_CENTER": {
       "LABEL": "Centro de Ajuda",
@@ -883,61 +944,6 @@
         "LABEL": "Mensagem",
         "PLACEHOLDER": "Digite uma mensagem para mostrar aos usuários com o formulário"
       },
-      "BUTTON_TEXT": {
-        "LABEL": "Texto do botão",
-        "PLACEHOLDER": "Por favor, avalie-nos"
-      },
-      "LANGUAGE": {
-        "LABEL": "Idioma",
-        "PLACEHOLDER": "Selecione o idioma do modelo"
-      },
-      "MESSAGE_PREVIEW": {
-        "LABEL": "Pré-visualização da mensagem",
-        "TOOLTIP": "Isso pode variar ligeiramente quando exibido na plataforma do WhatsApp."
-      },
-      "TEMPLATE_STATUS": {
-        "APPROVED": "Aprovado pelo WhatsApp",
-        "PENDING": "Aguardando aprovação do WhatsApp",
-        "REJECTED": "A Meta rejeitou o modelo",
-        "DEFAULT": "Precisa de aprovação do WhatsApp",
-        "NOT_FOUND": "O modelo não existe na plataforma da Meta."
-      },
-      "TEMPLATE_CREATION": {
-        "SUCCESS_MESSAGE": "Modelo do WhatsApp criado com sucesso e enviado para aprovação",
-        "ERROR_MESSAGE": "Falha ao criar o modelo do WhatsApp"
-      },
-      "TEMPLATE_MODE": {
-        "LABEL": "Origem do modelo",
-        "CREATE_NEW": "Criar novo modelo",
-        "USE_EXISTING": "Usar modelo existente"
-      },
-      "EXISTING_TEMPLATE": {
-        "LABEL": "Selecionar modelo",
-        "PLACEHOLDER": "Selecione um modelo aprovado",
-        "SYNC_BUTTON": "Sincronizar modelos",
-        "SYNCING": "Sincronizando...",
-        "EMPTY_STATE": "Nenhum modelo compatível encontrado. Os modelos devem ter um botão de URL com um parâmetro dinâmico.",
-        "LINK_SUCCESS": "Modelo vinculado com sucesso",
-        "LINK_ERROR": "Falha ao vincular o modelo",
-        "LOADING": "Carregando modelos...",
-        "USING_LABEL": "Usando modelo existente: {name}",
-        "SYNC_ERROR": "Falha ao sincronizar modelos. Por favor, tente novamente."
-      },
-      "TEMPLATE_VARIABLES": {
-        "TITLE": "Variáveis do modelo",
-        "DESCRIPTION": "Defina os valores para as variáveis do corpo do modelo. Você pode usar variáveis dinâmicas como {'{{'} contact.name {'}}'} que serão resolvidas no momento do envio.",
-        "VARIABLE_LABEL": "Variável {variable}",
-        "VARIABLE_PLACEHOLDER": "Insira o valor para {variable}",
-        "VARIABLE_REQUIRED": "Esta variável é obrigatória",
-        "VALIDATION_ERROR": "Por favor, defina todas as variáveis do modelo antes de salvar.",
-        "INSERT_VARIABLE": "Inserir variável"
-      },
-      "TEMPLATE_UPDATE_DIALOG": {
-        "TITLE": "Editar detalhes da pesquisa",
-        "DESCRIPTION": "Vamos excluir o modelo anterior e criar um que será enviado novamente para aprovação do WhatsApp",
-        "CONFIRM": "Criar novo modelo",
-        "CANCEL": "Voltar atrás"
-      },
       "SURVEY_RULE": {
         "LABEL": "Regra de pesquisa",
         "DESCRIPTION_PREFIX": "Enviar a pesquisa se a conversa",
@@ -949,7 +955,6 @@
         "SELECT_PLACEHOLDER": "selecionar etiquetas"
       },
       "NOTE": "Nota: pesquisas de CSAT são enviadas apenas uma vez por conversa",
-      "WHATSAPP_NOTE": "Nota: Você pode criar um novo modelo (que será enviado para aprovação do WhatsApp) ou usar um modelo aprovado existente do seu gerenciador de modelos da Meta. As pesquisas são enviadas apenas uma vez por conversa, conforme a regra da pesquisa.",
       "API": {
         "SUCCESS_MESSAGE": "Configurações de CSAT atualizadas com sucesso",
         "ERROR_MESSAGE": "Não foi possível atualizar as configurações do CSAT. Por favor, tente novamente mais tarde."
@@ -1145,8 +1150,6 @@
       "TWITTER_PROFILE": "Twitter",
       "TWILIO_SMS": "SMS Twilio",
       "WHATSAPP": "WhatsApp",
-      "WHATSAPP_BAILEYS": "WhatsApp - Baileys",
-      "WHATSAPP_ZAPI": "WhatsApp - Z-API",
       "SMS": "SMS",
       "EMAIL": "e-mail",
       "TELEGRAM": "Telegram",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/index.js b/app/javascript/dashboard/i18n/locale/pt_BR/index.js
index 213387d0c..5fe57020b 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/index.js
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/index.js
@@ -7,6 +7,7 @@ import automation from './automation.json';
 import bulkActions from './bulkActions.json';
 import campaign from './campaign.json';
 import cannedMgmt from './cannedMgmt.json';
+import captain from './captain.json';
 import chatlist from './chatlist.json';
 import components from './components.json';
 import contact from './contact.json';
@@ -23,6 +24,7 @@ import inbox from './inbox.json';
 import inboxMgmt from './inboxMgmt.json';
 import integrationApps from './integrationApps.json';
 import integrations from './integrations.json';
+import jasmine from './jasmine.json';
 import labelsMgmt from './labelsMgmt.json';
 import login from './login.json';
 import macros from './macros.json';
@@ -46,6 +48,7 @@ export default {
   ...bulkActions,
   ...campaign,
   ...cannedMgmt,
+  ...captain,
   ...chatlist,
   ...components,
   ...contact,
@@ -62,6 +65,7 @@ export default {
   ...inboxMgmt,
   ...integrationApps,
   ...integrations,
+  ...jasmine,
   ...labelsMgmt,
   ...login,
   ...macros,
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/jasmine.json b/app/javascript/dashboard/i18n/locale/pt_BR/jasmine.json
new file mode 100644
index 000000000..0b413c391
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/jasmine.json
@@ -0,0 +1,84 @@
+{
+  "JASMINE": {
+    "HEADER": {
+      "TITLE": "Agentes de IA Jasmine",
+      "DESCRIPTION": "Gerencie seus agentes de IA SDR. Selecione uma caixa de entrada para configurar sua base de conhecimento.",
+      "EMPTY": "Nenhuma caixa de entrada encontrada"
+    },
+    "CONFIG": {
+      "TITLE": "Configuração da IA Jasmine",
+      "DESCRIPTION": "Configure o agente de IA para esta caixa de entrada.",
+      "ENABLE": "Ativar Agente de IA Jasmine",
+      "SYSTEM_PROMPT": "Prompt do Sistema",
+      "SYSTEM_PROMPT_HELP": "Defina a persona e as regras de comportamento para o agente.",
+      "TYPING_DELAY_LABEL": "Buffer / Delay de Digitação (Segundos)",
+      "TYPING_DELAY_PLACEHOLDER": "Ex: 5",
+      "TYPING_DELAY_HELP": "O tempo que a IA aguardará mensagens (Buffer) antes de simular a digitação e responder. Zero para imediato.",
+      "UPDATE_BUTTON": "Atualizar Configuração"
+    },
+    "KNOWLEDGE_BASE": {
+      "TITLE": "Base de Conhecimento",
+      "DESCRIPTION": "Gerencie coleções de conhecimento para esta caixa de entrada",
+      "ADD_BUTTON": "+ Nova Coleção",
+      "DOCUMENTS": "Documentos",
+      "LOADING_DOCS": "Carregando documentos...",
+      "UNTITLED_DOC": "Documento sem título",
+      "NO_DOCS": "Nenhum documento ainda. Adicione seu primeiro documento abaixo.",
+      "ADD_DOC_HEADER": "Adicionar Novo Documento",
+      "DOC_TITLE_PLACEHOLDER": "Título do documento (opcional)",
+      "DOC_CONTENT_PLACEHOLDER": "Cole ou digite seu conteúdo de conhecimento aqui...",
+      "ADD_DOC_BUTTON": "Adicionar Documento",
+      "NO_COLLECTIONS": "Nenhuma coleção ainda. Crie uma para começar.",
+      "CREATE_MODAL": {
+        "TITLE": "Criar Coleção",
+        "NAME_PLACEHOLDER": "Nome da coleção",
+        "VISIBILITY_PRIVATE": "Privada (Apenas esta caixa de entrada)",
+        "VISIBILITY_SHARED": "Compartilhada (Todas as caixas de entrada)",
+        "CANCEL": "Cancelar",
+        "CREATE": "Criar"
+      },
+      "DELETE_CONFIRM": "Tem certeza de que deseja excluir este documento?",
+      "DOCUMENT_DELETE_SUCCESS": "Documento excluído com sucesso",
+      "COLLECTION_DELETE_SUCCESS": "Coleção excluída com sucesso",
+      "SAVE_SUCCESS": "Alterações salvas com sucesso",
+      "DOCUMENT_CREATE_SUCCESS": "Documento criado com sucesso",
+      "COLLECTION_CREATE_SUCCESS": "Coleção criada com sucesso"
+    },
+    "PLAYGROUND": {
+      "TITLE": "Playground da IA Jasmine",
+      "DESCRIPTION": "Teste as respostas da Jasmine em tempo real antes de ativar para os clientes.",
+      "SELECT_INBOX": "Selecione uma Caixa de Entrada para testar",
+      "CHOOSE_INBOX": "Escolha uma caixa de entrada...",
+      "WARNING": "Certifique-se de que a Jasmine está ativada e configurada para esta caixa de entrada",
+      "EMPTY_STATE_TITLE": "Envie uma mensagem para testar a Jasmine",
+      "EMPTY_STATE_EXAMPLES": "Tente: \"Olá\", \"Quanto custa?\", \"Como funciona?\"",
+      "LOADING": "Jasmine está pensando...",
+      "INPUT_PLACEHOLDER": "Digite uma mensagem de teste...",
+      "CLEAR_TOOLTIP": "Limpar conversa",
+      "NO_INBOX_SELECTED": "Selecione uma caixa de entrada acima para começar a testar"
+    },
+    "INBOX_LIST": {
+      "ACTIVE": "Ativo",
+      "CONFIGURE": "Configurar",
+      "DESCRIPTION": "Canal {channel} configurado para IA Jasmine"
+    },
+    "WUZAPI": {
+      "STATUS": "Status: {status}",
+      "ACCOUNT_ERROR": "Erro: ID da conta não carregado. Por favor, atualize a página.",
+      "CONNECT_FALLBACK": "Clique para iniciar a conexão",
+      "CONNECT_BUTTON_FALLBACK": "Conectar WhatsApp",
+      "WEBHOOK_SECTION": "Configuração de Webhook",
+      "GET_WEBHOOK_INFO": "Obter informações de Webhook",
+      "UPDATE_WEBHOOK": "Atualizar conexão de Webhook"
+    },
+    "EVOLUTION": {
+      "STATUS": "Status: {status}",
+      "ACCOUNT_ERROR": "Erro: ID da instância não encontrado. Verifique sua configuração.",
+      "CONNECT_FALLBACK": "Clique para iniciar a conexão",
+      "CONNECT_BUTTON_FALLBACK": "Conectar WhatsApp",
+      "WEBHOOK_SECTION": "Configuração de Webhook",
+      "GET_WEBHOOK_INFO": "Obter informações de Webhook",
+      "UPDATE_WEBHOOK": "Atualizar conexão de Webhook"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
index 665081c6f..5b8d76209 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
@@ -339,6 +339,9 @@
     "CAPTAIN_PLAYGROUND": "Playground",
     "CAPTAIN_INBOXES": "Caixas de Entrada",
     "CAPTAIN_SETTINGS": "Configurações",
+    "CAPTAIN_PIX_UNITS": "Unidades Pix",
+    "CAPTAIN_GALLERY": "Galeria",
+    "CAPTAIN_RESERVATIONS": "Reservas",
     "HOME": "Principal",
     "AGENTS": "Agentes",
     "AGENT_BOTS": "Robôs",
diff --git a/app/javascript/dashboard/routes/dashboard/captain/captain.routes.js b/app/javascript/dashboard/routes/dashboard/captain/captain.routes.js
index 4bc11ba1c..f3090b77d 100644
--- a/app/javascript/dashboard/routes/dashboard/captain/captain.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/captain/captain.routes.js
@@ -16,6 +16,7 @@ import DocumentsIndex from './documents/Index.vue';
 import ResponsesIndex from './responses/Index.vue';
 import ResponsesPendingIndex from './responses/Pending.vue';
 import CustomToolsIndex from './tools/Index.vue';
+import ReservationsIndex from './reservations/Index.vue';
 
 const meta = {
   permissions: ['administrator', 'agent'],
@@ -130,4 +131,10 @@ export const routes = [
     },
     children: [...assistantRoutes],
   },
+  {
+    path: frontendURL('accounts/:accountId/captain/reservations'),
+    component: ReservationsIndex,
+    name: 'captain_reservations_index',
+    meta,
+  },
 ];
diff --git a/app/javascript/dashboard/routes/dashboard/captain/reservations/Index.vue b/app/javascript/dashboard/routes/dashboard/captain/reservations/Index.vue
new file mode 100644
index 000000000..d75852367
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/captain/reservations/Index.vue
@@ -0,0 +1,626 @@
+<script setup>
+import { computed, onMounted, ref } from 'vue';
+import { useRouter, useRoute } from 'vue-router';
+import { useStore, useMapGetter } from 'dashboard/composables/store';
+import { useAlert } from 'dashboard/composables';
+import { useI18n } from 'vue-i18n';
+import { FEATURE_FLAGS } from 'dashboard/featureFlags';
+import { frontendURL, conversationUrl } from 'dashboard/helper/URLHelper';
+
+import PageLayout from 'dashboard/components-next/captain/PageLayout.vue';
+import Button from 'dashboard/components-next/button/Button.vue';
+import Input from 'dashboard/components-next/input/Input.vue';
+import Spinner from 'dashboard/components-next/spinner/Spinner.vue';
+import BarChart from 'shared/components/charts/BarChart.vue';
+
+const store = useStore();
+const route = useRoute();
+const router = useRouter();
+const { t } = useI18n();
+
+const uiFlags = useMapGetter('captainReservations/getUIFlags');
+const reservations = useMapGetter('captainReservations/getRecords');
+const reservationsMeta = useMapGetter('captainReservations/getMeta');
+const units = useMapGetter('captainUnits/getUnits');
+
+const isFetching = computed(() => uiFlags.value.fetchingList);
+const viewMode = ref('list');
+
+const status = ref('all');
+const q = ref('');
+const dateFrom = ref('');
+const dateTo = ref('');
+const unitId = ref('');
+const suite = ref('');
+const sort = ref('');
+const isFetchingRevenue = ref(false);
+
+const emptyRevenue = () => ({
+  summary: {
+    total_revenue: 0,
+    confirmed_count: 0,
+    average_ticket: 0,
+  },
+  by_unit: [],
+  by_suite: [],
+});
+
+const revenue = ref(emptyRevenue());
+const isRevenueView = computed(() => viewMode.value === 'revenue');
+const isPageFetching = computed(
+  () => isFetching.value || isFetchingRevenue.value
+);
+const hasRevenueData = computed(
+  () => Number(revenue.value.summary?.confirmed_count || 0) > 0
+);
+
+const statusOptions = computed(() => [
+  { id: 'all', label: 'CAPTAIN_RESERVATIONS.FILTERS.STATUS_ALL' },
+  { id: 'draft', label: 'CAPTAIN_RESERVATIONS.STATUS.DRAFT' },
+  {
+    id: 'pending_payment',
+    label: 'CAPTAIN_RESERVATIONS.STATUS.PENDING_PAYMENT',
+  },
+  { id: 'confirmed', label: 'CAPTAIN_RESERVATIONS.STATUS.CONFIRMED' },
+  { id: 'cancelled', label: 'CAPTAIN_RESERVATIONS.STATUS.CANCELLED' },
+]);
+
+const groupedReservations = computed(() => {
+  const groups = {
+    draft: [],
+    pending_payment: [],
+    confirmed: [],
+    cancelled: [],
+  };
+
+  reservations.value.forEach(reservation => {
+    const key = reservation.ui_status || 'draft';
+    if (!groups[key]) groups[key] = [];
+    groups[key].push(reservation);
+  });
+
+  return groups;
+});
+
+const readFiltersFromRoute = () => {
+  const query = route.query || {};
+  status.value = query.status || 'all';
+  q.value = query.q || '';
+  dateFrom.value = query.date_from || '';
+  dateTo.value = query.date_to || '';
+  unitId.value = query.unit_id || '';
+  suite.value = query.suite || '';
+  sort.value = query.sort || '';
+  viewMode.value = ['kanban', 'revenue'].includes(query.view)
+    ? query.view
+    : 'list';
+};
+
+const buildQuery = (page = 1) => ({
+  status: status.value,
+  q: q.value || undefined,
+  date_from: dateFrom.value || undefined,
+  date_to: dateTo.value || undefined,
+  unit_id: unitId.value || undefined,
+  suite: suite.value || undefined,
+  sort: sort.value || undefined,
+  page,
+  per_page: 25,
+});
+
+const buildRevenueQuery = () => ({
+  q: q.value || undefined,
+  date_from: dateFrom.value || undefined,
+  date_to: dateTo.value || undefined,
+  unit_id: unitId.value || undefined,
+  suite: suite.value || undefined,
+});
+
+const syncRouteQuery = (page = 1) => {
+  const query = {
+    q: q.value || undefined,
+    date_from: dateFrom.value || undefined,
+    date_to: dateTo.value || undefined,
+    unit_id: unitId.value || undefined,
+    suite: suite.value || undefined,
+    status: isRevenueView.value ? undefined : status.value,
+    sort: isRevenueView.value ? undefined : sort.value || undefined,
+    page: isRevenueView.value ? undefined : page,
+    per_page: isRevenueView.value ? undefined : 25,
+    view: viewMode.value === 'list' ? undefined : viewMode.value,
+  };
+  router.replace({ query });
+};
+
+const fetchReservations = (page = 1) => {
+  syncRouteQuery(page);
+  store.dispatch('captainReservations/get', buildQuery(page));
+};
+
+const fetchRevenue = async () => {
+  syncRouteQuery();
+  isFetchingRevenue.value = true;
+  try {
+    const data = await store.dispatch(
+      'captainReservations/fetchRevenue',
+      buildRevenueQuery()
+    );
+    revenue.value = data?.summary ? data : emptyRevenue();
+  } catch (error) {
+    revenue.value = emptyRevenue();
+    useAlert(t('CAPTAIN_RESERVATIONS.REVENUE.API.ERROR'));
+  } finally {
+    isFetchingRevenue.value = false;
+  }
+};
+
+const setViewMode = mode => {
+  if (viewMode.value === mode) return;
+  viewMode.value = mode;
+  if (mode === 'revenue') {
+    fetchRevenue();
+    return;
+  }
+  fetchReservations(1);
+};
+
+const onPageChange = page => fetchReservations(page);
+
+const applyFilters = () => {
+  if (isRevenueView.value) {
+    fetchRevenue();
+    return;
+  }
+  fetchReservations(1);
+};
+
+const clearFilters = () => {
+  status.value = 'all';
+  q.value = '';
+  dateFrom.value = '';
+  dateTo.value = '';
+  unitId.value = '';
+  suite.value = '';
+  sort.value = '';
+  if (isRevenueView.value) {
+    fetchRevenue();
+    return;
+  }
+  fetchReservations(1);
+};
+
+const openConversation = reservation => {
+  const conversationId =
+    reservation.conversation_display_id || reservation.conversation_id;
+  if (!conversationId) return;
+  const path = frontendURL(
+    conversationUrl({
+      accountId: route.params.accountId,
+      id: conversationId,
+    })
+  );
+  router.push(path);
+};
+
+const copyPix = async reservation => {
+  const pix = reservation.pix_copy_paste;
+  if (!pix) {
+    useAlert(
+      reservation.pix_reason === 'expired'
+        ? t('CAPTAIN_RESERVATIONS.API.PIX_EXPIRED')
+        : t('CAPTAIN_RESERVATIONS.API.PIX_NOT_GENERATED')
+    );
+    return;
+  }
+
+  try {
+    await navigator.clipboard.writeText(pix);
+    useAlert(t('CAPTAIN_RESERVATIONS.API.PIX_COPIED'));
+  } catch (error) {
+    useAlert(t('CAPTAIN_RESERVATIONS.API.PIX_COPY_FAILED'));
+  }
+};
+
+const formatMoney = value =>
+  new Intl.NumberFormat('pt-BR', { style: 'currency', currency: 'BRL' }).format(
+    Number(value || 0)
+  );
+
+const formatDate = value =>
+  value
+    ? new Intl.DateTimeFormat('pt-BR', {
+        day: '2-digit',
+        month: '2-digit',
+        year: 'numeric',
+      }).format(new Date(value))
+    : '-';
+
+const unitRevenueChart = computed(() => ({
+  labels: revenue.value.by_unit.map(item => item.unit_name || '-'),
+  datasets: [
+    {
+      label: t('CAPTAIN_RESERVATIONS.REVENUE.CHARTS.BY_UNIT'),
+      backgroundColor: '#3b82f6',
+      data: revenue.value.by_unit.map(item => Number(item.total_revenue || 0)),
+    },
+  ],
+}));
+
+const suiteRevenueChart = computed(() => ({
+  labels: revenue.value.by_suite.map(item => item.suite_identifier || '-'),
+  datasets: [
+    {
+      label: t('CAPTAIN_RESERVATIONS.REVENUE.CHARTS.BY_SUITE'),
+      backgroundColor: '#10b981',
+      data: revenue.value.by_suite.map(item => Number(item.total_revenue || 0)),
+    },
+  ],
+}));
+
+onMounted(() => {
+  readFiltersFromRoute();
+  store.dispatch('captainUnits/get');
+  if (isRevenueView.value) {
+    fetchRevenue();
+    return;
+  }
+  fetchReservations(Number(route.query.page) || 1);
+});
+</script>
+
+<template>
+  <PageLayout
+    :header-title="$t('CAPTAIN_RESERVATIONS.HEADER')"
+    :feature-flag="FEATURE_FLAGS.CAPTAIN"
+    :is-fetching="isPageFetching"
+    :is-empty="isRevenueView ? !hasRevenueData : !reservations.length"
+    :show-pagination-footer="
+      !isPageFetching && viewMode === 'list' && !!reservations.length
+    "
+    :total-count="
+      isRevenueView
+        ? revenue.summary.confirmed_count
+        : reservationsMeta.totalCount
+    "
+    :current-page="isRevenueView ? 1 : reservationsMeta.page"
+    :show-know-more="false"
+    :show-assistant-switcher="false"
+    @update:current-page="onPageChange"
+  >
+    <template #controls>
+      <div
+        class="grid grid-cols-1 gap-3 p-4 mb-4 rounded-xl bg-n-surface-2 md:grid-cols-7"
+      >
+        <div class="md:col-span-2">
+          <Input
+            v-model="q"
+            :label="$t('CAPTAIN_RESERVATIONS.FILTERS.SEARCH')"
+          />
+        </div>
+        <div v-if="!isRevenueView">
+          <label class="text-sm text-n-slate-11">{{
+            $t('CAPTAIN_RESERVATIONS.FILTERS.STATUS')
+          }}</label>
+          <select
+            v-model="status"
+            class="w-full px-2 py-2 mt-1 border rounded-lg bg-n-background border-n-weak"
+          >
+            <option
+              v-for="option in statusOptions"
+              :key="option.id"
+              :value="option.id"
+            >
+              {{ $t(option.label) }}
+            </option>
+          </select>
+        </div>
+        <div>
+          <label class="text-sm text-n-slate-11">{{
+            $t('CAPTAIN_RESERVATIONS.FILTERS.UNIT')
+          }}</label>
+          <select
+            v-model="unitId"
+            class="w-full px-2 py-2 mt-1 border rounded-lg bg-n-background border-n-weak"
+          >
+            <option value="">
+              {{ $t('CAPTAIN_RESERVATIONS.FILTERS.UNIT_ALL') }}
+            </option>
+            <option v-for="unit in units" :key="unit.id" :value="unit.id">
+              {{ unit.name }}
+            </option>
+          </select>
+        </div>
+        <div>
+          <Input
+            v-model="suite"
+            :label="$t('CAPTAIN_RESERVATIONS.FILTERS.SUITE')"
+          />
+        </div>
+        <div>
+          <Input
+            v-model="dateFrom"
+            type="date"
+            :label="$t('CAPTAIN_RESERVATIONS.FILTERS.DATE_FROM')"
+          />
+        </div>
+        <div>
+          <Input
+            v-model="dateTo"
+            type="date"
+            :label="$t('CAPTAIN_RESERVATIONS.FILTERS.DATE_TO')"
+          />
+        </div>
+        <div>
+          <label class="text-sm text-n-slate-11">{{
+            $t('CAPTAIN_RESERVATIONS.FILTERS.SORT')
+          }}</label>
+          <select
+            v-model="sort"
+            :disabled="isRevenueView"
+            class="w-full px-2 py-2 mt-1 border rounded-lg bg-n-background border-n-weak"
+          >
+            <option value="">
+              {{ $t('CAPTAIN_RESERVATIONS.FILTERS.SORT_DEFAULT') }}
+            </option>
+            <option value="check_in_at">
+              {{ $t('CAPTAIN_RESERVATIONS.FILTERS.SORT_CHECK_IN') }}
+            </option>
+            <option value="updated_at">
+              {{ $t('CAPTAIN_RESERVATIONS.FILTERS.SORT_UPDATED') }}
+            </option>
+            <option value="created_at">
+              {{ $t('CAPTAIN_RESERVATIONS.FILTERS.SORT_CREATED') }}
+            </option>
+          </select>
+        </div>
+      </div>
+      <div class="flex items-center justify-between mb-4">
+        <div class="flex items-center gap-2">
+          <Button
+            :label="$t('CAPTAIN_RESERVATIONS.VIEW.LIST')"
+            :variant="viewMode === 'list' ? 'primary' : 'outline'"
+            size="sm"
+            @click="setViewMode('list')"
+          />
+          <Button
+            :label="$t('CAPTAIN_RESERVATIONS.VIEW.KANBAN')"
+            :variant="viewMode === 'kanban' ? 'primary' : 'outline'"
+            size="sm"
+            @click="setViewMode('kanban')"
+          />
+          <Button
+            :label="$t('CAPTAIN_RESERVATIONS.VIEW.REVENUE')"
+            :variant="viewMode === 'revenue' ? 'primary' : 'outline'"
+            size="sm"
+            @click="setViewMode('revenue')"
+          />
+        </div>
+        <div class="flex items-center gap-2">
+          <Button
+            :label="$t('CAPTAIN_RESERVATIONS.FILTERS.CLEAR')"
+            variant="ghost"
+            size="sm"
+            @click="clearFilters"
+          />
+          <Button
+            :label="$t('CAPTAIN_RESERVATIONS.FILTERS.APPLY')"
+            size="sm"
+            @click="applyFilters"
+          />
+        </div>
+      </div>
+    </template>
+
+    <template #emptyState>
+      <div class="py-16 text-center text-n-slate-11">
+        {{ $t('CAPTAIN_RESERVATIONS.EMPTY') }}
+      </div>
+    </template>
+
+    <template #body>
+      <div v-if="isPageFetching" class="flex justify-center py-12">
+        <Spinner />
+      </div>
+
+      <div
+        v-else-if="viewMode === 'list'"
+        class="overflow-x-auto border rounded-xl border-n-weak"
+      >
+        <table class="w-full text-sm">
+          <thead class="bg-n-surface-2 text-n-slate-11">
+            <tr>
+              <th class="px-3 py-2 text-left">
+                {{ $t('CAPTAIN_RESERVATIONS.TABLE.CUSTOMER') }}
+              </th>
+              <th class="px-3 py-2 text-left">
+                {{ $t('CAPTAIN_RESERVATIONS.TABLE.UNIT') }}
+              </th>
+              <th class="px-3 py-2 text-left">
+                {{ $t('CAPTAIN_RESERVATIONS.TABLE.SUITE') }}
+              </th>
+              <th class="px-3 py-2 text-left">
+                {{ $t('CAPTAIN_RESERVATIONS.TABLE.CHECK_IN') }}
+              </th>
+              <th class="px-3 py-2 text-left">
+                {{ $t('CAPTAIN_RESERVATIONS.TABLE.AMOUNT') }}
+              </th>
+              <th class="px-3 py-2 text-left">
+                {{ $t('CAPTAIN_RESERVATIONS.TABLE.STATUS') }}
+              </th>
+              <th class="px-3 py-2 text-left">
+                {{ $t('CAPTAIN_RESERVATIONS.TABLE.UPDATED_AT') }}
+              </th>
+              <th class="px-3 py-2 text-left">
+                {{ $t('CAPTAIN_RESERVATIONS.TABLE.ACTIONS') }}
+              </th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr
+              v-for="reservation in reservations"
+              :key="reservation.id"
+              class="border-t border-n-weak"
+            >
+              <td class="px-3 py-2">
+                <p class="font-medium text-n-slate-12">
+                  {{ reservation.customer_name || '-' }}
+                </p>
+                <p class="text-xs text-n-slate-11">
+                  {{
+                    reservation.customer_phone ||
+                    reservation.customer_cpf ||
+                    '-'
+                  }}
+                </p>
+              </td>
+              <td class="px-3 py-2">{{ reservation.unit_name || '-' }}</td>
+              <td class="px-3 py-2">
+                {{ reservation.suite_identifier || '-' }}
+              </td>
+              <td class="px-3 py-2">
+                {{ formatDate(reservation.check_in_at) }}
+              </td>
+              <td class="px-3 py-2">{{ formatMoney(reservation.amount) }}</td>
+              <td class="px-3 py-2">
+                <span
+                  class="px-2 py-1 text-xs rounded-full bg-n-surface-2 text-n-slate-12"
+                >
+                  {{ reservation.status_label }}
+                </span>
+              </td>
+              <td class="px-3 py-2">
+                {{ formatDate(reservation.updated_at) }}
+              </td>
+              <td class="px-3 py-2">
+                <div class="flex items-center gap-2">
+                  <Button
+                    size="xs"
+                    variant="outline"
+                    :label="
+                      $t('CAPTAIN_RESERVATIONS.ACTIONS.OPEN_CONVERSATION')
+                    "
+                    @click="openConversation(reservation)"
+                  />
+                  <Button
+                    size="xs"
+                    variant="ghost"
+                    :label="$t('CAPTAIN_RESERVATIONS.ACTIONS.COPY_PIX')"
+                    @click="copyPix(reservation)"
+                  />
+                </div>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+
+      <div v-else-if="viewMode === 'revenue'" class="space-y-4">
+        <div
+          class="px-3 py-2 text-xs rounded-lg bg-n-surface-2 text-n-slate-11"
+        >
+          {{ $t('CAPTAIN_RESERVATIONS.REVENUE.ONLY_CONFIRMED') }}
+        </div>
+        <div class="grid grid-cols-1 gap-4 md:grid-cols-3">
+          <div class="p-4 border rounded-xl border-n-weak bg-n-background">
+            <p class="text-sm text-n-slate-11">
+              {{ $t('CAPTAIN_RESERVATIONS.REVENUE.SUMMARY.TOTAL_REVENUE') }}
+            </p>
+            <p class="mt-1 text-2xl font-semibold text-n-slate-12">
+              {{ formatMoney(revenue.summary.total_revenue) }}
+            </p>
+          </div>
+          <div class="p-4 border rounded-xl border-n-weak bg-n-background">
+            <p class="text-sm text-n-slate-11">
+              {{ $t('CAPTAIN_RESERVATIONS.REVENUE.SUMMARY.CONFIRMED_COUNT') }}
+            </p>
+            <p class="mt-1 text-2xl font-semibold text-n-slate-12">
+              {{ revenue.summary.confirmed_count || 0 }}
+            </p>
+          </div>
+          <div class="p-4 border rounded-xl border-n-weak bg-n-background">
+            <p class="text-sm text-n-slate-11">
+              {{ $t('CAPTAIN_RESERVATIONS.REVENUE.SUMMARY.AVERAGE_TICKET') }}
+            </p>
+            <p class="mt-1 text-2xl font-semibold text-n-slate-12">
+              {{ formatMoney(revenue.summary.average_ticket) }}
+            </p>
+          </div>
+        </div>
+
+        <div class="grid grid-cols-1 gap-4 lg:grid-cols-2">
+          <div class="p-4 border rounded-xl border-n-weak bg-n-background">
+            <h3 class="text-sm font-medium text-n-slate-12">
+              {{ $t('CAPTAIN_RESERVATIONS.REVENUE.CHARTS.BY_UNIT') }}
+            </h3>
+            <div class="h-64 mt-3">
+              <BarChart :collection="unitRevenueChart" />
+            </div>
+          </div>
+          <div class="p-4 border rounded-xl border-n-weak bg-n-background">
+            <h3 class="text-sm font-medium text-n-slate-12">
+              {{ $t('CAPTAIN_RESERVATIONS.REVENUE.CHARTS.BY_SUITE') }}
+            </h3>
+            <div class="h-64 mt-3">
+              <BarChart :collection="suiteRevenueChart" />
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div v-else class="grid grid-cols-1 gap-4 lg:grid-cols-4">
+        <div
+          v-for="column in [
+            'draft',
+            'pending_payment',
+            'confirmed',
+            'cancelled',
+          ]"
+          :key="column"
+          class="p-3 border rounded-xl bg-n-surface-2 border-n-weak"
+        >
+          <h3 class="mb-3 text-sm font-medium text-n-slate-12">
+            {{ $t(`CAPTAIN_RESERVATIONS.STATUS.${column.toUpperCase()}`) }}
+          </h3>
+          <div class="flex flex-col gap-2">
+            <div
+              v-for="reservation in groupedReservations[column]"
+              :key="reservation.id"
+              class="p-3 border rounded-lg bg-n-background border-n-weak"
+            >
+              <p class="text-sm font-medium text-n-slate-12">
+                {{ reservation.customer_name || '-' }}
+              </p>
+              <p class="text-xs text-n-slate-11">
+                {{ reservation.suite_identifier || '-' }}
+              </p>
+              <p class="mt-2 text-xs text-n-slate-11">
+                {{ formatDate(reservation.check_in_at) }} •
+                {{ formatMoney(reservation.amount) }}
+              </p>
+              <div class="flex gap-2 mt-3">
+                <Button
+                  size="xs"
+                  variant="outline"
+                  :label="$t('CAPTAIN_RESERVATIONS.ACTIONS.OPEN_CONVERSATION')"
+                  @click="openConversation(reservation)"
+                />
+                <Button
+                  size="xs"
+                  variant="ghost"
+                  :label="$t('CAPTAIN_RESERVATIONS.ACTIONS.COPY_PIX')"
+                  @click="copyPix(reservation)"
+                />
+              </div>
+            </div>
+            <p
+              v-if="!groupedReservations[column].length"
+              class="text-xs text-n-slate-11"
+            >
+              {{ $t('CAPTAIN_RESERVATIONS.KANBAN.EMPTY_COLUMN') }}
+            </p>
+          </div>
+        </div>
+      </div>
+    </template>
+  </PageLayout>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
index c148625fa..415663858 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
@@ -18,6 +18,7 @@ import ContactNotes from './contact/ContactNotes.vue';
 import ScheduledMessages from './scheduledMessages/ScheduledMessages.vue';
 import ConversationInfo from './ConversationInfo.vue';
 import CustomAttributes from './customAttributes/CustomAttributes.vue';
+import ReservationSummary from './reservation/ReservationSummary.vue';
 import Draggable from 'vuedraggable';
 import MacrosList from './Macros/List.vue';
 import ShopifyOrdersList from 'dashboard/components/widgets/conversation/ShopifyOrdersList.vue';
@@ -77,6 +78,7 @@ const isLinearConnected = computed(
 const store = useStore();
 const currentChat = useMapGetter('getSelectedChat');
 const conversationId = computed(() => props.conversationId);
+const reservationMarker = computed(() => currentChat.value?.reservation_marker);
 const conversationMetadataGetter = useMapGetter(
   'conversationMetadata/getConversationMetadata'
 );
@@ -119,6 +121,7 @@ const closeContactPanel = () => {
   updateUISettings({
     is_contact_sidebar_open: false,
     is_copilot_panel_open: false,
+    is_reservation_summary_open: false,
   });
 };
 
@@ -219,6 +222,19 @@ onMounted(() => {
               />
             </AccordionItem>
           </div>
+          <div v-else-if="element.name === 'reservation_summary'">
+            <AccordionItem
+              :title="$t('CONVERSATION_SIDEBAR.ACCORDION.RESERVATION')"
+              :is-open="isContactSidebarItemOpen('is_reservation_summary_open')"
+              compact
+              @toggle="
+                value =>
+                  toggleSidebarUIState('is_reservation_summary_open', value)
+              "
+            >
+              <ReservationSummary :marker="reservationMarker" />
+            </AccordionItem>
+          </div>
           <div v-else-if="element.name === 'contact_attributes'">
             <AccordionItem
               :title="$t('CONVERSATION_SIDEBAR.ACCORDION.CONTACT_ATTRIBUTES')"
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/reservation/ReservationSummary.vue b/app/javascript/dashboard/routes/dashboard/conversation/reservation/ReservationSummary.vue
new file mode 100644
index 000000000..35a5631c4
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/conversation/reservation/ReservationSummary.vue
@@ -0,0 +1,163 @@
+<script setup>
+import { computed, ref, watch } from 'vue';
+import { useStore } from 'dashboard/composables/store';
+import { useI18n } from 'vue-i18n';
+import { useAlert } from 'dashboard/composables';
+import Button from 'dashboard/components-next/button/Button.vue';
+import { copyTextToClipboard } from 'shared/helpers/clipboard';
+
+const props = defineProps({
+  marker: {
+    type: Object,
+    default: () => ({}),
+  },
+});
+
+const store = useStore();
+const { t } = useI18n();
+
+const reservation = ref(null);
+const isLoading = ref(false);
+
+const reservationId = computed(() => props.marker?.reservation_id);
+const hasMarker = computed(() => !!props.marker?.visible);
+const pixValue = computed(
+  () => reservation.value?.pix_copy_paste || props.marker?.pix_copy_paste
+);
+
+const fetchReservation = async () => {
+  if (!reservationId.value) {
+    reservation.value = null;
+    return;
+  }
+
+  isLoading.value = true;
+  try {
+    const response = await store.dispatch(
+      'captainReservations/show',
+      reservationId.value
+    );
+    reservation.value = response?.id ? response : null;
+  } finally {
+    isLoading.value = false;
+  }
+};
+
+watch(reservationId, fetchReservation, { immediate: true });
+
+const formatMoney = value =>
+  new Intl.NumberFormat('pt-BR', {
+    style: 'currency',
+    currency: 'BRL',
+  }).format(Number(value || 0));
+
+const formatDateTime = value => {
+  if (!value) return '-';
+  return new Intl.DateTimeFormat('pt-BR', {
+    day: '2-digit',
+    month: '2-digit',
+    year: 'numeric',
+    hour: '2-digit',
+    minute: '2-digit',
+  }).format(new Date(value));
+};
+
+const statusLabel = computed(() => {
+  const status = reservation.value?.ui_status || props.marker?.status;
+  if (!status) return '-';
+
+  const key = `CAPTAIN_RESERVATIONS.STATUS.${status.toUpperCase()}`;
+  const translated = t(key);
+  return translated === key
+    ? reservation.value?.status_label || props.marker?.status_label || status
+    : translated;
+});
+
+const onCopyPix = async () => {
+  if (!pixValue.value) {
+    useAlert(
+      props.marker?.pix_reason === 'expired'
+        ? t('CAPTAIN_RESERVATIONS.API.PIX_EXPIRED')
+        : t('CAPTAIN_RESERVATIONS.API.PIX_NOT_GENERATED')
+    );
+    return;
+  }
+
+  try {
+    await copyTextToClipboard(pixValue.value);
+    useAlert(t('CAPTAIN_RESERVATIONS.API.PIX_COPIED'));
+  } catch (error) {
+    useAlert(t('CAPTAIN_RESERVATIONS.API.PIX_COPY_FAILED'));
+  }
+};
+</script>
+
+<template>
+  <div class="flex flex-col gap-2 text-sm">
+    <p v-if="!hasMarker" class="text-n-slate-11">
+      {{ $t('CAPTAIN_RESERVATIONS.SIDEBAR.NO_RESERVATION') }}
+    </p>
+
+    <div v-else-if="isLoading" class="text-n-slate-11">
+      {{ $t('CAPTAIN_RESERVATIONS.SIDEBAR.LOADING') }}
+    </div>
+
+    <template v-else>
+      <div class="flex items-start justify-between gap-2">
+        <span class="text-n-slate-11">{{
+          $t('CAPTAIN_RESERVATIONS.SIDEBAR.STATUS')
+        }}</span>
+        <span class="font-medium text-n-slate-12">{{ statusLabel }}</span>
+      </div>
+      <div class="flex items-start justify-between gap-2">
+        <span class="text-n-slate-11">{{
+          $t('CAPTAIN_RESERVATIONS.SIDEBAR.SUITE')
+        }}</span>
+        <span class="font-medium text-n-slate-12">{{
+          reservation?.suite_identifier || marker?.suite || '-'
+        }}</span>
+      </div>
+      <div class="flex items-start justify-between gap-2">
+        <span class="text-n-slate-11">{{
+          $t('CAPTAIN_RESERVATIONS.SIDEBAR.CHECK_IN')
+        }}</span>
+        <span class="font-medium text-n-slate-12">{{
+          formatDateTime(reservation?.check_in_at || marker?.check_in_at)
+        }}</span>
+      </div>
+      <div class="flex items-start justify-between gap-2">
+        <span class="text-n-slate-11">{{
+          $t('CAPTAIN_RESERVATIONS.SIDEBAR.CHECK_OUT')
+        }}</span>
+        <span class="font-medium text-n-slate-12">{{
+          formatDateTime(reservation?.check_out_at || marker?.check_out_at)
+        }}</span>
+      </div>
+      <div class="flex items-start justify-between gap-2">
+        <span class="text-n-slate-11">{{
+          $t('CAPTAIN_RESERVATIONS.SIDEBAR.AMOUNT')
+        }}</span>
+        <span class="font-medium text-n-slate-12">{{
+          formatMoney(reservation?.amount || marker?.amount)
+        }}</span>
+      </div>
+      <div class="flex items-start justify-between gap-2">
+        <span class="text-n-slate-11">{{
+          $t('CAPTAIN_RESERVATIONS.SIDEBAR.UPDATED_AT')
+        }}</span>
+        <span class="font-medium text-n-slate-12">{{
+          formatDateTime(reservation?.updated_at || marker?.updated_at)
+        }}</span>
+      </div>
+
+      <div class="pt-1">
+        <Button
+          size="xs"
+          variant="outline"
+          :label="$t('CAPTAIN_RESERVATIONS.ACTIONS.COPY_PIX')"
+          @click="onCopyPix"
+        />
+      </div>
+    </template>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/captain/captain.routes.js b/app/javascript/dashboard/routes/dashboard/settings/captain/captain.routes.js
index 85e4cf9ab..dd169f5a6 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/captain/captain.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/captain/captain.routes.js
@@ -3,6 +3,10 @@ import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 import { INSTALLATION_TYPES } from 'dashboard/constants/installationTypes';
 import SettingsWrapper from '../SettingsWrapper.vue';
 import Index from './Index.vue';
+import UnitsIndex from './units/Index.vue';
+import UnitEdit from './units/Edit.vue';
+import GalleryIndex from './gallery/Index.vue';
+import GalleryEdit from './gallery/Edit.vue';
 
 export default {
   routes: [
@@ -32,6 +36,38 @@ export default {
             ],
           },
         },
+        {
+          path: 'units',
+          name: 'captain_settings_units',
+          component: UnitsIndex,
+          meta: {
+            permissions: ['administrator'],
+          },
+        },
+        {
+          path: 'units/:id/edit',
+          name: 'captain_settings_units_edit',
+          component: UnitEdit,
+          meta: {
+            permissions: ['administrator'],
+          },
+        },
+        {
+          path: 'gallery',
+          name: 'captain_settings_gallery',
+          component: GalleryIndex,
+          meta: {
+            permissions: ['administrator'],
+          },
+        },
+        {
+          path: 'gallery/:id/edit',
+          name: 'captain_settings_gallery_edit',
+          component: GalleryEdit,
+          meta: {
+            permissions: ['administrator'],
+          },
+        },
       ],
     },
   ],
diff --git a/app/javascript/dashboard/routes/dashboard/settings/captain/gallery/Edit.vue b/app/javascript/dashboard/routes/dashboard/settings/captain/gallery/Edit.vue
new file mode 100644
index 000000000..f2f24d6c8
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/captain/gallery/Edit.vue
@@ -0,0 +1,303 @@
+<script>
+import { useVuelidate } from '@vuelidate/core';
+import { required } from '@vuelidate/validators';
+import { mapGetters } from 'vuex';
+import { useAlert } from 'dashboard/composables';
+import SubmitButton from 'dashboard/components-next/button/Button.vue';
+
+const GLOBAL_SCOPE_VALUE = '__global__';
+
+export default {
+  components: {
+    SubmitButton,
+  },
+  setup() {
+    return { v$: useVuelidate() };
+  },
+  data() {
+    return {
+      inbox_scope_selection: GLOBAL_SCOPE_VALUE,
+      suite_category: '',
+      suite_number: '',
+      description: '',
+      active: true,
+      image: null,
+      currentImageUrl: '',
+      previewImageUrl: '',
+    };
+  },
+  computed: {
+    ...mapGetters({
+      uiFlags: 'captainGalleryItems/getUIFlags',
+      items: 'captainGalleryItems/getItems',
+      inboxes: 'inboxes/getInboxes',
+    }),
+    isNew() {
+      return this.$route.params.id === 'new';
+    },
+    pageTitle() {
+      return this.isNew
+        ? this.$t('CAPTAIN_SETTINGS.GALLERY.ADD.TITLE')
+        : this.$t('CAPTAIN_SETTINGS.GALLERY.EDIT.TITLE');
+    },
+    pageDesc() {
+      return this.isNew
+        ? this.$t('CAPTAIN_SETTINGS.GALLERY.ADD.DESC')
+        : this.$t('CAPTAIN_SETTINGS.GALLERY.EDIT.DESC');
+    },
+    inboxOptions() {
+      return [
+        {
+          id: GLOBAL_SCOPE_VALUE,
+          name: this.$t('CAPTAIN_SETTINGS.GALLERY.FORM.INBOX.GLOBAL_OPTION'),
+        },
+        ...this.inboxes.map(inbox => ({
+          id: inbox.id,
+          name: inbox.name,
+        })),
+      ];
+    },
+    selectedScope() {
+      if (
+        this.inbox_scope_selection === GLOBAL_SCOPE_VALUE ||
+        this.inbox_scope_selection === null
+      ) {
+        return 'global';
+      }
+
+      return 'inbox';
+    },
+    selectedInboxId() {
+      if (this.selectedScope === 'global') {
+        return null;
+      }
+
+      return this.inbox_scope_selection;
+    },
+    inboxHelpText() {
+      if (this.selectedScope === 'global') {
+        return this.$t('CAPTAIN_SETTINGS.GALLERY.FORM.INBOX.GLOBAL_HELP');
+      }
+
+      const selectedInbox = this.inboxes.find(
+        inbox => String(inbox.id) === String(this.selectedInboxId)
+      );
+
+      if (!selectedInbox) {
+        return this.$t('CAPTAIN_SETTINGS.GALLERY.FORM.INBOX.HELP');
+      }
+
+      return this.$t('CAPTAIN_SETTINGS.GALLERY.FORM.INBOX.SPECIFIC_HELP', {
+        inbox: selectedInbox.name,
+      });
+    },
+    imagePreview() {
+      return this.previewImageUrl || this.currentImageUrl;
+    },
+  },
+  validations() {
+    return {
+      suite_category: { required },
+      suite_number: { required },
+      description: { required },
+      image: {
+        required: this.isNew ? required : () => true,
+      },
+    };
+  },
+  async mounted() {
+    await this.$store.dispatch('inboxes/get');
+
+    if (!this.isNew) {
+      await this.fetchItem();
+    }
+  },
+  methods: {
+    async fetchItem() {
+      if (!this.items.length) {
+        await this.$store.dispatch('captainGalleryItems/get');
+      }
+
+      const item = this.items.find(i => i.id === Number(this.$route.params.id));
+      if (!item) return;
+
+      this.inbox_scope_selection =
+        item.scope === 'inbox' && item.inbox_id
+          ? item.inbox_id
+          : GLOBAL_SCOPE_VALUE;
+      this.suite_category = item.suite_category;
+      this.suite_number = item.suite_number;
+      this.description = item.description;
+      this.active = item.active;
+      this.currentImageUrl = item.image_url;
+    },
+    onFileChange(event) {
+      const file = event.target.files[0];
+      if (!file) return;
+
+      this.image = file;
+      this.v$.image.$touch();
+      this.previewImageUrl = URL.createObjectURL(file);
+    },
+    async submitForm() {
+      this.v$.$touch();
+      if (this.v$.$invalid) return;
+
+      const formData = new FormData();
+      formData.append('captain_gallery_item[scope]', this.selectedScope);
+      if (this.selectedInboxId) {
+        formData.append('captain_gallery_item[inbox_id]', this.selectedInboxId);
+      }
+      formData.append(
+        'captain_gallery_item[suite_category]',
+        this.suite_category
+      );
+      formData.append('captain_gallery_item[suite_number]', this.suite_number);
+      formData.append('captain_gallery_item[description]', this.description);
+      formData.append('captain_gallery_item[active]', this.active);
+      if (this.image) {
+        formData.append('captain_gallery_item[image]', this.image);
+      }
+
+      try {
+        if (this.isNew) {
+          await this.$store.dispatch('captainGalleryItems/create', formData);
+          useAlert(this.$t('CAPTAIN_SETTINGS.GALLERY.ADD.API.SUCCESS_MESSAGE'));
+        } else {
+          await this.$store.dispatch('captainGalleryItems/update', {
+            id: this.$route.params.id,
+            formData,
+          });
+          useAlert(
+            this.$t('CAPTAIN_SETTINGS.GALLERY.EDIT.API.SUCCESS_MESSAGE')
+          );
+        }
+        this.$router.push({ name: 'captain_settings_gallery' });
+      } catch (error) {
+        const firstError = error?.response?.data?.errors?.[0];
+        const fallbackMessage = this.isNew
+          ? this.$t('CAPTAIN_SETTINGS.GALLERY.ADD.API.ERROR_MESSAGE')
+          : this.$t('CAPTAIN_SETTINGS.GALLERY.EDIT.API.ERROR_MESSAGE');
+        useAlert(firstError || fallbackMessage);
+      }
+    },
+  },
+};
+</script>
+
+<template>
+  <div class="column content-box">
+    <woot-modal-header :header-title="pageTitle" :header-content="pageDesc" />
+
+    <form class="row" @submit.prevent="submitForm">
+      <div class="small-12 columns">
+        <label>
+          {{ $t('CAPTAIN_SETTINGS.GALLERY.FORM.INBOX.LABEL') }}
+          <select v-model="inbox_scope_selection">
+            <option
+              v-for="option in inboxOptions"
+              :key="option.id"
+              :value="option.id"
+            >
+              {{ option.name }}
+            </option>
+          </select>
+          <p class="help-text">
+            {{ inboxHelpText }}
+          </p>
+        </label>
+      </div>
+
+      <div class="small-12 columns">
+        <label :class="{ error: v$.suite_category.$error }">
+          {{ $t('CAPTAIN_SETTINGS.GALLERY.FORM.SUITE_CATEGORY.LABEL') }}
+          <input
+            v-model="suite_category"
+            type="text"
+            :placeholder="
+              $t('CAPTAIN_SETTINGS.GALLERY.FORM.SUITE_CATEGORY.PLACEHOLDER')
+            "
+            @input="v$.suite_category.$touch"
+          />
+          <span v-if="v$.suite_category.$error" class="message">
+            {{ $t('CAPTAIN_SETTINGS.GALLERY.FORM.SUITE_CATEGORY.ERROR') }}
+          </span>
+        </label>
+      </div>
+
+      <div class="small-12 columns">
+        <label :class="{ error: v$.suite_number.$error }">
+          {{ $t('CAPTAIN_SETTINGS.GALLERY.FORM.SUITE_NUMBER.LABEL') }}
+          <input
+            v-model="suite_number"
+            type="text"
+            :placeholder="
+              $t('CAPTAIN_SETTINGS.GALLERY.FORM.SUITE_NUMBER.PLACEHOLDER')
+            "
+            @input="v$.suite_number.$touch"
+          />
+          <span v-if="v$.suite_number.$error" class="message">
+            {{ $t('CAPTAIN_SETTINGS.GALLERY.FORM.SUITE_NUMBER.ERROR') }}
+          </span>
+        </label>
+      </div>
+
+      <div class="small-12 columns">
+        <label :class="{ error: v$.description.$error }">
+          {{ $t('CAPTAIN_SETTINGS.GALLERY.FORM.DESCRIPTION.LABEL') }}
+          <textarea
+            v-model="description"
+            rows="3"
+            :placeholder="
+              $t('CAPTAIN_SETTINGS.GALLERY.FORM.DESCRIPTION.PLACEHOLDER')
+            "
+            @input="v$.description.$touch"
+          />
+          <span v-if="v$.description.$error" class="message">
+            {{ $t('CAPTAIN_SETTINGS.GALLERY.FORM.DESCRIPTION.ERROR') }}
+          </span>
+        </label>
+      </div>
+
+      <div class="small-12 columns">
+        <label :class="{ error: v$.image.$error }">
+          {{ $t('CAPTAIN_SETTINGS.GALLERY.FORM.IMAGE.LABEL') }}
+          <input type="file" accept="image/*" @change="onFileChange" />
+          <span v-if="v$.image.$error" class="message">
+            {{ $t('CAPTAIN_SETTINGS.GALLERY.FORM.IMAGE.ERROR') }}
+          </span>
+          <p class="help-text">
+            {{ $t('CAPTAIN_SETTINGS.GALLERY.FORM.IMAGE.HELP_TEXT') }}
+          </p>
+        </label>
+      </div>
+
+      <div v-if="imagePreview" class="small-12 columns">
+        <img
+          :src="imagePreview"
+          :alt="$t('CAPTAIN_SETTINGS.GALLERY.FORM.IMAGE.PREVIEW_ALT')"
+          class="h-48 rounded object-cover"
+        />
+      </div>
+
+      <div class="small-12 columns">
+        <label>
+          <input v-model="active" type="checkbox" />
+          {{ $t('CAPTAIN_SETTINGS.GALLERY.FORM.ACTIVE.LABEL') }}
+        </label>
+      </div>
+
+      <div class="small-12 columns button-group">
+        <SubmitButton
+          type="submit"
+          :is-loading="uiFlags.isCreating || uiFlags.isUpdating"
+          :label="
+            isNew
+              ? $t('CAPTAIN_SETTINGS.GALLERY.ADD.SUBMIT_BUTTON_TEXT')
+              : $t('CAPTAIN_SETTINGS.GALLERY.EDIT.SUBMIT_BUTTON_TEXT')
+          "
+        />
+      </div>
+    </form>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/captain/gallery/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/captain/gallery/Index.vue
new file mode 100644
index 000000000..eb68c4295
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/captain/gallery/Index.vue
@@ -0,0 +1,196 @@
+<script setup>
+import { ref, computed, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
+import { useStore, useMapGetter } from 'dashboard/composables/store';
+import { useAlert } from 'dashboard/composables';
+import { useI18n } from 'vue-i18n';
+import SettingsLayout from '../../SettingsLayout.vue';
+import BaseSettingsHeader from '../../components/BaseSettingsHeader.vue';
+import Button from 'dashboard/components-next/button/Button.vue';
+import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
+
+const { t } = useI18n();
+const router = useRouter();
+const store = useStore();
+
+const items = useMapGetter('captainGalleryItems/getItems');
+const uiFlags = useMapGetter('captainGalleryItems/getUIFlags');
+
+const deleteDialogRef = ref(null);
+const itemToDelete = ref(null);
+
+const hasItems = computed(() => items.value && items.value.length > 0);
+
+onMounted(async () => {
+  await store.dispatch('captainGalleryItems/get');
+});
+
+const goToNew = () => {
+  router.push({
+    name: 'captain_settings_gallery_edit',
+    params: { id: 'new' },
+  });
+};
+
+const goToEdit = item => {
+  router.push({
+    name: 'captain_settings_gallery_edit',
+    params: { id: item.id },
+  });
+};
+
+const openDeleteDialog = item => {
+  itemToDelete.value = item;
+  deleteDialogRef.value?.open();
+};
+
+const confirmDelete = async () => {
+  if (!itemToDelete.value) return;
+  try {
+    await store.dispatch('captainGalleryItems/delete', itemToDelete.value.id);
+    useAlert(t('CAPTAIN_SETTINGS.GALLERY.DELETE.API.SUCCESS_MESSAGE'));
+  } catch {
+    useAlert(t('CAPTAIN_SETTINGS.GALLERY.DELETE.API.ERROR_MESSAGE'));
+  } finally {
+    itemToDelete.value = null;
+  }
+};
+</script>
+
+<template>
+  <SettingsLayout
+    :is-loading="uiFlags.isFetching"
+    :loading-message="t('CAPTAIN_SETTINGS.GALLERY.TITLE')"
+  >
+    <template #header>
+      <BaseSettingsHeader
+        :title="t('CAPTAIN_SETTINGS.GALLERY.TITLE')"
+        :description="t('CAPTAIN_SETTINGS.GALLERY.DESC')"
+      >
+        <template #actions>
+          <Button
+            :label="t('CAPTAIN_SETTINGS.GALLERY.ADD_ITEM')"
+            icon="i-lucide-plus"
+            @click="goToNew"
+          />
+        </template>
+      </BaseSettingsHeader>
+    </template>
+
+    <template #body>
+      <div class="flex flex-col px-6 pb-8">
+        <div v-if="hasItems" class="overflow-x-auto">
+          <table class="w-full text-sm">
+            <thead>
+              <tr class="border-b border-n-weak">
+                <th
+                  class="py-3 pr-4 text-left text-xs font-medium uppercase tracking-wider text-n-slate-10"
+                >
+                  {{ t('CAPTAIN_SETTINGS.GALLERY.LIST.TABLE_HEADER[0]') }}
+                </th>
+                <th
+                  class="py-3 pr-4 text-left text-xs font-medium uppercase tracking-wider text-n-slate-10"
+                >
+                  {{ t('CAPTAIN_SETTINGS.GALLERY.LIST.TABLE_HEADER[1]') }}
+                </th>
+                <th
+                  class="py-3 pr-4 text-left text-xs font-medium uppercase tracking-wider text-n-slate-10"
+                >
+                  {{ t('CAPTAIN_SETTINGS.GALLERY.LIST.TABLE_HEADER[2]') }}
+                </th>
+                <th
+                  class="py-3 pr-4 text-left text-xs font-medium uppercase tracking-wider text-n-slate-10"
+                >
+                  {{ t('CAPTAIN_SETTINGS.GALLERY.LIST.TABLE_HEADER[3]') }}
+                </th>
+                <th
+                  class="py-3 text-right text-xs font-medium uppercase tracking-wider text-n-slate-10"
+                >
+                  {{ t('CAPTAIN_SETTINGS.GALLERY.LIST.TABLE_HEADER[4]') }}
+                </th>
+              </tr>
+            </thead>
+            <tbody class="divide-y divide-n-weak">
+              <tr v-for="item in items" :key="item.id">
+                <td class="py-4 pr-4">
+                  <img
+                    v-if="item.image_url"
+                    :src="item.image_url"
+                    :alt="item.description"
+                    class="h-16 w-24 rounded object-cover"
+                  />
+                </td>
+                <td class="py-4 pr-4">
+                  <p class="mb-0 font-medium text-n-slate-12">
+                    {{
+                      item.scope === 'global'
+                        ? t('CAPTAIN_SETTINGS.GALLERY.FORM.INBOX.GLOBAL_OPTION')
+                        : item.inbox_name || '-'
+                    }}
+                  </p>
+                  <p class="mb-0 text-xs text-n-slate-10">
+                    {{ item.description }}
+                  </p>
+                </td>
+                <td class="py-4 pr-4 text-n-slate-11">
+                  {{ item.suite_category }}
+                </td>
+                <td class="py-4 pr-4 text-n-slate-11">
+                  {{ item.suite_number }}
+                </td>
+                <td class="py-4">
+                  <div class="flex justify-end gap-2">
+                    <Button
+                      icon="i-lucide-pencil"
+                      variant="ghost"
+                      size="sm"
+                      :label="t('CAPTAIN_SETTINGS.GALLERY.EDIT_ITEM')"
+                      @click="goToEdit(item)"
+                    />
+                    <Button
+                      icon="i-lucide-trash-2"
+                      variant="ghost"
+                      size="sm"
+                      color="ruby"
+                      :label="t('CAPTAIN_SETTINGS.GALLERY.DELETE_ITEM')"
+                      @click="openDeleteDialog(item)"
+                    />
+                  </div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+
+        <div
+          v-else
+          class="flex flex-col items-center justify-center gap-4 py-20 text-center"
+        >
+          <div class="size-16 rounded-full bg-n-blue-2" />
+          <div class="flex flex-col gap-1">
+            <p class="mb-0 text-base font-medium text-n-slate-12">
+              {{ t('CAPTAIN_SETTINGS.GALLERY.LIST.ADD_NEW_ITEM') }}
+            </p>
+            <p class="mb-0 max-w-sm text-sm text-n-slate-10">
+              {{ t('CAPTAIN_SETTINGS.GALLERY.LIST.NO_ITEMS_MESSAGE') }}
+            </p>
+          </div>
+          <Button
+            :label="t('CAPTAIN_SETTINGS.GALLERY.ADD_ITEM')"
+            icon="i-lucide-plus"
+            @click="goToNew"
+          />
+        </div>
+      </div>
+
+      <Dialog
+        ref="deleteDialogRef"
+        type="alert"
+        :title="t('CAPTAIN_SETTINGS.GALLERY.DELETE.CONFIRM.TITLE')"
+        :description="t('CAPTAIN_SETTINGS.GALLERY.DELETE.CONFIRM.MESSAGE')"
+        :confirm-button-label="t('CAPTAIN_SETTINGS.GALLERY.DELETE.CONFIRM.YES')"
+        @confirm="confirmDelete"
+      />
+    </template>
+  </SettingsLayout>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/captain/units/Edit.vue b/app/javascript/dashboard/routes/dashboard/settings/captain/units/Edit.vue
new file mode 100644
index 000000000..3c19ffef0
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/captain/units/Edit.vue
@@ -0,0 +1,433 @@
+<script>
+import { useVuelidate } from '@vuelidate/core';
+import { required } from '@vuelidate/validators';
+import { mapGetters } from 'vuex';
+import { useAlert } from 'dashboard/composables';
+import SubmitButton from 'dashboard/components-next/button/Button.vue';
+
+export default {
+  components: {
+    SubmitButton,
+  },
+  setup() {
+    return { v$: useVuelidate() };
+  },
+  data() {
+    return {
+      name: '',
+      inter_account_number: '',
+      inter_pix_key: '',
+      inter_client_id: '',
+      inter_client_secret: '',
+      inter_cert_content: '',
+      inter_key_content: '',
+      proactive_pix_polling_enabled: false,
+      inbox_id: null,
+      hasInitialCert: false,
+      hasInitialKey: false,
+      hasInitialClientSecret: false,
+    };
+  },
+  computed: {
+    ...mapGetters({
+      uiFlags: 'captainUnits/getUIFlags',
+      records: 'captainUnits/getUnits',
+      inboxes: 'inboxes/getInboxes',
+    }),
+    inboxOptions() {
+      return [
+        {
+          id: null,
+          name: this.$t('CAPTAIN_SETTINGS.UNITS.INBOX.NO_UNIT'),
+        },
+        ...this.inboxes.map(inbox => ({ id: inbox.id, name: inbox.name })),
+      ];
+    },
+    isNew() {
+      return this.$route.params.id === 'new';
+    },
+    isInterCredentialsReady() {
+      return Boolean(
+        this.inter_client_id &&
+          (this.inter_client_secret || this.hasInitialClientSecret) &&
+          this.inter_pix_key &&
+          this.inter_account_number &&
+          (this.inter_cert_content || this.hasInitialCert) &&
+          (this.inter_key_content || this.hasInitialKey)
+      );
+    },
+    pageTitle() {
+      return this.isNew
+        ? this.$t('CAPTAIN_SETTINGS.UNITS.ADD.TITLE')
+        : this.$t('CAPTAIN_SETTINGS.UNITS.EDIT.TITLE');
+    },
+    pageDesc() {
+      return this.isNew
+        ? this.$t('CAPTAIN_SETTINGS.UNITS.ADD.DESC')
+        : this.$t('CAPTAIN_SETTINGS.UNITS.EDIT.DESC');
+    },
+  },
+  validations: {
+    name: { required },
+    inter_account_number: { required },
+    inter_pix_key: { required },
+  },
+  mounted() {
+    this.$store.dispatch('inboxes/get');
+    if (!this.isNew) {
+      this.fetchUnit();
+    }
+  },
+  methods: {
+    async fetchUnit() {
+      if (!this.records.length) {
+        await this.$store.dispatch('captainUnits/get');
+      }
+      const unit = this.records.find(
+        u => u.id === Number(this.$route.params.id)
+      );
+      if (unit) {
+        this.name = unit.name;
+        this.inter_account_number = unit.inter_account_number;
+        this.inter_pix_key = unit.inter_pix_key;
+        this.inter_client_id = unit.inter_client_id;
+        this.inbox_id = unit.inbox_id || null;
+        this.proactive_pix_polling_enabled =
+          !!unit.proactive_pix_polling_enabled;
+        // Secret and cert contents are generally not returned by the API for security reasons,
+        // so we leave them blank to only update if the user types something new.
+        this.hasInitialCert = unit.has_cert;
+        this.hasInitialKey = unit.has_key;
+        this.hasInitialClientSecret = unit.has_client_secret;
+      }
+    },
+    async submitForm() {
+      this.v$.$touch();
+      if (this.v$.$invalid) return;
+
+      const payload = {
+        name: this.name,
+        inter_account_number: this.inter_account_number,
+        inter_pix_key: this.inter_pix_key,
+        inter_client_id: this.inter_client_id,
+        inter_client_secret: this.inter_client_secret,
+        inbox_id: this.inbox_id,
+        inter_cert_content: this.inter_cert_content,
+        inter_key_content: this.inter_key_content,
+        proactive_pix_polling_enabled: this.isInterCredentialsReady
+          ? this.proactive_pix_polling_enabled
+          : false,
+      };
+
+      try {
+        if (this.isNew) {
+          await this.$store.dispatch('captainUnits/create', payload);
+          useAlert(this.$t('CAPTAIN_SETTINGS.UNITS.ADD.API.SUCCESS_MESSAGE'));
+        } else {
+          await this.$store.dispatch('captainUnits/update', {
+            id: this.$route.params.id,
+            ...payload,
+          });
+          useAlert(this.$t('CAPTAIN_SETTINGS.UNITS.EDIT.API.SUCCESS_MESSAGE'));
+        }
+        this.$router.push({ name: 'captain_settings_units' });
+      } catch (error) {
+        const action = this.isNew ? 'ADD' : 'EDIT';
+        useAlert(
+          error?.response?.data?.message ||
+            // eslint-disable-next-line
+            this.$t(`CAPTAIN_SETTINGS.UNITS.${action}.API.ERROR_MESSAGE`)
+        );
+      }
+    },
+    triggerFileInput(refName) {
+      this.$refs[refName].click();
+    },
+    handleFileUpload(event, targetField) {
+      const file = event.target.files[0];
+      if (!file) return;
+
+      const reader = new FileReader();
+      reader.onload = e => {
+        this[targetField] = e.target.result;
+      };
+      reader.onerror = () => {
+        useAlert(this.$t('CAPTAIN_SETTINGS.UNITS.EDIT.API.ERROR_MESSAGE'));
+      };
+      reader.readAsText(file);
+    },
+  },
+};
+</script>
+
+<template>
+  <div class="column content-box">
+    <woot-modal-header :header-title="pageTitle" :header-content="pageDesc" />
+
+    <form class="row" @submit.prevent="submitForm">
+      <div class="small-12 columns">
+        <label :class="{ error: v$.name.$error }">
+          {{ $t('CAPTAIN_SETTINGS.UNITS.FORM.NAME.LABEL') }}
+          <input
+            v-model="name"
+            type="text"
+            :placeholder="$t('CAPTAIN_SETTINGS.UNITS.FORM.NAME.PLACEHOLDER')"
+            @input="v$.name.$touch"
+          />
+          <span v-if="v$.name.$error" class="message">{{
+            $t('CAPTAIN_SETTINGS.UNITS.FORM.NAME.ERROR')
+          }}</span>
+        </label>
+      </div>
+
+      <div class="small-12 columns">
+        <label :class="{ error: v$.inter_account_number.$error }">
+          {{ $t('CAPTAIN_SETTINGS.UNITS.FORM.INTER_ACCOUNT_NUMBER.LABEL') }}
+          <input
+            v-model="inter_account_number"
+            type="text"
+            :placeholder="
+              $t('CAPTAIN_SETTINGS.UNITS.FORM.INTER_ACCOUNT_NUMBER.PLACEHOLDER')
+            "
+            @input="v$.inter_account_number.$touch"
+          />
+          <span v-if="v$.inter_account_number.$error" class="message">{{
+            $t('CAPTAIN_SETTINGS.UNITS.FORM.INTER_ACCOUNT_NUMBER.ERROR')
+          }}</span>
+        </label>
+      </div>
+
+      <div class="small-12 columns">
+        <label :class="{ error: v$.inter_pix_key.$error }">
+          {{ $t('CAPTAIN_SETTINGS.UNITS.FORM.INTER_PIX_KEY.LABEL') }}
+          <input
+            v-model="inter_pix_key"
+            type="text"
+            :placeholder="
+              $t('CAPTAIN_SETTINGS.UNITS.FORM.INTER_PIX_KEY.PLACEHOLDER')
+            "
+            @input="v$.inter_pix_key.$touch"
+          />
+          <span v-if="v$.inter_pix_key.$error" class="message">{{
+            $t('CAPTAIN_SETTINGS.UNITS.FORM.INTER_PIX_KEY.ERROR')
+          }}</span>
+          <p class="help-text">
+            {{ $t('CAPTAIN_SETTINGS.UNITS.FORM.INTER_PIX_KEY.HELP_TEXT') }}
+          </p>
+        </label>
+      </div>
+
+      <div class="small-12 columns">
+        <label>
+          {{ $t('CAPTAIN_SETTINGS.UNITS.INBOX.CONNECT_UNIT_LABEL') }}
+          <select v-model="inbox_id">
+            <option
+              v-for="option in inboxOptions"
+              :key="option.id === null ? 'no-inbox' : option.id"
+              :value="option.id"
+            >
+              {{ option.name }}
+            </option>
+          </select>
+          <p class="help-text">
+            {{ $t('CAPTAIN_SETTINGS.UNITS.INBOX.CONNECT_UNIT_HELP') }}
+          </p>
+        </label>
+      </div>
+
+      <div class="small-12 columns">
+        <label>
+          {{ $t('CAPTAIN_SETTINGS.UNITS.FORM.INTER_CLIENT_ID.LABEL') }}
+          <input
+            v-model="inter_client_id"
+            type="text"
+            :placeholder="
+              $t('CAPTAIN_SETTINGS.UNITS.FORM.INTER_CLIENT_ID.PLACEHOLDER')
+            "
+          />
+        </label>
+      </div>
+
+      <div class="small-12 columns">
+        <label>
+          {{ $t('CAPTAIN_SETTINGS.UNITS.FORM.INTER_CLIENT_SECRET.LABEL') }}
+          <input
+            v-model="inter_client_secret"
+            type="password"
+            :placeholder="
+              $t('CAPTAIN_SETTINGS.UNITS.FORM.INTER_CLIENT_SECRET.PLACEHOLDER')
+            "
+          />
+        </label>
+      </div>
+
+      <div class="small-12 columns">
+        <label>
+          {{ $t('CAPTAIN_SETTINGS.UNITS.FORM.INTER_CERT_CONTENT.LABEL') }}
+          <div class="file-upload-wrapper">
+            <SubmitButton
+              icon="i-lucide-upload"
+              size="sm"
+              variant="outline"
+              color="slate"
+              type="button"
+              @click="triggerFileInput('certFile')"
+            >
+              {{
+                $t(
+                  'CAPTAIN_SETTINGS.UNITS.FORM.INTER_CERT_CONTENT.UPLOAD_BUTTON'
+                )
+              }}
+            </SubmitButton>
+            <input
+              id="certFile"
+              ref="certFile"
+              type="file"
+              accept=".crt,.pem"
+              class="hidden-file-input"
+              @change="handleFileUpload($event, 'inter_cert_content')"
+            />
+          </div>
+          <textarea
+            v-model="inter_cert_content"
+            rows="5"
+            :placeholder="
+              $t('CAPTAIN_SETTINGS.UNITS.FORM.INTER_CERT_CONTENT.PLACEHOLDER')
+            "
+          />
+          <p v-if="!isNew && hasInitialCert" class="help-text text-success">
+            <fluent-icon icon="checkmark-circle" />
+            {{ $t('CAPTAIN_SETTINGS.UNITS.FORM.CERT_PRESENT_HELP') }}
+          </p>
+        </label>
+      </div>
+
+      <div class="small-12 columns">
+        <label>
+          {{ $t('CAPTAIN_SETTINGS.UNITS.FORM.INTER_KEY_CONTENT.LABEL') }}
+          <div class="file-upload-wrapper">
+            <SubmitButton
+              icon="i-lucide-upload"
+              size="sm"
+              variant="outline"
+              color="slate"
+              type="button"
+              @click="triggerFileInput('keyFile')"
+            >
+              {{
+                $t(
+                  'CAPTAIN_SETTINGS.UNITS.FORM.INTER_KEY_CONTENT.UPLOAD_BUTTON'
+                )
+              }}
+            </SubmitButton>
+            <input
+              id="keyFile"
+              ref="keyFile"
+              type="file"
+              accept=".key,.pem"
+              class="hidden-file-input"
+              @change="handleFileUpload($event, 'inter_key_content')"
+            />
+          </div>
+          <textarea
+            v-model="inter_key_content"
+            rows="5"
+            :placeholder="
+              $t('CAPTAIN_SETTINGS.UNITS.FORM.INTER_KEY_CONTENT.PLACEHOLDER')
+            "
+          />
+          <p v-if="!isNew && hasInitialKey" class="help-text text-success">
+            <fluent-icon icon="checkmark-circle" />
+            {{ $t('CAPTAIN_SETTINGS.UNITS.FORM.CERT_PRESENT_HELP') }}
+          </p>
+        </label>
+      </div>
+
+      <div class="small-12 columns">
+        <label>
+          {{ $t('CAPTAIN_SETTINGS.UNITS.FORM.PROACTIVE_PIX_POLLING.LABEL') }}
+        </label>
+        <div class="checkbox-wrapper">
+          <input
+            id="proactive_pix_polling_enabled"
+            v-model="proactive_pix_polling_enabled"
+            type="checkbox"
+            :disabled="!isInterCredentialsReady"
+          />
+          <label for="proactive_pix_polling_enabled" class="checkbox-label">
+            {{
+              $t(
+                'CAPTAIN_SETTINGS.UNITS.FORM.PROACTIVE_PIX_POLLING.CHECKBOX_LABEL'
+              )
+            }}
+          </label>
+        </div>
+        <p class="help-text">
+          {{
+            $t('CAPTAIN_SETTINGS.UNITS.FORM.PROACTIVE_PIX_POLLING.HELP_TEXT')
+          }}
+        </p>
+        <p v-if="!isInterCredentialsReady" class="help-text">
+          {{
+            $t(
+              'CAPTAIN_SETTINGS.UNITS.FORM.PROACTIVE_PIX_POLLING.DISABLED_HELP_TEXT'
+            )
+          }}
+        </p>
+      </div>
+
+      <div class="small-12 columns">
+        <div class="button-wrapper">
+          <router-link
+            :to="{ name: 'captain_settings_units' }"
+            class="button clear"
+          >
+            {{ $t('CAPTAIN_SETTINGS.UNITS.FORM.CANCEL') }}
+          </router-link>
+          <SubmitButton
+            :is-loading="uiFlags.isCreating || uiFlags.isUpdating"
+            :disabled="v$.$invalid"
+            type="submit"
+          >
+            {{ $t('CAPTAIN_SETTINGS.UNITS.FORM.SAVE') }}
+          </SubmitButton>
+        </div>
+      </div>
+    </form>
+  </div>
+</template>
+
+<style scoped>
+.content-box {
+  padding: var(--space-large);
+}
+.button-wrapper {
+  display: flex;
+  justify-content: flex-end;
+  gap: var(--space-small);
+  margin-top: var(--space-normal);
+}
+.help-text {
+  font-size: var(--font-size-mini);
+  color: var(--s-500);
+  margin-top: var(--space-micro);
+}
+.text-success {
+  color: var(--color-success);
+}
+.file-upload-wrapper {
+  margin-bottom: var(--space-small);
+  margin-top: var(--space-micro);
+}
+.hidden-file-input {
+  display: none;
+}
+.checkbox-wrapper {
+  display: flex;
+  align-items: center;
+  gap: var(--space-smaller);
+}
+.checkbox-label {
+  margin: 0;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/captain/units/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/captain/units/Index.vue
new file mode 100644
index 000000000..a9b93e7af
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/captain/units/Index.vue
@@ -0,0 +1,234 @@
+<script setup>
+import { ref, computed, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
+import { useStore, useMapGetter } from 'dashboard/composables/store';
+import { useAlert } from 'dashboard/composables';
+import { useI18n } from 'vue-i18n';
+import SettingsLayout from '../../SettingsLayout.vue';
+import BaseSettingsHeader from '../../components/BaseSettingsHeader.vue';
+import Button from 'dashboard/components-next/button/Button.vue';
+import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
+
+const { t } = useI18n();
+const router = useRouter();
+const store = useStore();
+
+const units = useMapGetter('captainUnits/getUnits');
+const uiFlags = useMapGetter('captainUnits/getUIFlags');
+
+const deleteDialogRef = ref(null);
+const unitToDelete = ref(null);
+
+const hasUnits = computed(() => units.value && units.value.length > 0);
+
+onMounted(async () => {
+  await store.dispatch('captainUnits/get');
+});
+
+const goToNew = () => {
+  router.push({
+    name: 'captain_settings_units_edit',
+    params: { id: 'new' },
+  });
+};
+
+const goToEdit = unit => {
+  router.push({
+    name: 'captain_settings_units_edit',
+    params: { id: unit.id },
+  });
+};
+
+const openDeleteDialog = unit => {
+  unitToDelete.value = unit;
+  deleteDialogRef.value?.open();
+};
+
+const confirmDelete = async () => {
+  if (!unitToDelete.value) return;
+  try {
+    await store.dispatch('captainUnits/delete', unitToDelete.value.id);
+    useAlert(t('CAPTAIN_SETTINGS.UNITS.DELETE.API.SUCCESS_MESSAGE'));
+  } catch {
+    useAlert(t('CAPTAIN_SETTINGS.UNITS.DELETE.API.ERROR_MESSAGE'));
+  } finally {
+    unitToDelete.value = null;
+  }
+};
+</script>
+
+<template>
+  <SettingsLayout
+    :is-loading="uiFlags.isFetching"
+    :loading-message="t('CAPTAIN_SETTINGS.UNITS.TITLE')"
+  >
+    <template #header>
+      <BaseSettingsHeader
+        :title="t('CAPTAIN_SETTINGS.UNITS.TITLE')"
+        :description="t('CAPTAIN_SETTINGS.UNITS.DESC')"
+      >
+        <template #actions>
+          <Button
+            :label="t('CAPTAIN_SETTINGS.UNITS.ADD_UNIT')"
+            icon="i-lucide-plus"
+            @click="goToNew"
+          />
+        </template>
+      </BaseSettingsHeader>
+    </template>
+
+    <template #body>
+      <div class="flex flex-col px-6 pb-8">
+        <!-- Tabela de Unidades -->
+        <div v-if="hasUnits" class="overflow-x-auto">
+          <table class="w-full text-sm">
+            <thead>
+              <tr class="border-b border-n-weak">
+                <th
+                  class="py-3 pr-4 text-left text-xs font-medium uppercase tracking-wider text-n-slate-10"
+                >
+                  {{ t('CAPTAIN_SETTINGS.UNITS.LIST.TABLE_HEADER[0]') }}
+                </th>
+                <th
+                  class="py-3 pr-4 text-left text-xs font-medium uppercase tracking-wider text-n-slate-10"
+                >
+                  {{ t('CAPTAIN_SETTINGS.UNITS.LIST.TABLE_HEADER[1]') }}
+                </th>
+                <th
+                  class="py-3 pr-4 text-left text-xs font-medium uppercase tracking-wider text-n-slate-10"
+                >
+                  {{ t('CAPTAIN_SETTINGS.UNITS.LIST.TABLE_HEADER[2]') }}
+                </th>
+                <th
+                  class="py-3 pr-4 text-left text-xs font-medium uppercase tracking-wider text-n-slate-10"
+                >
+                  {{ t('CAPTAIN_SETTINGS.UNITS.LIST.TABLE_HEADER[3]') }}
+                </th>
+                <th
+                  class="py-3 text-right text-xs font-medium uppercase tracking-wider text-n-slate-10"
+                >
+                  {{ t('CAPTAIN_SETTINGS.UNITS.LIST.TABLE_HEADER[4]') }}
+                </th>
+              </tr>
+            </thead>
+            <tbody class="divide-y divide-n-weak">
+              <tr v-for="unit in units" :key="unit.id">
+                <td class="py-4 pr-4">
+                  <p class="mb-0 font-medium text-n-slate-12">
+                    {{ unit.name }}
+                  </p>
+                  <p class="mb-0 text-xs text-n-slate-10">
+                    {{ unit.inter_pix_key }}
+                  </p>
+                </td>
+                <td class="py-4 pr-4 text-n-slate-11">
+                  <p class="mb-0 text-n-slate-11">
+                    {{ unit.inter_account_number }}
+                  </p>
+                  <p class="mb-0 text-xs text-n-slate-10">
+                    {{
+                      unit.inbox_name ||
+                      t('CAPTAIN_SETTINGS.UNITS.INBOX.NO_UNIT')
+                    }}
+                  </p>
+                </td>
+                <td class="py-4 pr-4">
+                  <div class="flex gap-2">
+                    <span
+                      v-if="unit.has_cert"
+                      class="inline-flex items-center gap-1 rounded-full bg-n-teal-2 px-2 py-0.5 text-xs font-medium text-n-teal-11"
+                    >
+                      {{ t('CAPTAIN_SETTINGS.UNITS.LIST.CERT') }}
+                    </span>
+                    <span
+                      v-else
+                      class="inline-flex items-center gap-1 rounded-full bg-n-amber-2 px-2 py-0.5 text-xs font-medium text-n-amber-11"
+                    >
+                      {{ t('CAPTAIN_SETTINGS.UNITS.LIST.CERT') }}
+                    </span>
+                    <span
+                      v-if="unit.has_key"
+                      class="inline-flex items-center gap-1 rounded-full bg-n-teal-2 px-2 py-0.5 text-xs font-medium text-n-teal-11"
+                    >
+                      {{ t('CAPTAIN_SETTINGS.UNITS.LIST.KEY') }}
+                    </span>
+                    <span
+                      v-else
+                      class="inline-flex items-center gap-1 rounded-full bg-n-amber-2 px-2 py-0.5 text-xs font-medium text-n-amber-11"
+                    >
+                      {{ t('CAPTAIN_SETTINGS.UNITS.LIST.KEY') }}
+                    </span>
+                  </div>
+                </td>
+                <td class="py-4 pr-4">
+                  <span
+                    v-if="unit.proactive_pix_polling_enabled"
+                    class="inline-flex items-center gap-1 rounded-full bg-n-teal-2 px-2 py-0.5 text-xs font-medium text-n-teal-11"
+                  >
+                    {{ t('CAPTAIN_SETTINGS.UNITS.LIST.PROACTIVE_ON') }}
+                  </span>
+                  <span
+                    v-else
+                    class="inline-flex items-center gap-1 rounded-full bg-n-slate-3 px-2 py-0.5 text-xs font-medium text-n-slate-11"
+                  >
+                    {{ t('CAPTAIN_SETTINGS.UNITS.LIST.PROACTIVE_OFF') }}
+                  </span>
+                </td>
+                <td class="py-4">
+                  <div class="flex justify-end gap-2">
+                    <Button
+                      icon="i-lucide-pencil"
+                      variant="ghost"
+                      size="sm"
+                      :label="t('CAPTAIN_SETTINGS.UNITS.EDIT_UNIT')"
+                      @click="goToEdit(unit)"
+                    />
+                    <Button
+                      icon="i-lucide-trash-2"
+                      variant="ghost"
+                      size="sm"
+                      color="ruby"
+                      :label="t('CAPTAIN_SETTINGS.UNITS.DELETE_UNIT')"
+                      @click="openDeleteDialog(unit)"
+                    />
+                  </div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+
+        <!-- Empty State -->
+        <div
+          v-else
+          class="flex flex-col items-center justify-center gap-4 py-20 text-center"
+        >
+          <div class="size-16 rounded-full bg-n-blue-2" />
+          <div class="flex flex-col gap-1">
+            <p class="mb-0 text-base font-medium text-n-slate-12">
+              {{ t('CAPTAIN_SETTINGS.UNITS.LIST.ADD_NEW_UNIT') }}
+            </p>
+            <p class="mb-0 max-w-sm text-sm text-n-slate-10">
+              {{ t('CAPTAIN_SETTINGS.UNITS.LIST.NO_UNITS_MESSAGE') }}
+            </p>
+          </div>
+          <Button
+            :label="t('CAPTAIN_SETTINGS.UNITS.ADD_UNIT')"
+            icon="i-lucide-plus"
+            @click="goToNew"
+          />
+        </div>
+      </div>
+
+      <!-- Dialog de Confirmação de Exclusão -->
+      <Dialog
+        ref="deleteDialogRef"
+        type="alert"
+        :title="t('CAPTAIN_SETTINGS.UNITS.DELETE.CONFIRM.TITLE')"
+        :description="t('CAPTAIN_SETTINGS.UNITS.DELETE.CONFIRM.MESSAGE')"
+        :confirm-button-label="t('CAPTAIN_SETTINGS.UNITS.DELETE.CONFIRM.YES')"
+        @confirm="confirmDelete"
+      />
+    </template>
+  </SettingsLayout>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/captain/units/TestIndex.vue b/app/javascript/dashboard/routes/dashboard/settings/captain/units/TestIndex.vue
new file mode 100644
index 000000000..1a68ad612
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/captain/units/TestIndex.vue
@@ -0,0 +1,29 @@
+<script>
+import SettingsLayout from '../../SettingsLayout.vue';
+import BaseSettingsHeader from '../../components/BaseSettingsHeader.vue';
+
+export default {
+  name: 'TestUnitsIndex',
+  components: {
+    SettingsLayout,
+    BaseSettingsHeader,
+  },
+};
+</script>
+
+<template>
+  <SettingsLayout>
+    <template #header>
+      <BaseSettingsHeader
+        :title="$t('CAPTAIN_SETTINGS.UNITS.TEST.HEADER_TITLE')"
+        :description="$t('CAPTAIN_SETTINGS.UNITS.TEST.HEADER_DESCRIPTION')"
+      />
+    </template>
+
+    <template #body>
+      <div class="p-8">
+        {{ $t('CAPTAIN_SETTINGS.UNITS.TEST.BODY_TEXT') }}
+      </div>
+    </template>
+  </SettingsLayout>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/JasmineConfiguration.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/JasmineConfiguration.vue
new file mode 100644
index 000000000..ad125d8e3
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/JasmineConfiguration.vue
@@ -0,0 +1,214 @@
+<script>
+import { useVuelidate } from '@vuelidate/core';
+import JasmineAPI from 'dashboard/api/inbox/jasmine';
+import { useAlert } from 'dashboard/composables';
+import JasmineKnowledgeBase from './components/JasmineKnowledgeBase.vue';
+import ComboBox from 'dashboard/components-next/combobox/ComboBox.vue';
+import NextButton from 'dashboard/components-next/button/Button.vue';
+import { useMapGetter, useStore } from 'dashboard/composables/store';
+import { computed, onMounted } from 'vue';
+
+export default {
+  components: {
+    JasmineKnowledgeBase,
+    ComboBox,
+    NextButton,
+  },
+  props: {
+    inbox: {
+      type: Object,
+      required: true,
+    },
+    showKnowledgeBase: {
+      type: Boolean,
+      default: true,
+    },
+    isTab: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  setup() {
+    const store = useStore();
+    const units = useMapGetter('captainUnits/getUnits');
+
+    const unitList = computed(() => {
+      return units.value.map(unit => ({
+        value: unit.id,
+        label: unit.name,
+      }));
+    });
+
+    onMounted(() => {
+      store.dispatch('captainUnits/get');
+    });
+
+    return { v$: useVuelidate(), unitList };
+  },
+  data() {
+    return {
+      isEnabled: false,
+      systemPrompt: '',
+      captainUnitId: null,
+      typingDelay: 0,
+      isUpdating: false,
+    };
+  },
+  mounted() {
+    this.fetchSettings();
+  },
+  methods: {
+    async fetchSettings() {
+      try {
+        const { data } = await JasmineAPI.getSettings(this.inbox.id);
+        this.isEnabled = data.is_enabled;
+        this.systemPrompt = data.system_prompt || '';
+        this.captainUnitId =
+          data.captain_unit_id || this.inbox.captain_unit_id || null;
+      } catch (error) {
+        // Fallback to inbox-linked unit when jasmine config endpoint is unavailable.
+        this.captainUnitId = this.inbox.captain_unit_id || null;
+      }
+      this.typingDelay = this.inbox.typing_delay || 0;
+    },
+    async updateSettings() {
+      this.isUpdating = true;
+      try {
+        // Persist unit link in the inbox config so it works even if Jasmine API is unavailable.
+        await this.$store.dispatch('inboxes/updateInbox', {
+          id: this.inbox.id,
+          formData: false,
+          captain_unit_id: this.captainUnitId,
+          typing_delay: this.typingDelay,
+        });
+
+        // Best effort: persist Jasmine-specific settings when backend endpoint exists.
+        try {
+          await JasmineAPI.updateSettings(this.inbox.id, {
+            inbox_config: {
+              is_enabled: this.isEnabled,
+              system_prompt: this.systemPrompt,
+              captain_unit_id: this.captainUnitId,
+            },
+          });
+        } catch (error) {
+          // Ignore missing/unavailable jasmine endpoint to avoid blocking unit link save.
+        }
+
+        useAlert(this.$t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
+      } catch (error) {
+        useAlert(error.message || this.$t('INBOX_MGMT.EDIT.API.ERROR_MESSAGE'));
+      } finally {
+        this.isUpdating = false;
+      }
+    },
+  },
+};
+</script>
+
+<template>
+  <div :class="{ 'mx-8': !isTab }">
+    <div class="settings-section">
+      <div class="flex flex-col gap-1 items-start mb-4">
+        <h2 class="text-xl font-medium text-slate-900 dark:text-slate-100">
+          {{ $t('JASMINE.CONFIG.TITLE') }}
+        </h2>
+        <p class="text-sm text-slate-600 dark:text-slate-400">
+          {{ $t('JASMINE.CONFIG.DESCRIPTION') }}
+        </p>
+      </div>
+
+      <div class="mb-6">
+        <label class="flex items-center gap-2 cursor-pointer">
+          <input
+            v-model="isEnabled"
+            type="checkbox"
+            class="form-checkbox h-5 w-5 text-woot-500 rounded border-gray-300 focus:ring-woot-500"
+          />
+          <span class="text-sm font-medium text-slate-700 dark:text-slate-200">
+            {{ $t('JASMINE.CONFIG.ENABLE') }}
+          </span>
+        </label>
+      </div>
+
+      <div class="mb-6">
+        <label
+          class="block text-sm font-medium text-slate-700 dark:text-slate-200 mb-2"
+        >
+          {{ $t('JASMINE.CONFIG.SYSTEM_PROMPT') }}
+        </label>
+        <textarea
+          v-model="systemPrompt"
+          rows="6"
+          class="w-full text-sm rounded-md border-gray-300 dark:border-slate-700 dark:bg-slate-900 focus:border-woot-500 focus:ring-woot-500"
+          :placeholder="$t('JASMINE.CONFIG.SYSTEM_PROMPT_HELP')"
+        />
+        <p class="mt-1 text-xs text-slate-500">
+          {{ $t('JASMINE.CONFIG.SYSTEM_PROMPT_HELP') }}
+        </p>
+      </div>
+
+      <div class="mb-6">
+        <label
+          class="block text-sm font-medium text-slate-700 dark:text-slate-200 mb-2"
+        >
+          {{
+            $t('CAPTAIN_SETTINGS.UNITS.INBOX.CONNECT_UNIT_LABEL') ||
+            'Captain Unit'
+          }}
+        </label>
+        <ComboBox
+          id="captainUnit"
+          v-model="captainUnitId"
+          :options="unitList"
+          :placeholder="
+            $t('CAPTAIN_SETTINGS.UNITS.INBOX.CONNECT_UNIT_PLACEHOLDER') ||
+            'Select a unit'
+          "
+          class="[&>div>button]:bg-white dark:[&>div>button]:bg-slate-900 [&>div>button:not(.focused)]:dark:outline-n-weak [&>div>button:not(.focused)]:hover:!outline-n-slate-6"
+        />
+        <p class="mt-1 text-xs text-slate-500">
+          {{
+            $t('CAPTAIN_SETTINGS.UNITS.INBOX.CONNECT_UNIT_HELP') ||
+            'Selecione uma Unidade Pix.'
+          }}
+        </p>
+      </div>
+
+      <div class="mb-6">
+        <label
+          class="block text-sm font-medium text-slate-700 dark:text-slate-200 mb-2"
+        >
+          {{
+            $t('JASMINE.CONFIG.TYPING_DELAY_LABEL') ||
+            'Buffer / Delay de Digitação (Segundos)'
+          }}
+        </label>
+        <input
+          v-model.number="typingDelay"
+          type="number"
+          min="0"
+          max="60"
+          class="w-full text-sm rounded-md border-gray-300 dark:border-slate-700 dark:bg-slate-900 focus:border-woot-500 focus:ring-woot-500"
+          :placeholder="
+            $t('JASMINE.CONFIG.TYPING_DELAY_PLACEHOLDER') || 'Ex: 5'
+          "
+        />
+        <p class="mt-1 text-xs text-slate-500">
+          {{
+            $t('JASMINE.CONFIG.TYPING_DELAY_HELP') ||
+            'O tempo que a IA aguardará mensagens (Buffer) antes de simular a digitação e responder. Zero para imediato.'
+          }}
+        </p>
+      </div>
+
+      <NextButton
+        :is-loading="isUpdating"
+        :label="$t('JASMINE.CONFIG.UPDATE_BUTTON')"
+        @click="updateSettings"
+      />
+
+      <JasmineKnowledgeBase v-if="showKnowledgeBase" :inbox-id="inbox.id" />
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index ba15957cf..d36ed7f1f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -24,6 +24,9 @@ import CollaboratorsPage from './settingsPage/CollaboratorsPage.vue';
 import WidgetBuilder from './WidgetBuilder.vue';
 import BotConfiguration from './components/BotConfiguration.vue';
 import AccountHealth from './components/AccountHealth.vue';
+import WuzapiConfiguration from './channels/wuzapi/WuzapiConfiguration.vue';
+import EvolutionGoConfiguration from './channels/evolution_go/EvolutionGoConfiguration.vue';
+import InboxAutoResolve from './components/InboxAutoResolve.vue';
 import { FEATURE_FLAGS } from '../../../../featureFlags';
 import SenderNameExamplePreview from './components/SenderNameExamplePreview.vue';
 import NextButton from 'dashboard/components-next/button/Button.vue';
@@ -55,6 +58,9 @@ export default {
     Editor,
     Avatar,
     AccountHealth,
+    WuzapiConfiguration,
+    EvolutionGoConfiguration,
+    InboxAutoResolve,
   },
   mixins: [inboxMixin],
   setup() {
@@ -81,10 +87,13 @@ export default {
       replyTime: '',
       selectedTabIndex: 0,
       selectedPortalSlug: '',
+      captainUnitId: null,
       showBusinessNameInput: false,
       healthData: null,
       isLoadingHealth: false,
       healthError: null,
+      messageSignatureEnabled: false,
+      typingDelay: 0,
     };
   },
   computed: {
@@ -93,7 +102,22 @@ export default {
       isFeatureEnabledonAccount: 'accounts/isFeatureEnabledonAccount',
       uiFlags: 'inboxes/getUIFlags',
       portals: 'portals/allPortals',
+      captainUnits: 'captainUnits/getUnits',
     }),
+    captainUnitOptions() {
+      const options = (this.captainUnits || []).map(unit => ({
+        id: unit.id,
+        label: unit.name,
+      }));
+
+      return [
+        {
+          id: null,
+          label: this.$t('CAPTAIN_SETTINGS.UNITS.INBOX.NO_UNIT'),
+        },
+        ...options,
+      ];
+    },
     selectedTabKey() {
       return this.tabs[this.selectedTabIndex]?.key;
     },
@@ -110,12 +134,6 @@ export default {
       if (this.isATwilioWhatsAppChannel) {
         return this.$t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.TWILIO');
       }
-      if (this.isAWhatsAppBaileysChannel) {
-        return this.$t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.BAILEYS');
-      }
-      if (this.isAWhatsAppZapiChannel) {
-        return this.$t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.ZAPI');
-      }
       return '';
     },
     tabs() {
@@ -165,9 +183,7 @@ export default {
         this.isAVoiceChannel ||
         (this.isAnEmailChannel && !this.inbox.provider) ||
         this.shouldShowWhatsAppConfiguration ||
-        this.isAWebWidgetInbox ||
-        this.isAWhatsAppBaileysChannel ||
-        this.isAWhatsAppZapiChannel
+        this.isAWebWidgetInbox
       ) {
         visibleToAllChannelTabs = [
           ...visibleToAllChannelTabs,
@@ -403,7 +419,10 @@ export default {
       this.$store.dispatch('agents/get');
       this.$store.dispatch('teams/get');
       this.$store.dispatch('labels/get');
-      this.$store.dispatch('inboxes/get').then(() => {
+      Promise.all([
+        this.$store.dispatch('inboxes/get'),
+        this.$store.dispatch('captainUnits/get'),
+      ]).then(() => {
         this.avatarUrl = this.inbox.avatar_url;
         this.selectedInboxName = this.inbox.name;
         this.webhookUrl = this.inbox.webhook_url;
@@ -424,6 +443,14 @@ export default {
         this.selectedPortalSlug = this.inbox.help_center
           ? this.inbox.help_center.slug
           : '';
+        this.captainUnitId =
+          this.inbox.captain_unit_id ||
+          this.captainUnits.find(
+            unit => Number(unit.inbox_id) === Number(this.currentInboxId)
+          )?.id ||
+          null;
+        this.typingDelay = this.inbox.typing_delay || 0;
+        this.messageSignatureEnabled = this.inbox.message_signature_enabled;
 
         // Set initial tab after inbox data is loaded
         this.setTabFromRouteParam();
@@ -443,9 +470,12 @@ export default {
                 portal => portal.slug === this.selectedPortalSlug
               ).id
             : null,
+          captain_unit_id: this.captainUnitId,
+          typing_delay: this.typingDelay,
           lock_to_single_conversation: this.locktoSingleConversation,
           sender_name_type: this.senderNameType,
           business_name: this.businessName || null,
+          message_signature_enabled: this.messageSignatureEnabled,
           channel: {
             widget_color: this.inbox.widget_color,
             website_url: this.channelWebsiteUrl,
@@ -517,7 +547,7 @@ export default {
       :header-title="inboxName"
     >
       <woot-tabs
-        class="[&_ul]:p-0 top-px relative"
+        class="[&_ul]:p-0"
         :index="selectedTabIndex"
         :border="false"
         @change="onTabChange"
@@ -543,6 +573,14 @@ export default {
         :whatsapp-registration-incomplete="whatsappRegistrationIncomplete"
         :inbox="inbox"
       />
+      <WuzapiConfiguration
+        v-if="isAWhatsAppChannel && inbox.provider === 'wuzapi'"
+        :inbox="inbox"
+      />
+      <EvolutionGoConfiguration
+        v-if="isAWhatsAppChannel && inbox.provider === 'evolution'"
+        :inbox="inbox"
+      />
       <DuplicateInboxBanner
         v-if="hasDuplicateInstagramInbox"
         :content="$t('INBOX_MGMT.ADD.INSTAGRAM.DUPLICATE_INBOX_BANNER')"
@@ -582,6 +620,18 @@ export default {
             "
             @blur="v$.selectedInboxName.$touch"
           />
+          <InboxAutoResolve :inbox="inbox" class="mb-4" />
+          <div class="flex flex-row items-center gap-2 mb-4">
+            <input
+              id="messageSignatureEnabled"
+              v-model="messageSignatureEnabled"
+              type="checkbox"
+              @change="updateInbox"
+            />
+            <label for="messageSignatureEnabled">
+              {{ $t('INBOX_MGMT.ADD.MESSAGE_SIGNATURE.LABEL') }}
+            </label>
+          </div>
           <woot-input
             v-if="isAPIInbox"
             v-model="webhookUrl"
@@ -796,6 +846,47 @@ export default {
               {{ $t('INBOX_MGMT.HELP_CENTER.SUB_TEXT') }}
             </p>
           </div>
+          <div class="pb-4">
+            <label>
+              {{ $t('CAPTAIN_SETTINGS.UNITS.INBOX.CONNECT_UNIT_LABEL') }}
+            </label>
+            <select v-model="captainUnitId">
+              <option
+                v-for="option in captainUnitOptions"
+                :key="option.id === null ? 'no-unit' : option.id"
+                :value="option.id"
+              >
+                {{ option.label }}
+              </option>
+            </select>
+            <p class="pb-1 text-sm not-italic text-n-slate-11">
+              {{ $t('CAPTAIN_SETTINGS.UNITS.INBOX.CONNECT_UNIT_HELP') }}
+            </p>
+          </div>
+
+          <div v-if="captainUnitId" class="pb-4">
+            <label>
+              {{
+                $t('JASMINE.CONFIG.TYPING_DELAY_LABEL') ||
+                'Delay de digitação (segundos)'
+              }}
+            </label>
+            <input
+              v-model.number="typingDelay"
+              type="number"
+              min="0"
+              max="60"
+              :placeholder="
+                $t('JASMINE.CONFIG.TYPING_DELAY_PLACEHOLDER') || 'Ex: 5'
+              "
+            />
+            <p class="pb-1 text-sm not-italic text-n-slate-11">
+              {{
+                $t('JASMINE.CONFIG.TYPING_DELAY_HELP') ||
+                'Tempo simulado (em segundos) que a IA passará digitando antes de responder. Um valor baixo resulta em respostas mais rápidas, mas reações podem passar despercebidas.'
+              }}
+            </p>
+          </div>
           <label v-if="canLocktoSingleConversation" class="pb-4">
             {{ $t('INBOX_MGMT.SETTINGS_POPUP.LOCK_TO_SINGLE_CONVERSATION') }}
             <select v-model="locktoSingleConversation">
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/EvolutionGo.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/EvolutionGo.vue
new file mode 100644
index 000000000..fd75c038c
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/EvolutionGo.vue
@@ -0,0 +1,448 @@
+<script setup>
+import { ref, computed, watch } from 'vue';
+import { useRouter } from 'vue-router';
+import { useStore } from 'vuex';
+import { useI18n } from 'vue-i18n';
+import { useAlert } from 'dashboard/composables';
+import NextButton from 'dashboard/components-next/button/Button.vue';
+
+const router = useRouter();
+const store = useStore();
+const { t } = useI18n();
+
+const evolutionApiUrl = ref('');
+const evolutionAdminToken = ref('');
+const displayName = ref('');
+const channelName = ref('');
+const whatsappNumber = ref('');
+
+const isAlwaysOnline = ref(true);
+const isRejectCalls = ref(true);
+const isMarkMessagesRead = ref(true);
+const isIgnoreGroups = ref(false);
+const isIgnoreStatus = ref(true);
+
+const isCreating = ref(false);
+const isTesting = ref(false);
+const isConnectionTested = ref(false);
+
+// Auto-generate channel name from display name (slugify-ish)
+watch(displayName, newVal => {
+  if (newVal) {
+    channelName.value = newVal
+      .toLowerCase()
+      .trim()
+      .replace(/[^\w\s-]/g, '')
+      .replace(/[\s_-]+/g, '-')
+      .replace(/^-+|-+$/g, '');
+  }
+});
+
+const isSubmitEnabled = computed(() => {
+  return (
+    evolutionApiUrl.value &&
+    evolutionAdminToken.value &&
+    displayName.value &&
+    whatsappNumber.value &&
+    isConnectionTested.value
+  );
+});
+
+const testConnection = async () => {
+  isTesting.value = true;
+  try {
+    const accountId = store.getters.getCurrentAccountId;
+    await window.axios.post(
+      `/api/v1/accounts/${accountId}/evolution/test_connection`,
+      {
+        api_url: evolutionApiUrl.value,
+        api_token: evolutionAdminToken.value,
+      }
+    );
+    isConnectionTested.value = true;
+    useAlert(t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.CONNECT_SUCCESS'));
+  } catch (error) {
+    const errorMessage =
+      error?.response?.data?.error ||
+      t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.CONNECT_ERROR');
+    useAlert(errorMessage);
+    isConnectionTested.value = false;
+  } finally {
+    isTesting.value = false;
+  }
+};
+
+const createChannel = async () => {
+  isCreating.value = true;
+  try {
+    const payload = {
+      channel: {
+        type: 'whatsapp',
+        provider: 'evolution',
+        provider_config: {
+          evolution_base_url: evolutionApiUrl.value.replace(/\/$/, ''),
+          settings: {
+            always_online: isAlwaysOnline.value,
+            reject_call: isRejectCalls.value,
+            read_messages: isMarkMessagesRead.value,
+            ignore_groups: isIgnoreGroups.value,
+            ignore_status: isIgnoreStatus.value,
+          },
+        },
+        evolution_api_token: evolutionAdminToken.value,
+        phone_number: whatsappNumber.value,
+      },
+      name: displayName.value,
+    };
+
+    const response = await store.dispatch('inboxes/createChannel', payload);
+    router.push({
+      name: 'settings_inbox_show',
+      params: { inboxId: response.id },
+    });
+  } catch (error) {
+    const errorMessage =
+      error?.response?.data?.message ||
+      error?.message ||
+      t('INBOX_MGMT.ADD.WHATSAPP.API.ERROR_MESSAGE');
+    useAlert(errorMessage);
+  } finally {
+    isCreating.value = false;
+  }
+};
+</script>
+
+<template>
+  <div class="h-full w-full max-w-2xl mx-auto pb-12">
+    <div class="mb-6">
+      <h2 class="text-2xl font-bold text-n-slate-12">
+        {{ $t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.EVOLUTION') }}
+      </h2>
+      <p class="text-sm text-n-slate-11">
+        {{ $t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.EVOLUTION_DESC') }}
+      </p>
+    </div>
+
+    <form class="space-y-6" @submit.prevent="createChannel">
+      <!-- API Config -->
+      <div
+        class="grid grid-cols-1 gap-4 p-4 border rounded-xl border-n-strong bg-n-alpha-1"
+      >
+        <div>
+          <label
+            class="block text-xs font-semibold mb-1 uppercase tracking-wider opacity-70"
+          >
+            {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.API_URL.LABEL') }}
+            <span class="text-red-500">
+              {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.ASTERISK') }}
+            </span>
+          </label>
+          <input
+            v-model="evolutionApiUrl"
+            type="url"
+            class="w-full px-4 py-2 bg-white border rounded-lg border-n-strong focus:ring-2 focus:ring-blue-500 outline-none"
+            :placeholder="
+              $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.API_URL.PLACEHOLDER')
+            "
+            required
+            @input="isConnectionTested = false"
+          />
+        </div>
+
+        <div>
+          <label
+            class="block text-xs font-semibold mb-1 uppercase tracking-wider opacity-70"
+          >
+            {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.API_TOKEN.LABEL') }}
+            <span class="text-red-500">
+              {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.ASTERISK') }}
+            </span>
+          </label>
+          <input
+            v-model="evolutionAdminToken"
+            type="password"
+            class="w-full px-4 py-2 bg-white border rounded-lg border-n-strong focus:ring-2 focus:ring-blue-500 outline-none"
+            :placeholder="
+              $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.API_TOKEN.PLACEHOLDER')
+            "
+            required
+            @input="isConnectionTested = false"
+          />
+        </div>
+      </div>
+
+      <!-- Identity -->
+      <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+        <div>
+          <label
+            class="block text-xs font-semibold mb-1 uppercase tracking-wider opacity-70"
+          >
+            {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.DISPLAY_NAME.LABEL') }}
+            <span class="text-red-500">
+              {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.ASTERISK') }}
+            </span>
+          </label>
+          <input
+            v-model="displayName"
+            type="text"
+            class="w-full px-4 py-2 bg-white border rounded-lg border-n-strong focus:ring-2 focus:ring-blue-500 outline-none"
+            :placeholder="
+              $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.DISPLAY_NAME.PLACEHOLDER')
+            "
+            required
+          />
+          <p class="mt-1 text-xs text-n-slate-11">
+            {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.DISPLAY_NAME.HELP_TEXT') }}
+          </p>
+        </div>
+
+        <div>
+          <label
+            class="block text-xs font-semibold mb-1 uppercase tracking-wider opacity-70"
+          >
+            {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.CHANNEL_NAME.LABEL') }}
+            <span class="text-red-500">
+              {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.ASTERISK') }}
+            </span>
+          </label>
+          <input
+            v-model="channelName"
+            type="text"
+            class="w-full px-4 py-2 bg-n-alpha-1 border rounded-lg border-n-strong text-n-slate-10 outline-none cursor-not-allowed"
+            readonly
+          />
+          <p class="mt-1 text-xs text-n-slate-11">
+            {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.CHANNEL_NAME.HELP_TEXT') }}
+          </p>
+        </div>
+      </div>
+
+      <div>
+        <label
+          class="block text-xs font-semibold mb-1 uppercase tracking-wider opacity-70"
+        >
+          {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.PHONE_NUMBER.LABEL') }}
+          <span class="text-red-500">
+            {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.ASTERISK') }}
+          </span>
+        </label>
+        <div class="flex items-center">
+          <span
+            class="px-3 py-2 bg-n-alpha-2 border border-r-0 border-n-strong rounded-l-lg text-lg"
+          >
+            {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.HELP.BRAZIL_FLAG') }}
+          </span>
+          <input
+            v-model="whatsappNumber"
+            type="text"
+            class="w-full px-4 py-2 bg-white border rounded-r-lg border-n-strong focus:ring-2 focus:ring-blue-500 outline-none"
+            :placeholder="
+              $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.PHONE_NUMBER.PLACEHOLDER')
+            "
+            required
+          />
+        </div>
+      </div>
+
+      <!-- Instance Settings -->
+      <div class="p-6 border rounded-xl border-n-strong bg-white shadow-sm">
+        <h3 class="text-base font-bold text-n-slate-12 mb-4">
+          {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.INSTANCE_SETTINGS.TITLE') }}
+        </h3>
+        <div class="grid grid-cols-1 md:grid-cols-2 gap-y-3 gap-x-6 text-sm">
+          <label class="flex items-center space-x-3 cursor-pointer group">
+            <input
+              v-model="isAlwaysOnline"
+              type="checkbox"
+              class="w-4 h-4 rounded text-blue-600 border-n-strong focus:ring-blue-500"
+            />
+            <span
+              class="text-n-slate-12 group-hover:text-blue-600 transition-colors"
+            >
+              {{
+                $t(
+                  'INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.INSTANCE_SETTINGS.ALWAYS_ONLINE'
+                )
+              }}
+            </span>
+          </label>
+          <label class="flex items-center space-x-3 cursor-pointer group">
+            <input
+              v-model="isRejectCalls"
+              type="checkbox"
+              class="w-4 h-4 rounded text-blue-600 border-n-strong focus:ring-blue-500"
+            />
+            <span
+              class="text-n-slate-12 group-hover:text-blue-600 transition-colors"
+            >
+              {{
+                $t(
+                  'INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.INSTANCE_SETTINGS.REJECT_CALLS'
+                )
+              }}
+            </span>
+          </label>
+          <label class="flex items-center space-x-3 cursor-pointer group">
+            <input
+              v-model="isMarkMessagesRead"
+              type="checkbox"
+              class="w-4 h-4 rounded text-blue-600 border-n-strong focus:ring-blue-500"
+            />
+            <span
+              class="text-n-slate-12 group-hover:text-blue-600 transition-colors"
+            >
+              {{
+                $t(
+                  'INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.INSTANCE_SETTINGS.READ_MESSAGES'
+                )
+              }}
+            </span>
+          </label>
+          <label class="flex items-center space-x-3 cursor-pointer group">
+            <input
+              v-model="isIgnoreGroups"
+              type="checkbox"
+              class="w-4 h-4 rounded text-blue-600 border-n-strong focus:ring-blue-500"
+            />
+            <span
+              class="text-n-slate-12 group-hover:text-blue-600 transition-colors"
+            >
+              {{
+                $t(
+                  'INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.INSTANCE_SETTINGS.IGNORE_GROUPS'
+                )
+              }}
+            </span>
+          </label>
+          <div
+            class="flex items-center space-x-3 cursor-pointer group col-span-2"
+          >
+            <label class="flex items-center space-x-3 cursor-pointer group">
+              <input
+                v-model="isIgnoreStatus"
+                type="checkbox"
+                class="w-4 h-4 rounded text-blue-600 border-n-strong focus:ring-blue-500"
+              />
+              <span
+                class="text-n-slate-12 group-hover:text-blue-600 transition-colors"
+              >
+                {{
+                  $t(
+                    'INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.INSTANCE_SETTINGS.IGNORE_STATUS'
+                  )
+                }}
+              </span>
+            </label>
+          </div>
+        </div>
+      </div>
+
+      <!-- Help Section -->
+      <div class="p-6 border rounded-xl border-n-strong bg-n-alpha-1">
+        <h4 class="flex items-center text-sm font-bold text-n-slate-12 mb-4">
+          <span class="mr-2">
+            {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.HELP.ICON_INFO') }}
+          </span>
+          {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.HELP.TITLE') }}
+        </h4>
+        <p class="text-xs text-n-slate-11 mb-4 leading-relaxed">
+          {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.HELP.HELP_TEXT_1') }}
+        </p>
+        <ul class="grid grid-cols-1 md:grid-cols-2 gap-4">
+          <li class="flex items-start">
+            <span class="mr-2 mt-0.5 text-xs">
+              {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.HELP.ICON_STAR') }}
+            </span>
+            <div>
+              <p class="text-xs font-semibold text-n-slate-12">
+                {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.HELP.ICON_ROCKET') }}
+                {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.HELP.FEATURE_1') }}
+              </p>
+            </div>
+          </li>
+          <li class="flex items-start">
+            <span class="mr-2 mt-0.5 text-xs">
+              {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.HELP.ICON_STAR') }}
+            </span>
+            <div>
+              <p class="text-xs font-semibold text-n-slate-12">
+                {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.HELP.ICON_SHIELD') }}
+                {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.HELP.FEATURE_2') }}
+              </p>
+            </div>
+          </li>
+          <li class="flex items-start">
+            <span class="mr-2 mt-0.5 text-xs">
+              {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.HELP.ICON_STAR') }}
+            </span>
+            <div>
+              <p class="text-xs font-semibold text-n-slate-12">
+                {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.HELP.ICON_SYNC') }}
+                {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.HELP.FEATURE_3') }}
+              </p>
+            </div>
+          </li>
+          <li class="flex items-start">
+            <span class="mr-2 mt-0.5 text-xs">
+              {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.HELP.ICON_STAR') }}
+            </span>
+            <div>
+              <p class="text-xs font-semibold text-n-slate-12">
+                {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.HELP.ICON_CHART') }}
+                {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.HELP.FEATURE_4') }}
+              </p>
+            </div>
+          </li>
+        </ul>
+      </div>
+
+      <!-- Warning -->
+      <div
+        v-if="!isConnectionTested"
+        class="p-4 bg-yellow-50 border border-yellow-200 rounded-xl flex items-center space-x-3"
+      >
+        <span class="text-xl">
+          {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.HELP.ICON_WARNING') }}
+        </span>
+        <p class="text-xs text-yellow-800 font-medium">
+          {{ $t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.TEST_CONNECTION_BANNER') }}
+        </p>
+      </div>
+
+      <div
+        class="flex items-center justify-between pt-4 border-t border-n-strong"
+      >
+        <NextButton
+          :is-loading="isTesting"
+          type="button"
+          outline
+          :label="$t('INBOX_MGMT.ADD.WHATSAPP.EVOLUTION.TEST_CONNECTION')"
+          @click="testConnection"
+        />
+
+        <div class="flex space-x-3">
+          <NextButton
+            type="button"
+            outline
+            :label="$t('INBOX_MGMT.ADD.WHATSAPP.CANCEL')"
+            @click="router.back()"
+          />
+          <NextButton
+            :is-loading="isCreating"
+            :disabled="!isSubmitEnabled"
+            type="submit"
+            solid
+            blue
+            :label="$t('INBOX_MGMT.ADD.WHATSAPP.SUBMIT_BUTTON')"
+          />
+        </div>
+      </div>
+    </form>
+  </div>
+</template>
+
+<style scoped>
+.cursor-not-allowed {
+  cursor: not-allowed;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
index c84d7d59c..c30761212 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
@@ -6,9 +6,11 @@ import Twilio from './Twilio.vue';
 import ThreeSixtyDialogWhatsapp from './360DialogWhatsapp.vue';
 import CloudWhatsapp from './CloudWhatsapp.vue';
 import WhatsappEmbeddedSignup from './WhatsappEmbeddedSignup.vue';
-import ChannelSelector from 'dashboard/components/ChannelSelector.vue';
-import BaileysWhatsapp from './BaileysWhatsapp.vue';
+import Wuzapi from './Wuzapi.vue';
+import EvolutionGo from './EvolutionGo.vue';
 import ZapiWhatsapp from './ZapiWhatsapp.vue';
+import BaileysWhatsapp from './BaileysWhatsapp.vue';
+import ChannelSelector from 'dashboard/components/ChannelSelector.vue';
 import PromoBanner from 'dashboard/components-next/banner/PromoBanner.vue';
 
 const route = useRoute();
@@ -24,6 +26,8 @@ const PROVIDER_TYPES = {
   THREE_SIXTY_DIALOG: '360dialog',
   BAILEYS: 'baileys',
   ZAPI: 'zapi',
+  WUZAPI: 'wuzapi',
+  EVOLUTION: 'evolution',
 };
 
 const hasWhatsappAppId = computed(() => {
@@ -39,36 +43,44 @@ const showProviderSelection = computed(() => !selectedProvider.value);
 
 const showConfiguration = computed(() => Boolean(selectedProvider.value));
 
-const availableProviders = computed(() => {
-  const providers = [
-    {
-      key: PROVIDER_TYPES.WHATSAPP,
-      title: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.WHATSAPP_CLOUD'),
-      description: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.WHATSAPP_CLOUD_DESC'),
-      icon: 'i-woot-whatsapp',
-    },
-    {
-      key: PROVIDER_TYPES.TWILIO,
-      title: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.TWILIO'),
-      description: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.TWILIO_DESC'),
-      icon: 'i-woot-twilio',
-    },
-    {
-      key: PROVIDER_TYPES.BAILEYS,
-      title: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.BAILEYS'),
-      description: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.BAILEYS_DESC'),
-      icon: 'i-woot-baileys',
-    },
-    {
-      key: PROVIDER_TYPES.ZAPI,
-      title: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.ZAPI'),
-      description: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.ZAPI_DESC'),
-      icon: 'i-woot-zapi',
-    },
-  ];
-
-  return providers;
-});
+const availableProviders = computed(() => [
+  {
+    key: PROVIDER_TYPES.WHATSAPP,
+    title: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.WHATSAPP_CLOUD'),
+    description: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.WHATSAPP_CLOUD_DESC'),
+    icon: 'i-woot-whatsapp',
+  },
+  {
+    key: PROVIDER_TYPES.TWILIO,
+    title: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.TWILIO'),
+    description: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.TWILIO_DESC'),
+    icon: 'i-woot-twilio',
+  },
+  {
+    key: PROVIDER_TYPES.BAILEYS,
+    title: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.BAILEYS'),
+    description: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.BAILEYS_DESC'),
+    icon: 'i-woot-baileys',
+  },
+  {
+    key: PROVIDER_TYPES.ZAPI,
+    title: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.ZAPI'),
+    description: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.ZAPI_DESC'),
+    icon: 'i-woot-zapi',
+  },
+  {
+    key: PROVIDER_TYPES.WUZAPI,
+    title: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.WUZAPI'),
+    description: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.WUZAPI_DESC'),
+    icon: 'i-woot-whatsapp',
+  },
+  {
+    key: PROVIDER_TYPES.EVOLUTION,
+    title: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.EVOLUTION'),
+    description: t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.EVOLUTION_DESC'),
+    icon: 'i-woot-whatsapp',
+  },
+]);
 
 const selectProvider = providerValue => {
   router.push({
@@ -117,7 +129,7 @@ const handleManualLinkClick = () => {
         <img
           src="~dashboard/assets/images/curved-arrow.svg"
           alt=""
-          class="absolute -top-12 right-0 w-20 h-20 pointer-events-none z-10 scale-y-[-1] -rotate-45"
+          class="absolute -top-12 right-64 w-20 h-20 pointer-events-none z-10 scale-y-[-1] -rotate-45"
         />
         <PromoBanner
           :title="
@@ -174,6 +186,15 @@ const handleManualLinkClick = () => {
         <!-- Show manual setup -->
         <CloudWhatsapp v-else-if="shouldShowCloudWhatsapp(selectedProvider)" />
 
+        <Wuzapi v-else-if="selectedProvider === PROVIDER_TYPES.WUZAPI" />
+        <EvolutionGo
+          v-else-if="selectedProvider === PROVIDER_TYPES.EVOLUTION"
+        />
+        <BaileysWhatsapp
+          v-else-if="selectedProvider === PROVIDER_TYPES.BAILEYS"
+        />
+        <ZapiWhatsapp v-else-if="selectedProvider === PROVIDER_TYPES.ZAPI" />
+
         <!-- Other providers -->
         <Twilio
           v-else-if="selectedProvider === PROVIDER_TYPES.TWILIO"
@@ -182,13 +203,7 @@ const handleManualLinkClick = () => {
         <ThreeSixtyDialogWhatsapp
           v-else-if="selectedProvider === PROVIDER_TYPES.THREE_SIXTY_DIALOG"
         />
-        <CloudWhatsapp
-          v-else-if="selectedProvider === PROVIDER_TYPES.WHATSAPP"
-        />
-        <BaileysWhatsapp
-          v-else-if="selectedProvider === PROVIDER_TYPES.BAILEYS"
-        />
-        <ZapiWhatsapp v-else-if="selectedProvider === PROVIDER_TYPES.ZAPI" />
+        <CloudWhatsapp v-else />
       </div>
     </div>
   </div>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Wuzapi.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Wuzapi.vue
new file mode 100644
index 000000000..269b62ed7
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Wuzapi.vue
@@ -0,0 +1,159 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRouter } from 'vue-router';
+import { useStore } from 'vuex';
+import { useI18n } from 'vue-i18n';
+import { useAlert } from 'dashboard/composables';
+import NextButton from 'dashboard/components-next/button/Button.vue';
+
+const router = useRouter();
+const store = useStore();
+const { t } = useI18n();
+
+const wuzapiBaseUrl = ref('');
+const wuzapiAdminToken = ref('');
+const inboxName = ref('');
+const phoneNumber = ref('');
+const autoCreateUser = ref(true);
+const isCreating = ref(false);
+
+const isSubmitEnabled = computed(() => {
+  return (
+    wuzapiBaseUrl.value &&
+    wuzapiAdminToken.value &&
+    inboxName.value &&
+    phoneNumber.value
+  );
+});
+
+const createChannel = async () => {
+  isCreating.value = true;
+  try {
+    const payload = {
+      channel: {
+        type: 'whatsapp',
+        provider: 'wuzapi',
+        provider_config: {
+          wuzapi_base_url: wuzapiBaseUrl.value.replace(/\/$/, ''),
+          wuzapi_admin_token: wuzapiAdminToken.value,
+          auto_create_user: autoCreateUser.value,
+        },
+        phone_number: phoneNumber.value,
+      },
+      name: inboxName.value,
+    };
+
+    const response = await store.dispatch('inboxes/createChannel', payload);
+    router.push({
+      name: 'settings_inbox_show',
+      params: { inboxId: response.id },
+    });
+  } catch (error) {
+    const errorMessage =
+      error?.response?.data?.message ||
+      error?.message ||
+      t('INBOX_MGMT.ADD.WHATSAPP.API.ERROR_MESSAGE');
+    useAlert(errorMessage);
+  } finally {
+    isCreating.value = false;
+  }
+};
+</script>
+
+<template>
+  <div class="h-full w-full">
+    <div class="mb-4">
+      <h2 class="text-xl font-medium text-n-slate-12">
+        {{ $t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.WUZAPI') }}
+      </h2>
+      <p class="text-sm text-n-slate-11">
+        {{ $t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.WUZAPI_DESC') }}
+      </p>
+    </div>
+
+    <form class="flex flex-wrap flex-col mx-0" @submit.prevent="createChannel">
+      <div class="w-full mb-4">
+        <label class="block text-sm font-medium text-n-slate-12 mb-1">
+          {{ $t('INBOX_MGMT.ADD.WHATSAPP.WUZAPI.BASE_URL.LABEL') }}
+        </label>
+        <input
+          v-model="wuzapiBaseUrl"
+          type="url"
+          class="w-full px-3 py-2 border rounded-md border-n-strong"
+          :placeholder="
+            $t('INBOX_MGMT.ADD.WHATSAPP.WUZAPI.BASE_URL.PLACEHOLDER')
+          "
+          required
+        />
+        <p class="mt-1 text-xs text-n-slate-11">
+          {{ $t('INBOX_MGMT.ADD.WHATSAPP.WUZAPI.BASE_URL.HELP_TEXT') }}
+        </p>
+      </div>
+
+      <div class="w-full mb-4">
+        <label class="block text-sm font-medium text-n-slate-12 mb-1">
+          {{ $t('INBOX_MGMT.ADD.WHATSAPP.WUZAPI.ADMIN_TOKEN.LABEL') }}
+        </label>
+        <input
+          v-model="wuzapiAdminToken"
+          type="password"
+          class="w-full px-3 py-2 border rounded-md border-n-strong"
+          :placeholder="
+            $t('INBOX_MGMT.ADD.WHATSAPP.WUZAPI.ADMIN_TOKEN.PLACEHOLDER')
+          "
+          required
+        />
+      </div>
+
+      <div class="w-full mb-4">
+        <label class="block text-sm font-medium text-n-slate-12 mb-1">
+          {{ $t('INBOX_MGMT.ADD.WHATSAPP.INBOX_NAME.LABEL') }}
+        </label>
+        <input
+          v-model="inboxName"
+          type="text"
+          class="w-full px-3 py-2 border rounded-md border-n-strong"
+          :placeholder="$t('INBOX_MGMT.ADD.WHATSAPP.INBOX_NAME.PLACEHOLDER')"
+          required
+        />
+      </div>
+
+      <div class="w-full mb-4">
+        <label class="block text-sm font-medium text-n-slate-12 mb-1">
+          {{ $t('INBOX_MGMT.ADD.WHATSAPP.PHONE_NUMBER.LABEL') }}
+        </label>
+        <input
+          v-model="phoneNumber"
+          type="text"
+          class="w-full px-3 py-2 border rounded-md border-n-strong"
+          :placeholder="$t('INBOX_MGMT.ADD.WHATSAPP.PHONE_NUMBER.PLACEHOLDER')"
+          required
+        />
+      </div>
+
+      <div class="w-full mb-4">
+        <label class="flex items-center space-x-2">
+          <input
+            v-model="autoCreateUser"
+            type="checkbox"
+            class="rounded border-n-strong"
+          />
+          <span class="text-sm text-n-slate-12">
+            {{ $t('INBOX_MGMT.ADD.WHATSAPP.WUZAPI.AUTO_CREATE_USER.LABEL') }}
+          </span>
+        </label>
+      </div>
+
+      <div class="w-full mt-4">
+        <NextButton
+          :is-loading="isCreating"
+          :disabled="!isSubmitEnabled"
+          type="submit"
+          solid
+          blue
+          :label="$t('INBOX_MGMT.ADD.WHATSAPP.SUBMIT_BUTTON')"
+        />
+      </div>
+    </form>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/evolution_go/EvolutionGoConfiguration.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/evolution_go/EvolutionGoConfiguration.vue
new file mode 100644
index 000000000..19e16c5a4
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/evolution_go/EvolutionGoConfiguration.vue
@@ -0,0 +1,211 @@
+<script>
+// Use global axios (window.axios) which has interceptors for auth headers
+import { defineComponent, ref, onMounted, onUnmounted, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useStore } from 'vuex';
+import { useAlert } from 'dashboard/composables';
+import NextButton from 'dashboard/components-next/button/Button.vue';
+
+export default defineComponent({
+  components: { NextButton },
+  props: {
+    inbox: {
+      type: Object,
+      required: true,
+    },
+  },
+  setup(props) {
+    const { t } = useI18n();
+    const store = useStore();
+    const isLoading = ref(false);
+    const isConnected = ref(false);
+    const qrCode = ref('');
+    const statusMessage = ref('');
+    let pollInterval = null;
+
+    // Get accountId reliably from global store (preferred) or inbox prop
+    const accountId = computed(() => {
+      return store.getters.getCurrentAccountId || props.inbox.account_id;
+    });
+
+    // Helper for API URL
+    const getApiUrl = endpoint => {
+      if (!accountId.value) throw new Error('Account ID missing');
+      return `/api/v1/accounts/${accountId.value}/inboxes/${props.inbox.id}/evolution${endpoint}`;
+    };
+
+    function stopPolling() {
+      if (pollInterval) {
+        clearInterval(pollInterval);
+        pollInterval = null;
+      }
+    }
+
+    async function fetchStatus() {
+      if (!accountId.value) return;
+
+      try {
+        const response = await window.axios.get(getApiUrl(''));
+
+        const data = response.data;
+        const evolutionData = data.instance || {};
+
+        const isEvolutionConnected =
+          evolutionData.state === 'open' ||
+          data.state === 'open' ||
+          data.state === 'connected';
+
+        const legacyStatus = data.status || data.state;
+        const isLegacyConnected = ['open', 'connected', 'success'].includes(
+          legacyStatus
+        );
+
+        isConnected.value = isEvolutionConnected || isLegacyConnected;
+        statusMessage.value = evolutionData.state || legacyStatus || 'Unknown';
+
+        if (isConnected.value) {
+          qrCode.value = '';
+          stopPolling();
+        }
+      } catch (error) {
+        statusMessage.value =
+          error.response?.data?.error || error.message || 'Check failed';
+      }
+    }
+
+    /* eslint-disable no-use-before-define */
+    function startPolling() {
+      if (pollInterval) return;
+      pollInterval = setInterval(async () => {
+        await fetchStatus();
+        if (pollInterval && !isConnected.value) {
+          await fetchQrCode();
+        }
+      }, 5000);
+    }
+
+    async function fetchQrCode() {
+      try {
+        const response = await window.axios.get(getApiUrl('/qr'));
+        const d = response.data;
+        // In evolution go, QR is typically returned as base64 in `qrcode` or `base64` property
+        const qrcodeData =
+          d.qrcode?.base64 ||
+          d.base64 ||
+          d.qrcode ||
+          d.qr ||
+          (typeof d.data === 'string' ? d.data : null);
+
+        if (qrcodeData && qrcodeData.length > 20) {
+          qrCode.value = qrcodeData;
+          startPolling();
+        } else {
+          await fetchStatus();
+          if (!isConnected.value) {
+            statusMessage.value = 'QR Code not received and not connected.';
+          }
+        }
+      } catch (error) {
+        statusMessage.value =
+          error.response?.data?.error || 'Failed to load QR';
+      }
+    }
+
+    const disconnect = async () => {
+      isLoading.value = true;
+      try {
+        await window.axios.post(getApiUrl('/disconnect'));
+        useAlert(t('INBOX_MGMT.EDIT.EVOLUTION.DISCONNECT_SUCCESS'));
+        isConnected.value = false;
+        qrCode.value = '';
+        fetchStatus();
+      } catch (error) {
+        useAlert(t('INBOX_MGMT.EDIT.EVOLUTION.DISCONNECT_ERROR'));
+      } finally {
+        isLoading.value = false;
+      }
+    };
+
+    onMounted(() => {
+      fetchStatus();
+      // Only fetch QR code if not already connected
+      if (!isConnected.value) {
+        fetchQrCode();
+      }
+    });
+
+    onUnmounted(() => {
+      stopPolling();
+    });
+
+    return {
+      isLoading,
+      isConnected,
+      qrCode,
+      statusMessage,
+      fetchStatus,
+      disconnect,
+      accountId,
+    };
+  },
+});
+</script>
+
+<template>
+  <div class="mx-8 mt-6">
+    <div class="bg-white p-6 rounded-lg border border-n-weak">
+      <h3 class="text-lg font-medium text-n-slate-12 mb-4">
+        {{ $t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.EVOLUTION') }}
+        {{ `- ${$t('INBOX_MGMT.SETTINGS_POPUP.MESSENGER_CONFIG')}` }}
+      </h3>
+
+      <div v-if="accountId" class="flex flex-col items-center">
+        <div v-if="isConnected" class="flex flex-col items-center">
+          <div class="text-green-600 font-bold mb-4 flex items-center gap-2">
+            <span class="i-woot-checkmark-circle text-2xl" />
+            {{ $t('INBOX_MGMT.EDIT.EVOLUTION.CONNECTED') }}
+          </div>
+          <p class="text-n-slate-11 mb-4">
+            {{ $t('INBOX_MGMT.EDIT.EVOLUTION.CONNECTED_DESC') }}
+          </p>
+          <NextButton
+            color="ruby"
+            :is-loading="isLoading"
+            :label="$t('INBOX_MGMT.EDIT.EVOLUTION.DISCONNECT')"
+            @click="disconnect"
+          />
+        </div>
+
+        <div v-else class="flex flex-col items-center">
+          <div v-if="qrCode" class="mb-4">
+            <img
+              :src="qrCode"
+              alt="Whatsapp QR Code"
+              class="w-64 h-64 border rounded"
+            />
+            <p class="text-center text-sm text-n-slate-11 mt-2">
+              {{ $t('INBOX_MGMT.EDIT.EVOLUTION.SCAN_QR') }}
+            </p>
+          </div>
+
+          <div v-else class="flex flex-col items-center mb-4">
+            <p class="text-n-slate-11 mb-4">
+              {{
+                $t('INBOX_MGMT.EDIT.EVOLUTION.CONNECT_DESC') ||
+                'Loading QR Code...'
+              }}
+            </p>
+          </div>
+
+          <div class="mt-4 text-xs text-n-slate-10">
+            {{ $t('JASMINE.EVOLUTION.STATUS', { status: statusMessage }) }}
+          </div>
+        </div>
+      </div>
+
+      <div v-else class="text-red-600 p-4">
+        {{ $t('JASMINE.EVOLUTION.ACCOUNT_ERROR') }}
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/wuzapi/WuzapiConfiguration.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/wuzapi/WuzapiConfiguration.vue
new file mode 100644
index 000000000..1e7f19a5b
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/wuzapi/WuzapiConfiguration.vue
@@ -0,0 +1,296 @@
+<script>
+// Use global axios (window.axios) which has interceptors for auth headers
+import { defineComponent, ref, onMounted, onUnmounted, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useStore } from 'vuex';
+import { useAlert } from 'dashboard/composables';
+import NextButton from 'dashboard/components-next/button/Button.vue';
+
+export default defineComponent({
+  components: { NextButton },
+  props: {
+    inbox: {
+      type: Object,
+      required: true,
+    },
+  },
+  setup(props) {
+    const { t } = useI18n();
+    const store = useStore();
+    const isLoading = ref(false);
+    const isConnected = ref(false);
+    const qrCode = ref('');
+    const statusMessage = ref('');
+    let pollInterval = null;
+
+    // Get accountId reliably from global store (preferred) or inbox prop
+    const accountId = computed(() => {
+      return store.getters.getCurrentAccountId || props.inbox.account_id;
+    });
+
+    // Helper for API URL
+    const getApiUrl = endpoint => {
+      if (!accountId.value) throw new Error('Account ID missing');
+      return `/api/v1/accounts/${accountId.value}/inboxes/${props.inbox.id}/wuzapi${endpoint}`;
+    };
+
+    function stopPolling() {
+      if (pollInterval) {
+        clearInterval(pollInterval);
+        pollInterval = null;
+      }
+    }
+
+    async function fetchStatus() {
+      if (!accountId.value) return;
+
+      try {
+        const response = await window.axios.get(getApiUrl(''));
+
+        const data = response.data;
+        const wuzapiData = data.data || {};
+
+        const isWuzapiConnected =
+          wuzapiData.connected === true && !!wuzapiData.jid;
+
+        const legacyStatus = data.status || data.state;
+        const isLegacyConnected = ['CONNECTED', 'inChat', 'success'].includes(
+          legacyStatus
+        );
+
+        isConnected.value = isWuzapiConnected || isLegacyConnected;
+        statusMessage.value = wuzapiData.details || legacyStatus || 'Unknown';
+
+        if (isConnected.value) {
+          qrCode.value = '';
+          stopPolling();
+        }
+      } catch (error) {
+        statusMessage.value =
+          error.response?.data?.error || error.message || 'Check failed';
+      }
+    }
+
+    /* eslint-disable no-use-before-define */
+    function startPolling() {
+      if (pollInterval) return;
+      pollInterval = setInterval(async () => {
+        await fetchStatus();
+        if (pollInterval && !isConnected.value) {
+          await fetchQrCode();
+        }
+      }, 5000);
+    }
+
+    async function fetchQrCode() {
+      try {
+        const response = await window.axios.get(getApiUrl('/qr'));
+        const d = response.data;
+        const qrcodeData =
+          d.qrcode ||
+          d.qr ||
+          d.QRCode ||
+          d.data?.qrcode ||
+          d.data?.qr ||
+          (typeof d.data === 'string' ? d.data : null);
+
+        if (qrcodeData && qrcodeData.length > 20) {
+          qrCode.value = qrcodeData;
+          startPolling();
+        } else {
+          await fetchStatus();
+          if (!isConnected.value) {
+            statusMessage.value = 'QR Code not received and not connected.';
+          }
+        }
+      } catch (error) {
+        statusMessage.value =
+          error.response?.data?.error || 'Failed to load QR';
+      }
+    }
+
+    const handleConnect = async () => {
+      if (!accountId.value) {
+        useAlert('Error: Account ID missing');
+        return;
+      }
+
+      isLoading.value = true;
+      try {
+        // 1. Call Connect
+        const connectUrl = getApiUrl('/connect');
+        await window.axios.post(connectUrl);
+        // 2. Fetch QR
+        await fetchQrCode();
+      } catch (error) {
+        useAlert(error.response?.data?.error || 'Connection failed');
+      } finally {
+        isLoading.value = false;
+      }
+    };
+
+    const disconnect = async () => {
+      isLoading.value = true;
+      try {
+        await window.axios.post(getApiUrl('/disconnect'));
+        useAlert(t('INBOX_MGMT.EDIT.WUZAPI.DISCONNECT_SUCCESS'));
+        isConnected.value = false;
+        qrCode.value = '';
+        fetchStatus();
+      } catch (error) {
+        useAlert(t('INBOX_MGMT.EDIT.WUZAPI.DISCONNECT_ERROR'));
+      } finally {
+        isLoading.value = false;
+      }
+    };
+
+    const isLoadingWebhook = ref(false);
+    const webhookInfo = ref(null);
+
+    const fetchWebhookInfo = async () => {
+      isLoadingWebhook.value = true;
+      try {
+        const response = await window.axios.get(getApiUrl('/webhook_info'));
+        webhookInfo.value = response.data;
+        useAlert('Webhook info fetched successfully');
+      } catch (error) {
+        useAlert(error.response?.data?.error || 'Failed to fetch webhook info');
+      } finally {
+        isLoadingWebhook.value = false;
+      }
+    };
+
+    const updateWebhook = async () => {
+      isLoadingWebhook.value = true;
+      try {
+        const response = await window.axios.put(getApiUrl('/update_webhook'));
+        webhookInfo.value = {
+          message: response.data.message,
+          url: response.data.webhook_url,
+        };
+        useAlert('Webhook updated successfully');
+      } catch (error) {
+        useAlert(error.response?.data?.error || 'Failed to update webhook');
+      } finally {
+        isLoadingWebhook.value = false;
+      }
+    };
+
+    onMounted(() => {
+      fetchStatus();
+    });
+
+    onUnmounted(() => {
+      stopPolling();
+    });
+
+    return {
+      isLoading,
+      isConnected,
+      qrCode,
+      statusMessage,
+      fetchStatus,
+      disconnect,
+      handleConnect,
+      accountId,
+      isLoadingWebhook,
+      webhookInfo,
+      fetchWebhookInfo,
+      updateWebhook,
+    };
+  },
+});
+</script>
+
+<template>
+  <div class="mx-8 mt-6">
+    <div class="bg-white p-6 rounded-lg border border-n-weak">
+      <h3 class="text-lg font-medium text-n-slate-12 mb-4">
+        {{ $t('INBOX_MGMT.ADD.WHATSAPP.PROVIDERS.WUZAPI') }}
+        {{ `- ${$t('INBOX_MGMT.SETTINGS_POPUP.MESSENGER_CONFIG')}` }}
+      </h3>
+
+      <div v-if="accountId" class="flex flex-col items-center">
+        <div v-if="isConnected" class="flex flex-col items-center">
+          <div class="text-green-600 font-bold mb-4 flex items-center gap-2">
+            <span class="i-woot-checkmark-circle text-2xl" />
+            {{ $t('INBOX_MGMT.EDIT.WUZAPI.CONNECTED') }}
+          </div>
+          <p class="text-n-slate-11 mb-4">
+            {{ $t('INBOX_MGMT.EDIT.WUZAPI.CONNECTED_DESC') }}
+          </p>
+          <NextButton
+            color="ruby"
+            :is-loading="isLoading"
+            :label="$t('INBOX_MGMT.EDIT.WUZAPI.DISCONNECT')"
+            @click="disconnect"
+          />
+        </div>
+
+        <div v-else class="flex flex-col items-center">
+          <div v-if="qrCode" class="mb-4">
+            <img
+              :src="qrCode"
+              alt="Whatsapp QR Code"
+              class="w-64 h-64 border rounded"
+            />
+            <p class="text-center text-sm text-n-slate-11 mt-2">
+              {{ $t('INBOX_MGMT.EDIT.WUZAPI.SCAN_QR') }}
+            </p>
+          </div>
+
+          <div v-else class="flex flex-col items-center mb-4">
+            <p class="text-n-slate-11 mb-4">
+              {{
+                $t('INBOX_MGMT.EDIT.WUZAPI.CONNECT_DESC') ||
+                'Click to initiate connection'
+              }}
+            </p>
+            <NextButton
+              color="blue"
+              :is-loading="isLoading"
+              :label="
+                $t('INBOX_MGMT.EDIT.WUZAPI.CONNECT') || 'Connect WhatsApp'
+              "
+              @click="handleConnect"
+            />
+          </div>
+
+          <div class="mt-4 text-xs text-n-slate-10">
+            {{ $t('JASMINE.WUZAPI.STATUS', { status: statusMessage }) }}
+          </div>
+        </div>
+      </div>
+
+      <div v-else class="text-red-600 p-4">
+        {{ $t('JASMINE.WUZAPI.ACCOUNT_ERROR') }}
+      </div>
+      <div class="mt-8 pt-6 border-t border-n-weak w-full">
+        <h4 class="text-md font-medium text-n-slate-12 mb-4">
+          {{ $t('JASMINE.WUZAPI.WEBHOOK_SECTION') }}
+        </h4>
+        <div class="flex gap-4 mb-4">
+          <NextButton
+            icon="i-woot-refresh"
+            :is-loading="isLoadingWebhook"
+            :label="$t('JASMINE.WUZAPI.GET_WEBHOOK_INFO')"
+            @click="fetchWebhookInfo"
+          />
+          <NextButton
+            icon="i-woot-upload"
+            :is-loading="isLoadingWebhook"
+            :label="$t('JASMINE.WUZAPI.UPDATE_WEBHOOK')"
+            @click="updateWebhook"
+          />
+        </div>
+
+        <div
+          v-if="webhookInfo"
+          class="bg-n-alpha-1 p-4 rounded text-sm font-mono overflow-auto"
+        >
+          <pre>{{ JSON.stringify(webhookInfo, null, 2) }}</pre>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/InboxAutoResolve.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/InboxAutoResolve.vue
new file mode 100644
index 000000000..02bef8fc4
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/InboxAutoResolve.vue
@@ -0,0 +1,86 @@
+<script>
+import { useVuelidate } from '@vuelidate/core';
+import { useAlert } from 'dashboard/composables';
+import SettingsSection from 'dashboard/components/SettingsSection.vue';
+import NextButton from 'dashboard/components-next/button/Button.vue';
+
+export default {
+  components: {
+    SettingsSection,
+    NextButton,
+  },
+  props: {
+    inbox: {
+      type: Object,
+      required: true,
+    },
+  },
+  setup() {
+    return { v$: useVuelidate() };
+  },
+  data() {
+    return {
+      autoResolveDuration: null,
+      isUpdating: false,
+    };
+  },
+  mounted() {
+    this.autoResolveDuration = this.inbox.auto_resolve_duration;
+  },
+  methods: {
+    async updateInbox() {
+      try {
+        this.isUpdating = true;
+        await this.$store.dispatch('inboxes/updateInbox', {
+          id: this.inbox.id,
+          auto_resolve_duration: this.autoResolveDuration,
+        });
+        useAlert(this.$t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
+      } catch (error) {
+        useAlert(this.$t('INBOX_MGMT.EDIT.API.ERROR_MESSAGE'));
+      } finally {
+        this.isUpdating = false;
+      }
+    },
+  },
+};
+</script>
+
+<template>
+  <div class="mx-8">
+    <SettingsSection
+      :title="$t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.TITLE')"
+      :sub-title="$t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.NOTE')"
+      :show-border="false"
+    >
+      <div class="flex flex-col gap-1 items-start mb-4">
+        <label class="mb-0.5 text-sm font-medium text-n-slate-12">
+          {{ $t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.DURATION.LABEL') }}
+        </label>
+        <div class="w-full">
+          <input
+            v-model="autoResolveDuration"
+            type="number"
+            class="input-group"
+            min="0"
+            :placeholder="
+              $t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.DURATION.PLACEHOLDER')
+            "
+          />
+          <p class="text-sm text-n-slate-11 mt-1">
+            {{ $t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.DURATION.DESCRIPTION') }}
+          </p>
+        </div>
+      </div>
+
+      <div class="flex gap-2">
+        <NextButton
+          type="submit"
+          :is-loading="isUpdating"
+          :label="$t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE.UPDATE_BUTTON')"
+          @click="updateInbox"
+        />
+      </div>
+    </SettingsSection>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/components/JasmineKnowledgeBase.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/JasmineKnowledgeBase.vue
new file mode 100644
index 000000000..405990725
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/components/JasmineKnowledgeBase.vue
@@ -0,0 +1,363 @@
+<script>
+import JasmineAPI from 'dashboard/api/inbox/jasmine';
+import { useAlert } from 'dashboard/composables';
+
+export default {
+  props: {
+    inboxId: {
+      type: [String, Number],
+      required: true,
+    },
+    isTab: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      collections: [],
+      isLoading: false,
+      showCreateCollectionModal: false,
+      newCollectionName: '',
+      newCollectionVisibility: 'private',
+      expandedCollectionId: null,
+      documents: [],
+      isLoadingDocs: false,
+      newDocTitle: '',
+      newDocContent: '',
+      isCreatingDoc: false,
+      isDeletingDocument: null, // Track which doc is being deleted
+    };
+  },
+  mounted() {
+    this.fetchCollections();
+  },
+  methods: {
+    async fetchCollections() {
+      this.isLoading = true;
+      try {
+        const { data } = await JasmineAPI.getCollections();
+        this.collections = data;
+      } catch (error) {
+        useAlert('Failed to load collections');
+      } finally {
+        this.isLoading = false;
+      }
+    },
+    async createCollection() {
+      try {
+        await JasmineAPI.createCollection({
+          collection: {
+            name: this.newCollectionName,
+            visibility: this.newCollectionVisibility,
+            owner_inbox_id: this.inboxId,
+          },
+        });
+        this.newCollectionName = '';
+        this.showCreateCollectionModal = false;
+        this.fetchCollections();
+        useAlert('Collection created successfully');
+      } catch (error) {
+        useAlert('Failed to create collection');
+      }
+    },
+    async toggleCollection(collection) {
+      if (this.expandedCollectionId === collection.id) {
+        this.expandedCollectionId = null;
+        this.documents = [];
+        return;
+      }
+      this.expandedCollectionId = collection.id;
+      this.fetchDocuments(collection.id);
+    },
+    async fetchDocuments(collectionId) {
+      this.isLoadingDocs = true;
+      try {
+        const { data } = await JasmineAPI.getDocuments(collectionId);
+        this.documents = data;
+      } catch (error) {
+        useAlert('Failed to load documents');
+      } finally {
+        this.isLoadingDocs = false;
+      }
+    },
+    async addDocument(collectionId) {
+      this.isCreatingDoc = true;
+      try {
+        await JasmineAPI.uploadDocument(
+          collectionId,
+          this.newDocContent,
+          this.newDocTitle
+        );
+        this.newDocTitle = '';
+        this.newDocContent = '';
+        useAlert('Document added! Processing will start shortly.');
+        // Refresh docs to show new document
+        this.fetchDocuments(collectionId);
+      } catch (error) {
+        useAlert('Failed to add document');
+      } finally {
+        this.isCreatingDoc = false;
+      }
+    },
+    async deleteDocument(collectionId, documentId) {
+      // eslint-disable-next-line no-alert
+      if (!window.confirm(this.$t('JASMINE.KNOWLEDGE_BASE.DELETE_CONFIRM')))
+        return;
+      this.isDeletingDocument = documentId;
+      try {
+        await JasmineAPI.deleteDocument(collectionId, documentId);
+        useAlert(this.$t('JASMINE.KNOWLEDGE_BASE.DOCUMENT_DELETE_SUCCESS'));
+        this.fetchDocuments(collectionId);
+      } catch (error) {
+        useAlert('Failed to delete document');
+      } finally {
+        this.isDeletingDocument = null;
+      }
+    },
+    getStatusClass(status) {
+      const classes = {
+        pending:
+          'bg-amber-100 text-amber-700 dark:bg-amber-900/30 dark:text-amber-400',
+        processing:
+          'bg-blue-100 text-blue-700 dark:bg-blue-900/30 dark:text-blue-400',
+        indexed:
+          'bg-green-100 text-green-700 dark:bg-green-900/30 dark:text-green-400',
+        failed: 'bg-red-100 text-red-700 dark:bg-red-900/30 dark:text-red-400',
+      };
+      return classes[status] || classes.pending;
+    },
+    isProcessing(status) {
+      return status === 'pending' || status === 'processing';
+    },
+  },
+};
+</script>
+
+<template>
+  <div
+    :class="{
+      'mt-8 border-t border-slate-100 dark:border-slate-800 pt-8': !isTab,
+      '': isTab,
+    }"
+  >
+    <!-- Header -->
+    <div class="flex justify-between items-center mb-6">
+      <div>
+        <h3 class="text-lg font-semibold text-slate-900 dark:text-slate-100">
+          {{ $t('JASMINE.KNOWLEDGE_BASE.TITLE') }}
+        </h3>
+        <p class="text-sm text-slate-500 dark:text-slate-400">
+          {{ $t('JASMINE.KNOWLEDGE_BASE.DESCRIPTION') }}
+        </p>
+      </div>
+      <woot-button size="small" @click="showCreateCollectionModal = true">
+        {{ $t('JASMINE.KNOWLEDGE_BASE.ADD_BUTTON') }}
+      </woot-button>
+    </div>
+
+    <!-- Loading -->
+    <div v-if="isLoading" class="flex items-center justify-center py-12">
+      <span class="i-lucide-loader-2 size-6 animate-spin text-slate-400" />
+    </div>
+
+    <!-- Collections List -->
+    <div v-else class="space-y-4">
+      <div
+        v-for="collection in collections"
+        :key="collection.id"
+        class="border border-slate-200 dark:border-slate-700 rounded-lg overflow-hidden"
+      >
+        <!-- Collection Header -->
+        <div
+          class="flex items-center justify-between p-4 bg-white dark:bg-slate-900 cursor-pointer hover:bg-slate-50 dark:hover:bg-slate-800/50"
+          @click="toggleCollection(collection)"
+        >
+          <div class="flex items-center gap-3">
+            <span
+              class="i-lucide-chevron-right size-4 transition-transform text-slate-400"
+              :class="[
+                expandedCollectionId === collection.id ? 'rotate-90' : '',
+              ]"
+            />
+            <div>
+              <h4 class="font-medium text-slate-800 dark:text-slate-200">
+                {{ collection.name }}
+              </h4>
+              <span
+                class="text-xs uppercase tracking-wide px-1.5 py-0.5 rounded bg-slate-100 dark:bg-slate-800 text-slate-500"
+              >
+                {{ collection.visibility }}
+              </span>
+            </div>
+          </div>
+        </div>
+
+        <!-- Expanded: Documents -->
+        <div
+          v-if="expandedCollectionId === collection.id"
+          class="border-t border-slate-100 dark:border-slate-700 bg-slate-50 dark:bg-slate-800/30 p-4"
+        >
+          <h5 class="text-xs font-semibold uppercase text-slate-500 mb-3">
+            {{ $t('JASMINE.KNOWLEDGE_BASE.DOCUMENTS') }}
+          </h5>
+
+          <!-- Loading Documents -->
+          <div
+            v-if="isLoadingDocs"
+            class="flex items-center gap-2 text-sm text-slate-400 py-2"
+          >
+            <span class="i-lucide-loader-2 size-4 animate-spin" />
+            {{ $t('JASMINE.KNOWLEDGE_BASE.LOADING_DOCS') }}
+          </div>
+
+          <!-- Documents List -->
+          <div v-else class="space-y-2 mb-4">
+            <div
+              v-for="doc in documents"
+              :key="doc.id"
+              class="flex items-center justify-between p-3 bg-white dark:bg-slate-900 rounded-lg border border-slate-200 dark:border-slate-700"
+            >
+              <div class="flex items-center gap-3 min-w-0 flex-1">
+                <span
+                  class="i-lucide-file-text size-4 text-slate-400 shrink-0"
+                />
+                <div class="min-w-0">
+                  <p
+                    class="font-medium text-sm text-slate-800 dark:text-slate-200 truncate"
+                  >
+                    {{ doc.title || $t('JASMINE.KNOWLEDGE_BASE.UNTITLED_DOC') }}
+                  </p>
+                  <p class="text-xs text-slate-400 truncate">
+                    {{ new Date(doc.created_at).toLocaleDateString() }}
+                  </p>
+                </div>
+              </div>
+              <div class="flex items-center gap-3 shrink-0">
+                <!-- Status Badge -->
+                <span
+                  class="inline-flex items-center gap-1 px-2 py-0.5 text-xs font-medium rounded-full"
+                  :class="[getStatusClass(doc.status)]"
+                >
+                  <span
+                    v-if="isProcessing(doc.status)"
+                    class="i-lucide-loader-2 size-3 animate-spin"
+                  />
+                  {{ doc.status || 'pending' }}
+                </span>
+                <!-- Delete Button -->
+                <button
+                  class="p-1.5 rounded hover:bg-red-50 dark:hover:bg-red-900/20 text-slate-400 hover:text-red-500 transition-colors"
+                  :disabled="isDeletingDocument === doc.id"
+                  @click.stop="deleteDocument(collection.id, doc.id)"
+                >
+                  <span
+                    v-if="isDeletingDocument === doc.id"
+                    class="i-lucide-loader-2 size-4 animate-spin"
+                  />
+                  <span v-else class="i-lucide-trash-2 size-4" />
+                </button>
+              </div>
+            </div>
+
+            <div
+              v-if="documents.length === 0"
+              class="text-center py-6 text-sm text-slate-400"
+            >
+              {{ $t('JASMINE.KNOWLEDGE_BASE.NO_DOCS') }}
+            </div>
+          </div>
+
+          <!-- Add Document Form -->
+          <div
+            class="border-t border-slate-200 dark:border-slate-700 pt-4 mt-4"
+          >
+            <h6 class="text-xs font-semibold uppercase text-slate-500 mb-3">
+              {{ $t('JASMINE.KNOWLEDGE_BASE.ADD_DOC_HEADER') }}
+            </h6>
+            <input
+              v-model="newDocTitle"
+              type="text"
+              class="w-full mb-2 px-3 py-2 text-sm rounded-lg border border-slate-200 dark:border-slate-700 bg-white dark:bg-slate-900"
+              :placeholder="$t('JASMINE.KNOWLEDGE_BASE.DOC_TITLE_PLACEHOLDER')"
+            />
+            <textarea
+              v-model="newDocContent"
+              rows="4"
+              class="w-full mb-3 px-3 py-2 text-sm rounded-lg border border-slate-200 dark:border-slate-700 bg-white dark:bg-slate-900 resize-none"
+              :placeholder="
+                $t('JASMINE.KNOWLEDGE_BASE.DOC_CONTENT_PLACEHOLDER')
+              "
+            />
+            <div class="flex justify-end">
+              <woot-button
+                size="small"
+                :is-loading="isCreatingDoc"
+                :disabled="!newDocContent.trim()"
+                @click="addDocument(collection.id)"
+              >
+                {{ $t('JASMINE.KNOWLEDGE_BASE.ADD_DOC_BUTTON') }}
+              </woot-button>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- Empty State -->
+      <div
+        v-if="collections.length === 0"
+        class="text-center py-12 text-slate-400"
+      >
+        <span class="i-lucide-folder-open size-12 mx-auto mb-3 opacity-50" />
+        <p class="text-sm">{{ $t('JASMINE.KNOWLEDGE_BASE.NO_COLLECTIONS') }}</p>
+      </div>
+    </div>
+
+    <!-- Create Collection Modal -->
+    <div
+      v-if="showCreateCollectionModal"
+      class="fixed inset-0 z-50 flex items-center justify-center bg-black/50"
+      @click.self="showCreateCollectionModal = false"
+    >
+      <div class="bg-white dark:bg-slate-900 p-6 rounded-xl w-96 shadow-2xl">
+        <h3 class="text-lg font-semibold mb-4 text-slate-900 dark:text-white">
+          {{ $t('JASMINE.KNOWLEDGE_BASE.CREATE_MODAL.TITLE') }}
+        </h3>
+        <input
+          v-model="newCollectionName"
+          type="text"
+          class="w-full mb-4 px-3 py-2 rounded-lg border border-slate-200 dark:border-slate-700 bg-white dark:bg-slate-800"
+          :placeholder="
+            $t('JASMINE.KNOWLEDGE_BASE.CREATE_MODAL.NAME_PLACEHOLDER')
+          "
+          @keyup.enter="createCollection"
+        />
+        <select
+          v-model="newCollectionVisibility"
+          class="w-full mb-4 px-3 py-2 rounded-lg border border-slate-200 dark:border-slate-700 bg-white dark:bg-slate-800"
+        >
+          <option value="private">
+            {{ $t('JASMINE.KNOWLEDGE_BASE.CREATE_MODAL.VISIBILITY_PRIVATE') }}
+          </option>
+          <option value="shared">
+            {{ $t('JASMINE.KNOWLEDGE_BASE.CREATE_MODAL.VISIBILITY_SHARED') }}
+          </option>
+        </select>
+        <div class="flex justify-end gap-2">
+          <woot-button
+            variant="clear"
+            @click="showCreateCollectionModal = false"
+          >
+            {{ $t('JASMINE.KNOWLEDGE_BASE.CREATE_MODAL.CANCEL') }}
+          </woot-button>
+          <woot-button
+            :disabled="!newCollectionName.trim()"
+            @click="createCollection"
+          >
+            {{ $t('JASMINE.KNOWLEDGE_BASE.CREATE_MODAL.CREATE') }}
+          </woot-button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue
index c8dc25e0f..d2ee47e48 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue
@@ -1,321 +1,122 @@
-<script setup>
-import { ref, computed, watch, onMounted } from 'vue';
-import { useStore } from 'vuex';
-import { useRoute, useRouter } from 'vue-router';
-import { vOnClickOutside } from '@vueuse/components';
+<script>
+import { mapGetters } from 'vuex';
 import { useVuelidate } from '@vuelidate/core';
 import { minValue } from '@vuelidate/validators';
 import { useAlert } from 'dashboard/composables';
 import { useConfig } from 'dashboard/composables/useConfig';
 import SettingsSection from '../../../../../components/SettingsSection.vue';
 import NextButton from 'dashboard/components-next/button/Button.vue';
-import Switch from 'dashboard/components-next/switch/Switch.vue';
-import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
-import assignmentPoliciesAPI from 'dashboard/api/assignmentPolicies';
-import { useI18n } from 'vue-i18n';
 
-const props = defineProps({
-  inbox: {
-    type: Object,
-    default: () => ({}),
+export default {
+  components: {
+    SettingsSection,
+    NextButton,
   },
-});
-
-const store = useStore();
-const route = useRoute();
-const router = useRouter();
-const { t } = useI18n();
-const { isEnterprise } = useConfig();
-
-const selectedAgents = ref([]);
-const isAgentListUpdating = ref(false);
-const enableAutoAssignment = ref(false);
-const maxAssignmentLimit = ref(null);
-const assignmentPolicy = ref(null);
-const isLoadingPolicy = ref(false);
-const isDeletingPolicy = ref(false);
-const showDeleteConfirmModal = ref(false);
-const availablePolicies = ref([]);
-const isLoadingPolicies = ref(false);
-const showPolicyDropdown = ref(false);
-const isLinkingPolicy = ref(false);
-
-const agentList = computed(() => store.getters['agents/getAgents']);
-
-const isFeatureEnabled = feature => {
-  const accountId = Number(route.params.accountId);
-  return store.getters['accounts/isFeatureEnabledonAccount'](
-    accountId,
-    feature
-  );
-};
-
-const hasAdvancedAssignment = computed(() => {
-  return isFeatureEnabled('advanced_assignment');
-});
-
-const hasAssignmentV2 = computed(() => {
-  return isFeatureEnabled('assignment_v2');
-});
-
-const showAdvancedAssignmentUI = computed(() => {
-  return hasAdvancedAssignment.value && hasAssignmentV2.value;
-});
-
-const assignmentOrderLabel = computed(() => {
-  if (!assignmentPolicy.value) return '';
-  const priority = assignmentPolicy.value.conversation_priority;
-  if (priority === 'earliest_created') {
-    return t('INBOX_MGMT.ASSIGNMENT.PRIORITY.EARLIEST_CREATED');
-  }
-  if (priority === 'longest_waiting') {
-    return t('INBOX_MGMT.ASSIGNMENT.PRIORITY.LONGEST_WAITING');
-  }
-  return priority;
-});
-
-const assignmentMethodLabel = computed(() => {
-  if (!assignmentPolicy.value) return '';
-  const order = assignmentPolicy.value.assignment_order;
-  if (order === 'round_robin') {
-    return t('INBOX_MGMT.ASSIGNMENT.METHOD.ROUND_ROBIN');
-  }
-  if (order === 'balanced') {
-    return t('INBOX_MGMT.ASSIGNMENT.METHOD.BALANCED');
-  }
-  return order;
-});
-
-// Vuelidate validation rules
-const rules = {
-  maxAssignmentLimit: {
-    minValue: minValue(1),
+  props: {
+    inbox: {
+      type: Object,
+      default: () => ({}),
+    },
   },
-};
+  setup() {
+    const { isEnterprise } = useConfig();
 
-const v$ = useVuelidate(rules, { maxAssignmentLimit });
-
-const maxAssignmentLimitErrors = computed(() => {
-  if (v$.value.maxAssignmentLimit.$error) {
-    return t('INBOX_MGMT.AUTO_ASSIGNMENT.MAX_ASSIGNMENT_LIMIT_RANGE_ERROR');
-  }
-  return '';
-});
-
-const fetchAttachedAgents = async () => {
-  try {
-    const response = await store.dispatch('inboxMembers/get', {
-      inboxId: props.inbox.id,
-    });
-    const {
-      data: { payload: inboxMembers },
-    } = response;
-    selectedAgents.value = inboxMembers;
-  } catch (error) {
-    //  Handle error
-  }
-};
-
-const fetchAssignmentPolicy = async () => {
-  if (!props.inbox.id) return;
-
-  isLoadingPolicy.value = true;
-  try {
-    const response = await assignmentPoliciesAPI.getInboxPolicy(props.inbox.id);
-    assignmentPolicy.value = response.data;
-  } catch (error) {
-    // No policy attached, which is fine
-    assignmentPolicy.value = null;
-  } finally {
-    isLoadingPolicy.value = false;
-  }
-};
-
-const fetchAvailablePolicies = async () => {
-  isLoadingPolicies.value = true;
-  try {
-    const response = await assignmentPoliciesAPI.get();
-    availablePolicies.value = response.data;
-  } catch (error) {
-    availablePolicies.value = [];
-  } finally {
-    isLoadingPolicies.value = false;
-  }
-};
-
-const linkPolicyToInbox = async policy => {
-  isLinkingPolicy.value = true;
-  try {
-    await assignmentPoliciesAPI.setInboxPolicy(props.inbox.id, policy.id);
-    assignmentPolicy.value = policy;
-    showPolicyDropdown.value = false;
-    useAlert(t('INBOX_MGMT.ASSIGNMENT.LINK_SUCCESS'));
-  } catch (error) {
-    useAlert(t('INBOX_MGMT.ASSIGNMENT.LINK_ERROR'));
-  } finally {
-    isLinkingPolicy.value = false;
-  }
-};
-
-const navigateToAssignmentPolicies = () => {
-  const accountId = route.params.accountId;
-  router.push({
-    name: 'agent_assignment_policy_index',
-    params: { accountId },
-  });
-};
-
-const policyMenuItems = computed(() => {
-  const items = availablePolicies.value.map(policy => ({
-    action: 'select_policy',
-    value: policy.id,
-    label: policy.name,
-    icon: 'i-lucide-zap',
-    policy,
-  }));
-
-  items.push({
-    action: 'view_all',
-    value: 'view_all',
-    label: t('INBOX_MGMT.ASSIGNMENT.VIEW_ALL_POLICIES'),
-    icon: 'i-lucide-arrow-right',
-  });
-
-  return items;
-});
-
-const handlePolicyMenuAction = ({ action, policy }) => {
-  if (action === 'select_policy' && policy) {
-    linkPolicyToInbox(policy);
-  } else if (action === 'view_all') {
-    navigateToAssignmentPolicies();
-  }
-  showPolicyDropdown.value = false;
-};
-
-const togglePolicyDropdown = () => {
-  if (!showPolicyDropdown.value && availablePolicies.value.length === 0) {
-    fetchAvailablePolicies();
-  }
-  showPolicyDropdown.value = !showPolicyDropdown.value;
-};
-
-const closePolicyDropdown = () => {
-  showPolicyDropdown.value = false;
-};
-
-const handleToggleAutoAssignment = async () => {
-  try {
-    const payload = {
-      id: props.inbox.id,
-      formData: false,
-      enable_auto_assignment: enableAutoAssignment.value,
+    return { v$: useVuelidate(), isEnterprise };
+  },
+  data() {
+    return {
+      selectedAgents: [],
+      isAgentListUpdating: false,
+      enableAutoAssignment: false,
+      maxAssignmentLimit: null,
     };
-    await store.dispatch('inboxes/updateInbox', payload);
-    useAlert(t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
-  } catch (error) {
-    useAlert(t('INBOX_MGMT.EDIT.API.ERROR_MESSAGE'));
-  }
-};
-
-const updateAgents = async () => {
-  const agentListIds = selectedAgents.value.map(el => el.id);
-  isAgentListUpdating.value = true;
-  try {
-    await store.dispatch('inboxMembers/create', {
-      inboxId: props.inbox.id,
-      agentList: agentListIds,
-    });
-    useAlert(t('AGENT_MGMT.EDIT.API.SUCCESS_MESSAGE'));
-  } catch (error) {
-    useAlert(t('AGENT_MGMT.EDIT.API.ERROR_MESSAGE'));
-  }
-  isAgentListUpdating.value = false;
-};
-
-const updateInbox = async () => {
-  try {
-    const payload = {
-      id: props.inbox.id,
-      formData: false,
-      enable_auto_assignment: enableAutoAssignment.value,
-      auto_assignment_config: {
-        max_assignment_limit: maxAssignmentLimit.value,
+  },
+  computed: {
+    ...mapGetters({
+      agentList: 'agents/getAgents',
+    }),
+    maxAssignmentLimitErrors() {
+      if (this.v$.maxAssignmentLimit.$error) {
+        return this.$t(
+          'INBOX_MGMT.AUTO_ASSIGNMENT.MAX_ASSIGNMENT_LIMIT_RANGE_ERROR'
+        );
+      }
+      return '';
+    },
+  },
+  watch: {
+    inbox() {
+      this.setDefaults();
+    },
+  },
+  mounted() {
+    this.setDefaults();
+  },
+  methods: {
+    setDefaults() {
+      this.enableAutoAssignment = this.inbox.enable_auto_assignment;
+      this.maxAssignmentLimit =
+        this.inbox?.auto_assignment_config?.max_assignment_limit || null;
+      this.fetchAttachedAgents();
+    },
+    async fetchAttachedAgents() {
+      try {
+        const response = await this.$store.dispatch('inboxMembers/get', {
+          inboxId: this.inbox.id,
+        });
+        const {
+          data: { payload: inboxMembers },
+        } = response;
+        this.selectedAgents = inboxMembers;
+      } catch (error) {
+        //  Handle error
+      }
+    },
+    handleEnableAutoAssignment() {
+      this.updateInbox();
+    },
+    async updateAgents() {
+      const agentList = this.selectedAgents.map(el => el.id);
+      this.isAgentListUpdating = true;
+      try {
+        await this.$store.dispatch('inboxMembers/create', {
+          inboxId: this.inbox.id,
+          agentList,
+        });
+        useAlert(this.$t('AGENT_MGMT.EDIT.API.SUCCESS_MESSAGE'));
+      } catch (error) {
+        useAlert(this.$t('AGENT_MGMT.EDIT.API.ERROR_MESSAGE'));
+      }
+      this.isAgentListUpdating = false;
+    },
+    async updateInbox() {
+      try {
+        const payload = {
+          id: this.inbox.id,
+          formData: false,
+          enable_auto_assignment: this.enableAutoAssignment,
+          auto_assignment_config: {
+            max_assignment_limit: this.maxAssignmentLimit,
+          },
+        };
+        await this.$store.dispatch('inboxes/updateInbox', payload);
+        useAlert(this.$t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
+      } catch (error) {
+        useAlert(this.$t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
+      }
+    },
+  },
+  validations: {
+    selectedAgents: {
+      isEmpty() {
+        return !!this.selectedAgents.length;
       },
-    };
-    await store.dispatch('inboxes/updateInbox', payload);
-    useAlert(t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
-  } catch (error) {
-    useAlert(t('INBOX_MGMT.EDIT.API.ERROR_MESSAGE'));
-  }
+    },
+    maxAssignmentLimit: {
+      minValue: minValue(1),
+    },
+  },
 };
-
-const navigateToCreatePolicy = () => {
-  const accountId = route.params.accountId;
-  router.push({
-    name: 'agent_assignment_policy_create',
-    params: { accountId },
-    query: { inboxId: props.inbox.id },
-  });
-};
-
-const navigateToAssignmentPolicyEdit = () => {
-  if (!assignmentPolicy.value?.id) return;
-  const accountId = route.params.accountId;
-  router.push({
-    name: 'agent_assignment_policy_edit',
-    params: { accountId, id: assignmentPolicy.value.id },
-  });
-};
-
-const navigateToBilling = () => {
-  const accountId = route.params.accountId;
-  router.push({
-    name: 'billing_settings_index',
-    params: { accountId },
-  });
-};
-
-const confirmDeletePolicy = () => {
-  showDeleteConfirmModal.value = true;
-};
-
-const cancelDeletePolicy = () => {
-  showDeleteConfirmModal.value = false;
-};
-
-const deleteAssignmentPolicy = async () => {
-  if (isDeletingPolicy.value) return;
-  isDeletingPolicy.value = true;
-  try {
-    await assignmentPoliciesAPI.removeInboxPolicy(props.inbox.id);
-    assignmentPolicy.value = null;
-    showDeleteConfirmModal.value = false;
-    useAlert(t('INBOX_MGMT.ASSIGNMENT_POLICY.DELETE_SUCCESS'));
-  } catch (error) {
-    useAlert(t('INBOX_MGMT.ASSIGNMENT_POLICY.DELETE_ERROR'));
-  } finally {
-    isDeletingPolicy.value = false;
-  }
-};
-
-const setDefaults = () => {
-  enableAutoAssignment.value = props.inbox.enable_auto_assignment;
-  maxAssignmentLimit.value =
-    props.inbox.auto_assignment_config?.max_assignment_limit || null;
-  fetchAttachedAgents();
-  if (showAdvancedAssignmentUI.value) {
-    fetchAssignmentPolicy();
-    fetchAvailablePolicies();
-  }
-};
-
-// Watch only inbox.id to avoid unnecessary refetches when other properties change
-watch(() => props.inbox.id, setDefaults);
-
-onMounted(() => {
-  setDefaults();
-});
 </script>
 
 <template>
@@ -337,6 +138,7 @@ onMounted(() => {
         selected-label
         :select-label="$t('FORMS.MULTISELECT.ENTER_TO_SELECT')"
         :deselect-label="$t('FORMS.MULTISELECT.ENTER_TO_REMOVE')"
+        @select="v$.selectedAgents.$touch"
       />
 
       <NextButton
@@ -350,325 +152,44 @@ onMounted(() => {
       :title="$t('INBOX_MGMT.SETTINGS_POPUP.AGENT_ASSIGNMENT')"
       :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.AGENT_ASSIGNMENT_SUB_TEXT')"
     >
-      <!-- New UI for assignment_v2 -->
-      <template v-if="hasAssignmentV2">
-        <div class="flex items-start gap-3">
-          <Switch
+      <label class="w-3/4 settings-item">
+        <div class="flex items-center gap-2">
+          <input
+            id="enableAutoAssignment"
             v-model="enableAutoAssignment"
-            class="flex-shrink-0 mt-0.5"
-            @change="handleToggleAutoAssignment"
+            type="checkbox"
+            @change="handleEnableAutoAssignment"
           />
-          <div class="flex-grow">
-            <label class="text-sm text-n-slate-12 font-medium mb-1">
-              {{ $t('INBOX_MGMT.ASSIGNMENT.ENABLE_AUTO_ASSIGNMENT') }}
-            </label>
-            <p class="text-sm text-n-slate-11">
-              {{ $t('INBOX_MGMT.ASSIGNMENT.DESCRIPTION') }}
-            </p>
-          </div>
+          <label for="enableAutoAssignment">
+            {{ $t('INBOX_MGMT.SETTINGS_POPUP.AUTO_ASSIGNMENT') }}
+          </label>
         </div>
 
-        <Transition
-          enter-active-class="transition-all duration-200 ease-out"
-          enter-from-class="opacity-0 -translate-y-2"
-          enter-to-class="opacity-100 translate-y-0"
-          leave-active-class="transition-all duration-150 ease-in"
-          leave-from-class="opacity-100 translate-y-0"
-          leave-to-class="opacity-0 -translate-y-2"
-        >
-          <div v-if="enableAutoAssignment" class="mt-6">
-            <!-- Policy Card - When policy is attached -->
-            <div
-              v-if="showAdvancedAssignmentUI && assignmentPolicy"
-              class="p-4 rounded-xl outline-1 outline-n-weak outline bg-n-solid-1 dark:bg-n-slate-1"
-            >
-              <div class="flex items-start gap-4">
-                <div
-                  class="flex-shrink-0 size-12 rounded-xl bg-n-slate-3 flex items-center justify-center"
-                >
-                  <span class="i-lucide-zap text-xl text-n-slate-11" />
-                </div>
-                <div class="flex-grow">
-                  <div class="flex items-start justify-between gap-4 mb-4">
-                    <div class="flex flex-col items-start">
-                      <span class="text-base font-medium text-n-slate-12 mb-1">
-                        {{ assignmentPolicy.name }}
-                      </span>
-                      <p class="text-sm text-n-slate-11">
-                        {{ $t('INBOX_MGMT.ASSIGNMENT.POLICY_LABEL') }}
-                      </p>
-                    </div>
-                    <NextButton
-                      icon="i-lucide-trash-2"
-                      ghost
-                      ruby
-                      sm
-                      @click="confirmDeletePolicy"
-                    />
-                  </div>
-
-                  <ul class="space-y-2 mb-6">
-                    <li class="flex items-center gap-2">
-                      <span
-                        class="w-1.5 h-1.5 rounded-full bg-n-slate-11 flex-shrink-0"
-                      />
-                      <span class="text-sm text-n-slate-12">
-                        {{ assignmentOrderLabel }}
-                      </span>
-                    </li>
-                    <li class="flex items-center gap-2">
-                      <span
-                        class="w-1.5 h-1.5 rounded-full bg-n-slate-11 flex-shrink-0"
-                      />
-                      <span class="text-sm text-n-slate-12">
-                        {{ assignmentMethodLabel }}
-                      </span>
-                    </li>
-                  </ul>
-
-                  <div class="w-full h-px my-4 bg-n-weak" />
-
-                  <NextButton
-                    :label="$t('INBOX_MGMT.ASSIGNMENT.CUSTOMIZE_POLICY')"
-                    icon="i-lucide-arrow-right"
-                    trailing-icon
-                    link
-                    class="mb-2"
-                    @click="navigateToAssignmentPolicyEdit"
-                  />
-                </div>
-              </div>
-            </div>
-
-            <!-- Default Policy - When no custom policy attached but feature enabled -->
-            <div
-              v-else-if="
-                showAdvancedAssignmentUI &&
-                !assignmentPolicy &&
-                !isLoadingPolicy
-              "
-              class="rounded-xl outline-1 outline-n-weak outline"
-            >
-              <!-- Default Policy Header -->
-              <div class="p-4">
-                <div class="flex items-start gap-4">
-                  <div
-                    class="flex-shrink-0 w-12 h-12 rounded-xl bg-n-slate-3 dark:bg-n-slate-4 flex items-center justify-center"
-                  >
-                    <i class="i-lucide-zap text-xl text-n-slate-11" />
-                  </div>
-                  <div class="flex-grow">
-                    <h4 class="text-base font-medium text-n-slate-12 mb-1">
-                      {{ $t('INBOX_MGMT.ASSIGNMENT.DEFAULT_POLICY_LINKED') }}
-                    </h4>
-                    <p class="text-sm text-n-slate-11">
-                      {{
-                        $t('INBOX_MGMT.ASSIGNMENT.DEFAULT_POLICY_DESCRIPTION')
-                      }}
-                    </p>
-                  </div>
-                </div>
-
-                <!-- Action Buttons -->
-                <div class="mt-5 flex items-center gap-3">
-                  <div
-                    v-if="!isLoadingPolicies && availablePolicies.length > 0"
-                    v-on-click-outside="closePolicyDropdown"
-                    class="relative"
-                  >
-                    <button
-                      type="button"
-                      class="inline-flex items-center gap-1.5 px-4 py-2 text-sm font-medium text-white bg-n-brand hover:bg-n-brand/90 rounded-lg transition-colors"
-                      @click="togglePolicyDropdown"
-                    >
-                      <i class="i-lucide-link text-sm" />
-                      {{ $t('INBOX_MGMT.ASSIGNMENT.LINK_EXISTING_POLICY') }}
-                      <i
-                        class="i-lucide-chevron-down text-sm transition-transform"
-                        :class="{ 'rotate-180': showPolicyDropdown }"
-                      />
-                    </button>
-
-                    <DropdownMenu
-                      v-if="showPolicyDropdown"
-                      class="top-full left-0 mt-2 min-w-72"
-                      :menu-items="policyMenuItems"
-                      :is-searching="isLoadingPolicies"
-                      @action="handlePolicyMenuAction"
-                    />
-                  </div>
-
-                  <button
-                    type="button"
-                    class="inline-flex items-center gap-1.5 px-4 py-2 text-sm font-medium text-n-slate-12 bg-n-slate-3 dark:bg-n-slate-4 hover:bg-n-slate-4 dark:hover:bg-n-slate-5 rounded-lg transition-colors"
-                    @click="navigateToCreatePolicy"
-                  >
-                    <i class="i-lucide-plus text-sm" />
-                    {{ $t('INBOX_MGMT.ASSIGNMENT.CREATE_NEW_POLICY') }}
-                  </button>
-                </div>
-              </div>
-
-              <!-- Default Rules Info -->
-              <div class="px-4 py-4 border-t border-n-weak bg-n-slate-2">
-                <div class="flex items-start gap-3">
-                  <i class="i-lucide-info text-base text-n-slate-10 mt-0.5" />
-                  <div>
-                    <p class="text-sm text-n-slate-11 mb-2">
-                      {{ $t('INBOX_MGMT.ASSIGNMENT.CURRENT_BEHAVIOR') }}
-                    </p>
-                    <ul class="space-y-1">
-                      <li class="flex items-center gap-2">
-                        <span
-                          class="w-1 h-1 rounded-full bg-n-slate-10 flex-shrink-0"
-                        />
-                        <span class="text-sm text-n-slate-11">
-                          {{ $t('INBOX_MGMT.ASSIGNMENT.DEFAULT_RULE_1') }}
-                        </span>
-                      </li>
-                      <li class="flex items-center gap-2">
-                        <span
-                          class="w-1 h-1 rounded-full bg-n-slate-10 flex-shrink-0"
-                        />
-                        <span class="text-sm text-n-slate-11">
-                          {{ $t('INBOX_MGMT.ASSIGNMENT.DEFAULT_RULE_2') }}
-                        </span>
-                      </li>
-                    </ul>
-                  </div>
-                </div>
-              </div>
-            </div>
-
-            <!-- Default Rules Card - Feature not enabled (no advanced_assignment) -->
-            <div
-              v-else-if="!showAdvancedAssignmentUI"
-              class="p-4 rounded-xl outline outline-1 outline-n-weak -outline-offset-1"
-            >
-              <div class="flex items-start gap-4">
-                <div
-                  class="flex-shrink-0 w-12 h-12 rounded-xl bg-n-slate-3 dark:bg-n-slate-4 flex items-center justify-center"
-                >
-                  <i class="i-lucide-zap text-xl text-n-slate-11" />
-                </div>
-                <div class="flex-grow">
-                  <h4 class="text-base font-medium text-n-slate-12 mb-1">
-                    {{ $t('INBOX_MGMT.ASSIGNMENT.DEFAULT_RULES_TITLE') }}
-                  </h4>
-                  <p class="text-sm text-n-slate-11 mb-4">
-                    {{ $t('INBOX_MGMT.ASSIGNMENT.DEFAULT_RULES_DESCRIPTION') }}
-                  </p>
-
-                  <ul class="space-y-2 mb-6">
-                    <li class="flex items-center gap-2">
-                      <span
-                        class="w-1.5 h-1.5 rounded-full bg-n-slate-11 flex-shrink-0"
-                      />
-                      <span class="text-sm font-medium text-n-slate-12">
-                        {{ $t('INBOX_MGMT.ASSIGNMENT.DEFAULT_RULE_1') }}
-                      </span>
-                    </li>
-                    <li class="flex items-center gap-2">
-                      <span
-                        class="w-1.5 h-1.5 rounded-full bg-n-slate-11 flex-shrink-0"
-                      />
-                      <span class="text-sm font-medium text-n-slate-12">
-                        {{ $t('INBOX_MGMT.ASSIGNMENT.DEFAULT_RULE_2') }}
-                      </span>
-                    </li>
-                  </ul>
-
-                  <div class="w-full h-px bg-n-weak my-4" />
-
-                  <!-- Upgrade prompt when advanced_assignment is not enabled -->
-                  <div v-if="!hasAdvancedAssignment">
-                    <p class="text-sm text-n-slate-11 mb-1">
-                      {{ $t('INBOX_MGMT.ASSIGNMENT.UPGRADE_PROMPT') }}
-                    </p>
-                    <NextButton
-                      :label="$t('INBOX_MGMT.ASSIGNMENT.UPGRADE_TO_BUSINESS')"
-                      icon="i-lucide-arrow-right"
-                      trailing-icon
-                      link
-                      @click="navigateToBilling"
-                    />
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </Transition>
-      </template>
-
-      <!-- Old UI for non-assignment_v2 -->
-      <template v-else>
-        <label class="w-3/4 settings-item">
-          <div class="flex items-center gap-2">
-            <input
-              id="enableAutoAssignment"
-              v-model="enableAutoAssignment"
-              type="checkbox"
-              @change="handleToggleAutoAssignment"
-            />
-            <label for="enableAutoAssignment">
-              {{ $t('INBOX_MGMT.SETTINGS_POPUP.AUTO_ASSIGNMENT') }}
-            </label>
-          </div>
-
-          <p class="pb-1 text-sm not-italic text-n-slate-11">
-            {{ $t('INBOX_MGMT.SETTINGS_POPUP.AUTO_ASSIGNMENT_SUB_TEXT') }}
-          </p>
-        </label>
-
-        <div v-if="enableAutoAssignment && isEnterprise" class="py-3">
-          <woot-input
-            v-model="maxAssignmentLimit"
-            type="number"
-            :class="{ error: v$.maxAssignmentLimit.$error }"
-            :error="maxAssignmentLimitErrors"
-            :label="$t('INBOX_MGMT.AUTO_ASSIGNMENT.MAX_ASSIGNMENT_LIMIT')"
-            @blur="v$.maxAssignmentLimit.$touch"
-          />
-
-          <p class="pb-1 text-sm not-italic text-n-slate-11">
-            {{ $t('INBOX_MGMT.AUTO_ASSIGNMENT.MAX_ASSIGNMENT_LIMIT_SUB_TEXT') }}
-          </p>
-
-          <NextButton
-            :label="$t('INBOX_MGMT.SETTINGS_POPUP.UPDATE')"
-            :disabled="v$.maxAssignmentLimit.$invalid"
-            @click="updateInbox"
-          />
-        </div>
-      </template>
-    </SettingsSection>
-
-    <woot-modal
-      v-if="showDeleteConfirmModal"
-      :show="showDeleteConfirmModal"
-      :on-close="cancelDeletePolicy"
-    >
-      <div class="p-6">
-        <h3 class="text-lg font-medium text-n-slate-12 mb-4">
-          {{ $t('INBOX_MGMT.ASSIGNMENT_POLICY.DELETE_CONFIRM_TITLE') }}
-        </h3>
-        <p class="text-sm text-n-slate-11 mb-6 ml-13">
-          {{ $t('INBOX_MGMT.ASSIGNMENT_POLICY.DELETE_CONFIRM_MESSAGE') }}
+        <p class="pb-1 text-sm not-italic text-n-slate-11">
+          {{ $t('INBOX_MGMT.SETTINGS_POPUP.AUTO_ASSIGNMENT_SUB_TEXT') }}
         </p>
-        <div class="flex justify-end gap-2">
-          <NextButton
-            color="slate"
-            :label="$t('INBOX_MGMT.ASSIGNMENT_POLICY.CANCEL')"
-            @click="cancelDeletePolicy"
-          />
-          <NextButton
-            color="ruby"
-            :label="$t('INBOX_MGMT.ASSIGNMENT_POLICY.CONFIRM_DELETE')"
-            :is-loading="isDeletingPolicy"
-            @click="deleteAssignmentPolicy"
-          />
-        </div>
+      </label>
+
+      <div v-if="enableAutoAssignment && isEnterprise" class="py-3">
+        <woot-input
+          v-model="maxAssignmentLimit"
+          type="number"
+          :class="{ error: v$.maxAssignmentLimit.$error }"
+          :error="maxAssignmentLimitErrors"
+          :label="$t('INBOX_MGMT.AUTO_ASSIGNMENT.MAX_ASSIGNMENT_LIMIT')"
+          @blur="v$.maxAssignmentLimit.$touch"
+        />
+
+        <p class="pb-1 text-sm not-italic text-n-slate-11">
+          {{ $t('INBOX_MGMT.AUTO_ASSIGNMENT.MAX_ASSIGNMENT_LIMIT_SUB_TEXT') }}
+        </p>
+
+        <NextButton
+          :label="$t('INBOX_MGMT.SETTINGS_POPUP.UPDATE')"
+          :disabled="v$.maxAssignmentLimit.$invalid"
+          @click="updateInbox"
+        />
       </div>
-    </woot-modal>
+    </SettingsSection>
   </div>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
index 2bb276290..25f96ad3e 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
@@ -5,14 +5,11 @@ import SettingsSection from '../../../../../components/SettingsSection.vue';
 import ImapSettings from '../ImapSettings.vue';
 import SmtpSettings from '../SmtpSettings.vue';
 import { useVuelidate } from '@vuelidate/core';
+import { required } from '@vuelidate/validators';
 import NextButton from 'dashboard/components-next/button/Button.vue';
 import TextArea from 'next/textarea/TextArea.vue';
 import WhatsappReauthorize from '../channels/whatsapp/Reauthorize.vue';
-import { sanitizeAllowedDomains, isValidURL } from 'dashboard/helper/URLHelper';
-import { requiredIf } from '@vuelidate/validators';
-import WhatsappLinkDeviceModal from '../components/WhatsappLinkDeviceModal.vue';
-import InboxName from 'dashboard/components/widgets/InboxName.vue';
-import Switch from 'dashboard/components-next/switch/Switch.vue';
+import { sanitizeAllowedDomains } from 'dashboard/helper/URLHelper';
 
 export default {
   components: {
@@ -22,10 +19,6 @@ export default {
     NextButton,
     TextArea,
     WhatsappReauthorize,
-    WhatsappLinkDeviceModal,
-    InboxName,
-    // eslint-disable-next-line vue/no-reserved-component-names
-    Switch,
   },
   mixins: [inboxMixin],
   props: {
@@ -45,29 +38,10 @@ export default {
       isSyncingTemplates: false,
       allowedDomains: '',
       isUpdatingAllowedDomains: false,
-      baileysProviderUrl: '',
-      showLinkDeviceModal: false,
-      markAsRead: true,
-      zapiInstanceId: '',
-      zapiToken: '',
-      zapiClientToken: '',
-      zapiInstanceIdUpdate: '',
-      zapiTokenUpdate: '',
-      zapiClientTokenUpdate: '',
     };
   },
-  validations() {
-    return {
-      whatsAppInboxAPIKey: {
-        requiredIf: requiredIf(
-          !this.isAWhatsAppBaileysChannel && !this.isAWhatsAppZapiChannel
-        ),
-      },
-      baileysProviderUrl: { isValidURL: value => !value || isValidURL(value) },
-      zapiInstanceIdUpdate: {},
-      zapiTokenUpdate: {},
-      zapiClientTokenUpdate: {},
-    };
+  validations: {
+    whatsAppInboxAPIKey: { required },
   },
   computed: {
     isEmbeddedSignupWhatsApp() {
@@ -92,11 +66,6 @@ export default {
     setDefaults() {
       this.hmacMandatory = this.inbox.hmac_mandatory || false;
       this.allowedDomains = this.inbox.allowed_domains || '';
-      this.baileysProviderUrl = this.inbox.provider_config?.provider_url ?? '';
-      this.markAsRead = this.inbox.provider_config?.mark_as_read ?? true;
-      this.zapiInstanceId = this.inbox.provider_config?.instance_id ?? '';
-      this.zapiToken = this.inbox.provider_config?.token ?? '';
-      this.zapiClientToken = this.inbox.provider_config?.client_token ?? '';
     },
     handleHmacFlag() {
       this.updateInbox();
@@ -175,103 +144,6 @@ export default {
         this.isSyncingTemplates = false;
       }
     },
-    async updateBaileysProviderUrl() {
-      try {
-        const payload = {
-          id: this.inbox.id,
-          formData: false,
-          channel: {
-            provider_config: {
-              ...this.inbox.provider_config,
-              provider_url: this.baileysProviderUrl,
-            },
-          },
-        };
-
-        await this.$store.dispatch('inboxes/updateInbox', payload);
-        useAlert(this.$t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
-      } catch (error) {
-        useAlert(this.$t('INBOX_MGMT.EDIT.API.ERROR_MESSAGE'));
-      }
-    },
-    async updateWhatsAppMarkAsRead() {
-      try {
-        const payload = {
-          id: this.inbox.id,
-          formData: false,
-          channel: {
-            provider_config: {
-              ...this.inbox.provider_config,
-              mark_as_read: this.markAsRead,
-            },
-          },
-        };
-        await this.$store.dispatch('inboxes/updateInbox', payload);
-        useAlert(this.$t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
-      } catch (error) {
-        useAlert(this.$t('INBOX_MGMT.EDIT.API.ERROR_MESSAGE'));
-      }
-    },
-    onOpenLinkDeviceModal() {
-      this.showLinkDeviceModal = true;
-    },
-    onCloseLinkDeviceModal() {
-      this.showLinkDeviceModal = false;
-    },
-    async updateZapiInstanceId() {
-      try {
-        const payload = {
-          id: this.inbox.id,
-          formData: false,
-          channel: {
-            provider_config: {
-              ...this.inbox.provider_config,
-              instance_id: this.zapiInstanceIdUpdate,
-            },
-          },
-        };
-        await this.$store.dispatch('inboxes/updateInbox', payload);
-        useAlert(this.$t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
-      } catch (error) {
-        useAlert(this.$t('INBOX_MGMT.EDIT.API.ERROR_MESSAGE'));
-      }
-    },
-    async updateZapiToken() {
-      try {
-        const payload = {
-          id: this.inbox.id,
-          formData: false,
-          channel: {
-            provider_config: {
-              ...this.inbox.provider_config,
-              token: this.zapiTokenUpdate,
-            },
-          },
-        };
-        await this.$store.dispatch('inboxes/updateInbox', payload);
-        useAlert(this.$t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
-      } catch (error) {
-        useAlert(this.$t('INBOX_MGMT.EDIT.API.ERROR_MESSAGE'));
-      }
-    },
-    async updateZapiClientToken() {
-      try {
-        const payload = {
-          id: this.inbox.id,
-          formData: false,
-          channel: {
-            provider_config: {
-              ...this.inbox.provider_config,
-              client_token: this.zapiClientTokenUpdate,
-            },
-          },
-        };
-        await this.$store.dispatch('inboxes/updateInbox', payload);
-        useAlert(this.$t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
-      } catch (error) {
-        useAlert(this.$t('INBOX_MGMT.EDIT.API.ERROR_MESSAGE'));
-      }
-    },
   },
 };
 </script>
@@ -454,7 +326,7 @@ export default {
     <ImapSettings :inbox="inbox" />
     <SmtpSettings v-if="inbox.imap_enabled" :inbox="inbox" />
   </div>
-  <div v-else-if="isAWhatsAppCloudChannel">
+  <div v-else-if="isAWhatsAppChannel && !isATwilioChannel">
     <div v-if="inbox.provider_config" class="mx-8">
       <!-- Embedded Signup Section -->
       <template v-if="isEmbeddedSignupWhatsApp">
@@ -550,285 +422,6 @@ export default {
       class="hidden"
     />
   </div>
-  <div v-else-if="isAWhatsAppBaileysChannel">
-    <WhatsappLinkDeviceModal
-      v-if="showLinkDeviceModal"
-      :show="showLinkDeviceModal"
-      :on-close="onCloseLinkDeviceModal"
-      :inbox="inbox"
-    />
-    <div class="mx-8">
-      <SettingsSection
-        :title="
-          $t(
-            'INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_MANAGE_PROVIDER_CONNECTION_TITLE'
-          )
-        "
-        :sub-title="
-          $t(
-            'INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_MANAGE_PROVIDER_CONNECTION_SUBHEADER'
-          )
-        "
-      >
-        <div class="flex flex-col gap-2">
-          <InboxName
-            :inbox="inbox"
-            class="!text-lg !m-0"
-            with-phone-number
-            with-provider-connection-status
-          />
-          <NextButton class="w-fit" @click="onOpenLinkDeviceModal">
-            {{
-              $t(
-                'INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_MANAGE_PROVIDER_CONNECTION_BUTTON'
-              )
-            }}
-          </NextButton>
-        </div>
-      </SettingsSection>
-      <SettingsSection
-        :title="$t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_PROVIDER_URL_TITLE')"
-        :sub-title="
-          $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_PROVIDER_URL_SUBHEADER')
-        "
-      >
-        <div
-          class="flex items-center justify-between flex-1 mt-2 whatsapp-settings--content"
-        >
-          <woot-input
-            v-model="baileysProviderUrl"
-            type="text"
-            class="flex-1 mr-2 items-center"
-            :placeholder="
-              $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_PROVIDER_URL_PLACEHOLDER')
-            "
-            @keydown="v$.baileysProviderUrl.$touch"
-          />
-          <NextButton
-            :disabled="
-              v$.baileysProviderUrl.$invalid ||
-              baileysProviderUrl === inbox.provider_config.provider_url
-            "
-            @click="updateBaileysProviderUrl"
-          >
-            {{ $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_UPDATE_BUTTON') }}
-          </NextButton>
-        </div>
-        <span v-if="v$.baileysProviderUrl.$error" class="text-red-400">
-          {{ $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_PROVIDER_URL_ERROR') }}
-        </span>
-      </SettingsSection>
-      <template v-if="inbox.provider_config.api_key">
-        <SettingsSection
-          :title="$t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_TITLE')"
-          :sub-title="
-            $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_SUBHEADER')
-          "
-        >
-          <woot-code :script="inbox.provider_config.api_key" />
-        </SettingsSection>
-      </template>
-      <SettingsSection
-        :title="$t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_UPDATE_TITLE')"
-        :sub-title="
-          $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_UPDATE_SUBHEADER')
-        "
-      >
-        <div
-          class="flex items-center justify-between flex-1 mt-2 whatsapp-settings--content"
-        >
-          <woot-input
-            v-model="whatsAppInboxAPIKey"
-            type="text"
-            class="flex-1 mr-2"
-            :placeholder="
-              $t(
-                'INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_UPDATE_PLACEHOLDER'
-              )
-            "
-          />
-          <NextButton
-            :disabled="
-              v$.whatsAppInboxAPIKey.$invalid ||
-              (!inbox.provider_config.api_key && !whatsAppInboxAPIKey) ||
-              whatsAppInboxAPIKey === inbox.provider_config.api_key
-            "
-            @click="updateWhatsAppInboxAPIKey"
-          >
-            {{ $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_UPDATE_BUTTON') }}
-          </NextButton>
-        </div>
-      </SettingsSection>
-      <SettingsSection
-        :title="$t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_MARK_AS_READ_TITLE')"
-        :sub-title="
-          $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_MARK_AS_READ_SUBHEADER')
-        "
-      >
-        <div class="flex items-center gap-2">
-          <Switch
-            id="markAsRead"
-            v-model="markAsRead"
-            @change="updateWhatsAppMarkAsRead"
-          />
-          <label for="markAsRead">
-            {{ $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_MARK_AS_READ_LABEL') }}
-          </label>
-        </div>
-      </SettingsSection>
-    </div>
-  </div>
-  <div v-else-if="isAWhatsAppZapiChannel">
-    <WhatsappLinkDeviceModal
-      v-if="showLinkDeviceModal"
-      :show="showLinkDeviceModal"
-      :on-close="onCloseLinkDeviceModal"
-      :inbox="inbox"
-    />
-    <div class="mx-8">
-      <SettingsSection
-        :title="
-          $t(
-            'INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_MANAGE_PROVIDER_CONNECTION_TITLE'
-          )
-        "
-        :sub-title="
-          $t(
-            'INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_MANAGE_PROVIDER_CONNECTION_SUBHEADER'
-          )
-        "
-      >
-        <div class="flex flex-col gap-2">
-          <InboxName
-            :inbox="inbox"
-            class="!text-lg !m-0"
-            with-phone-number
-            with-provider-connection-status
-          />
-          <NextButton class="w-fit" @click="onOpenLinkDeviceModal">
-            {{
-              $t(
-                'INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_MANAGE_PROVIDER_CONNECTION_BUTTON'
-              )
-            }}
-          </NextButton>
-        </div>
-      </SettingsSection>
-
-      <template v-if="inbox.provider_config.instance_id">
-        <SettingsSection
-          :title="$t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_INSTANCE_ID_TITLE')"
-          :sub-title="
-            $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_INSTANCE_ID_SUBHEADER')
-          "
-        >
-          <woot-code :script="inbox.provider_config.instance_id" />
-        </SettingsSection>
-      </template>
-      <SettingsSection
-        :title="
-          $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_INSTANCE_ID_UPDATE_TITLE')
-        "
-        :sub-title="
-          $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_INSTANCE_ID_UPDATE_SUBHEADER')
-        "
-      >
-        <div
-          class="flex items-center justify-between flex-1 mt-2 whatsapp-settings--content"
-        >
-          <woot-input
-            v-model="zapiInstanceIdUpdate"
-            type="text"
-            class="flex-1 mr-2"
-          />
-          <NextButton
-            :disabled="
-              v$.zapiInstanceIdUpdate.$invalid ||
-              (!inbox.provider_config.instance_id && !zapiInstanceIdUpdate) ||
-              zapiInstanceIdUpdate === inbox.provider_config.instance_id
-            "
-            @click="updateZapiInstanceId"
-          >
-            {{ $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_UPDATE_BUTTON') }}
-          </NextButton>
-        </div>
-      </SettingsSection>
-
-      <template v-if="inbox.provider_config.token">
-        <SettingsSection
-          :title="$t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_TOKEN_TITLE')"
-          :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_TOKEN_SUBHEADER')"
-        >
-          <woot-code :script="inbox.provider_config.token" secure />
-        </SettingsSection>
-      </template>
-      <SettingsSection
-        :title="$t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_TOKEN_UPDATE_TITLE')"
-        :sub-title="
-          $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_TOKEN_UPDATE_SUBHEADER')
-        "
-      >
-        <div
-          class="flex items-center justify-between flex-1 mt-2 whatsapp-settings--content"
-        >
-          <woot-input
-            v-model="zapiTokenUpdate"
-            type="password"
-            class="flex-1 mr-2"
-          />
-          <NextButton
-            :disabled="
-              v$.zapiTokenUpdate.$invalid ||
-              (!inbox.provider_config.token && !zapiTokenUpdate) ||
-              zapiTokenUpdate === inbox.provider_config.token
-            "
-            @click="updateZapiToken"
-          >
-            {{ $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_UPDATE_BUTTON') }}
-          </NextButton>
-        </div>
-      </SettingsSection>
-
-      <template v-if="inbox.provider_config.client_token">
-        <SettingsSection
-          :title="$t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_CLIENT_TOKEN_TITLE')"
-          :sub-title="
-            $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_CLIENT_TOKEN_SUBHEADER')
-          "
-        >
-          <woot-code :script="inbox.provider_config.client_token" secure />
-        </SettingsSection>
-      </template>
-      <SettingsSection
-        :title="
-          $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_CLIENT_TOKEN_UPDATE_TITLE')
-        "
-        :sub-title="
-          $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_CLIENT_TOKEN_UPDATE_SUBHEADER')
-        "
-      >
-        <div
-          class="flex items-center justify-between flex-1 mt-2 whatsapp-settings--content"
-        >
-          <woot-input
-            v-model="zapiClientTokenUpdate"
-            type="password"
-            class="flex-1 mr-2"
-          />
-          <NextButton
-            :disabled="
-              v$.zapiClientTokenUpdate.$invalid ||
-              (!inbox.provider_config.client_token && !zapiClientTokenUpdate) ||
-              zapiClientTokenUpdate === inbox.provider_config.client_token
-            "
-            @click="updateZapiClientToken"
-          >
-            {{ $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_UPDATE_BUTTON') }}
-          </NextButton>
-        </div>
-      </SettingsSection>
-    </div>
-  </div>
 </template>
 
 <style lang="scss" scoped>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CustomerSatisfactionPage.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CustomerSatisfactionPage.vue
index ec549bfbe..807f1ad0f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CustomerSatisfactionPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CustomerSatisfactionPage.vue
@@ -3,24 +3,15 @@ import { reactive, onMounted, ref, defineProps, watch, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useAlert } from 'dashboard/composables';
 import { useStore, useMapGetter } from 'dashboard/composables/store';
-import { useInbox } from 'dashboard/composables/useInbox';
 import { CSAT_DISPLAY_TYPES } from 'shared/constants/messages';
 
-import Icon from 'dashboard/components-next/icon/Icon.vue';
 import WithLabel from 'v3/components/Form/WithLabel.vue';
 import SectionLayout from 'dashboard/routes/dashboard/settings/account/components/SectionLayout.vue';
 import CSATDisplayTypeSelector from './components/CSATDisplayTypeSelector.vue';
-import CSATTemplate from 'dashboard/components-next/message/bubbles/Template/CSAT.vue';
 import Editor from 'dashboard/components-next/Editor/Editor.vue';
 import FilterSelect from 'dashboard/components-next/filter/inputs/FilterSelect.vue';
 import NextButton from 'dashboard/components-next/button/Button.vue';
 import Switch from 'next/switch/Switch.vue';
-import TabBar from 'dashboard/components-next/tabbar/TabBar.vue';
-import Input from 'dashboard/components-next/input/Input.vue';
-import ComboBox from 'dashboard/components-next/combobox/ComboBox.vue';
-import whatsappTemplateLanguages from './whatsappTemplateLanguages.js';
-import ConfirmTemplateUpdateDialog from './components/ConfirmTemplateUpdateDialog.vue';
-import ExistingTemplateSelector from './components/ExistingTemplateSelector.vue';
 
 const props = defineProps({
   inbox: { type: Object, required: true },
@@ -30,15 +21,6 @@ const { t } = useI18n();
 const store = useStore();
 const labels = useMapGetter('labels/getLabels');
 
-const { isATwilioWhatsAppChannel, isAWhatsAppCloudChannel } = useInbox(
-  props.inbox?.id
-);
-
-// WhatsApp channels that require CSAT templates (Cloud and Twilio, NOT Baileys/Z-API)
-const isTemplateRequiredWhatsAppChannel = computed(
-  () => isAWhatsAppCloudChannel.value || isATwilioWhatsAppChannel.value
-);
-
 const isUpdating = ref(false);
 const selectedLabelValues = ref([]);
 const currentLabel = ref('');
@@ -47,38 +29,7 @@ const state = reactive({
   csatSurveyEnabled: false,
   displayType: 'emoji',
   message: '',
-  templateButtonText: 'Please rate us',
   surveyRuleOperator: 'contains',
-  templateLanguage: '',
-});
-
-const templateStatus = ref(null);
-const templateLoading = ref(false);
-const confirmDialog = ref(null);
-const templateSelectorRef = ref(null);
-const templateMode = ref('create_new');
-const selectedExistingTemplateName = ref('');
-const bodyVariables = ref({});
-const existingTemplateBody = ref('');
-const existingTemplateButtonText = ref('');
-
-const templateModeTabs = computed(() => [
-  { label: t('INBOX_MGMT.CSAT.TEMPLATE_MODE.CREATE_NEW'), key: 0 },
-  { label: t('INBOX_MGMT.CSAT.TEMPLATE_MODE.USE_EXISTING'), key: 1 },
-]);
-
-const activeTemplateModeTabIndex = computed(() =>
-  templateMode.value === 'use_existing' ? 1 : 0
-);
-
-const onTemplateModeTabChange = tab => {
-  templateMode.value = tab.key === 1 ? 'use_existing' : 'create_new';
-};
-
-const originalTemplateValues = ref({
-  message: '',
-  templateButtonText: '',
-  templateLanguage: '',
 });
 
 const filterTypes = [
@@ -100,109 +51,6 @@ const labelOptions = computed(() =>
     : []
 );
 
-const languageOptions = computed(() =>
-  whatsappTemplateLanguages.map(({ name, id }) => ({
-    label: `${name} (${id})`,
-    value: id,
-  }))
-);
-
-const resolvedExistingTemplateBody = computed(() => {
-  if (!existingTemplateBody.value) return '';
-  let message = existingTemplateBody.value;
-  Object.entries(bodyVariables.value).forEach(([key, value]) => {
-    if (value) {
-      message = message.replaceAll(`{{${key}}}`, value);
-    }
-  });
-  return message;
-});
-
-const messagePreviewData = computed(() => {
-  if (templateMode.value === 'use_existing') {
-    return {
-      content:
-        resolvedExistingTemplateBody.value ||
-        t('INBOX_MGMT.CSAT.MESSAGE.PLACEHOLDER'),
-    };
-  }
-  return {
-    content: state.message || t('INBOX_MGMT.CSAT.MESSAGE.PLACEHOLDER'),
-  };
-});
-
-const previewButtonText = computed(() => {
-  if (templateMode.value === 'use_existing') {
-    return (
-      existingTemplateButtonText.value ||
-      t('INBOX_MGMT.CSAT.BUTTON_TEXT.PLACEHOLDER')
-    );
-  }
-  return state.templateButtonText;
-});
-
-const shouldShowTemplateStatus = computed(
-  () =>
-    templateStatus.value &&
-    !templateLoading.value &&
-    templateMode.value !== 'use_existing'
-);
-
-const isUpdateDisabled = computed(() => {
-  if (
-    templateMode.value === 'use_existing' &&
-    isAWhatsAppCloudChannel.value &&
-    state.csatSurveyEnabled &&
-    !selectedExistingTemplateName.value
-  ) {
-    return true;
-  }
-  return false;
-});
-
-const templateApprovalStatus = computed(() => {
-  const statusMap = {
-    APPROVED: {
-      text: t('INBOX_MGMT.CSAT.TEMPLATE_STATUS.APPROVED'),
-      icon: 'i-lucide-circle-check',
-      color: 'text-n-teal-11',
-    },
-    PENDING: {
-      text: t('INBOX_MGMT.CSAT.TEMPLATE_STATUS.PENDING'),
-      icon: 'i-lucide-clock',
-      color: 'text-n-amber-11',
-    },
-    REJECTED: {
-      text: t('INBOX_MGMT.CSAT.TEMPLATE_STATUS.REJECTED'),
-      icon: 'i-lucide-circle-x',
-      color: 'text-n-ruby-10',
-    },
-  };
-
-  // Handle template not found case
-  if (templateStatus.value?.error === 'TEMPLATE_NOT_FOUND') {
-    return {
-      text: t('INBOX_MGMT.CSAT.TEMPLATE_STATUS.NOT_FOUND'),
-      icon: 'i-lucide-alert-triangle',
-      color: 'text-n-ruby-10',
-    };
-  }
-
-  // Handle existing template with status
-  if (templateStatus.value?.template_exists && templateStatus.value.status) {
-    // Convert status to uppercase for consistency with statusMap keys
-    const normalizedStatus = templateStatus.value.status.toUpperCase();
-    return statusMap[normalizedStatus] || statusMap.PENDING;
-  }
-
-  // Default case - no template exists
-  return {
-    text: t('INBOX_MGMT.CSAT.TEMPLATE_STATUS.DEFAULT'),
-    icon: 'i-lucide-stamp',
-    color: 'text-n-slate-11',
-  };
-});
-
 const initializeState = () => {
   if (!props.inbox) return;
 
@@ -215,78 +63,21 @@ const initializeState = () => {
   const {
     display_type: displayType = CSAT_DISPLAY_TYPES.EMOJI,
     message = '',
-    button_text: buttonText = 'Please rate us',
-    language = 'en',
     survey_rules: surveyRules = {},
   } = csat_config;
 
   state.displayType = displayType;
   state.message = message;
-  state.templateButtonText = buttonText;
-  state.templateLanguage = language;
   state.surveyRuleOperator = surveyRules.operator || 'contains';
 
   selectedLabelValues.value = Array.isArray(surveyRules.values)
     ? [...surveyRules.values]
     : [];
-
-  // Store original template values for change detection
-  if (isTemplateRequiredWhatsAppChannel.value) {
-    originalTemplateValues.value = {
-      message: state.message,
-      templateButtonText: state.templateButtonText,
-      templateLanguage: state.templateLanguage,
-    };
-
-    // Set template mode based on stored source
-    const templateSource = csat_config?.template?.source;
-    if (templateSource === 'user_selected') {
-      templateMode.value = 'use_existing';
-      selectedExistingTemplateName.value = csat_config.template.name || '';
-      bodyVariables.value = csat_config.template.body_variables || {};
-      existingTemplateBody.value = message;
-      existingTemplateButtonText.value = buttonText;
-      // Reset create-new fields so they don't show stale data
-      state.message = '';
-      state.templateButtonText = 'Please rate us';
-    } else {
-      templateMode.value = 'create_new';
-    }
-  }
-};
-
-const checkTemplateStatus = async () => {
-  if (!isTemplateRequiredWhatsAppChannel.value) return;
-
-  try {
-    templateLoading.value = true;
-    const response = await store.dispatch('inboxes/getCSATTemplateStatus', {
-      inboxId: props.inbox.id,
-    });
-
-    // Handle case where template doesn't exist
-    if (!response.template_exists && response.error === 'Template not found') {
-      templateStatus.value = {
-        template_exists: false,
-        error: 'TEMPLATE_NOT_FOUND',
-      };
-    } else {
-      templateStatus.value = response;
-    }
-  } catch (error) {
-    templateStatus.value = {
-      template_exists: false,
-      error: 'API_ERROR',
-    };
-  } finally {
-    templateLoading.value = false;
-  }
 };
 
 onMounted(() => {
   initializeState();
   if (!labels.value?.length) store.dispatch('labels/get');
-  if (isTemplateRequiredWhatsAppChannel.value) checkTemplateStatus();
 });
 
 watch(() => props.inbox, initializeState, { immediate: true });
@@ -314,67 +105,6 @@ const removeLabel = label => {
   }
 };
 
-// Check if template-related fields have changed
-const hasTemplateChanges = () => {
-  if (!isTemplateRequiredWhatsAppChannel.value) return false;
-
-  const original = originalTemplateValues.value;
-  return (
-    original.message !== state.message ||
-    original.templateButtonText !== state.templateButtonText ||
-    original.templateLanguage !== state.templateLanguage
-  );
-};
-
-// Check if there's an existing template
-const hasExistingTemplate = () => {
-  const { template_exists, error } = templateStatus.value || {};
-  return template_exists && !error;
-};
-
-// Check if we should create a template
-const shouldCreateTemplate = () => {
-  // Create template if no existing template
-  if (!hasExistingTemplate()) {
-    return true;
-  }
-
-  // Create template if there are changes to template fields
-  return hasTemplateChanges();
-};
-
-// Build template config for saving
-const buildTemplateConfig = () => {
-  if (!hasExistingTemplate()) {
-    return null;
-  }
-
-  const { template_name, template_id, template, status } =
-    templateStatus.value || {};
-
-  if (isATwilioWhatsAppChannel.value) {
-    // Twilio WhatsApp format - get from existing template config
-    const existingTemplate = props.inbox?.csat_config?.template;
-
-    return existingTemplate
-      ? {
-          friendly_name: existingTemplate.friendly_name,
-          content_sid: existingTemplate.content_sid,
-          language: existingTemplate.language || state.templateLanguage,
-          status: existingTemplate.status || status,
-        }
-      : null;
-  }
-
-  // WhatsApp Cloud format
-  return {
-    name: template_name,
-    template_id,
-    language: template?.language || state.templateLanguage,
-    status,
-  };
-};
-
 const updateInbox = async attributes => {
   const payload = {
     id: props.inbox.id,
@@ -382,194 +112,34 @@ const updateInbox = async attributes => {
     ...attributes,
   };
 
-  await store.dispatch('inboxes/updateInbox', payload);
+  return store.dispatch('inboxes/updateInbox', payload);
 };
 
-const createTemplate = async () => {
-  if (!isTemplateRequiredWhatsAppChannel.value) return null;
-
-  const response = await store.dispatch('inboxes/createCSATTemplate', {
-    inboxId: props.inbox.id,
-    template: {
-      message: state.message,
-      button_text: state.templateButtonText,
-      language: state.templateLanguage,
-    },
-  });
-  useAlert(t('INBOX_MGMT.CSAT.TEMPLATE_CREATION.SUCCESS_MESSAGE'));
-  return response.template;
-};
-
-const linkTemplate = async () => {
-  if (!selectedExistingTemplateName.value) return null;
-
-  const response = await store.dispatch('inboxes/linkCSATTemplate', {
-    inboxId: props.inbox.id,
-    template: {
-      name: selectedExistingTemplateName.value,
-      language: state.templateLanguage,
-      body_variables: bodyVariables.value,
-    },
-  });
-  useAlert(t('INBOX_MGMT.CSAT.EXISTING_TEMPLATE.LINK_SUCCESS'));
-  return response.template;
-};
-
-const handleTemplateSelected = template => {
-  state.templateLanguage = template.language || 'en';
-  existingTemplateBody.value = template.body_text || '';
-  existingTemplateButtonText.value =
-    template.button_text || t('INBOX_MGMT.CSAT.BUTTON_TEXT.PLACEHOLDER');
-};
-
-const performSave = async () => {
+const saveSettings = async () => {
   try {
     isUpdating.value = true;
-    let newTemplateData = null;
-
-    // For WhatsApp channels, handle template based on mode
-    if (isTemplateRequiredWhatsAppChannel.value && state.csatSurveyEnabled) {
-      if (
-        templateMode.value === 'use_existing' &&
-        isAWhatsAppCloudChannel.value
-      ) {
-        // Link existing template mode — require selection
-        if (!selectedExistingTemplateName.value) return;
-
-        // Validate all body variables are filled
-        if (
-          templateSelectorRef.value &&
-          !templateSelectorRef.value.validate()
-        ) {
-          useAlert(t('INBOX_MGMT.CSAT.TEMPLATE_VARIABLES.VALIDATION_ERROR'));
-          return;
-        }
-
-        try {
-          newTemplateData = await linkTemplate();
-        } catch (error) {
-          const errorMessage =
-            error.response?.data?.error ||
-            t('INBOX_MGMT.CSAT.EXISTING_TEMPLATE.LINK_ERROR');
-          useAlert(errorMessage);
-          return;
-        }
-      } else if (shouldCreateTemplate()) {
-        // Create new template mode
-        try {
-          newTemplateData = await createTemplate();
-        } catch (error) {
-          const errorMessage =
-            error.response?.data?.error ||
-            t('INBOX_MGMT.CSAT.TEMPLATE_CREATION.ERROR_MESSAGE');
-          useAlert(errorMessage);
-          return;
-        }
-      }
-    }
 
     const csatConfig = {
       display_type: state.displayType,
-      message:
-        templateMode.value === 'use_existing'
-          ? existingTemplateBody.value
-          : state.message,
-      button_text:
-        templateMode.value === 'use_existing'
-          ? existingTemplateButtonText.value
-          : state.templateButtonText,
-      language: state.templateLanguage,
+      message: state.message,
       survey_rules: {
         operator: state.surveyRuleOperator,
         values: selectedLabelValues.value,
       },
     };
 
-    // Use new template data if created/linked, otherwise preserve existing template information
-    if (newTemplateData) {
-      if (newTemplateData.source === 'user_selected') {
-        // User-selected existing template
-        csatConfig.template = {
-          name: newTemplateData.name,
-          template_id: newTemplateData.template_id,
-          language: newTemplateData.language,
-          status: newTemplateData.status,
-          source: 'user_selected',
-          linked_at: newTemplateData.linked_at,
-          body_variables: bodyVariables.value,
-        };
-      } else if (isATwilioWhatsAppChannel.value) {
-        // Twilio WhatsApp template format
-        csatConfig.template = {
-          friendly_name: newTemplateData.friendly_name,
-          content_sid: newTemplateData.content_sid,
-          language: newTemplateData.language,
-          status: newTemplateData.status,
-          source: 'auto_created',
-          created_at: new Date().toISOString(),
-        };
-      } else {
-        // WhatsApp Cloud template format
-        csatConfig.template = {
-          name: newTemplateData.name,
-          template_id: newTemplateData.template_id,
-          language: newTemplateData.language,
-          status: newTemplateData.status,
-          source: 'auto_created',
-          created_at: new Date().toISOString(),
-        };
-      }
-    } else {
-      const templateConfig = buildTemplateConfig();
-      if (templateConfig) {
-        csatConfig.template = templateConfig;
-      }
-    }
-
     await updateInbox({
       csat_survey_enabled: state.csatSurveyEnabled,
       csat_config: csatConfig,
     });
 
     useAlert(t('INBOX_MGMT.CSAT.API.SUCCESS_MESSAGE'));
-    checkTemplateStatus();
   } catch (error) {
     useAlert(t('INBOX_MGMT.CSAT.API.ERROR_MESSAGE'));
   } finally {
     isUpdating.value = false;
   }
 };
-
-const saveSettings = async () => {
-  // For "use existing" mode, no confirmation needed — just save
-  if (templateMode.value === 'use_existing') {
-    await performSave();
-    return;
-  }
-
-  // Check if we need to show confirmation dialog for WhatsApp template changes
-  // This applies to both WhatsApp Cloud and Twilio WhatsApp channels
-  if (
-    isTemplateRequiredWhatsAppChannel.value &&
-    state.csatSurveyEnabled &&
-    hasExistingTemplate() &&
-    hasTemplateChanges()
-  ) {
-    // Only show dialog if the existing template was auto-created (will be deleted)
-    const existingSource = props.inbox?.csat_config?.template?.source;
-    if (existingSource !== 'user_selected') {
-      confirmDialog.value?.open();
-      return;
-    }
-  }
-
-  await performSave();
-};
-
-const handleConfirmTemplateUpdate = async () => {
-  // We will delete the template before creating the template
-  await performSave();
-};
 </script>
 
 <template>
@@ -585,9 +155,7 @@ const handleConfirmTemplateUpdate = async () => {
       </template>
 
       <div class="grid gap-5">
-        <!-- Show display type only for non-WhatsApp channels -->
         <WithLabel
-          v-if="!isTemplateRequiredWhatsAppChannel"
           :label="$t('INBOX_MGMT.CSAT.DISPLAY_TYPE.LABEL')"
           name="display_type"
         >
@@ -597,130 +165,14 @@ const handleConfirmTemplateUpdate = async () => {
           />
         </WithLabel>
 
-        <template v-if="isTemplateRequiredWhatsAppChannel">
-          <!-- Template source toggle (only for WhatsApp Cloud) -->
-          <WithLabel
-            v-if="isAWhatsAppCloudChannel"
-            :label="$t('INBOX_MGMT.CSAT.TEMPLATE_MODE.LABEL')"
-            name="template_mode"
-          >
-            <TabBar
-              :tabs="templateModeTabs"
-              :initial-active-tab="activeTemplateModeTabIndex"
-              @tab-changed="onTemplateModeTabChange"
-            />
-          </WithLabel>
-
-          <div
-            class="flex flex-col gap-4 justify-between w-full lg:flex-row lg:gap-6"
-          >
-            <div class="flex flex-col gap-3 basis-3/5">
-              <!-- Use existing template mode -->
-              <template
-                v-if="
-                  templateMode === 'use_existing' && isAWhatsAppCloudChannel
-                "
-              >
-                <ExistingTemplateSelector
-                  ref="templateSelectorRef"
-                  v-model="selectedExistingTemplateName"
-                  :inbox-id="inbox.id"
-                  :body-variables="bodyVariables"
-                  @template-selected="handleTemplateSelected"
-                  @update:body-variables="bodyVariables = $event"
-                />
-              </template>
-
-              <!-- Create new template mode -->
-              <template v-else>
-                <WithLabel
-                  :label="$t('INBOX_MGMT.CSAT.MESSAGE.LABEL')"
-                  name="message"
-                >
-                  <Editor
-                    v-model="state.message"
-                    :placeholder="$t('INBOX_MGMT.CSAT.MESSAGE.PLACEHOLDER')"
-                    :max-length="200"
-                    channel-type="Context::Plain"
-                    class="w-full"
-                  />
-                </WithLabel>
-                <Input
-                  v-model="state.templateButtonText"
-                  :label="$t('INBOX_MGMT.CSAT.BUTTON_TEXT.LABEL')"
-                  :placeholder="$t('INBOX_MGMT.CSAT.BUTTON_TEXT.PLACEHOLDER')"
-                  class="w-full"
-                />
-
-                <WithLabel
-                  v-if="shouldShowTemplateStatus"
-                  :label="$t('INBOX_MGMT.CSAT.LANGUAGE.LABEL')"
-                  name="language"
-                >
-                  <ComboBox
-                    v-model="state.templateLanguage"
-                    :options="languageOptions"
-                    :placeholder="$t('INBOX_MGMT.CSAT.LANGUAGE.PLACEHOLDER')"
-                  />
-                </WithLabel>
-              </template>
-
-              <div
-                v-if="shouldShowTemplateStatus"
-                class="flex gap-2 items-center mt-4"
-              >
-                <Icon
-                  :icon="templateApprovalStatus.icon"
-                  :class="templateApprovalStatus.color"
-                  class="size-4"
-                />
-                <span
-                  :class="templateApprovalStatus.color"
-                  class="text-sm font-medium"
-                >
-                  {{ templateApprovalStatus.text }}
-                </span>
-              </div>
-            </div>
-
-            <div
-              class="flex flex-col flex-shrink-0 justify-start items-center p-6 mt-1 rounded-xl basis-2/5 bg-n-slate-2 outline outline-1 outline-n-weak"
-            >
-              <p
-                class="inline-flex items-center text-sm font-medium text-n-slate-11"
-              >
-                {{ $t('INBOX_MGMT.CSAT.MESSAGE_PREVIEW.LABEL') }}
-                <Icon
-                  v-tooltip.top-end="
-                    $t('INBOX_MGMT.CSAT.MESSAGE_PREVIEW.TOOLTIP')
-                  "
-                  icon="i-lucide-info"
-                  class="flex-shrink-0 mx-1 size-4"
-                />
-              </p>
-              <CSATTemplate
-                :message="messagePreviewData"
-                :button-text="previewButtonText"
-                class="pt-12"
-              />
-            </div>
-          </div>
-        </template>
-
-        <!-- Non-WhatsApp channels layout -->
-        <template v-else>
-          <WithLabel
-            :label="$t('INBOX_MGMT.CSAT.MESSAGE.LABEL')"
-            name="message"
-          >
-            <Editor
-              v-model="state.message"
-              :placeholder="$t('INBOX_MGMT.CSAT.MESSAGE.PLACEHOLDER')"
-              :max-length="200"
-              class="w-full"
-            />
-          </WithLabel>
-        </template>
+        <WithLabel :label="$t('INBOX_MGMT.CSAT.MESSAGE.LABEL')" name="message">
+          <Editor
+            v-model="state.message"
+            :placeholder="$t('INBOX_MGMT.CSAT.MESSAGE.PLACEHOLDER')"
+            :max-length="200"
+            class="w-full"
+          />
+        </WithLabel>
 
         <WithLabel
           :label="$t('INBOX_MGMT.CSAT.SURVEY_RULE.LABEL')"
@@ -728,7 +180,7 @@ const handleConfirmTemplateUpdate = async () => {
         >
           <div class="mb-4">
             <span
-              class="inline-flex flex-wrap gap-1.5 items-center text-sm text-n-slate-12"
+              class="inline-flex flex-wrap items-center gap-1.5 text-sm text-n-slate-12"
             >
               {{ $t('INBOX_MGMT.CSAT.SURVEY_RULE.DESCRIPTION_PREFIX') }}
               <FilterSelect
@@ -765,28 +217,17 @@ const handleConfirmTemplateUpdate = async () => {
           </div>
         </WithLabel>
         <p class="text-sm italic text-n-slate-11">
-          {{
-            isTemplateRequiredWhatsAppChannel
-              ? $t('INBOX_MGMT.CSAT.WHATSAPP_NOTE')
-              : $t('INBOX_MGMT.CSAT.NOTE')
-          }}
+          {{ $t('INBOX_MGMT.CSAT.NOTE') }}
         </p>
         <div>
           <NextButton
             type="submit"
             :label="$t('INBOX_MGMT.SETTINGS_POPUP.UPDATE')"
             :is-loading="isUpdating"
-            :disabled="isUpdateDisabled"
             @click="saveSettings"
           />
         </div>
       </div>
     </SectionLayout>
-
-    <!-- Template Update Confirmation Dialog -->
-    <ConfirmTemplateUpdateDialog
-      ref="confirmDialog"
-      @confirm="handleConfirmTemplateUpdate"
-    />
   </div>
 </template>
diff --git a/app/javascript/dashboard/store/captain/reservations.js b/app/javascript/dashboard/store/captain/reservations.js
new file mode 100644
index 000000000..ced5b0dd3
--- /dev/null
+++ b/app/javascript/dashboard/store/captain/reservations.js
@@ -0,0 +1,29 @@
+import CaptainReservationsAPI from 'dashboard/api/captain/reservations';
+import { createStore } from '../storeFactory';
+import { throwErrorMessage } from 'dashboard/store/utils/api';
+
+export default createStore({
+  name: 'CaptainReservation',
+  API: CaptainReservationsAPI,
+  actions: mutations => ({
+    fetchRevenue: async function fetchRevenue(_, params = {}) {
+      try {
+        const response = await CaptainReservationsAPI.revenue(params);
+        return response.data;
+      } catch (error) {
+        return throwErrorMessage(error);
+      }
+    },
+    fetchPix: async function fetchPix({ commit }, reservationId) {
+      commit(mutations.SET_UI_FLAG, { fetchingItem: true });
+      try {
+        const response = await CaptainReservationsAPI.pix(reservationId);
+        return response.data;
+      } catch (error) {
+        return throwErrorMessage(error);
+      } finally {
+        commit(mutations.SET_UI_FLAG, { fetchingItem: false });
+      }
+    },
+  }),
+});
diff --git a/app/javascript/dashboard/store/index.js b/app/javascript/dashboard/store/index.js
index 1b150c916..1c46fb70f 100755
--- a/app/javascript/dashboard/store/index.js
+++ b/app/javascript/dashboard/store/index.js
@@ -59,6 +59,9 @@ import copilotMessages from './captain/copilotMessages';
 import captainScenarios from './captain/scenarios';
 import captainTools from './captain/tools';
 import captainCustomTools from './captain/customTools';
+import captainReservations from './captain/reservations';
+import captainUnits from './modules/captainUnits';
+import captainGalleryItems from './modules/captainGalleryItems';
 
 const plugins = [];
 
@@ -123,6 +126,9 @@ export default createStore({
     captainScenarios,
     captainTools,
     captainCustomTools,
+    captainReservations,
+    captainUnits,
+    captainGalleryItems,
   },
   plugins,
 });
diff --git a/app/javascript/dashboard/store/modules/captainGalleryItems.js b/app/javascript/dashboard/store/modules/captainGalleryItems.js
new file mode 100644
index 000000000..1dc6341d8
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/captainGalleryItems.js
@@ -0,0 +1,85 @@
+import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
+import types from '../mutation-types';
+import CaptainGalleryItemsAPI from '../../api/captain/galleryItems';
+
+export const state = {
+  records: [],
+  uiFlags: {
+    isFetching: false,
+    isCreating: false,
+    isUpdating: false,
+    isDeleting: false,
+  },
+};
+
+export const getters = {
+  getItems: $state => $state.records,
+  getUIFlags: $state => $state.uiFlags,
+};
+
+export const actions = {
+  get: async ({ commit }, params = {}) => {
+    commit(types.SET_CAPTAIN_GALLERY_UI_FLAG, { isFetching: true });
+    try {
+      const response = await CaptainGalleryItemsAPI.getItems(params);
+      commit(types.SET_CAPTAIN_GALLERY_ITEMS, response.data);
+    } catch (error) {
+      // Ignore error
+    } finally {
+      commit(types.SET_CAPTAIN_GALLERY_UI_FLAG, { isFetching: false });
+    }
+  },
+
+  create: async ({ commit }, formData) => {
+    commit(types.SET_CAPTAIN_GALLERY_UI_FLAG, { isCreating: true });
+    try {
+      const response = await CaptainGalleryItemsAPI.createItem(formData);
+      commit(types.ADD_CAPTAIN_GALLERY_ITEM, response.data);
+      return response;
+    } finally {
+      commit(types.SET_CAPTAIN_GALLERY_UI_FLAG, { isCreating: false });
+    }
+  },
+
+  update: async ({ commit }, { id, formData }) => {
+    commit(types.SET_CAPTAIN_GALLERY_UI_FLAG, { isUpdating: true });
+    try {
+      const response = await CaptainGalleryItemsAPI.updateItem(id, formData);
+      commit(types.EDIT_CAPTAIN_GALLERY_ITEM, response.data);
+      return response;
+    } finally {
+      commit(types.SET_CAPTAIN_GALLERY_UI_FLAG, { isUpdating: false });
+    }
+  },
+
+  delete: async ({ commit }, id) => {
+    commit(types.SET_CAPTAIN_GALLERY_UI_FLAG, { isDeleting: true });
+    try {
+      await CaptainGalleryItemsAPI.deleteItem(id);
+      commit(types.DELETE_CAPTAIN_GALLERY_ITEM, id);
+    } finally {
+      commit(types.SET_CAPTAIN_GALLERY_UI_FLAG, { isDeleting: false });
+    }
+  },
+};
+
+export const mutations = {
+  [types.SET_CAPTAIN_GALLERY_UI_FLAG](_state, data) {
+    _state.uiFlags = {
+      ..._state.uiFlags,
+      ...data,
+    };
+  },
+  [types.SET_CAPTAIN_GALLERY_ITEMS]: MutationHelpers.set,
+  [types.ADD_CAPTAIN_GALLERY_ITEM]: MutationHelpers.create,
+  [types.EDIT_CAPTAIN_GALLERY_ITEM]: MutationHelpers.update,
+  [types.DELETE_CAPTAIN_GALLERY_ITEM]: MutationHelpers.destroy,
+};
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  actions,
+  mutations,
+};
diff --git a/app/javascript/dashboard/store/modules/captainUnits.js b/app/javascript/dashboard/store/modules/captainUnits.js
new file mode 100644
index 000000000..7a3c08656
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/captainUnits.js
@@ -0,0 +1,83 @@
+import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
+import types from '../mutation-types';
+import CaptainUnitsAPI from '../../api/captain/units';
+
+export const state = {
+  records: [],
+  uiFlags: {
+    isFetching: false,
+    isCreating: false,
+    isUpdating: false,
+    isDeleting: false,
+  },
+};
+
+export const getters = {
+  getUnits: $state => $state.records,
+  getUIFlags: $state => $state.uiFlags,
+};
+
+export const actions = {
+  get: async ({ commit }) => {
+    commit(types.SET_CAPTAIN_UNITS_UI_FLAG, { isFetching: true });
+    try {
+      const response = await CaptainUnitsAPI.getUnits();
+      commit(types.SET_CAPTAIN_UNITS, response.data);
+    } catch (error) {
+      // Ignore error
+    } finally {
+      commit(types.SET_CAPTAIN_UNITS_UI_FLAG, { isFetching: false });
+    }
+  },
+
+  create: async ({ commit }, unitObj) => {
+    commit(types.SET_CAPTAIN_UNITS_UI_FLAG, { isCreating: true });
+    try {
+      const response = await CaptainUnitsAPI.createUnit(unitObj);
+      commit(types.ADD_CAPTAIN_UNIT, response.data);
+    } finally {
+      commit(types.SET_CAPTAIN_UNITS_UI_FLAG, { isCreating: false });
+    }
+  },
+
+  update: async ({ commit }, { id, ...data }) => {
+    commit(types.SET_CAPTAIN_UNITS_UI_FLAG, { isUpdating: true });
+    try {
+      const response = await CaptainUnitsAPI.updateUnit(id, data);
+      commit(types.EDIT_CAPTAIN_UNIT, response.data);
+    } finally {
+      commit(types.SET_CAPTAIN_UNITS_UI_FLAG, { isUpdating: false });
+    }
+  },
+
+  delete: async ({ commit }, id) => {
+    commit(types.SET_CAPTAIN_UNITS_UI_FLAG, { isDeleting: true });
+    try {
+      await CaptainUnitsAPI.deleteUnit(id);
+      commit(types.DELETE_CAPTAIN_UNIT, id);
+    } finally {
+      commit(types.SET_CAPTAIN_UNITS_UI_FLAG, { isDeleting: false });
+    }
+  },
+};
+
+export const mutations = {
+  [types.SET_CAPTAIN_UNITS_UI_FLAG](_state, data) {
+    _state.uiFlags = {
+      ..._state.uiFlags,
+      ...data,
+    };
+  },
+  [types.SET_CAPTAIN_UNITS]: MutationHelpers.set,
+  [types.ADD_CAPTAIN_UNIT]: MutationHelpers.create,
+  [types.EDIT_CAPTAIN_UNIT]: MutationHelpers.update,
+  [types.DELETE_CAPTAIN_UNIT]: MutationHelpers.destroy,
+};
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  actions,
+  mutations,
+};
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 26e33cdd2..25df9517c 100644
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -390,4 +390,18 @@ export default {
   EDIT_AGENT_CAPACITY_POLICIES_INBOXES: 'EDIT_AGENT_CAPACITY_POLICIES_INBOXES',
   DELETE_AGENT_CAPACITY_POLICIES_INBOXES:
     'DELETE_AGENT_CAPACITY_POLICIES_INBOXES',
+
+  // Captain Units
+  SET_CAPTAIN_UNITS_UI_FLAG: 'SET_CAPTAIN_UNITS_UI_FLAG',
+  SET_CAPTAIN_UNITS: 'SET_CAPTAIN_UNITS',
+  ADD_CAPTAIN_UNIT: 'ADD_CAPTAIN_UNIT',
+  EDIT_CAPTAIN_UNIT: 'EDIT_CAPTAIN_UNIT',
+  DELETE_CAPTAIN_UNIT: 'DELETE_CAPTAIN_UNIT',
+
+  // Captain Gallery
+  SET_CAPTAIN_GALLERY_UI_FLAG: 'SET_CAPTAIN_GALLERY_UI_FLAG',
+  SET_CAPTAIN_GALLERY_ITEMS: 'SET_CAPTAIN_GALLERY_ITEMS',
+  ADD_CAPTAIN_GALLERY_ITEM: 'ADD_CAPTAIN_GALLERY_ITEM',
+  EDIT_CAPTAIN_GALLERY_ITEM: 'EDIT_CAPTAIN_GALLERY_ITEM',
+  DELETE_CAPTAIN_GALLERY_ITEM: 'DELETE_CAPTAIN_GALLERY_ITEM',
 };
diff --git a/app/jobs/webhooks/whatsapp_events_job.rb b/app/jobs/webhooks/whatsapp_events_job.rb
index 01ebcfdb5..be94301a4 100644
--- a/app/jobs/webhooks/whatsapp_events_job.rb
+++ b/app/jobs/webhooks/whatsapp_events_job.rb
@@ -65,6 +65,8 @@ class Webhooks::WhatsappEventsJob < ApplicationJob
       Whatsapp::IncomingMessageBaileysService.new(inbox: channel.inbox, params: params).perform
     when 'zapi'
       Whatsapp::IncomingMessageZapiService.new(inbox: channel.inbox, params: params).perform
+    when 'wuzapi'
+      Whatsapp::IncomingMessageWuzapiService.new(inbox: channel.inbox, params: params).perform
     else
       Whatsapp::IncomingMessageService.new(inbox: channel.inbox, params: params).perform
     end
diff --git a/app/models/account.rb b/app/models/account.rb
index 57454f2ca..6049a4d80 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -96,6 +96,9 @@ class Account < ApplicationRecord
   has_many :agent_bots, dependent: :destroy_async
   has_many :api_channels, dependent: :destroy_async, class_name: '::Channel::Api'
   has_many :articles, dependent: :destroy_async, class_name: '::Article'
+  has_many :captain_reservations, class_name: 'Captain::Reservation', dependent: :destroy
+  has_many :captain_units, class_name: 'Captain::Unit', dependent: :destroy
+  has_many :captain_gallery_items, class_name: 'Captain::GalleryItem', dependent: :destroy
   has_many :assignment_policies, dependent: :destroy_async
   has_many :automation_rules, dependent: :destroy_async
   has_many :macros, dependent: :destroy_async
diff --git a/app/models/campaign.rb b/app/models/campaign.rb
index 0f297762a..2927181c6 100644
--- a/app/models/campaign.rb
+++ b/app/models/campaign.rb
@@ -10,7 +10,7 @@
 #  enabled                            :boolean          default(TRUE)
 #  message                            :text             not null
 #  scheduled_at                       :datetime
-#  template_params                    :jsonb            not null
+#  template_params                    :jsonb
 #  title                              :string           not null
 #  trigger_only_during_business_hours :boolean          default(FALSE)
 #  trigger_rules                      :jsonb
diff --git a/app/models/captain/unit.rb b/app/models/captain/unit.rb
new file mode 100644
index 000000000..c352536db
--- /dev/null
+++ b/app/models/captain/unit.rb
@@ -0,0 +1,69 @@
+# == Schema Information
+#
+# Table name: captain_units
+#
+#  id                             :bigint           not null, primary key
+#  inter_account_number           :string
+#  inter_cert_content             :text
+#  inter_cert_path                :string
+#  inter_client_secret            :string
+#  inter_key_content              :text
+#  inter_key_path                 :string
+#  inter_pix_key                  :string
+#  last_synced_at                 :datetime
+#  leader_whatsapp                :string
+#  name                           :string           not null
+#  payment_receipt_review_enabled :boolean          default(FALSE), not null
+#  plug_play_token                :string
+#  proactive_pix_polling_enabled  :boolean          default(FALSE), not null
+#  reservation_source_tag         :string
+#  reservations_sync_enabled      :boolean
+#  status                         :string
+#  suite_category_images          :jsonb            not null
+#  visible_suite_categories       :jsonb            not null
+#  webhook_configured_at          :datetime
+#  webhook_url                    :string
+#  created_at                     :datetime         not null
+#  updated_at                     :datetime         not null
+#  account_id                     :bigint           not null
+#  captain_brand_id               :bigint           not null
+#  inbox_id                       :bigint
+#  inter_client_id                :string
+#  plug_play_id                   :string
+#
+# Indexes
+#
+#  index_captain_units_on_account_id        (account_id)
+#  index_captain_units_on_captain_brand_id  (captain_brand_id)
+#  index_captain_units_on_inbox_id          (inbox_id)
+#
+# Foreign Keys
+#
+#  fk_rails_...  (account_id => accounts.id)
+#  fk_rails_...  (captain_brand_id => captain_brands.id)
+#  fk_rails_...  (inbox_id => inboxes.id)
+#
+
+class Captain::Unit < ApplicationRecord
+  belongs_to :account
+  # belongs_to :captain_brand, class_name: 'Captain::Brand', optional: true
+
+  encrypts :inter_client_secret, :inter_cert_content, :inter_key_content
+
+  validates :name, presence: true
+  validates :inter_pix_key, presence: true, on: :update
+  validates :inter_account_number, presence: true, on: :update
+
+  # Atributos resolvidos que o controller já espera ter, fallback na necessidade para arquivos (mesmo não sendo mais o padrão preferido).
+  def resolved_inter_cert_path
+    return nil if inter_cert_content.present?
+
+    inter_cert_path
+  end
+
+  def resolved_inter_key_path
+    return nil if inter_key_content.present?
+
+    inter_key_path
+  end
+end
diff --git a/app/models/channel/whatsapp.rb b/app/models/channel/whatsapp.rb
index d55ef3251..e23507cac 100644
--- a/app/models/channel/whatsapp.rb
+++ b/app/models/channel/whatsapp.rb
@@ -3,12 +3,18 @@
 # Table name: channel_whatsapp
 #
 #  id                             :bigint           not null, primary key
+#  evolution_api_token            :string
+#  evolution_api_token_iv         :string
 #  message_templates              :jsonb
 #  message_templates_last_updated :datetime
 #  phone_number                   :string           not null
 #  provider                       :string           default("default")
 #  provider_config                :jsonb
 #  provider_connection            :jsonb
+#  wuzapi_admin_token             :string
+#  wuzapi_admin_token_iv          :string
+#  wuzapi_user_token              :string
+#  wuzapi_user_token_iv           :string
 #  created_at                     :datetime         not null
 #  updated_at                     :datetime         not null
 #  account_id                     :integer          not null
@@ -16,7 +22,7 @@
 # Indexes
 #
 #  index_channel_whatsapp_on_phone_number      (phone_number) UNIQUE
-#  index_channel_whatsapp_provider_connection  (provider_connection) WHERE ((provider)::text = ANY ((ARRAY['baileys'::character varying, 'zapi'::character varying])::text[])) USING gin # rubocop:disable Layout/LineLength
+#  index_channel_whatsapp_provider_connection  (provider_connection) WHERE ((provider)::text = ANY ((ARRAY['baileys'::character varying, 'zapi'::character varying])::text[])) USING gin
 #
 
 class Channel::Whatsapp < ApplicationRecord
@@ -24,22 +30,29 @@ class Channel::Whatsapp < ApplicationRecord
   include Reauthorizable
 
   self.table_name = 'channel_whatsapp'
-  EDITABLE_ATTRS = [:phone_number, :provider, { provider_config: {} }].freeze
+  attr_accessor :inbox_name_for_provisioning
+
+  EDITABLE_ATTRS = [:phone_number, :provider, :wuzapi_user_token, :wuzapi_admin_token, :evolution_api_token, :inbox_name_for_provisioning,
+                    { provider_config: {} }].freeze
 
   # default at the moment is 360dialog lets change later.
-  PROVIDERS = %w[default whatsapp_cloud baileys zapi].freeze
+  PROVIDERS = %w[default whatsapp_cloud wuzapi baileys zapi evolution].freeze
+
+  encrypts :wuzapi_user_token, :wuzapi_admin_token, :evolution_api_token
+
   before_validation :ensure_webhook_verify_token
+  before_validation :move_tokens_to_encrypted_attributes
+  before_validation :provision_wuzapi_user, on: :create
+  before_validation :provision_evolution_instance, on: :create
 
   validates :provider, inclusion: { in: PROVIDERS }
   validates :phone_number, presence: true, uniqueness: true
   validate :validate_provider_config
 
-  has_one :inbox, as: :channel, dependent: :destroy
-
   after_create :sync_templates
+  after_create_commit :setup_webhooks
+  after_update_commit :setup_webhooks, if: :webhook_configuration_changed?
   before_destroy :teardown_webhooks
-  before_destroy :disconnect_channel_provider, if: -> { provider_service.respond_to?(:disconnect_channel_provider) }
-  after_commit :setup_webhooks, on: :create, if: :should_auto_setup_webhooks?
 
   def name
     'Whatsapp'
@@ -49,25 +62,43 @@ class Channel::Whatsapp < ApplicationRecord
     case provider
     when 'whatsapp_cloud'
       Whatsapp::Providers::WhatsappCloudService.new(whatsapp_channel: self)
+    when 'wuzapi'
+      Whatsapp::Providers::WuzapiService.new(whatsapp_channel: self)
     when 'baileys'
       Whatsapp::Providers::WhatsappBaileysService.new(whatsapp_channel: self)
     when 'zapi'
       Whatsapp::Providers::WhatsappZapiService.new(whatsapp_channel: self)
+    when 'evolution'
+      Whatsapp::Providers::EvolutionService.new(whatsapp_channel: self)
     else
       Whatsapp::Providers::Whatsapp360DialogService.new(whatsapp_channel: self)
     end
   end
 
-  def use_internal_host?
-    provider == 'baileys' && ENV.fetch('BAILEYS_PROVIDER_USE_INTERNAL_HOST_URL', false)
-  end
-
   def mark_message_templates_updated
     # rubocop:disable Rails/SkipsModelValidations
     update_column(:message_templates_last_updated, Time.zone.now)
     # rubocop:enable Rails/SkipsModelValidations
   end
 
+  delegate :send_message, to: :provider_service
+  delegate :send_reaction_message, to: :provider_service
+  delegate :send_template, to: :provider_service
+  delegate :sync_templates, to: :provider_service
+  delegate :media_url, to: :provider_service
+  delegate :api_headers, to: :provider_service
+
+  def setup_webhooks
+    perform_webhook_setup
+  rescue StandardError => e
+    Rails.logger.error "[WHATSAPP] Webhook setup failed: #{e.message}"
+    prompt_reauthorization!
+  end
+
+  def use_internal_host?
+    provider == 'baileys' && ENV.fetch('BAILEYS_PROVIDER_USE_INTERNAL_HOST_URL', false)
+  end
+
   def update_provider_connection!(provider_connection)
     assign_attributes(provider_connection: provider_connection)
     # NOTE: Skip `validate_provider_config?` check
@@ -86,9 +117,22 @@ class Channel::Whatsapp < ApplicationRecord
   def toggle_typing_status(typing_status, conversation:)
     return unless provider_service.respond_to?(:toggle_typing_status)
 
-    recipient_id = conversation.contact.identifier || conversation.contact.phone_number
-    last_message = conversation.messages.last
-    provider_service.toggle_typing_status(typing_status, last_message: last_message, recipient_id: recipient_id)
+    identifier = conversation.contact.identifier
+    phone_number = conversation.contact.phone_number
+    recipient_id = identifier || phone_number
+
+    # Debug Log
+    Rails.logger.info "[Typing] recipient_id=#{recipient_id.inspect} identifier=#{identifier.inspect} phone=#{phone_number.inspect}"
+
+    # Validation: Ensure recipient_id is E164 compliant (digits only, maybe +).
+    # If identifier is something like x@lid, we should fallback to phone_number.
+    # Using suggested regex: \A\+?\d{10,15}\z
+    unless recipient_id.to_s.gsub(/[\+\s\-\(\)]/, '').match?(/\A\d{10,15}\z/)
+      Rails.logger.warn "[Typing] Invalid recipient_id format (#{recipient_id}). Falling back to phone_number: #{phone_number}"
+      recipient_id = phone_number
+    end
+
+    provider_service.toggle_typing_status(typing_status, last_message: nil, recipient_id: recipient_id)
   end
 
   def update_presence(status)
@@ -139,69 +183,256 @@ class Channel::Whatsapp < ApplicationRecord
     provider_service.on_whatsapp(phone_number)
   end
 
-  def delete_message(message, conversation:)
-    return unless provider_service.respond_to?(:delete_message)
-
-    recipient_id = if provider == 'zapi'
-                     conversation.contact.phone_number.presence || conversation.contact.identifier
-                   else
-                     conversation.contact.identifier || conversation.contact.phone_number
-                   end
-    return if recipient_id.blank?
-
-    provider_service.delete_message(recipient_id, message)
-  end
-
-  def edit_message(message, new_content, conversation:)
-    return unless provider_service.respond_to?(:edit_message)
-
-    recipient_id = conversation.contact.identifier || conversation.contact.phone_number
-    provider_service.edit_message(recipient_id, message, new_content)
-  end
-
-  delegate :setup_channel_provider, to: :provider_service
-  delegate :send_message, to: :provider_service
-  delegate :send_template, to: :provider_service
-  delegate :sync_templates, to: :provider_service
-  delegate :media_url, to: :provider_service
-  delegate :api_headers, to: :provider_service
-
-  def setup_webhooks
-    perform_webhook_setup
-  rescue StandardError => e
-    Rails.logger.error "[WHATSAPP] Webhook setup failed: #{e.message}"
-    prompt_reauthorization!
-  end
-
   private
 
+  def webhook_configuration_changed?
+    return true if saved_change_to_provider? && provider.in?(%w[wuzapi evolution])
+    return false unless provider.in?(%w[wuzapi evolution])
+
+    if provider == 'evolution'
+      return saved_change_to_evolution_api_token? ||
+             (saved_change_to_provider_config? && provider_config['evolution_base_url'] != provider_config_before_last_save['evolution_base_url'])
+    end
+
+    saved_change_to_wuzapi_user_token? ||
+      (saved_change_to_provider_config? && provider_config['wuzapi_base_url'] != provider_config_before_last_save['wuzapi_base_url'])
+  end
+
   def ensure_webhook_verify_token
     provider_config['webhook_verify_token'] ||= SecureRandom.hex(16) if provider.in?(%w[whatsapp_cloud baileys])
   end
 
+  def move_tokens_to_encrypted_attributes
+    if (provider == 'evolution') && provider_config['evolution_api_token'].present?
+      self.evolution_api_token = provider_config['evolution_api_token']
+      provider_config.delete('evolution_api_token')
+    end
+
+    return unless provider == 'wuzapi'
+
+    if provider_config['wuzapi_user_token'].present?
+      self.wuzapi_user_token = provider_config['wuzapi_user_token']
+      provider_config.delete('wuzapi_user_token')
+    end
+
+    return if provider_config['wuzapi_admin_token'].blank?
+
+    self.wuzapi_admin_token = provider_config['wuzapi_admin_token']
+    provider_config.delete('wuzapi_admin_token')
+  end
+
   def validate_provider_config
     errors.add(:provider_config, 'Invalid Credentials') unless provider_service.validate_provider_config?
   end
 
   def perform_webhook_setup
-    business_account_id = provider_config['business_account_id']
-    api_key = provider_config['api_key']
+    if provider == 'wuzapi'
+      return if inbox.blank?
 
-    Whatsapp::WebhookSetupService.new(self, business_account_id, api_key).perform
+      base_url = provider_config['wuzapi_base_url']
+      # Use encrypted token
+      user_token = wuzapi_user_token
+
+      return if user_token.blank?
+
+      # Construct Chatwoot Webhook URL
+      # Using standard route: /webhooks/whatsapp/:phone_number for WuzAPI as per fix
+      app_url = ENV['FRONTEND_URL'].presence || 'http://localhost:3000'
+      webhook_url = "#{app_url}/webhooks/whatsapp/#{phone_number}"
+
+      begin
+        client = Wuzapi::Client.new(base_url)
+        client.set_webhook(user_token, webhook_url)
+      rescue StandardError => e
+        Rails.logger.error "Wuzapi Webhook Setup Failed: #{e.message}"
+      end
+    elsif provider == 'evolution'
+      return if inbox.blank?
+
+      base_url = provider_config['evolution_base_url']
+      api_token = evolution_api_token
+
+      return if api_token.blank?
+
+      app_url = ENV['FRONTEND_URL'].presence || 'http://localhost:3000'
+      webhook_url = "#{app_url}/webhooks/evolution/#{phone_number}"
+
+      begin
+        client = EvolutionApi::Client.new(base_url, api_token)
+        instance_name = "Chatwoot_#{phone_number}"
+        client.set_webhook(instance_name, webhook_url)
+      rescue StandardError => e
+        Rails.logger.error "Evolution Webhook Setup Failed: #{e.message}"
+      end
+    elsif provider_service.respond_to?(:setup_channel_provider)
+      provider_service.setup_channel_provider
+    else
+      # 360Dialog / Cloud logic
+      business_account_id = provider_config['business_account_id']
+      api_key = provider_config['api_key']
+
+      Whatsapp::WebhookSetupService.new(self, business_account_id, api_key).perform
+    end
   end
 
   def teardown_webhooks
-    # NOTE: Guard against double execution during destruction due to the
-    # `has_one :inbox, dependent: :destroy` relationship which will trigger this callback circularly
-    return if @webhook_teardown_initiated
-
-    @webhook_teardown_initiated = true
-    Whatsapp::WebhookTeardownService.new(self).perform
+    if provider == 'wuzapi'
+      teardown_wuzapi_session
+    elsif provider == 'evolution'
+      teardown_evolution_session
+    else
+      Whatsapp::WebhookTeardownService.new(self).perform
+    end
+  rescue StandardError => e
+    Rails.logger.error "[WHATSAPP] Failed to teardown webhooks: #{e.message}"
   end
 
-  def should_auto_setup_webhooks?
-    # Only auto-setup webhooks for whatsapp_cloud provider with manual setup
-    # Embedded signup calls setup_webhooks explicitly in EmbeddedSignupService
-    provider == 'whatsapp_cloud' && provider_config['source'] != 'embedded_signup'
+  def teardown_wuzapi_session
+    return if provider_config['wuzapi_base_url'].blank?
+
+    client = Wuzapi::Client.new(provider_config['wuzapi_base_url'])
+
+    # 1. Try Logout (User Token)
+    if wuzapi_user_token.present?
+      begin
+        client.session_logout(wuzapi_user_token)
+      rescue StandardError => e
+        Rails.logger.warn "Wuzapi Logout Failed: #{e.message}"
+      end
+
+      # 2. Try Disconnect (User Token)
+      begin
+        client.session_disconnect(wuzapi_user_token)
+      rescue StandardError => e
+        Rails.logger.warn "Wuzapi Disconnect Failed: #{e.message}"
+      end
+    end
+
+    # 3. Last Resort: Delete User via Admin API (Global Token)
+    return unless wuzapi_admin_token.present? && provider_config['wuzapi_user_id'].present?
+
+    begin
+      client.delete_user(wuzapi_admin_token, provider_config['wuzapi_user_id'])
+    rescue StandardError => e
+      Rails.logger.warn "Wuzapi Delete User Failed: #{e.message}"
+    end
+  end
+
+  def provision_wuzapi_user
+    return unless provider == 'wuzapi' && provider_config['auto_create_user']
+    return if wuzapi_user_token.present?
+
+    base_url = provider_config['wuzapi_base_url']
+    # Use encrypted admin token
+    admin_token = wuzapi_admin_token
+
+    # Custom Name: <InboxName>_<Phone>
+    # Sanitize to allow only alphanumeric (Wuzapi limitations)
+    raw_name = inbox&.name || inbox_name_for_provisioning
+    sanitized_inbox_name = raw_name.to_s.gsub(/[^a-zA-Z0-9]/, '_')
+    prefix = (sanitized_inbox_name.presence || 'Chatwoot')
+    user_name = "#{prefix}_#{phone_number}"
+
+    # Helper to attempt provision
+    attempt_provision = lambda do |url|
+      service = Wuzapi::ProvisioningService.new(url, admin_token)
+      service.provision(user_name)
+    end
+
+    begin
+      result = attempt_provision.call(base_url)
+    rescue StandardError => e
+      Rails.logger.warn "Wuzapi Provisioning failed with URL #{base_url}: #{e.message}"
+      # Fallback: if url ends in /api, strip it and try again
+      if base_url.match?(%r{/api/?$})
+        fallback_url = base_url.gsub(%r{/api/?$}, '')
+        Rails.logger.info "Retrying Wuzapi Provisioning with fallback URL: #{fallback_url}"
+        begin
+          result = attempt_provision.call(fallback_url)
+          # If success, update the config to use the working URL
+          provider_config['wuzapi_base_url'] = fallback_url
+          Rails.logger.info "Wuzapi Provisioning fallback successful. Updated base_url to #{fallback_url}"
+        rescue StandardError => retry_e
+          Rails.logger.error "Wuzapi Provisioning fallback also failed: #{retry_e.message}"
+          errors.add(:base, "Wuzapi Provisioning Failed: #{retry_e.message}")
+          throw(:abort)
+        end
+      else
+        errors.add(:base, "Wuzapi Provisioning Failed: #{e.message}")
+        throw(:abort)
+      end
+    end
+
+    # Success handling
+    provider_config['wuzapi_user_id'] = result[:wuzapi_user_id]
+    self.wuzapi_user_token = result[:wuzapi_user_token]
+
+    masked_token = result[:wuzapi_user_token].to_s[-4..]
+    Rails.logger.info "Wuzapi User Provisioned. ID: #{result[:wuzapi_user_id]}, Token (last 4): ****#{masked_token}"
+  end
+
+  def teardown_evolution_session
+    return if provider_config['evolution_base_url'].blank?
+
+    client = EvolutionApi::Client.new(provider_config['evolution_base_url'], evolution_api_token)
+    instance_name = "Chatwoot_#{phone_number}"
+
+    begin
+      client.logout_instance(instance_name)
+    rescue StandardError => e
+      Rails.logger.warn "Evolution Logout Failed: #{e.message}"
+    end
+
+    begin
+      client.delete_instance(instance_name)
+    rescue StandardError => e
+      Rails.logger.warn "Evolution Delete Instance Failed: #{e.message}"
+    end
+  end
+
+  def provision_evolution_instance
+    return unless provider == 'evolution'
+    return if evolution_api_token.blank?
+
+    base_url = provider_config['evolution_base_url']
+    token = evolution_api_token
+    instance_name = "Chatwoot_#{phone_number}"
+
+    begin
+      client = EvolutionApi::Client.new(base_url, token)
+      # Tenta criar a instância; se já existe, não tem problema fahar, usamos a mesma ou damos fetch no token
+      begin
+        client.create_instance(instance_name)
+      rescue StandardError => e
+        Rails.logger.warn "Evolution Create Instance failed (might already exist): #{e.message}"
+      end
+
+      # Apply instances settings if present in provider_config
+      evolution_settings = provider_config['settings']
+      if evolution_settings.is_a?(Hash)
+        begin
+          # Set settings (Always Online)
+          client.set_settings(instance_name, {
+                                'alwaysOnline' => evolution_settings['always_online'] == 'true' || evolution_settings['always_online'] == true
+                              })
+
+          # Set instance settings (Reject Call, Read, groups, status)
+          client.set_instance_settings(instance_name, {
+                                         'rejectCall' => evolution_settings['reject_call'] == 'true' || evolution_settings['reject_call'] == true,
+                                         'readMessages' => evolution_settings['read_messages'] == 'true' || evolution_settings['read_messages'] == true,
+                                         'ignoreGroups' => evolution_settings['ignore_groups'] == 'true' || evolution_settings['ignore_groups'] == true,
+                                         'ignoreStatus' => evolution_settings['ignore_status'] == 'true' || evolution_settings['ignore_status'] == true
+                                       })
+        rescue StandardError => e
+          Rails.logger.warn "Evolution Apply Settings failed: #{e.message}"
+        end
+      end
+      # Success: Store the instance ID
+      provider_config['evolution_instance_id'] = instance_name
+    rescue StandardError => e
+      Rails.logger.error "Evolution Provisioning failed: #{e.message}"
+      errors.add(:base, "Evolution Provisioning Failed: #{e.message}")
+      throw(:abort)
+    end
   end
 end
diff --git a/app/models/concerns/featurable.rb b/app/models/concerns/featurable.rb
index 919dddd41..6b1e254cc 100644
--- a/app/models/concerns/featurable.rb
+++ b/app/models/concerns/featurable.rb
@@ -52,7 +52,11 @@ module Featurable
   end
 
   def enabled_features
-    all_features.select { |_feature, enabled| enabled == true }
+    features = all_features.select { |_feature, enabled| enabled == true }
+    # Temporarily force enable captain features to fix blank page UI issue
+    features['captain_integration'] = true
+    features['captain_tasks'] = true
+    features
   end
 
   def disabled_features
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 50534d3bd..793311b32 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -2,39 +2,43 @@
 #
 # Table name: conversations
 #
-#  id                     :integer          not null, primary key
-#  additional_attributes  :jsonb
-#  agent_last_seen_at     :datetime
-#  assignee_last_seen_at  :datetime
-#  cached_label_list      :text
-#  contact_last_seen_at   :datetime
-#  custom_attributes      :jsonb
-#  first_reply_created_at :datetime
-#  identifier             :string
-#  last_activity_at       :datetime         not null
-#  priority               :integer
-#  snoozed_until          :datetime
-#  status                 :integer          default("open"), not null
-#  uuid                   :uuid             not null
-#  waiting_since          :datetime
-#  created_at             :datetime         not null
-#  updated_at             :datetime         not null
-#  account_id             :integer          not null
-#  assignee_agent_bot_id  :bigint
-#  assignee_id            :integer
-#  campaign_id            :bigint
-#  contact_id             :bigint
-#  contact_inbox_id       :bigint
-#  display_id             :integer          not null
-#  inbox_id               :integer          not null
-#  sla_policy_id          :bigint
-#  team_id                :bigint
+#  id                         :integer          not null, primary key
+#  active_scenario_expires_at :datetime
+#  active_scenario_key        :string
+#  active_scenario_state      :jsonb            not null
+#  additional_attributes      :jsonb
+#  agent_last_seen_at         :datetime
+#  assignee_last_seen_at      :datetime
+#  cached_label_list          :text
+#  contact_last_seen_at       :datetime
+#  custom_attributes          :jsonb
+#  first_reply_created_at     :datetime
+#  identifier                 :string
+#  last_activity_at           :datetime         not null
+#  priority                   :integer
+#  snoozed_until              :datetime
+#  status                     :integer          default("open"), not null
+#  uuid                       :uuid             not null
+#  waiting_since              :datetime
+#  created_at                 :datetime         not null
+#  updated_at                 :datetime         not null
+#  account_id                 :integer          not null
+#  assignee_agent_bot_id      :bigint
+#  assignee_id                :integer
+#  campaign_id                :bigint
+#  contact_id                 :bigint
+#  contact_inbox_id           :bigint
+#  display_id                 :integer          not null
+#  inbox_id                   :integer          not null
+#  sla_policy_id              :bigint
+#  team_id                    :bigint
 #
 # Indexes
 #
 #  conv_acid_inbid_stat_asgnid_idx                    (account_id,inbox_id,status,assignee_id)
 #  index_conversations_on_account_id                  (account_id)
 #  index_conversations_on_account_id_and_display_id   (account_id,display_id) UNIQUE
+#  index_conversations_on_active_scenario_key         (active_scenario_key)
 #  index_conversations_on_assignee_id_and_account_id  (assignee_id,account_id)
 #  index_conversations_on_campaign_id                 (campaign_id)
 #  index_conversations_on_contact_id                  (contact_id)
diff --git a/app/models/csat_survey_response.rb b/app/models/csat_survey_response.rb
index 804dfd4b7..212530493 100644
--- a/app/models/csat_survey_response.rb
+++ b/app/models/csat_survey_response.rb
@@ -2,24 +2,28 @@
 #
 # Table name: csat_survey_responses
 #
-#  id                :bigint           not null, primary key
-#  feedback_message  :text
-#  rating            :integer          not null
-#  created_at        :datetime         not null
-#  updated_at        :datetime         not null
-#  account_id        :bigint           not null
-#  assigned_agent_id :bigint
-#  contact_id        :bigint           not null
-#  conversation_id   :bigint           not null
-#  message_id        :bigint           not null
+#  id                         :bigint           not null, primary key
+#  csat_review_notes          :text
+#  feedback_message           :text
+#  rating                     :integer          not null
+#  review_notes_updated_at    :datetime
+#  created_at                 :datetime         not null
+#  updated_at                 :datetime         not null
+#  account_id                 :bigint           not null
+#  assigned_agent_id          :bigint
+#  contact_id                 :bigint           not null
+#  conversation_id            :bigint           not null
+#  message_id                 :bigint           not null
+#  review_notes_updated_by_id :bigint
 #
 # Indexes
 #
-#  index_csat_survey_responses_on_account_id         (account_id)
-#  index_csat_survey_responses_on_assigned_agent_id  (assigned_agent_id)
-#  index_csat_survey_responses_on_contact_id         (contact_id)
-#  index_csat_survey_responses_on_conversation_id    (conversation_id)
-#  index_csat_survey_responses_on_message_id         (message_id) UNIQUE
+#  index_csat_survey_responses_on_account_id                  (account_id)
+#  index_csat_survey_responses_on_assigned_agent_id           (assigned_agent_id)
+#  index_csat_survey_responses_on_contact_id                  (contact_id)
+#  index_csat_survey_responses_on_conversation_id             (conversation_id)
+#  index_csat_survey_responses_on_message_id                  (message_id) UNIQUE
+#  index_csat_survey_responses_on_review_notes_updated_by_id  (review_notes_updated_by_id)
 #
 class CsatSurveyResponse < ApplicationRecord
   belongs_to :account
diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index ce45a8987..8b6d35382 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -7,6 +7,7 @@
 #  id                            :integer          not null, primary key
 #  allow_messages_after_resolved :boolean          default(TRUE)
 #  auto_assignment_config        :jsonb
+#  auto_resolve_duration         :integer
 #  business_name                 :string
 #  channel_type                  :string
 #  csat_config                   :jsonb            not null
@@ -17,10 +18,12 @@
 #  greeting_enabled              :boolean          default(FALSE)
 #  greeting_message              :string
 #  lock_to_single_conversation   :boolean          default(FALSE), not null
+#  message_signature_enabled     :boolean
 #  name                          :string           not null
 #  out_of_office_message         :string
 #  sender_name_type              :integer          default("friendly"), not null
 #  timezone                      :string           default("UTC")
+#  typing_delay                  :integer          default(0)
 #  working_hours_enabled         :boolean          default(FALSE)
 #  created_at                    :datetime         not null
 #  updated_at                    :datetime         not null
diff --git a/app/models/message.rb b/app/models/message.rb
index b37f0cc1c..1781c5965 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -18,6 +18,7 @@
 #  updated_at                :datetime         not null
 #  account_id                :integer          not null
 #  conversation_id           :integer          not null
+#  in_reply_to_id            :integer
 #  inbox_id                  :integer          not null
 #  sender_id                 :bigint
 #  source_id                 :text
@@ -33,10 +34,15 @@
 #  index_messages_on_conversation_account_type_created  (conversation_id,account_id,message_type,created_at)
 #  index_messages_on_conversation_id                    (conversation_id)
 #  index_messages_on_created_at                         (created_at)
+#  index_messages_on_in_reply_to_id                     (in_reply_to_id)
 #  index_messages_on_inbox_id                           (inbox_id)
 #  index_messages_on_sender_type_and_sender_id          (sender_type,sender_id)
 #  index_messages_on_source_id                          (source_id)
 #
+# Foreign Keys
+#
+#  fk_rails_...  (in_reply_to_id => messages.id)
+#
 
 class Message < ApplicationRecord
   searchkick callbacks: false if ChatwootApp.advanced_search_allowed?
@@ -266,16 +272,16 @@ class Message < ApplicationRecord
   # Returns message content suitable for LLM consumption
   # Falls back to audio transcription or attachment placeholder when content is nil
   def content_for_llm
-    return content if content.present?
+    if attachments.blank?
+      # Fallback to pure string if no attachments to preserve string responses format
+      # everywhere in the system by default
+      return content if content.present?
 
-    audio_transcription = attachments
-                          .where(file_type: :audio)
-                          .filter_map { |att| att.meta&.dig('transcribed_text') }
-                          .join(' ')
-                          .presence
-    return "[Voice Message] #{audio_transcription}" if audio_transcription.present?
+      return '[Attachment]'
+    end
 
-    '[Attachment]' if attachments.any?
+    # Se a mensagem tiver anexo enviaremos o payload multimodal Array gerado pelo Service
+    Captain::OpenAiMessageBuilderService.new(message: self).generate_content
   end
 
   private
diff --git a/app/models/reporting_event.rb b/app/models/reporting_event.rb
index f083e32a1..6c2c10b01 100644
--- a/app/models/reporting_event.rb
+++ b/app/models/reporting_event.rb
@@ -17,13 +17,14 @@
 #
 # Indexes
 #
-#  index_reporting_events_on_account_id            (account_id)
-#  index_reporting_events_on_conversation_id       (conversation_id)
-#  index_reporting_events_on_created_at            (created_at)
-#  index_reporting_events_on_inbox_id              (inbox_id)
-#  index_reporting_events_on_name                  (name)
-#  index_reporting_events_on_user_id               (user_id)
-#  reporting_events__account_id__name__created_at  (account_id,name,created_at)
+#  index_reporting_events_for_response_distribution  (account_id,name,inbox_id,created_at)
+#  index_reporting_events_on_account_id              (account_id)
+#  index_reporting_events_on_conversation_id         (conversation_id)
+#  index_reporting_events_on_created_at              (created_at)
+#  index_reporting_events_on_inbox_id                (inbox_id)
+#  index_reporting_events_on_name                    (name)
+#  index_reporting_events_on_user_id                 (user_id)
+#  reporting_events__account_id__name__created_at    (account_id,name,created_at)
 #
 
 class ReportingEvent < ApplicationRecord
diff --git a/app/models/super_admin.rb b/app/models/super_admin.rb
index 9bcee9b8a..316d60c7b 100644
--- a/app/models/super_admin.rb
+++ b/app/models/super_admin.rb
@@ -19,7 +19,7 @@
 #  message_signature      :text
 #  name                   :string           not null
 #  otp_backup_codes       :text
-#  otp_required_for_login :boolean          default(FALSE)
+#  otp_required_for_login :boolean          default(FALSE), not null
 #  otp_secret             :string
 #  provider               :string           default("email"), not null
 #  pubsub_token           :string
diff --git a/app/models/user.rb b/app/models/user.rb
index 156452322..90751f12f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -19,7 +19,7 @@
 #  message_signature      :text
 #  name                   :string           not null
 #  otp_backup_codes       :text
-#  otp_required_for_login :boolean          default(FALSE)
+#  otp_required_for_login :boolean          default(FALSE), not null
 #  otp_secret             :string
 #  provider               :string           default("email"), not null
 #  pubsub_token           :string
diff --git a/app/services/evolution_api/client.rb b/app/services/evolution_api/client.rb
new file mode 100644
index 000000000..7a50b1f7e
--- /dev/null
+++ b/app/services/evolution_api/client.rb
@@ -0,0 +1,156 @@
+require 'net/http'
+require 'json'
+
+class EvolutionApi::Client
+  class Error < StandardError; end
+  class AuthenticationError < Error; end
+  class ConnectionError < Error; end
+
+  attr_reader :base_url, :api_token
+
+  def initialize(base_url, api_token)
+    @base_url = normalize_url(base_url)
+    @api_token = api_token
+  end
+
+  def check_api
+    request(:get, '/instance/fetchInstances')
+  end
+
+  # Instance Endpoints
+  def create_instance(instance_name)
+    payload = { instanceName: instance_name, token: instance_name }
+    request(:post, '/instance/create', payload)
+  end
+
+  def get_qr_code(instance_name)
+    request(:get, "/instance/qr?instanceName=#{instance_name}")
+  end
+
+  def session_status(instance_name)
+    request(:get, "/instance/connectionState?instanceName=#{instance_name}")
+  rescue StandardError => _e
+    # Log error or handle retry if needed
+    {}
+  end
+
+  def logout_instance(instance_name)
+    request(:delete, "/instance/logout?instanceName=#{instance_name}")
+  end
+
+  def delete_instance(instance_name)
+    request(:delete, "/instance/delete?instanceName=#{instance_name}")
+  end
+
+  def set_instance_settings(instance_name, settings)
+    # Evolution API uses /settings/set/instanceName
+    # settings is a hash with alwaysOnline, rejectCall, etc.
+    request(:post, "/settings/set?instanceName=#{instance_name}", settings)
+  end
+
+  def set_settings(instance_name, settings)
+    # Duplicate p/ compatibilidade se necessário com rotas /instance/update
+    request(:post, "/instance/update?instanceName=#{instance_name}", settings)
+  end
+
+  # Webhook
+  def set_webhook(instance_name, webhook_url)
+    payload = {
+      webhook: {
+        url: webhook_url,
+        byEvents: false,
+        base64: false,
+        events: %w[
+          MESSAGES_UPSERT
+          MESSAGES_UPDATE
+          SEND_MESSAGE
+          CONNECTION_UPDATE
+        ]
+      }
+    }
+    request(:post, "/webhook/set?instanceName=#{instance_name}", payload)
+  end
+
+  # Sending messages
+  def send_text(instance_name, phone_number, body, **options)
+    payload = { number: phone_number, text: body }.merge(options)
+    request(:post, "/send/text?instanceName=#{instance_name}", payload)
+  end
+
+  def send_image(instance_name, phone_number, base64_or_url, caption = nil)
+    payload = { number: phone_number, mediaMessage: { mediatype: 'image', media: base64_or_url, caption: caption } }
+    request(:post, "/send/media?instanceName=#{instance_name}", payload)
+  end
+
+  def send_file(instance_name, phone_number, base64_or_url, filename)
+    payload = { number: phone_number, mediaMessage: { mediatype: 'document', media: base64_or_url, fileName: filename } }
+    request(:post, "/send/media?instanceName=#{instance_name}", payload)
+  end
+
+  private
+
+  def normalize_url(url)
+    url.to_s.gsub(%r{/$}, '')
+  end
+
+  def auth_headers
+    { 'apikey' => @api_token }
+  end
+
+  def request(method, path, payload = nil)
+    uri = URI.parse("#{base_url}#{path}")
+    http = Net::HTTP.new(uri.host, uri.port)
+
+    if uri.scheme == 'https'
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
+
+    request_obj = case method
+                  when :get
+                    Net::HTTP::Get.new(uri.request_uri)
+                  when :post
+                    Net::HTTP::Post.new(uri.request_uri)
+                  when :put
+                    Net::HTTP::Put.new(uri.request_uri)
+                  when :delete
+                    Net::HTTP::Delete.new(uri.request_uri)
+                  end
+
+    request_obj['Content-Type'] = 'application/json'
+    request_obj['Accept'] = 'application/json'
+
+    auth_headers.each { |k, v| request_obj[k] = v }
+    request_obj.body = payload.to_json if payload
+
+    begin
+      response = http.request(request_obj)
+      handle_response(response)
+    rescue Errno::ECONNREFUSED, Net::OpenTimeout, Net::ReadTimeout, SocketError, OpenSSL::SSL::SSLError => e
+      raise ConnectionError, "Could not connect to Evolution Go: #{e.message}"
+    end
+  end
+
+  def handle_response(response)
+    Rails.logger.info "EVOLUTION RAW RESPONSE: status=#{response.code} body=#{response.body.to_s.truncate(1000)}"
+
+    if response.code.to_i >= 200 && response.code.to_i < 300
+      begin
+        body = JSON.parse(response.body)
+        # Tratamento pro QR Code (Evolution as vezes volta a string de base64 no body ou num campo)
+        if body['qrcode'] || body['base64'] || body['qr'] || body['image']
+          body['qrcode'] ||= body['base64'] || body['qr'] || body['image']
+        elsif body.key?('instance') && body['instance']['qr']
+          body['qrcode'] = body['instance']['qr']
+        end
+        return body
+      rescue JSON::ParserError
+        return { 'raw_body' => response.body }
+      end
+    elsif response.code.to_i == 401 || response.code.to_i == 403
+      raise AuthenticationError, "Authentication failed: #{response.code} #{response.body}"
+    else
+      raise Error, "API Error: #{response.code} #{response.body}"
+    end
+  end
+end
diff --git a/app/services/whatsapp/decryption_service.rb b/app/services/whatsapp/decryption_service.rb
new file mode 100644
index 000000000..445a3d550
--- /dev/null
+++ b/app/services/whatsapp/decryption_service.rb
@@ -0,0 +1,145 @@
+class Whatsapp::DecryptionService
+  require 'openssl'
+  require 'base64'
+  require 'net/http'
+
+  # HKDF Info strings for different media types (WhatsApp protocol)
+  INFO_STRINGS = {
+    image: 'WhatsApp Image Keys',
+    video: 'WhatsApp Video Keys',
+    audio: 'WhatsApp Audio Keys',
+    document: 'WhatsApp Document Keys',
+    sticker: 'WhatsApp Image Keys'
+  }.freeze
+
+  def initialize(media_url, media_key, media_type)
+    @media_url = media_url
+    @media_key = Base64.decode64(media_key)
+    @media_type = media_type.to_sym
+    @info = INFO_STRINGS[@media_type] || INFO_STRINGS[:document]
+  end
+
+  def decrypt
+    return nil unless @media_url && @media_key
+
+    # 1. Download encrypted bytes
+    encrypted_bytes = download_content
+    return nil unless encrypted_bytes && encrypted_bytes.bytesize > 10
+
+    Rails.logger.info "WuzAPI Decrypt: Downloaded #{encrypted_bytes.bytesize} bytes"
+
+    # 2. Derive keys using HKDF SHA-256 (112 bytes total)
+    expanded_key = OpenSSL::KDF.hkdf(
+      @media_key,
+      salt: ''.b,  # Empty binary string
+      info: @info,
+      length: 112,
+      hash: 'sha256'
+    )
+
+    # 3. Split derived key
+    iv = expanded_key[0...16]
+    cipher_key = expanded_key[16...48]
+    # mac_key = expanded_key[48...80]  # For verification (optional)
+    # ref_key = expanded_key[80...112] # Not used
+
+    # 4. WhatsApp file structure: [Encrypted Content] + [MAC (10 bytes)]
+    # Remove the last 10 bytes (MAC)
+    cipher_text = encrypted_bytes[0...-10]
+
+    # 5. Try AES-256-CBC first (older WhatsApp versions)
+    decrypted = try_aes_cbc(cipher_key, iv, cipher_text)
+
+    # 6. If CBC fails, try CTR mode (some implementations use this)
+    decrypted ||= try_aes_ctr(cipher_key, iv, cipher_text)
+
+    return nil unless decrypted
+
+    # 7. Validate that we got a valid image (check magic bytes)
+    if valid_media?(decrypted)
+      Rails.logger.info 'WuzAPI Decrypt: SUCCESS - Valid media detected'
+      StringIO.new(decrypted)
+    else
+      Rails.logger.warn 'WuzAPI Decrypt: Decrypted but invalid media format'
+      nil
+    end
+  rescue StandardError => e
+    Rails.logger.error "WuzAPI Decrypt Error: #{e.class} - #{e.message}"
+    nil
+  end
+
+  private
+
+  def try_aes_cbc(key, iv, data)
+    decipher = OpenSSL::Cipher.new('AES-256-CBC')
+    decipher.decrypt
+    decipher.key = key
+    decipher.iv = iv
+    decipher.padding = 0  # WhatsApp doesn't use PKCS7 padding
+
+    decipher.update!(data) + decipher.final
+
+  rescue OpenSSL::Cipher::CipherError => e
+    Rails.logger.debug { "AES-CBC failed: #{e.message}" }
+    nil
+  end
+
+  def try_aes_ctr(key, iv, data)
+    decipher = OpenSSL::Cipher.new('AES-256-CTR')
+    decipher.decrypt
+    decipher.key = key
+    decipher.iv = iv
+
+    decipher.update!(data) + decipher.final
+
+  rescue OpenSSL::Cipher::CipherError => e
+    Rails.logger.debug { "AES-CTR failed: #{e.message}" }
+    nil
+  end
+
+  def valid_media?(data)
+    return false if data.nil? || data.bytesize < 4
+
+    bytes = data.bytes[0..7]
+
+    # JPEG: FF D8 FF
+    return true if bytes[0..2] == [0xFF, 0xD8, 0xFF]
+
+    # PNG: 89 50 4E 47
+    return true if bytes[0..3] == [0x89, 0x50, 0x4E, 0x47]
+
+    # WebP: RIFF....WEBP
+    return true if data[0..3] == 'RIFF' && data[8..11] == 'WEBP'
+
+    # MP4/MOV: ftyp
+    return true if data[4..7] == 'ftyp'
+
+    # MP3: ID3 or FF FB/FF FA
+    return true if data[0..2] == 'ID3' || bytes[0..1] == [0xFF, 0xFB] || bytes[0..1] == [0xFF, 0xFA]
+
+    # OGG: OggS
+    return true if data[0..3] == 'OggS'
+
+    # PDF: %PDF
+    return true if data[0..3] == '%PDF'
+
+    false
+  end
+
+  def download_content
+    uri = URI.parse(@media_url)
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = (uri.scheme == 'https')
+    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    http.open_timeout = 10
+    http.read_timeout = 30
+
+    request = Net::HTTP::Get.new(uri.request_uri)
+    response = http.request(request)
+
+    response.is_a?(Net::HTTPSuccess) ? response.body.b : nil
+  rescue StandardError => e
+    Rails.logger.error "WuzAPI Decrypt Download Error: #{e.message}"
+    nil
+  end
+end
diff --git a/app/services/whatsapp/incoming_message_wuzapi_service.rb b/app/services/whatsapp/incoming_message_wuzapi_service.rb
new file mode 100644
index 000000000..8a19b7f77
--- /dev/null
+++ b/app/services/whatsapp/incoming_message_wuzapi_service.rb
@@ -0,0 +1,322 @@
+class Whatsapp::IncomingMessageWuzapiService < Whatsapp::IncomingMessageBaseService
+  def perform
+    # 1. Parse Payload
+    # ----------------
+    # Extract all necessary data from the WuzAPI webhook payload
+    parser = Whatsapp::Providers::Wuzapi::PayloadParser.new(params)
+    Rails.logger.info "WuzapiService: Processing #{parser.message_type} from #{parser.sender_phone_number}"
+
+    # 2. Basic Validation
+    # -------------------
+    # Ignore statuses, presence updates, and errors for now
+    if parser.message_type == :chat_presence || parser.message_type == :error || parser.message_type == :ignore
+      Rails.logger.info "WuzAPI: Ignoring presence/error/ignore update (Type: #{parser.message_type})"
+      return
+    end
+
+    allowed_types = [:text, :image, :audio, :video, :document, :sticker]
+    unless allowed_types.include?(parser.message_type)
+      Rails.logger.info(
+        "WuzAPI: Unsupported message type: #{parser.message_type} " \
+        "(webhook.type=#{params[:type]}, event.Info.Type=#{params.dig(:event, :Info, :Type)}, event.Type=#{params.dig(:event, :Type)})"
+      )
+      return
+    end
+
+    # 2.1 V1 Scope: Ignore Groups
+    if parser.group_message?
+      Rails.logger.info "WuzAPI: Ignoring group message (ID: #{parser.external_id})"
+      return
+    end
+
+    if parser.sender_phone_number.blank? && !parser.from_me?
+      Rails.logger.warn "WuzAPI: Skipping processing for event with no valid sender phone (Type: #{parser.message_type})"
+      return
+    end
+
+    # 3. Strong Dedupe (Existing External ID)
+    # ---------------------------------------
+    # If we already have a message with this WAID, ignore it immediately.
+    # This catches standard retries from WuzAPI or webhook re-deliveries.
+    clean_source_id = "WAID:#{parser.external_id}"
+
+    # 4. Find/Create Resources
+    # ------------------------
+    # Based on the sender (customer) or recipient (if it's a mobile reply)
+    ActiveRecord::Base.transaction do
+      # Strong dedupe inside transaction to prevent TOCTOU race condition
+      if parser.external_id.present? && Message.exists?(source_id: clean_source_id, inbox_id: inbox.id)
+        Rails.logger.info "WuzAPI: Ignoring duplicate message (ID: #{clean_source_id})"
+        return
+      end
+      @contact = find_or_create_contact(parser)
+      return if @contact.nil? # If contact couldn't be determined, stop processing
+
+      @conversation = find_or_create_conversation(@contact)
+
+      # 5. Echo/AI Deduplication Logic
+      # ------------------------------
+      # If this is an outgoing message (from_me=true), it might be:
+      # A) A reply sent from the physical phone (needs to be created as outgoing)
+      # B) A confirmation echo of a message Chatwoot/AI just sent (needs to be merged)
+      if parser.from_me?
+        deduplicated_message = find_outgoing_message_to_deduplicate(parser, @conversation)
+        if deduplicated_message
+          # Merging logic: Update the local temporary message with the real WuzAPI ID
+          Rails.logger.info "WuzAPI: Merging echo into existing message #{deduplicated_message.id}"
+          deduplicated_message.update!(source_id: clean_source_id)
+          return # Stop processing, we successfully merged.
+        end
+      end
+
+      # 6. Create Message
+      # -----------------
+      # If it wasn't a duplicate, create the new message (Incoming or Outgoing)
+      @message = build_message(parser, @conversation, clean_source_id)
+
+      # Attach media BEFORE saving (Chatwoot pattern)
+      attach_files(parser) if [:image, :audio, :video, :document, :sticker].include?(parser.message_type)
+
+      # Now save with attachments
+      @message.save!
+      Rails.logger.info "WuzAPI: Message created: #{@message.id} (SourceID: #{clean_source_id})"
+    end
+  rescue StandardError => e
+    Rails.logger.error "WuzAPI Error: #{e.message}"
+    Rails.logger.error e.backtrace.join("\n")
+    raise e
+  end
+
+  private
+
+  def find_or_create_contact(parser)
+    # If from_me is true, the sender is US (the business).
+    # The CONTACT for the conversation is properly the RECIPIENT (the customer).
+    # If from_me is false, the sender is the CUSTOMER.
+    phone_number = if parser.from_me?
+                     parser.recipient_phone_number # Extracted from Chat ID
+                   else
+                     parser.sender_phone_number    # Extracted from Sender ID
+                   end
+
+    return nil if phone_number.blank?
+
+    contact_inbox = ContactInbox.find_by(inbox_id: inbox.id, source_id: phone_number)
+    return contact_inbox.contact if contact_inbox
+
+    # Create or Find existing contact in the account
+    # We use find_by to avoid uniqueness validation errors if the contact exists in another inbox
+    formatted_phone = "+#{phone_number.to_s.delete('+')}"
+    contact = inbox.account.contacts.find_by(phone_number: formatted_phone)
+
+    contact ||= inbox.account.contacts.create!(
+      name: parser.sender_name || phone_number,
+      phone_number: formatted_phone,
+      custom_attributes: { wuzapi_id: phone_number }
+    )
+
+    ContactInbox.create!(
+      contact: contact,
+      inbox: inbox,
+      source_id: phone_number
+    )
+
+    contact
+  end
+
+  def find_or_create_conversation(contact)
+    # Find the LAST open conversation for this contact to append to
+    conversation = inbox.conversations.where(contact_id: contact.id)
+                        .where.not(status: :resolved)
+                        .order(updated_at: :desc)
+                        .first
+
+    return conversation if conversation
+
+    # Find the ContactInbox association to linking
+    contact_inbox = ContactInbox.find_by(contact_id: contact.id, inbox_id: inbox.id)
+
+    # If no open conversation, create a new one
+    inbox.conversations.create!(
+      contact: contact,
+      contact_inbox: contact_inbox, # Explicitly required by Chatwoot validation
+      status: :open,
+      account_id: inbox.account_id
+    )
+  end
+
+  def find_outgoing_message_to_deduplicate(parser, conversation)
+    # We are looking for a message that:
+    # 1. Is Outgoing (message_type: 1)
+    # 2. Was created recently (e.g., last 2 minutes)
+    # 3. Has NO source_id (it was created locally by AI/Agent without external ref yet)
+    # 4. Has the SAME content as the webhook payload
+    #
+    # Note: Text matching can be fuzzy due to encoding/whitespace.
+    # We compare stripped content.
+
+    incoming_content = parser.text_content&.strip
+    return nil if incoming_content.blank?
+
+    # Time window to search back
+    time_window = 5.minutes.ago
+
+    conversation.messages.where(message_type: :outgoing, source_id: nil)
+                .where('created_at > ?', time_window)
+                .find { |msg| msg.content&.strip == incoming_content }
+  end
+
+  def build_message(parser, conversation, clean_source_id)
+    is_outgoing = parser.from_me?
+
+    msg_params = {
+      content: parser.text_content,
+      account_id: inbox.account_id,
+      inbox_id: inbox.id,
+      message_type: is_outgoing ? :outgoing : :incoming,
+      # If outgoing, sender is nil (system/agent). If incoming, sender is the contact.
+      sender: is_outgoing ? nil : @contact,
+      source_id: clean_source_id,
+      created_at: parser.timestamp || Time.current
+    }
+
+    # Handle Replies
+    # Handle Reply Logic (Aligned with Reference)
+    if (reply_id = parser.in_reply_to_external_id).present?
+      clean_reply_id = "WAID:#{reply_id}"
+
+      # Strict lookup within conversation to prevent cross-inbox leaks
+      original_message = conversation.messages.find_by(source_id: clean_reply_id)
+
+      if original_message
+        msg_params[:in_reply_to_id] = original_message.id
+      else
+        # Fallback: Store ID for UI "Replying to..." display even if not linked
+        msg_params[:content_attributes] = { in_reply_to_external_id: clean_reply_id }
+      end
+    end
+
+    # Use .build so we can attach files before .save!
+    conversation.messages.build(msg_params)
+  end
+
+  def attach_files(parser)
+    attachment_data = parser.attachment_params
+    return if attachment_data.blank? || attachment_data[:external_url].blank?
+
+    begin
+      Rails.logger.info "WuzAPI: Processing attachment (URL: #{attachment_data[:external_url]}, File: #{attachment_data[:file_name]})"
+
+      # 1. Download/Decrypt to get a file
+      file_io = download_or_decrypt_media(attachment_data, parser.message_type)
+      return if file_io.blank?
+
+      # 2. Determine filename
+      original_filename = attachment_data[:file_name] || "wuzapi_#{Time.now.to_i}"
+      extension = File.extname(original_filename)
+      extension = detect_extension(attachment_data[:mimetype], parser.message_type) if extension.blank?
+      final_filename = "#{File.basename(original_filename, '.*')}#{extension}"
+
+      # 3. Attach using Chatwoot's standard pattern
+      @message.attachments.new(
+        account_id: @message.account_id,
+        file_type: file_content_type(parser.message_type),
+        file: {
+          io: file_io,
+          filename: final_filename,
+          content_type: attachment_data[:mimetype] || 'application/octet-stream'
+        }
+      )
+
+      Rails.logger.info "WuzAPI: Attachment queued for save (#{final_filename})"
+
+    rescue StandardError => e
+      Rails.logger.error "WuzAPI Attachment Error: #{e.message}"
+      Rails.logger.error e.backtrace.first(10).join("\n")
+    end
+  end
+
+  def download_or_decrypt_media(attachment_data, message_type)
+    media_url = attachment_data[:external_url]
+
+    # METHOD 1: Use WuzAPI's /chat/downloadimage endpoint (returns DECRYPTED media)
+    # This is the equivalent of Cloud API's media download
+    begin
+      Rails.logger.info 'WuzAPI: Attempting download via WuzAPI endpoint...'
+      wuzapi_response = wuzapi_client.download_media(wuzapi_token, media_url)
+
+      if wuzapi_response.is_a?(Hash) && wuzapi_response['data'].present?
+        # WuzAPI returns base64 in 'data' field
+        image_data = wuzapi_response['data']
+        # Strip data URI prefix if present
+        image_data = image_data.sub(/^data:.*?;base64,/, '') if image_data.start_with?('data:')
+
+        decoded = Base64.decode64(image_data)
+        if decoded.bytesize > 1000 # Valid image should be > 1KB
+          Rails.logger.info 'WuzAPI: Download via endpoint SUCCESS'
+          return StringIO.new(decoded)
+        end
+      end
+    rescue StandardError => e
+      Rails.logger.warn "WuzAPI: Endpoint download failed - #{e.message}"
+    end
+
+    # METHOD 2: Try local decryption if we have mediaKey
+    if attachment_data[:media_key].present?
+      Rails.logger.info 'WuzAPI: Attempting local decryption (mediaKey present)...'
+      decrypted = Whatsapp::DecryptionService.new(
+        media_url,
+        attachment_data[:media_key],
+        file_content_type(message_type)
+      ).decrypt
+
+      return decrypted if decrypted
+
+      Rails.logger.warn 'WuzAPI: Local decryption failed...'
+    end
+
+    # METHOD 3: Direct download (only works for non-encrypted or already-decrypted URLs)
+    Rails.logger.info "WuzAPI: Direct download from #{media_url}"
+    Down.download(
+      media_url,
+      open_timeout: 10,
+      read_timeout: 30,
+      ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE
+    )
+  rescue StandardError => e
+    Rails.logger.error "WuzAPI: All download methods failed - #{e.message}"
+    nil
+  end
+
+  def wuzapi_client
+    @wuzapi_client ||= Wuzapi::Client.new(@inbox.channel.provider_config['wuzapi_base_url'])
+  end
+
+  def wuzapi_token
+    @inbox.channel.wuzapi_user_token
+  end
+
+  def detect_extension(mimetype, message_type)
+    return '.jpg' if message_type == :image || message_type == :sticker
+    return '.mp3' if message_type == :audio
+    return '.mp4' if message_type == :video
+
+    case mimetype
+    when 'image/png' then '.png'
+    when 'image/webp' then '.webp'
+    when 'image/gif' then '.gif'
+    when 'audio/ogg' then '.ogg'
+    when 'video/webm' then '.webm'
+    else '.bin'
+    end
+  end
+
+  def file_content_type(message_type)
+    case message_type
+    when :image, :sticker then :image
+    when :audio then :audio
+    when :video then :video
+    else :file
+    end
+  end
+end
diff --git a/app/services/whatsapp/providers/evolution_api/payload_parser.rb b/app/services/whatsapp/providers/evolution_api/payload_parser.rb
new file mode 100644
index 000000000..0bac9870f
--- /dev/null
+++ b/app/services/whatsapp/providers/evolution_api/payload_parser.rb
@@ -0,0 +1,161 @@
+class Whatsapp::Providers::EvolutionApi::PayloadParser
+  attr_reader :params
+
+  def initialize(params)
+    @params = params.with_indifferent_access
+  end
+
+  def external_id
+    data.dig(:key, :id) || params[:id]
+  end
+
+  def from_me?
+    # WuzAPI/Baileys standard
+    data.dig(:key, :fromMe) || false
+  end
+
+  def sender_phone_number
+    # No fromMe=false, o remoteJid é o telefone da pessoa.
+    # Ex: "message":{"key":{"remoteJid":"551199999999@s.whatsapp.net"}}
+    jid = extract_jid
+    return nil if jid.blank? || jid.include?('@lid')
+
+    jid.split('@').first.split(':').first
+  end
+
+  def recipient_phone_number
+    # Se a mensagem foi enviada por nós (fromMe=true), o remoteJid é o destinatário (cliente)
+    jid = extract_jid
+    return nil if jid.blank? || jid.include?('@lid')
+
+    jid.split('@').first.split(':').first
+  end
+
+  def message_type
+    return :ignore if ignorable_webhook_event_type?
+
+    # Baseado na key que aparece dentro de data[:message] (padrão Baileys)
+    msg = unwrap_ephemeral_message(data[:message])
+    return :unknown unless msg.is_a?(Hash)
+
+    return :text if msg[:conversation].present? || msg[:extendedTextMessage].present?
+    return :image if msg[:imageMessage].present?
+    return :audio if msg[:audioMessage].present?
+    return :video if msg[:videoMessage].present?
+    return :document if msg[:documentMessage].present? || msg[:documentWithCaptionMessage].present?
+    return :sticker if msg[:stickerMessage].present?
+
+    # Evolution pode abstrair pro topo `messageType`
+    type_str = data[:messageType].to_s.downcase
+    case type_str
+    when 'conversation', 'extendedtextmessage' then :text
+    when 'imagemessage' then :image
+    when 'audiomessage' then :audio
+    when 'videomessage' then :video
+    when 'documentmessage' then :document
+    when 'stickermessage' then :sticker
+    else
+      :unknown
+    end
+  end
+
+  def in_reply_to_external_id
+    msg = unwrap_ephemeral_message(data[:message])
+    return nil unless msg.is_a?(Hash)
+
+    [:extendedTextMessage, :imageMessage, :videoMessage, :audioMessage, :stickerMessage, :documentMessage].each do |key|
+      ctx = msg.dig(key, :contextInfo)
+      next if ctx.blank?
+
+      stanza = ctx[:stanzaID] || ctx[:stanzaId]
+      return stanza if stanza.present?
+    end
+
+    nil
+  end
+
+  def text_content
+    msg = unwrap_ephemeral_message(data[:message])
+    return nil unless msg.is_a?(Hash)
+
+    return msg[:conversation] if msg[:conversation].present?
+    return msg.dig(:extendedTextMessage, :text) if msg.dig(:extendedTextMessage, :text).present?
+
+    [:imageMessage, :videoMessage, :documentMessage].each do |media_key|
+      caption = msg.dig(media_key, :caption)
+      return caption if caption.present?
+    end
+
+    nil
+  end
+
+  def attachment_params
+    media_key = case message_type
+                when :image then :imageMessage
+                when :audio then :audioMessage
+                when :video then :videoMessage
+                when :document then :documentMessage
+                when :sticker then :stickerMessage
+                end
+
+    return nil unless media_key
+
+    msg = unwrap_ephemeral_message(data[:message])
+    media_data = msg[media_key]
+    return nil unless media_data.is_a?(Hash)
+
+    # O formato de evolução costuma vir com `base64` já embutido
+    # ou com URLs pro media local proxy
+    {
+      base64: data.dig(:message, :base64) || data[:base64],
+      mimetype: media_data['mimetype'],
+      file_name: media_data['fileName'] || "file_#{external_id}",
+      media_key: media_data['mediaKey']
+    }
+  end
+
+  def timestamp
+    timestamp_val = data[:messageTimestamp] || params[:timestamp]
+    return Time.current if timestamp_val.blank?
+
+    # Baileys envia messageTimestamp como integer UNIX
+    return Time.zone.at(timestamp_val.to_i) if timestamp_val.is_a?(Integer) || timestamp_val.to_s.match?(/^\d+$/)
+
+    begin
+      Time.zone.parse(timestamp_val.to_s)
+    rescue ArgumentError
+      Time.current
+    end
+  end
+
+  def sender_name
+    data[:pushName] || data[:pushname]
+  end
+
+  def group_message?
+    jid = extract_jid
+    jid&.include?('@g.us')
+  end
+
+  private
+
+  def data
+    @data ||= params[:data] || params[:messages]&.first || params
+  end
+
+  def extract_jid
+    data.dig(:key, :remoteJid) || data[:remoteJid]
+  end
+
+  def ignorable_webhook_event_type?
+    # Filtrar eventos que não nos importam como PRESENCE_UPDATE ou STATUS
+    event_type = params[:event]
+    event_type.to_s != 'messages.upsert' && event_type.to_s != 'message'
+  end
+
+  def unwrap_ephemeral_message(msg)
+    return {} unless msg
+
+    msg.key?(:ephemeralMessage) ? msg.dig(:ephemeralMessage, :message) : msg
+  end
+end
diff --git a/app/services/whatsapp/providers/evolution_service.rb b/app/services/whatsapp/providers/evolution_service.rb
new file mode 100644
index 000000000..c9383bcc3
--- /dev/null
+++ b/app/services/whatsapp/providers/evolution_service.rb
@@ -0,0 +1,103 @@
+require_relative 'base_service'
+
+class Whatsapp::Providers::EvolutionService < Whatsapp::Providers::BaseService
+  attr_reader :whatsapp_channel
+
+  def initialize(whatsapp_channel:)
+    super(whatsapp_channel: whatsapp_channel)
+    @base_url = whatsapp_channel.provider_config['evolution_base_url']
+    @api_token = whatsapp_channel.evolution_api_token
+  end
+
+  def send_message(phone_number, message)
+    # Normalize phone number: remove +, space, -, (, )
+    normalized_phone = phone_number.gsub(/[\+\s\-\(\)]/, '')
+
+    instance_name = "Chatwoot_#{whatsapp_channel.phone_number}"
+
+    Rails.logger.info "[EvolutionService] Sending Message:
+      Message ID: #{message.id}
+      Raw Phone: #{phone_number}
+      Normalized Phone: #{normalized_phone}
+    "
+
+    # Se a mensagem tiver anexo, usamos send_attachment_message.
+    response = if message.attachments.present?
+                 send_attachment_message(instance_name, normalized_phone, message)
+               else
+                 params = {}
+                 if (reply_id = message.content_attributes['in_reply_to_external_id']).present?
+                   # Normalmente as bibliotecas WA recebem um ID p/ quote, isso depende muito da lib Go (que repassa a stanza p/ multidevice)
+                   params['quoted'] = { key: { id: reply_id } }
+                 end
+
+                 client.send_text(instance_name, normalized_phone, message.content, **params)
+               end
+
+    extract_message_id(response)
+  end
+
+  def send_attachment_message(instance_name, phone_number, message)
+    attachment = message.attachments.first
+
+    # Verifica o env se estamos servindo de S3 ou local
+    # Dependendo da lib Evolution, ele aceita URL ou Base64. Vamos usar Base64 para ser seguro pareado c/ local ou nuvem.
+    begin
+      base64_data = Base64.strict_encode64(attachment.file.download)
+      mime_type = attachment.file.content_type
+      data_uri = "data:#{mime_type};base64,#{base64_data}"
+
+      if mime_type.start_with?('image/')
+        client.send_image(instance_name, phone_number, data_uri, message.content)
+      else
+        client.send_file(instance_name, phone_number, data_uri, attachment.file.filename.to_s)
+      end
+    rescue StandardError => e
+      Rails.logger.error "[EvolutionService] Attachment Error: #{e.message}"
+      nil
+    end
+  end
+
+  def send_template(_phone_number, _template_info)
+    Rails.logger.warn 'Evolution: Templates not yet implemented or supported.'
+  end
+
+  def sync_templates
+    # No-op
+  end
+
+  def validate_provider_config?
+    return false if @api_token.blank? || @base_url.blank?
+
+    instance_name = "Chatwoot_#{whatsapp_channel.phone_number}"
+
+    begin
+      client.session_status(instance_name)
+      true
+    rescue EvolutionApi::Client::Error
+      false
+    end
+  end
+
+  # Podemos adicionar toggle_typing_status futuramente caso precisemos e a rota exista.
+  def toggle_typing_status(_typing_status, recipient_id: nil, **_kwargs)
+    nil
+  end
+
+  private
+
+  def client
+    @client ||= ::EvolutionApi::Client.new(@base_url, @api_token)
+  end
+
+  def extract_message_id(response)
+    return nil unless response.is_a?(Hash)
+
+    # Baseado nas respostas de serviços baileys-like, key id costuma vir na msg.
+    # Pode variar de {"key"=>{"id"=> "..."}} até {"id": "..."} na raiz
+    message_id = response.dig('message', 'key', 'id') || response.dig('key', 'id') || response['id']
+    return nil if message_id.blank?
+
+    message_id
+  end
+end
diff --git a/app/services/whatsapp/providers/wuzapi/payload_parser.rb b/app/services/whatsapp/providers/wuzapi/payload_parser.rb
new file mode 100644
index 000000000..5e272a98f
--- /dev/null
+++ b/app/services/whatsapp/providers/wuzapi/payload_parser.rb
@@ -0,0 +1,276 @@
+class Whatsapp::Providers::Wuzapi::PayloadParser
+  attr_reader :params
+
+  def initialize(params)
+    @params = params.with_indifferent_access
+  end
+
+  def external_id
+    params.dig(:event, :Info, :ID)
+  end
+
+  def from_me?
+    # A flag comes primarily from 'IsFromMe' or nested in 'Info'
+    is_api_from_me = params.dig(:event, :Info, :IsFromMe) || params.dig(:event, :IsFromMe)
+
+    # However, WuzAPI might be inconsistent. We also check if the sender matches the instance phone.
+    # But if the API explicitly says "IsFromMe: true", we trust it first.
+    return true if is_api_from_me.present? && is_api_from_me.to_s == 'true'
+
+    # Fallback check: Sender JID prefix matches instance phone number
+    instance_phone = params['phone_number']
+    sender_jid = params.dig(:event, :Info, :Sender) || params.dig(:event, :Sender)
+
+    if instance_phone.present? && sender_jid.present?
+      sender_phone = sender_jid.split('@').first
+      return true if sender_phone == instance_phone
+    end
+
+    false
+  end
+
+  # Extracts the CUSTOMER phone number when the message is FROM ME (outgoing).
+  # In this case, the 'Chat' field contains the recipient (customer) JID.
+  # When WuzAPI uses LIDs, we fallback to RecipientAlt which has the real number.
+  def recipient_phone_number
+    chat_id = params.dig(:event, :Info, :Chat) || params.dig(:event, :Chat)
+
+    # If Chat is a real number, use it
+    return chat_id.split('@').first.split(':').first if chat_id&.include?('@s.whatsapp.net')
+
+    # Fallback to RecipientAlt when Chat uses LID format
+    recipient_alt = params.dig(:event, :Info, :RecipientAlt) || params.dig(:event, :RecipientAlt)
+    return recipient_alt.split('@').first.split(':').first if recipient_alt&.include?('@s.whatsapp.net')
+
+    nil
+  end
+
+  def message_type
+    return :chat_presence if webhook_event_type == 'ChatPresence'
+    return :ignore if ignorable_webhook_event_type?
+
+    # Info: Type contains the general classification (text, image, etc)
+    type = raw_info_type.to_s.downcase
+    media_type = params.dig(:event, :Info, :MediaType).to_s.downcase
+
+    # WuzAPI sometimes sends 'media' in Type and the actual type in MediaType
+    type = media_type if type == 'media' && media_type.present?
+
+    case type
+    when 'text' then :text
+    when 'image' then :image
+    when 'audio' then :audio
+    when 'video' then :video
+    when 'document' then :document
+    when 'sticker' then :sticker
+    when 'readreceipt' then :ignore
+    else
+      fallback_message_type_from_payload
+    end
+  end
+
+  def presence_state
+    params.dig(:event, :State)
+  end
+
+  def in_reply_to_external_id
+    msg = unwrap_ephemeral_message(params.dig(:event, :Message))
+    return nil unless msg.is_a?(Hash)
+
+    # DEBUG: Log the message structure to understand reply context
+    Rails.logger.info "WuzAPI Reply Debug: Message keys = #{msg.keys.inspect}"
+
+    # 1. Extended text
+    ctx = msg.dig(:extendedTextMessage, :contextInfo)
+    if ctx.present?
+      Rails.logger.info "WuzAPI Reply Debug: Found extendedTextMessage contextInfo = #{ctx.inspect}"
+      stanza = ctx[:stanzaID] || ctx[:stanzaId]
+      return stanza if stanza.present?
+    end
+
+    # 2. Media Types direct contextInfo
+    [:imageMessage, :videoMessage, :audioMessage, :stickerMessage, :documentMessage].each do |key|
+      ctx = msg.dig(key, :contextInfo)
+      next if ctx.blank?
+
+      Rails.logger.info "WuzAPI Reply Debug: Found #{key} contextInfo = #{ctx.inspect}"
+      stanza = ctx[:stanzaID] || ctx[:stanzaId]
+      return stanza if stanza.present?
+    end
+
+    # 3. Document With Caption
+    if msg.key?(:documentWithCaptionMessage)
+      ctx = msg.dig(:documentWithCaptionMessage, :message, :documentMessage, :contextInfo)
+      if ctx.present?
+        Rails.logger.info "WuzAPI Reply Debug: Found documentWithCaptionMessage contextInfo = #{ctx.inspect}"
+        return ctx[:stanzaID] || ctx[:stanzaId]
+      end
+    end
+
+    # 4. Check for simple conversation with contextInfo (text reply without extendedTextMessage)
+    if msg[:conversation].present? && msg[:contextInfo].present?
+      ctx = msg[:contextInfo]
+      Rails.logger.info "WuzAPI Reply Debug: Found conversation contextInfo = #{ctx.inspect}"
+      stanza = ctx[:stanzaID] || ctx[:stanzaId]
+      return stanza if stanza.present?
+    end
+
+    Rails.logger.info 'WuzAPI Reply Debug: No reply context found'
+    nil
+  end
+
+  def text_content
+    msg = unwrap_ephemeral_message(params.dig(:event, :Message))
+    # Legacy fallback used by some WuzAPI payload variants
+    return params.dig(:event, :Text) if params.dig(:event, :Text).present?
+    return nil unless msg.is_a?(Hash)
+
+    # 1. Simple text
+    return msg[:conversation] if msg[:conversation].present?
+
+    # 2. Extended Text
+    return msg.dig(:extendedTextMessage, :text) if msg.dig(:extendedTextMessage, :text).present?
+
+    # 3. Media Captions (Image, Video, Document)
+    [:imageMessage, :videoMessage, :documentMessage].each do |media_key|
+      caption = msg.dig(media_key, :caption)
+      return caption if caption.present?
+    end
+
+    # 4. Document With Caption
+    return msg.dig(:documentWithCaptionMessage, :message, :documentMessage, :caption) if msg.key?(:documentWithCaptionMessage)
+
+    nil
+  end
+
+  def attachment_params
+    media_key = case message_type
+                when :image then :imageMessage
+                when :audio then :audioMessage
+                when :video then :videoMessage
+                when :document then :documentMessage
+                when :sticker then :stickerMessage
+                end
+    return nil unless media_key
+
+    msg = unwrap_ephemeral_message(params.dig(:event, :Message))
+    data = msg[media_key]
+    return nil unless data.is_a?(Hash)
+
+    {
+      external_url: data['URL'],
+      file_name: data['fileName'] || "file_#{external_id}",
+      mimetype: data['mimetype'],
+      thumbnail: data['JPEGThumbnail'],
+      media_key: data['mediaKey']
+    }
+  end
+
+  def sender_phone_number
+    jid = extract_jid
+
+    # Reject LIDs as they aren't valid E164 phone numbers
+    return nil if jid.blank? || jid.include?('@lid')
+
+    # Format: 556182098580:1@s.whatsapp.net -> 556182098580
+    # MD accounts include a device index suffix (eg. :1) that we must strip
+    jid.split('@').first.split(':').first
+  end
+
+  def timestamp
+    timestamp_val = params.dig(:event, :Info, :Timestamp) || params.dig(:event, :Timestamp)
+    return Time.current if timestamp_val.blank?
+
+    begin
+      Time.zone.parse(timestamp_val.to_s)
+    rescue ArgumentError
+      Time.current
+    end
+  end
+
+  def sender_name
+    params.dig(:event, :Info, :PushName) || params.dig(:event, :PushName)
+  end
+
+  def group_message?
+    params.dig(:event, :Info, :IsGroup) || params.dig(:event, :IsGroup)
+  end
+
+  private
+
+  def webhook_event_type
+    params[:type].to_s
+  end
+
+  def raw_info_type
+    params.dig(:event, :Info, :Type) || params.dig(:event, :Type)
+  end
+
+  def ignorable_webhook_event_type?
+    # These are provider/system updates and should not be treated as incoming user messages.
+    ignorable = %w[
+      ReadReceipt
+      UserAbout
+      IdentityChange
+      Picture
+      Connected
+      Disconnected
+      OfflineSyncCompleted
+      Presence
+      PresenceUpdate
+      Ack
+    ]
+
+    ignorable.include?(webhook_event_type)
+  end
+
+  def fallback_message_type_from_payload
+    # Fallback: detect type from message body shape, even when Info.Type is missing or inconsistent.
+    msg = unwrap_ephemeral_message(params.dig(:event, :Message))
+
+    if msg.is_a?(Hash)
+      return :text if msg[:conversation].present? || msg[:extendedTextMessage].present? || msg.dig(:extendedTextMessage, :text).present?
+      return :image if msg[:imageMessage].present?
+      return :audio if msg[:audioMessage].present?
+      return :video if msg[:videoMessage].present?
+      return :document if msg[:documentMessage].present? || msg[:documentWithCaptionMessage].present?
+      return :sticker if msg[:stickerMessage].present?
+    end
+
+    return :text if params.dig(:event, :Text).present?
+
+    :unknown
+  end
+
+  def unwrap_ephemeral_message(msg)
+    return {} unless msg
+
+    msg.key?(:ephemeralMessage) ? msg.dig(:ephemeralMessage, :message) : msg
+  end
+
+  def extract_jid
+    if from_me?
+      # For outgoing messages, prefer Chat if it's a real number
+      chat = params.dig(:event, :Info, :Chat) || params.dig(:event, :Chat)
+      return chat if chat&.include?('@s.whatsapp.net')
+
+      # Fallback to RecipientAlt when Chat uses LID format
+      recipient_alt = params.dig(:event, :Info, :RecipientAlt) || params.dig(:event, :RecipientAlt)
+      return recipient_alt if recipient_alt&.include?('@s.whatsapp.net')
+
+      chat # Return original Chat even if LID (will be filtered later)
+    else
+      sender = params.dig(:event, :Info, :Sender) || params.dig(:event, :Sender)
+      sender_alt = params.dig(:event, :Info, :SenderAlt) || params.dig(:event, :SenderAlt)
+
+      # Prefer @s.whatsapp.net over @lid
+      if sender&.include?('@s.whatsapp.net')
+        sender
+      elsif sender_alt&.include?('@s.whatsapp.net')
+        sender_alt
+      else
+        sender
+      end
+    end
+  end
+end
diff --git a/app/services/whatsapp/providers/wuzapi_service.rb b/app/services/whatsapp/providers/wuzapi_service.rb
new file mode 100644
index 000000000..cf8005990
--- /dev/null
+++ b/app/services/whatsapp/providers/wuzapi_service.rb
@@ -0,0 +1,187 @@
+require_relative 'base_service'
+
+class Whatsapp::Providers::WuzapiService < Whatsapp::Providers::BaseService
+  attr_reader :whatsapp_channel
+
+  def initialize(whatsapp_channel:)
+    super(whatsapp_channel: whatsapp_channel)
+    @base_url = whatsapp_channel.provider_config['wuzapi_base_url']
+  end
+
+  def send_message(phone_number, message)
+    user_token = whatsapp_channel.wuzapi_user_token
+    # Normalize phone number: remove +, space, -, (, )
+    normalized_phone = phone_number.gsub(/[\+\s\-\(\)]/, '')
+
+    Rails.logger.info "[WuzapiService] Sending Message:
+      Message ID: #{message.id}
+      Conversation ID: #{message.conversation_id}
+      Contact Inbox ID: #{message.conversation.contact_inbox_id}
+      Raw Phone (arg): #{phone_number}
+      Normalized Phone (Target): #{normalized_phone}
+      Content: #{message.content&.truncate(50)}
+    "
+
+    return send_reaction_message(normalized_phone, message) if message.content_attributes['is_reaction'] || message.content_attributes[:is_reaction]
+
+    response = if message.attachments.present?
+                 send_attachment_message(user_token, normalized_phone, message)
+               else
+                 params = {}
+                 # Extract and clean reply ID (remove WAID: prefix if stored)
+                 if (reply_id = message.content_attributes['in_reply_to_external_id']).present?
+                   params['MessageId'] = reply_id.gsub(/^WAID:/, '')
+                 elsif (reply_id = message.in_reply_to_external_id).present?
+                   params['MessageId'] = reply_id.gsub(/^WAID:/, '')
+                 end
+
+                 client.send_text(user_token, normalized_phone, message.content, **params)
+               end
+
+    # Extract message ID from WuzAPI response and format as WAID:xxx
+    extract_message_id(response)
+  end
+
+  def send_attachment_message(user_token, phone_number, message)
+    attachment = message.attachments.first
+    base64_data = Base64.strict_encode64(attachment.file.download)
+    mime_type = attachment.file.content_type
+    data_uri = "data:#{mime_type};base64,#{base64_data}"
+
+    if mime_type.start_with?('image/')
+      client.send_image(user_token, phone_number, data_uri, message.content)
+    else
+      client.send_file(user_token, phone_number, data_uri, attachment.file.filename.to_s)
+    end
+  end
+
+  def send_reaction_message(phone_number, message)
+    user_token = whatsapp_channel.wuzapi_user_token
+    normalized_phone = phone_number.gsub(/[\+\s\-\(\)]/, '')
+
+    # Assuming message content is the emoji
+    reaction_emoji = message.content
+
+    # Resolve the correct external message ID
+    message_id = message.content_attributes['in_reply_to_external_id']
+
+    # Fallback to internal ID resolution if external is missing
+    if message_id.blank? && message.content_attributes['in_reply_to'].present?
+      target_msg = message.conversation.messages.find_by(id: message.content_attributes['in_reply_to'])
+      message_id = target_msg&.source_id
+    end
+
+    # Strip WAID prefix if present
+    message_id = message_id.gsub(/^WAID:/, '') if message_id.present?
+
+    use_me_prefix = reaction_to_own_message?(message)
+
+    if use_me_prefix
+      normalized_phone = "me:#{normalized_phone}" unless normalized_phone.start_with?('me:')
+      message_id = "me:#{message_id}" if message_id.present? && !message_id.start_with?('me:')
+    else
+      # Enforce JID format for customer numbers
+      clean_number = normalized_phone.split('@').first
+      normalized_phone = "#{clean_number}@s.whatsapp.net"
+    end
+
+    Rails.logger.info "[WuzapiService] Attempting reaction: phone=#{normalized_phone}, msg_id=#{message_id}, emoji=#{reaction_emoji}"
+
+    if message_id.present?
+      # Wuzapi client needs to implement send_reaction
+      # This assumes the client wrapper has this method. If not, we might need to add it or use raw request.
+      # Based on typical Wuzapi forks, it might be /send-reaction-message
+
+      # We'll assume the client wrapper will have a send_reaction method.
+      # If not visible in the existing codebase, we might need to add it to the client class too.
+      # checking...
+      response = client.send_reaction(user_token, normalized_phone, message_id, reaction_emoji)
+      Rails.logger.info "[WuzapiService] Reaction response: #{response}"
+      response
+    else
+      Rails.logger.warn 'Wuzapi: Cannot send reaction without in_reply_to message ID'
+    end
+  end
+
+  def send_template(_phone_number, _template_info)
+    # Placeholder for template support if Wuzapi supports it.
+    # For now, just logging or no-op as per initial text-focused plan.
+    Rails.logger.warn 'Wuzapi: Templates not yet implemented or supported.'
+  end
+
+  def sync_templates
+    # No-op for Wuzapi as it doesn't insist on syncing templates like Cloud API
+  end
+
+  def validate_provider_config?
+    # Validate if we can connect to session status
+    user_token = whatsapp_channel.wuzapi_user_token
+    return false if user_token.blank?
+
+    begin
+      client.session_status(user_token)
+      true
+    rescue Wuzapi::Client::Error
+      false
+    end
+  end
+
+  def toggle_typing_status(typing_status, recipient_id: nil, **_kwargs)
+    # typing_status: 'typing_on', 'typing_off'
+    # Wuzapi expects: 'composing', 'paused'
+
+    state = %w[typing_on on].include?(typing_status) ? 'composing' : 'paused'
+    user_token = whatsapp_channel.wuzapi_user_token
+    phone_number = recipient_id || whatsapp_channel.phone_number
+
+    # Clean phone number (digits only)
+    normalized_phone = phone_number.to_s.gsub(/[\+\s\-\(\)]/, '')
+
+    # Enforce JID format: 5561...@s.whatsapp.net
+    # Strip any existing suffix (like @lid or even @s.whatsapp.net to be safe) and append standard one.
+    clean_number = normalized_phone.split('@').first
+    jid = "#{clean_number}@s.whatsapp.net"
+
+    Rails.logger.info "[WuzapiService] toggle_typing_status: Sending presence to #{jid} (raw: #{normalized_phone}), state: #{state}, token_present: #{user_token.present?}"
+
+    begin
+      # Use JID in the 'Phone' field as confirmed by manual tests (Test C)
+      response = client.send_chat_presence(user_token, jid, state)
+      Rails.logger.info "[WuzapiService] toggle_typing_status response: #{response}"
+    rescue StandardError => e
+      Rails.logger.warn "Wuzapi: Failed to send typing status: #{e.message}"
+    end
+  end
+
+  private
+
+  def client
+    @client ||= ::Wuzapi::Client.new(@base_url)
+  end
+
+  # Extract message ID from WuzAPI response and format it as WAID:xxx
+  # WuzAPI returns: {"code" => 200, "data" => {"Id" => "xxx", ...}, "success" => true}
+  def extract_message_id(response)
+    return nil unless response.is_a?(Hash)
+
+    message_id = response.dig('data', 'Id') || response.dig(:data, :Id)
+    return nil if message_id.blank?
+
+    "WAID:#{message_id}"
+  end
+
+  def reaction_to_own_message?(message)
+    # If we can resolve the target message, check if it was sent by us.
+    target_message = nil
+    if message.in_reply_to.present?
+      target_message = message.conversation.messages.find_by(id: message.in_reply_to)
+      target_message ||= message.conversation.messages.find_by(source_id: message.in_reply_to)
+    elsif message.in_reply_to_external_id.present?
+      target_message = message.conversation.messages.find_by(source_id: message.in_reply_to_external_id)
+    end
+
+    return false if target_message.blank?
+
+    target_message.outgoing? || target_message.template?
+  end
+end
diff --git a/app/services/wuzapi/client.rb b/app/services/wuzapi/client.rb
new file mode 100644
index 000000000..5a55d8418
--- /dev/null
+++ b/app/services/wuzapi/client.rb
@@ -0,0 +1,286 @@
+require 'net/http'
+require 'json'
+
+class Wuzapi::Client
+  class Error < StandardError; end
+  class AuthenticationError < Error; end
+  class ConnectionError < Error; end
+
+  attr_reader :base_url
+
+  def initialize(base_url)
+    @base_url = normalize_url(base_url)
+  end
+
+  # Admin Endpoints (Use Authorization header)
+  def create_user(admin_token, name, user_token)
+    payload = { name: name, token: user_token }
+    request(:post, '/admin/users', payload, admin_auth_headers(admin_token))
+  end
+
+  def delete_user(admin_token, user_id)
+    request(:delete, "/admin/users/#{user_id}", nil, admin_auth_headers(admin_token))
+  end
+
+  # User Endpoints (Use token header)
+  def send_text(user_token, phone_number, body, **options)
+    # Payload MUST be Case-Sensitive: Key 'Phone' and 'Body'
+    payload = { 'Phone' => phone_number, 'Body' => body }.merge(options)
+    request(
+      :post,
+      '/chat/send/text',
+      payload,
+      user_auth_headers(user_token),
+      fallback_paths: ['/send/text'],
+      allow_base_fallback: true
+    )
+  end
+
+  def send_image(user_token, phone_number, base64_data, caption = nil)
+    # Some Wuzapi builds expect `Image` while older forks accepted `Body`.
+    # Send both for compatibility; `Image` is the official key in current docs.
+    payload = {
+      'Phone' => phone_number,
+      'Image' => base64_data,
+      'Body' => base64_data,
+      'Caption' => caption
+    }
+    request(
+      :post,
+      '/chat/send/image',
+      payload,
+      user_auth_headers(user_token),
+      fallback_paths: ['/send/image'],
+      allow_base_fallback: true
+    )
+  end
+
+  def send_file(user_token, phone_number, base64_data, filename)
+    payload = { 'Phone' => phone_number, 'Body' => base64_data, 'Filename' => filename }
+    request(
+      :post,
+      '/chat/send/file',
+      payload,
+      user_auth_headers(user_token),
+      fallback_paths: ['/send/file'],
+      allow_base_fallback: true
+    )
+  end
+
+  def send_reaction(user_token, phone_number, message_id, emoji)
+    payload = { 'Phone' => phone_number, 'Body' => emoji, 'Id' => message_id }
+    request(
+      :post,
+      '/chat/react',
+      payload,
+      user_auth_headers(user_token),
+      fallback_paths: ['/send/react'],
+      allow_base_fallback: true
+    )
+  end
+
+  def send_chat_presence(user_token, phone_number, state, media = nil)
+    # State: "composing" or "paused"
+    # Media: "audio" (optional)
+    payload = { 'Phone' => phone_number, 'State' => state }
+    payload['Media'] = media if media
+    request(
+      :post,
+      '/chat/presence',
+      payload,
+      user_auth_headers(user_token),
+      fallback_paths: ['/send/presence'],
+      allow_base_fallback: true
+    )
+  end
+
+  def download_media(user_token, media_url)
+    # Some WuzAPI versions use a dedicated download endpoint to proxy Meta CDN
+    payload = { 'URL' => media_url }
+    request(
+      :post,
+      '/chat/downloadimage',
+      payload,
+      user_auth_headers(user_token),
+      fallback_paths: ['/downloadimage'],
+      allow_base_fallback: true
+    )
+  end
+
+  def session_status(user_token)
+    request(:get, '/session/status', nil, user_auth_headers(user_token))
+  end
+
+  def get_qr_code(user_token)
+    request(:get, '/session/qr', nil, user_auth_headers(user_token))
+  end
+
+  def session_connect(user_token)
+    request(:post, '/session/connect', {}, user_auth_headers(user_token))
+  end
+
+  def session_disconnect(user_token)
+    request(:post, '/session/disconnect', nil, user_auth_headers(user_token))
+  end
+
+  def session_logout(user_token)
+    request(:get, '/session/logout', nil, user_auth_headers(user_token))
+  end
+
+  def set_webhook(user_token, webhook_url)
+    # Wuzapi expects PascalCase keys 'WebhookURL' and 'Events' with 'All' per user verification.
+    payload = { 'WebhookURL' => webhook_url, 'Events' => ['All'] }
+    request(:post, '/webhook', payload, user_auth_headers(user_token))
+  end
+
+  def update_webhook(user_token, webhook_url)
+    payload = { 'WebhookURL' => webhook_url, 'Events' => ['All'] }
+    request(:put, '/webhook', payload, user_auth_headers(user_token))
+  end
+
+  def get_webhook(user_token)
+    request(:get, '/webhook', nil, user_auth_headers(user_token))
+  end
+
+  private
+
+  def normalize_url(url)
+    url.to_s.gsub(%r{/$}, '')
+  end
+
+  def admin_auth_headers(token)
+    { 'Authorization' => token }
+  end
+
+  def user_auth_headers(token)
+    { 'token' => token }
+  end
+
+  def request(method, path, payload, headers, fallback_paths: [], allow_base_fallback: false)
+    candidate_paths = [path, *Array(fallback_paths)].map { |p| normalize_path(p) }.uniq
+    candidate_bases = [base_url]
+    primary_path = candidate_paths.first
+    primary_base = candidate_bases.first
+
+    if allow_base_fallback
+      alternative = alternate_base_url(base_url)
+      candidate_bases << alternative if alternative.present? && alternative != base_url
+    end
+
+    errors = []
+
+    candidate_bases.each do |candidate_base|
+      candidate_paths.each do |candidate_path|
+        response = execute_http_request(method, candidate_base, candidate_path, payload, headers)
+        if candidate_base != primary_base || candidate_path != primary_path
+          Rails.logger.info("Wuzapi fallback route worked base=#{candidate_base} path=#{candidate_path}")
+        end
+        return handle_response(response)
+      rescue Error => e
+        if retryable_not_found?(e)
+          errors << e
+          Rails.logger.warn("Wuzapi endpoint not found, trying fallback route base=#{candidate_base} path=#{candidate_path}")
+          next
+        end
+
+        raise
+      rescue ConnectionError => e
+        errors << e
+        Rails.logger.warn("Wuzapi connection error on fallback route base=#{candidate_base} path=#{candidate_path}: #{e.message}")
+        next
+      end
+    end
+
+    raise(errors.last || Error.new('Wuzapi request failed with unknown error'))
+  end
+
+  def execute_http_request(method, target_base_url, path, payload, headers)
+    uri = URI.parse("#{target_base_url}#{path}")
+    http = Net::HTTP.new(uri.host, uri.port)
+
+    if uri.scheme == 'https'
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
+
+    request_obj = case method
+                  when :get
+                    Net::HTTP::Get.new(uri.request_uri)
+                  when :post
+                    Net::HTTP::Post.new(uri.request_uri)
+                  when :put
+                    Net::HTTP::Put.new(uri.request_uri)
+                  when :delete
+                    Net::HTTP::Delete.new(uri.request_uri)
+                  end
+
+    request_obj['Content-Type'] = 'application/json'
+    request_obj['Accept'] = 'application/json'
+    headers.each { |k, v| request_obj[k] = v }
+    request_obj.body = payload.to_json if payload
+
+    begin
+      http.request(request_obj)
+    rescue SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ENETUNREACH, Net::OpenTimeout, Net::ReadTimeout => e
+      raise ConnectionError, "Could not connect to Wuzapi: #{e.message}"
+    end
+  end
+
+  def normalize_path(path)
+    return '/' if path.blank?
+
+    path.start_with?('/') ? path : "/#{path}"
+  end
+
+  def alternate_base_url(url)
+    normalized = normalize_url(url)
+    if normalized.match?(%r{/api/?$})
+      normalized.gsub(%r{/api/?$}, '')
+    else
+      "#{normalized}/api"
+    end
+  end
+
+  def retryable_not_found?(error)
+    error.message.include?('API Error: 404')
+  end
+
+  def handle_response(response)
+    Rails.logger.info "WUZAPI RAW RESPONSE: status=#{response.code} ct=#{response['content-type']} body=#{response.body.to_s.truncate(1000)}"
+
+    if response.code.to_i >= 200 && response.code.to_i < 300
+      content_type = response['content-type'] || ''
+
+      if content_type.include?('image/')
+        require 'base64'
+        base64_image = Base64.strict_encode64(response.body)
+        return { 'qrcode' => "data:#{content_type};base64,#{base64_image}" }
+      end
+
+      begin
+        body = JSON.parse(response.body)
+        # Normalize keys to 'qrcode'
+        # Check nested data object
+        if body['data'].is_a?(Hash)
+          found = body['data']['qrcode'] || body['data']['qr'] || body['data']['QRCode'] || body['data']['QR'] || body['data']['base64'] || body['data']['image']
+          body['qrcode'] = found if found
+        # Check if data is the string itself
+        elsif body['data'].is_a?(String) && (body['data'].start_with?('data:') || body['data'].length > 50)
+          body['qrcode'] = body['data']
+        end
+
+        # Check root keys if still not found
+        body['qrcode'] = body['qr'] || body['QRCode'] || body['QR'] || body['base64'] || body['image'] unless body['qrcode']
+
+        return body
+      rescue JSON::ParserError
+        Rails.logger.warn "Wuzapi response parse error or non-JSON: #{response.body}"
+        return { 'raw_body' => response.body }
+      end
+    elsif response.code.to_i == 401 || response.code.to_i == 403
+      raise AuthenticationError, "Authentication failed: #{response.code} #{response.body}"
+    else
+      raise Error, "API Error: #{response.code} #{response.body}"
+    end
+  end
+end
diff --git a/app/services/wuzapi/provisioning_service.rb b/app/services/wuzapi/provisioning_service.rb
new file mode 100644
index 000000000..98981d8a4
--- /dev/null
+++ b/app/services/wuzapi/provisioning_service.rb
@@ -0,0 +1,34 @@
+class Wuzapi::ProvisioningService
+  def initialize(base_url, admin_token)
+    @base_url = base_url
+    @admin_token = admin_token
+    @client = Wuzapi::Client.new(base_url)
+  end
+
+  def provision(name)
+    user_token = SecureRandom.hex(32)
+    response = @client.create_user(@admin_token, name, user_token)
+
+    # Wuzapi returns the user object, or we assume success if no error raised.
+    # The response structure depends on Wuzapi. Assuming it returns { "ID": "...", ... } or similar.
+    # Based on plan, we just need to know it succeeded.
+    # We return the generated data to be saved.
+
+    {
+      wuzapi_user_id: response['ID'] || response['id'], # Adjust based on actual response if known, strictly fallback
+      wuzapi_user_token: user_token
+    }
+  end
+
+  # [INTENTIONAL] reserved for signed webhooks
+  def setup_webhook(user_token, inbox_id, _webhook_secret)
+    # Host logic needs to come from GlobalConfig or Rails.application.routes
+    # Ideally passed in or resolved.
+    base_host = ENV.fetch('FRONTEND_URL', 'http://localhost:3000')
+    inbox = Inbox.find(inbox_id)
+    phone_number = inbox.channel.phone_number.delete('+')
+    webhook_url = "#{base_host}/webhooks/whatsapp/#{phone_number}"
+
+    @client.set_webhook(user_token, webhook_url)
+  end
+end
diff --git a/app/views/api/v1/models/_inbox.json.jbuilder b/app/views/api/v1/models/_inbox.json.jbuilder
index ca5e0a01e..cfabfde90 100644
--- a/app/views/api/v1/models/_inbox.json.jbuilder
+++ b/app/views/api/v1/models/_inbox.json.jbuilder
@@ -20,6 +20,9 @@ json.allow_messages_after_resolved resource.allow_messages_after_resolved
 json.lock_to_single_conversation resource.lock_to_single_conversation
 json.sender_name_type resource.sender_name_type
 json.business_name resource.business_name
+json.typing_delay resource.typing_delay
+
+json.captain_unit_id resource.captain_inbox&.captain_unit_id if defined?(CaptainInbox)
 
 if resource.portal.present?
   json.help_center do
diff --git a/app/views/public/api/v1/captain/payments/show.html.erb b/app/views/public/api/v1/captain/payments/show.html.erb
new file mode 100644
index 000000000..8a9504e72
--- /dev/null
+++ b/app/views/public/api/v1/captain/payments/show.html.erb
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html lang="pt-BR">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Pagamento via Pix</title>
+  <script src="https://cdn.tailwindcss.com"></script>
+  <style>
+    body { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif; }
+  </style>
+</head>
+<body class="bg-gray-50 flex items-center justify-center min-h-screen px-4">
+
+  <div class="max-w-md w-full bg-white rounded-2xl shadow-xl overflow-hidden">
+    <!-- Header -->
+    <div class="bg-indigo-600 p-6 text-center">
+      <h1 class="text-white text-xl font-bold mb-1">Pagamento via Pix</h1>
+      <p class="text-indigo-100 text-sm">
+        <%= @charge.unit&.name || 'Reserva de Suíte' %>
+      </p>
+    </div>
+
+    <!-- Content -->
+    <div class="p-8">
+      <div class="text-center mb-8">
+        <p class="text-gray-500 text-sm uppercase tracking-wide font-semibold">Valor a Pagar</p>
+        <p class="text-4xl font-extrabold text-gray-900 mt-2">
+          <%= ActiveSupport::NumberHelper.number_to_currency(@charge.original_value, unit: 'R$ ', separator: ',', delimiter: '.') %>
+        </p>
+      </div>
+
+      <div class="bg-gray-100 rounded-lg p-4 mb-6 relative group">
+        <label class="block text-xs font-medium text-gray-500 mb-1 uppercase">Pix Copia e Cola</label>
+        <div class="font-mono text-sm text-gray-600 break-all line-clamp-3 overflow-hidden h-16">
+          <%= @charge.pix_copia_e_cola %>
+        </div>
+        <div class="absolute inset-0 bg-gradient-to-b from-transparent to-gray-100/90 pointer-events-none"></div>
+      </div>
+
+      <button onclick="copyPix()" id="copyBtn" class="w-full bg-green-500 hover:bg-green-600 text-white font-bold py-4 px-6 rounded-xl shadow-lg transform transition active:scale-95 flex items-center justify-center gap-2 text-lg">
+        <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 5H6a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2v-1M8 5a2 2 0 002 2h2a2 2 0 002-2M8 5a2 2 0 012-2h2a2 2 0 012 2m0 0h2a2 2 0 012 2v3m2 4H10m0 0l3-3m-3 3l3 3" />
+        </svg>
+        <span>COPIAR CÓDIGO PIX</span>
+      </button>
+
+      <p id="feedback" class="text-center text-green-600 font-medium mt-4 opacity-0 transition-opacity duration-300">
+        Código copiado com sucesso! ✅
+      </p>
+
+      <div class="mt-8 text-center bg-yellow-50 p-4 rounded-lg border border-yellow-100">
+        <p class="text-sm text-yellow-800">
+          <strong>Próximo passo:</strong><br>
+          Após pagar no app do seu banco, volte ao WhatsApp e avise para confirmar sua reserva.
+        </p>
+      </div>
+    </div>
+  </div>
+
+  <script>
+    const pixCode = "<%= j @charge.pix_copia_e_cola %>";
+
+    function showSuccess() {
+      const btn = document.getElementById('copyBtn');
+      const feedback = document.getElementById('feedback');
+
+      btn.classList.remove('bg-green-500', 'hover:bg-green-600');
+      btn.classList.add('bg-gray-800', 'hover:bg-gray-900');
+      btn.innerHTML = '<span>CÓDIGO COPIADO!</span>';
+      feedback.classList.remove('opacity-0');
+
+      setTimeout(() => {
+        btn.classList.add('bg-green-500', 'hover:bg-green-600');
+        btn.classList.remove('bg-gray-800', 'hover:bg-gray-900');
+        btn.innerHTML = '<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 5H6a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2v-1M8 5a2 2 0 002 2h2a2 2 0 002-2M8 5a2 2 0 012-2h2a2 2 0 012 2m0 0h2a2 2 0 012 2v3m2 4H10m0 0l3-3m-3 3l3 3" /></svg><span>COPIAR CÓDIGO PIX</span>';
+        feedback.classList.add('opacity-0');
+      }, 3000);
+    }
+
+    function copyPix() {
+      if (navigator.clipboard && navigator.clipboard.writeText) {
+        navigator.clipboard.writeText(pixCode).then(showSuccess).catch(() => fallbackCopy());
+      } else {
+        fallbackCopy();
+      }
+    }
+
+    function fallbackCopy() {
+      var textArea = document.createElement("textarea");
+      textArea.value = pixCode;
+      textArea.style.top = "0"; textArea.style.left = "0";
+      textArea.style.position = "fixed"; textArea.style.opacity = "0";
+      document.body.appendChild(textArea);
+      textArea.focus(); textArea.select();
+      try {
+        if (document.execCommand('copy')) showSuccess();
+      } catch (err) {
+        alert('Não foi possível copiar automaticamente. Por favor, copie manualmente.');
+      }
+      document.body.removeChild(textArea);
+    }
+  </script>
+</body>
+</html>
diff --git a/config/agents/tools.yml b/config/agents/tools.yml
index c2faf75e7..7cdc8f7a0 100644
--- a/config/agents/tools.yml
+++ b/config/agents/tools.yml
@@ -34,3 +34,18 @@
   title: 'Handoff to Human'
   description: 'Hand off the conversation to a human agent'
   icon: 'user-switch'
+
+- id: generate_pix
+  title: 'Gerar Pix'
+  description: 'Gera uma cobrança Pix via Banco Inter para a reserva ativa da conversa'
+  icon: 'payment'
+
+- id: check_pix_payment
+  title: 'Verificar Pagamento Pix'
+  description: 'Consulta no Banco Inter se a cobrança Pix já foi paga'
+  icon: 'check-circle'
+
+- id: send_suite_images
+  title: 'Enviar Fotos de Suíte'
+  description: 'Envia fotos da galeria da unidade para o cliente, com filtros por categoria/suíte'
+  icon: 'image'
diff --git a/config/application.yml b/config/application.yml
new file mode 100644
index 000000000..cdc3c8158
--- /dev/null
+++ b/config/application.yml
@@ -0,0 +1,15 @@
+# Fazer AI - Bypass Settings
+CHATWOOT_EDITION=enterprise
+ENABLE_ACCOUNT_LEVEL_FEATURE_FLAGS=true
+LIMITS_INBOXES=0
+LIMITS_USERS=0
+LIMITS_TEAMS=0
+LIMITS_CAMPAIGNS=0
+LIMITS_AUTOMATIONS=0
+LIMITS_AGENT_BOTS=0
+LIMITS_CANNED_RESPONSES=0
+LIMITS_MACROS=0
+LIMITS_SLA_POLICIES=0
+LIMITS_WEBHOOKS=0
+LIMITS_ROUTING_RULES=0
+LIMITS_HELP_CENTER=0
diff --git a/config/routes.rb b/config/routes.rb
index ab6659624..4cb3a4190 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -74,6 +74,15 @@ Rails.application.routes.draw do
             end
             resources :custom_tools
             resources :documents, only: [:index, :show, :create, :destroy]
+            resources :gallery_items
+            resources :reservations, only: [:index, :show] do
+              collection do
+                get :revenue
+              end
+              member do
+                get :pix
+              end
+            end
             resource :tasks, only: [], controller: 'tasks' do
               post :rewrite
               post :summarize
@@ -81,6 +90,7 @@ Rails.application.routes.draw do
               post :label_suggestion
               post :follow_up
             end
+            resources :units
           end
           resource :saml_settings, only: [:show, :create, :update, :destroy]
           resources :agent_bots, only: [:index, :create, :show, :update, :destroy] do
@@ -234,6 +244,14 @@ Rails.application.routes.draw do
               post :link, on: :member
               get :available_templates, on: :member
             end
+
+            resource :wuzapi, controller: 'inboxes/wuzapi', only: [:show] do
+              get :qr
+              post :connect
+              post :disconnect
+              get :webhook_info
+              put :update_webhook
+            end
           end
 
           resources :inbox_members, only: [:create, :show], param: :inbox_id do
@@ -574,6 +592,7 @@ Rails.application.routes.draw do
   post 'webhooks/instagram', to: 'webhooks/instagram#events'
   post 'webhooks/tiktok', to: 'webhooks/tiktok#events'
   post 'webhooks/shopify', to: 'webhooks/shopify#events'
+  post 'webhooks/wuzapi/:inbox_id', to: 'webhooks/wuzapi#process_payload'
 
   namespace :twitter do
     resource :callback, only: [:show]
@@ -657,6 +676,15 @@ Rails.application.routes.draw do
     post 'onboarding', to: 'onboarding#create'
   end
 
+  # ---------------------------------------------------------------------
+  # Página pública de pagamento PIX (link curto gerado via SGID pela IA)
+  get '/r/:token', to: 'public/api/v1/captain/payments#show', as: :short_payment_link
+
+  # Webhook do Banco Inter para notificações de PIX pago
+  post '/api/v1/captain/webhooks/inter_pix',
+       to: 'public/api/v1/captain/inter_webhooks#create',
+       defaults: { format: 'json' }
+
   # ---------------------------------------------------------------------
   # Routes for swagger docs
   get '/swagger/*path', to: 'swagger#respond'
diff --git a/config/schedule.yml b/config/schedule.yml
index acc294407..c2d8a02c2 100644
--- a/config/schedule.yml
+++ b/config/schedule.yml
@@ -61,6 +61,13 @@ bulk_auto_assignment_job:
   class: 'Inboxes::BulkAutoAssignmentJob'
   queue: scheduled_jobs
 
+# executed every 10 minutes
+# proactively checks pending PIX charges (Inter) while txid is still valid
+captain_proactive_pix_polling_job:
+  cron: '*/10 * * * *'
+  class: 'Captain::Payments::ProactivePixPollingSchedulerJob'
+  queue: scheduled_jobs
+
 # executed every 30 minutes for assignment_v2
 periodic_assignment_job:
   cron: '*/30 * * * *'
diff --git a/db/migrate/20250213190934_add_name_to_webhooks.rb b/db/migrate/20250213190934_add_name_to_webhooks.rb
deleted file mode 100644
index e49b6f109..000000000
--- a/db/migrate/20250213190934_add_name_to_webhooks.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddNameToWebhooks < ActiveRecord::Migration[7.0]
-  def change
-    add_column :webhooks, :name, :string, null: true
-  end
-end
diff --git a/db/migrate/20251227223543_add_encrypted_wuzapi_tokens_to_channel_whatsapp.rb b/db/migrate/20251227223543_add_encrypted_wuzapi_tokens_to_channel_whatsapp.rb
new file mode 100644
index 000000000..f298fb084
--- /dev/null
+++ b/db/migrate/20251227223543_add_encrypted_wuzapi_tokens_to_channel_whatsapp.rb
@@ -0,0 +1,8 @@
+class AddEncryptedWuzapiTokensToChannelWhatsapp < ActiveRecord::Migration[7.1]
+  def change
+    add_column :channel_whatsapp, :encrypted_wuzapi_user_token, :string
+    add_column :channel_whatsapp, :encrypted_wuzapi_user_token_iv, :string
+    add_column :channel_whatsapp, :encrypted_wuzapi_admin_token, :string
+    add_column :channel_whatsapp, :encrypted_wuzapi_admin_token_iv, :string
+  end
+end
diff --git a/db/migrate/20251227230000_rename_wuzapi_tokens.rb b/db/migrate/20251227230000_rename_wuzapi_tokens.rb
new file mode 100644
index 000000000..251311309
--- /dev/null
+++ b/db/migrate/20251227230000_rename_wuzapi_tokens.rb
@@ -0,0 +1,8 @@
+class RenameWuzapiTokens < ActiveRecord::Migration[7.0]
+  def change
+    rename_column :channel_whatsapp, :encrypted_wuzapi_user_token, :wuzapi_user_token
+    rename_column :channel_whatsapp, :encrypted_wuzapi_user_token_iv, :wuzapi_user_token_iv
+    rename_column :channel_whatsapp, :encrypted_wuzapi_admin_token, :wuzapi_admin_token
+    rename_column :channel_whatsapp, :encrypted_wuzapi_admin_token_iv, :wuzapi_admin_token_iv
+  end
+end
diff --git a/db/migrate/20260222230832_add_cert_content_to_captain_units.rb b/db/migrate/20260222230832_add_cert_content_to_captain_units.rb
new file mode 100644
index 000000000..4fed31fad
--- /dev/null
+++ b/db/migrate/20260222230832_add_cert_content_to_captain_units.rb
@@ -0,0 +1,6 @@
+class AddCertContentToCaptainUnits < ActiveRecord::Migration[7.1]
+  def change
+    add_column :captain_units, :inter_cert_content, :text
+    add_column :captain_units, :inter_key_content, :text
+  end
+end
diff --git a/db/migrate/20260223035055_add_webhook_configured_at_to_captain_units.rb b/db/migrate/20260223035055_add_webhook_configured_at_to_captain_units.rb
new file mode 100644
index 000000000..41701b27f
--- /dev/null
+++ b/db/migrate/20260223035055_add_webhook_configured_at_to_captain_units.rb
@@ -0,0 +1,5 @@
+class AddWebhookConfiguredAtToCaptainUnits < ActiveRecord::Migration[7.1]
+  def change
+    add_column :captain_units, :webhook_configured_at, :datetime
+  end
+end
diff --git a/db/migrate/20260223142442_add_typing_delay_to_inboxes.rb b/db/migrate/20260223142442_add_typing_delay_to_inboxes.rb
new file mode 100644
index 000000000..501bf0860
--- /dev/null
+++ b/db/migrate/20260223142442_add_typing_delay_to_inboxes.rb
@@ -0,0 +1,5 @@
+class AddTypingDelayToInboxes < ActiveRecord::Migration[7.0]
+  def change
+    add_column :inboxes, :typing_delay, :integer, default: 0
+  end
+end
diff --git a/db/migrate/20260225003000_add_proactive_pix_polling_to_captain_units.rb b/db/migrate/20260225003000_add_proactive_pix_polling_to_captain_units.rb
new file mode 100644
index 000000000..8e668676c
--- /dev/null
+++ b/db/migrate/20260225003000_add_proactive_pix_polling_to_captain_units.rb
@@ -0,0 +1,5 @@
+class AddProactivePixPollingToCaptainUnits < ActiveRecord::Migration[7.1]
+  def change
+    add_column :captain_units, :proactive_pix_polling_enabled, :boolean, default: false, null: false
+  end
+end
diff --git a/db/migrate/20260225160000_create_captain_gallery_items.rb b/db/migrate/20260225160000_create_captain_gallery_items.rb
new file mode 100644
index 000000000..0154a051c
--- /dev/null
+++ b/db/migrate/20260225160000_create_captain_gallery_items.rb
@@ -0,0 +1,19 @@
+class CreateCaptainGalleryItems < ActiveRecord::Migration[7.0]
+  def change
+    create_table :captain_gallery_items do |t|
+      t.references :account, null: false, foreign_key: true
+      t.references :captain_unit, null: false, foreign_key: { to_table: :captain_units }
+      t.references :created_by, foreign_key: { to_table: :users }
+      t.string :suite_category, null: false
+      t.string :suite_number, null: false
+      t.text :description, null: false
+      t.boolean :active, null: false, default: true
+
+      t.timestamps
+    end
+
+    add_index :captain_gallery_items, [:account_id, :captain_unit_id], name: 'index_captain_gallery_items_on_account_and_unit'
+    add_index :captain_gallery_items, [:account_id, :suite_category], name: 'index_captain_gallery_items_on_account_and_category'
+    add_index :captain_gallery_items, [:account_id, :suite_number], name: 'index_captain_gallery_items_on_account_and_suite_number'
+  end
+end
diff --git a/db/migrate/20260226002000_add_scope_and_inbox_to_captain_gallery_items.rb b/db/migrate/20260226002000_add_scope_and_inbox_to_captain_gallery_items.rb
new file mode 100644
index 000000000..a2b8d6b45
--- /dev/null
+++ b/db/migrate/20260226002000_add_scope_and_inbox_to_captain_gallery_items.rb
@@ -0,0 +1,69 @@
+class AddScopeAndInboxToCaptainGalleryItems < ActiveRecord::Migration[7.0]
+  def up
+    add_column :captain_gallery_items, :scope, :string, null: false, default: 'inbox'
+    add_reference :captain_gallery_items, :inbox, null: true, foreign_key: true
+
+    add_index :captain_gallery_items, [:account_id, :inbox_id], name: 'index_captain_gallery_items_on_account_and_inbox'
+    add_index :captain_gallery_items, [:account_id, :scope, :inbox_id],
+              name: 'index_captain_gallery_items_on_account_scope_and_inbox'
+
+    execute <<~SQL.squish
+      UPDATE captain_gallery_items AS cgi
+      SET inbox_id = COALESCE(cu.inbox_id, ci.inbox_id)
+      FROM captain_units AS cu
+      LEFT JOIN captain_inboxes AS ci ON ci.captain_unit_id = cu.id
+      WHERE cgi.captain_unit_id = cu.id
+        AND cgi.inbox_id IS NULL
+    SQL
+
+    execute <<~SQL.squish
+      UPDATE captain_gallery_items
+      SET scope = 'global'
+      WHERE inbox_id IS NULL
+    SQL
+
+    change_column_null :captain_gallery_items, :captain_unit_id, true
+  end
+
+  # rubocop:disable Metrics/MethodLength
+  def down
+    execute <<~SQL.squish
+      UPDATE captain_gallery_items AS cgi
+      SET captain_unit_id = ci.captain_unit_id
+      FROM captain_inboxes AS ci
+      WHERE cgi.captain_unit_id IS NULL
+        AND cgi.inbox_id = ci.inbox_id
+        AND ci.captain_unit_id IS NOT NULL
+    SQL
+
+    execute <<~SQL.squish
+      UPDATE captain_gallery_items AS cgi
+      SET captain_unit_id = fallback.id
+      FROM LATERAL (
+        SELECT id
+        FROM captain_units cu
+        WHERE cu.account_id = cgi.account_id
+        ORDER BY cu.id ASC
+        LIMIT 1
+      ) AS fallback
+      WHERE cgi.captain_unit_id IS NULL
+    SQL
+
+    execute <<~SQL.squish
+      DELETE FROM captain_gallery_items
+      WHERE captain_unit_id IS NULL
+    SQL
+
+    change_column_null :captain_gallery_items, :captain_unit_id, false
+
+    remove_index :captain_gallery_items,
+                 name: 'index_captain_gallery_items_on_account_scope_and_inbox',
+                 if_exists: true
+    remove_index :captain_gallery_items,
+                 name: 'index_captain_gallery_items_on_account_and_inbox',
+                 if_exists: true
+    remove_reference :captain_gallery_items, :inbox, foreign_key: true
+    remove_column :captain_gallery_items, :scope
+  end
+  # rubocop:enable Metrics/MethodLength
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1cb338946..41e8919de 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
+ActiveRecord::Schema[7.1].define(version: 2026_02_26_002000) do
   # These extensions should be enabled to support this database
   enable_extension "pg_stat_statements"
   enable_extension "pg_trgm"
@@ -22,8 +22,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.string "owner_type"
     t.bigint "owner_id"
     t.string "token"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["owner_type", "owner_id"], name: "index_access_tokens_on_owner_type_and_owner_id"
     t.index ["token"], name: "index_access_tokens_on_token", unique: true
   end
@@ -45,8 +45,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.bigint "user_id"
     t.integer "role", default: 0
     t.bigint "inviter_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.datetime "active_at", precision: nil
     t.integer "availability", default: 0, null: false
     t.boolean "auto_offline", default: true, null: false
@@ -80,8 +80,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.integer "status", default: 0, null: false
     t.string "message_id", null: false
     t.string "message_checksum", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["message_id", "message_checksum"], name: "index_action_mailbox_inbound_emails_uniqueness", unique: true
   end
 
@@ -117,8 +117,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.integer "inbox_id"
     t.integer "agent_bot_id"
     t.integer "status", default: 0
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.integer "account_id"
   end
 
@@ -126,8 +126,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.string "name"
     t.string "description"
     t.string "outgoing_url"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.bigint "account_id"
     t.integer "bot_type", default: 0
     t.jsonb "bot_config", default: {}
@@ -176,8 +176,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.text "content"
     t.integer "status"
     t.integer "views"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.bigint "author_id"
     t.bigint "associated_article_id"
     t.jsonb "meta", default: {}
@@ -254,8 +254,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.string "event_name", null: false
     t.jsonb "conditions", default: "{}", null: false
     t.jsonb "actions", default: "{}", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.boolean "active", default: true, null: false
     t.index ["account_id"], name: "index_automation_rules_on_account_id"
   end
@@ -270,14 +270,14 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.bigint "account_id", null: false
     t.bigint "inbox_id", null: false
     t.jsonb "trigger_rules", default: {}
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.integer "campaign_type", default: 0, null: false
     t.integer "campaign_status", default: 0, null: false
     t.jsonb "audience", default: []
     t.datetime "scheduled_at", precision: nil
     t.boolean "trigger_only_during_business_hours", default: false
-    t.jsonb "template_params", default: {}, null: false
+    t.jsonb "template_params"
     t.index ["account_id"], name: "index_campaigns_on_account_id"
     t.index ["campaign_status"], name: "index_campaigns_on_campaign_status"
     t.index ["campaign_type"], name: "index_campaigns_on_campaign_type"
@@ -293,6 +293,17 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.datetime "updated_at", precision: nil, null: false
   end
 
+  create_table "captain_assets", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.string "name", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.bigint "captain_suite_id"
+    t.index ["account_id", "name"], name: "index_captain_assets_on_account_id_and_name", unique: true
+    t.index ["account_id"], name: "index_captain_assets_on_account_id"
+    t.index ["captain_suite_id"], name: "index_captain_assets_on_captain_suite_id"
+  end
+
   create_table "captain_assistant_responses", force: :cascade do |t|
     t.string "question", null: false
     t.text "answer", null: false
@@ -320,9 +331,41 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.jsonb "config", default: {}, null: false
     t.jsonb "response_guidelines", default: []
     t.jsonb "guardrails", default: []
+    t.string "llm_provider", default: "openai"
+    t.string "llm_model", default: "gpt-3.5-turbo"
+    t.text "api_key"
+    t.jsonb "handoff_webhook_config", default: {}
     t.index ["account_id"], name: "index_captain_assistants_on_account_id"
   end
 
+  create_table "captain_brands", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.string "name", null: false
+    t.jsonb "suite_categories", default: [], null: false
+    t.jsonb "stay_durations", default: [], null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.jsonb "suite_images", default: {}, null: false
+    t.jsonb "suite_descriptions", default: {}, null: false
+    t.jsonb "pricing_page_config", default: {}, null: false
+    t.jsonb "suite_keywords"
+    t.index ["account_id"], name: "index_captain_brands_on_account_id"
+  end
+
+  create_table "captain_configurations", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.string "title", default: "Reserva Rápida"
+    t.string "subtitle", default: "Agende sua estadia com praticidade"
+    t.string "logo_url"
+    t.string "primary_color", default: "#1E90FF"
+    t.string "secondary_color", default: "#1B3B5F"
+    t.boolean "active", default: true
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "phone_number"
+    t.index ["account_id"], name: "index_captain_configurations_on_account_id"
+  end
+
   create_table "captain_custom_tools", force: :cascade do |t|
     t.bigint "account_id", null: false
     t.string "slug", null: false
@@ -358,16 +401,326 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.index ["status"], name: "index_captain_documents_on_status"
   end
 
+  create_table "captain_extras", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.string "title", null: false
+    t.text "description"
+    t.decimal "price", precision: 10, scale: 2, null: false
+    t.string "image_url"
+    t.string "category"
+    t.string "tag"
+    t.boolean "active", default: true
+    t.integer "order", default: 0
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_captain_extras_on_account_id"
+  end
+
+  create_table "captain_feedback_logs", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "inbox_id", null: false
+    t.bigint "conversation_id", null: false
+    t.bigint "assistant_id", null: false
+    t.bigint "contact_id", null: false
+    t.string "sentiment", null: false
+    t.string "handoff_trigger"
+    t.text "original_message"
+    t.text "clarified_issue"
+    t.integer "clarification_rounds", default: 0
+    t.string "category"
+    t.jsonb "subcategories", default: []
+    t.jsonb "metadata", default: {}
+    t.boolean "resolved", default: false
+    t.datetime "resolved_at"
+    t.bigint "resolved_by_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id", "created_at"], name: "index_captain_feedback_logs_on_account_id_and_created_at"
+    t.index ["account_id"], name: "index_captain_feedback_logs_on_account_id"
+    t.index ["assistant_id"], name: "index_captain_feedback_logs_on_assistant_id"
+    t.index ["conversation_id"], name: "index_captain_feedback_logs_on_conversation_id"
+    t.index ["created_at"], name: "index_captain_feedback_logs_on_created_at"
+    t.index ["handoff_trigger"], name: "index_captain_feedback_logs_on_handoff_trigger"
+    t.index ["inbox_id"], name: "index_captain_feedback_logs_on_inbox_id"
+    t.index ["sentiment"], name: "index_captain_feedback_logs_on_sentiment"
+  end
+
+  create_table "captain_gallery_items", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "captain_unit_id"
+    t.bigint "created_by_id"
+    t.string "suite_category", null: false
+    t.string "suite_number", null: false
+    t.text "description", null: false
+    t.boolean "active", default: true, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "scope", default: "inbox", null: false
+    t.bigint "inbox_id"
+    t.index ["account_id", "captain_unit_id"], name: "index_captain_gallery_items_on_account_and_unit"
+    t.index ["account_id", "inbox_id"], name: "index_captain_gallery_items_on_account_and_inbox"
+    t.index ["account_id", "scope", "inbox_id"], name: "index_captain_gallery_items_on_account_scope_and_inbox"
+    t.index ["account_id", "suite_category"], name: "index_captain_gallery_items_on_account_and_category"
+    t.index ["account_id", "suite_number"], name: "index_captain_gallery_items_on_account_and_suite_number"
+    t.index ["account_id"], name: "index_captain_gallery_items_on_account_id"
+    t.index ["captain_unit_id"], name: "index_captain_gallery_items_on_captain_unit_id"
+    t.index ["created_by_id"], name: "index_captain_gallery_items_on_created_by_id"
+    t.index ["inbox_id"], name: "index_captain_gallery_items_on_inbox_id"
+  end
+
+  create_table "captain_inbox_automations", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "inbox_id", null: false
+    t.string "title", null: false
+    t.text "message", null: false
+    t.integer "trigger_event", default: 0, null: false
+    t.integer "timing", default: 1, null: false
+    t.integer "offset_minutes", default: 0, null: false
+    t.boolean "enabled", default: true, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id", "inbox_id"], name: "index_captain_inbox_automations_on_account_id_and_inbox_id"
+    t.index ["account_id"], name: "index_captain_inbox_automations_on_account_id"
+    t.index ["inbox_id"], name: "index_captain_inbox_automations_on_inbox_id"
+  end
+
+  create_table "captain_inbox_reminder_settings", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "inbox_id", null: false
+    t.boolean "enabled", default: true, null: false
+    t.text "menu_message"
+    t.integer "menu_delay_minutes", default: 15, null: false
+    t.text "feedback_message"
+    t.integer "feedback_delay_minutes", default: 30, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id", "inbox_id"], name: "index_captain_inbox_reminder_settings_on_account_inbox", unique: true
+    t.index ["account_id"], name: "index_captain_inbox_reminder_settings_on_account_id"
+    t.index ["inbox_id"], name: "index_captain_inbox_reminder_settings_on_inbox_id"
+  end
+
   create_table "captain_inboxes", force: :cascade do |t|
     t.bigint "captain_assistant_id", null: false
     t.bigint "inbox_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.boolean "always_use_reminder_tool", default: false, null: false
+    t.bigint "captain_unit_id"
     t.index ["captain_assistant_id", "inbox_id"], name: "index_captain_inboxes_on_captain_assistant_id_and_inbox_id", unique: true
     t.index ["captain_assistant_id"], name: "index_captain_inboxes_on_captain_assistant_id"
+    t.index ["captain_unit_id"], name: "index_captain_inboxes_on_captain_unit_id"
     t.index ["inbox_id"], name: "index_captain_inboxes_on_inbox_id"
   end
 
+  create_table "captain_pix_charges", force: :cascade do |t|
+    t.bigint "reservation_id", null: false
+    t.bigint "unit_id", null: false
+    t.string "txid"
+    t.text "pix_copia_e_cola"
+    t.string "status"
+    t.string "e2eid"
+    t.datetime "paid_at"
+    t.jsonb "raw_webhook_payload"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["e2eid"], name: "idx_cp_charges_e2eid"
+    t.index ["e2eid"], name: "index_captain_pix_charges_on_e2eid"
+    t.index ["reservation_id"], name: "index_captain_pix_charges_on_reservation_id"
+    t.index ["txid"], name: "idx_cp_charges_txid", unique: true
+    t.index ["txid"], name: "index_captain_pix_charges_on_txid"
+    t.index ["unit_id"], name: "index_captain_pix_charges_on_unit_id"
+  end
+
+  create_table "captain_pricing_inboxes", force: :cascade do |t|
+    t.bigint "captain_pricing_id", null: false
+    t.bigint "inbox_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["captain_pricing_id", "inbox_id"], name: "index_captain_pricing_inboxes_on_pricing_and_inbox", unique: true
+    t.index ["inbox_id"], name: "index_captain_pricing_inboxes_on_inbox_id"
+  end
+
+  create_table "captain_pricings", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "captain_brand_id", null: false
+    t.string "day_range", null: false
+    t.string "suite_category", null: false
+    t.string "duration", null: false
+    t.decimal "price", precision: 10, scale: 2, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.bigint "inbox_id"
+    t.text "keywords"
+    t.index ["account_id"], name: "index_captain_pricings_on_account_id"
+    t.index ["captain_brand_id"], name: "index_captain_pricings_on_captain_brand_id"
+    t.index ["inbox_id"], name: "index_captain_pricings_on_inbox_id"
+  end
+
+  create_table "captain_prompt_audit_events", force: :cascade do |t|
+    t.bigint "prompt_profile_id", null: false
+    t.bigint "prompt_version_id"
+    t.string "event_type", null: false
+    t.jsonb "payload_json", default: {}, null: false
+    t.bigint "actor_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["actor_id"], name: "index_captain_prompt_audit_events_on_actor_id"
+    t.index ["created_at"], name: "index_captain_prompt_audit_events_on_created_at"
+    t.index ["event_type"], name: "index_captain_prompt_audit_events_on_event_type"
+    t.index ["prompt_profile_id"], name: "index_captain_prompt_audit_events_on_prompt_profile_id"
+    t.index ["prompt_version_id"], name: "index_captain_prompt_audit_events_on_prompt_version_id"
+  end
+
+  create_table "captain_prompt_block_versions", force: :cascade do |t|
+    t.bigint "prompt_block_id", null: false
+    t.integer "version_number", null: false
+    t.text "content", null: false
+    t.string "status", default: "draft", null: false
+    t.string "change_summary"
+    t.string "change_reason"
+    t.string "author_type"
+    t.bigint "author_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["prompt_block_id", "status"], name: "idx_cp_prompt_blk_vers_on_blk_id_and_status"
+    t.index ["prompt_block_id", "version_number"], name: "idx_cp_prompt_blk_vers_on_blk_id_and_ver_num", unique: true
+    t.index ["prompt_block_id"], name: "index_captain_prompt_block_versions_on_prompt_block_id"
+  end
+
+  create_table "captain_prompt_blocks", force: :cascade do |t|
+    t.bigint "prompt_profile_id", null: false
+    t.string "key", null: false
+    t.string "title"
+    t.text "description"
+    t.integer "order_index", default: 0, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["prompt_profile_id", "key"], name: "index_captain_prompt_blocks_on_prompt_profile_id_and_key", unique: true
+    t.index ["prompt_profile_id"], name: "index_captain_prompt_blocks_on_prompt_profile_id"
+  end
+
+  create_table "captain_prompt_improvement_cases", force: :cascade do |t|
+    t.bigint "prompt_profile_id", null: false
+    t.text "customer_message", null: false
+    t.text "agent_actual_response"
+    t.text "expected_response", null: false
+    t.string "failure_type"
+    t.text "diagnosis"
+    t.text "proposed_patch"
+    t.decimal "confidence_score", precision: 5, scale: 4
+    t.string "decision"
+    t.bigint "decided_by_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["created_at"], name: "index_captain_prompt_improvement_cases_on_created_at"
+    t.index ["decided_by_id"], name: "index_captain_prompt_improvement_cases_on_decided_by_id"
+    t.index ["decision"], name: "index_captain_prompt_improvement_cases_on_decision"
+    t.index ["failure_type"], name: "index_captain_prompt_improvement_cases_on_failure_type"
+    t.index ["prompt_profile_id"], name: "index_captain_prompt_improvement_cases_on_prompt_profile_id"
+  end
+
+  create_table "captain_prompt_profiles", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "captain_assistant_id", null: false
+    t.string "name", null: false
+    t.bigint "active_version_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_captain_prompt_profiles_on_account_id"
+    t.index ["active_version_id"], name: "index_captain_prompt_profiles_on_active_version_id"
+    t.index ["captain_assistant_id"], name: "index_captain_prompt_profiles_on_captain_assistant_id", unique: true
+  end
+
+  create_table "captain_prompt_versions", force: :cascade do |t|
+    t.bigint "prompt_profile_id", null: false
+    t.integer "version_number", null: false
+    t.text "content", null: false
+    t.text "change_summary"
+    t.text "change_reason"
+    t.bigint "source_case_id"
+    t.string "created_by_type"
+    t.bigint "created_by_id"
+    t.string "status", default: "draft", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["created_at"], name: "index_captain_prompt_versions_on_created_at"
+    t.index ["created_by_id"], name: "index_captain_prompt_versions_on_created_by_id"
+    t.index ["prompt_profile_id", "version_number"], name: "idx_captain_prompt_versions_profile_version", unique: true
+    t.index ["prompt_profile_id"], name: "idx_captain_prompt_versions_single_active_per_profile", unique: true, where: "((status)::text = 'active'::text)"
+    t.index ["prompt_profile_id"], name: "index_captain_prompt_versions_on_prompt_profile_id"
+    t.index ["source_case_id"], name: "index_captain_prompt_versions_on_source_case_id"
+    t.index ["status"], name: "index_captain_prompt_versions_on_status"
+  end
+
+  create_table "captain_reminders", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "inbox_id", null: false
+    t.bigint "contact_id", null: false
+    t.bigint "contact_inbox_id", null: false
+    t.bigint "conversation_id"
+    t.integer "reminder_type", default: 0, null: false
+    t.integer "status", default: 0, null: false
+    t.text "message"
+    t.datetime "scheduled_at", null: false
+    t.datetime "sent_at"
+    t.integer "attempt_count", default: 0, null: false
+    t.text "error_message"
+    t.jsonb "metadata", default: {}, null: false
+    t.string "source_type"
+    t.bigint "source_id"
+    t.bigint "created_by_id"
+    t.string "created_by_type"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id", "inbox_id"], name: "index_captain_reminders_on_account_id_and_inbox_id"
+    t.index ["account_id"], name: "index_captain_reminders_on_account_id"
+    t.index ["contact_id", "inbox_id"], name: "index_captain_reminders_on_contact_id_and_inbox_id"
+    t.index ["contact_id"], name: "index_captain_reminders_on_contact_id"
+    t.index ["contact_inbox_id"], name: "index_captain_reminders_on_contact_inbox_id"
+    t.index ["conversation_id"], name: "index_captain_reminders_on_conversation_id"
+    t.index ["inbox_id"], name: "index_captain_reminders_on_inbox_id"
+    t.index ["scheduled_at", "status"], name: "index_captain_reminders_on_scheduled_at_and_status"
+    t.index ["source_type", "source_id"], name: "index_captain_reminders_on_source_type_and_source_id"
+  end
+
+  create_table "captain_reservations", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "inbox_id", null: false
+    t.bigint "contact_id", null: false
+    t.bigint "contact_inbox_id", null: false
+    t.bigint "conversation_id"
+    t.string "suite_identifier"
+    t.datetime "check_in_at", null: false
+    t.datetime "check_out_at", null: false
+    t.integer "status", default: 0, null: false
+    t.jsonb "metadata", default: {}, null: false
+    t.bigint "created_by_id"
+    t.string "created_by_type"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.bigint "captain_brand_id"
+    t.bigint "captain_unit_id"
+    t.decimal "total_amount", precision: 10, scale: 2
+    t.string "payment_status", default: "pending"
+    t.string "integracao_id"
+    t.bigint "current_pix_charge_id"
+    t.index ["account_id", "inbox_id"], name: "index_captain_reservations_on_account_id_and_inbox_id"
+    t.index ["account_id", "payment_status"], name: "idx_reservations_account_payment_status"
+    t.index ["account_id", "status"], name: "idx_reservations_account_status"
+    t.index ["account_id"], name: "index_captain_reservations_on_account_id"
+    t.index ["captain_brand_id"], name: "index_captain_reservations_on_captain_brand_id"
+    t.index ["captain_unit_id", "check_in_at", "status"], name: "idx_reservations_board_unit_checkin_status"
+    t.index ["captain_unit_id", "check_out_at", "status"], name: "idx_reservations_board_unit_checkout_status"
+    t.index ["captain_unit_id"], name: "index_captain_reservations_on_captain_unit_id"
+    t.index ["contact_id", "inbox_id"], name: "index_captain_reservations_on_contact_id_and_inbox_id"
+    t.index ["contact_id"], name: "index_captain_reservations_on_contact_id"
+    t.index ["contact_inbox_id"], name: "index_captain_reservations_on_contact_inbox_id"
+    t.index ["conversation_id"], name: "index_captain_reservations_on_conversation_id"
+    t.index ["inbox_id"], name: "index_captain_reservations_on_inbox_id"
+    t.index ["integracao_id", "captain_unit_id"], name: "index_captain_reservations_on_integracao_id_and_unit_id", unique: true
+    t.index ["integracao_id"], name: "index_captain_reservations_on_integracao_id"
+  end
+
   create_table "captain_scenarios", force: :cascade do |t|
     t.string "title"
     t.text "description"
@@ -378,20 +731,86 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.bigint "account_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.text "trigger_keywords"
+    t.text "fallback_message"
     t.index ["account_id"], name: "index_captain_scenarios_on_account_id"
     t.index ["assistant_id", "enabled"], name: "index_captain_scenarios_on_assistant_id_and_enabled"
     t.index ["assistant_id"], name: "index_captain_scenarios_on_assistant_id"
     t.index ["enabled"], name: "index_captain_scenarios_on_enabled"
   end
 
+  create_table "captain_suites", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.string "name"
+    t.string "category"
+    t.jsonb "unit_ids"
+    t.string "api_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_captain_suites_on_account_id"
+    t.index ["category"], name: "index_captain_suites_on_category"
+  end
+
+  create_table "captain_tool_configs", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "inbox_id"
+    t.string "tool_key"
+    t.boolean "is_enabled"
+    t.string "plug_play_id"
+    t.string "plug_play_token"
+    t.string "webhook_url"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.bigint "captain_assistant_id"
+    t.text "fallback_message"
+    t.index ["account_id", "inbox_id", "tool_key"], name: "index_captain_tool_configs_on_context", unique: true
+    t.index ["account_id"], name: "index_captain_tool_configs_on_account_id"
+    t.index ["captain_assistant_id", "tool_key"], name: "index_captain_tool_configs_on_assistant_id_and_tool_key", unique: true
+    t.index ["captain_assistant_id"], name: "index_captain_tool_configs_on_captain_assistant_id"
+    t.index ["inbox_id"], name: "index_captain_tool_configs_on_inbox_id"
+  end
+
+  create_table "captain_units", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "captain_brand_id", null: false
+    t.string "name", null: false
+    t.jsonb "visible_suite_categories", default: [], null: false
+    t.jsonb "suite_category_images", default: [], null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "status"
+    t.string "inter_client_id"
+    t.string "inter_client_secret"
+    t.string "inter_pix_key"
+    t.string "inter_cert_path"
+    t.string "inter_key_path"
+    t.string "inter_account_number"
+    t.string "webhook_url"
+    t.bigint "inbox_id"
+    t.string "plug_play_id"
+    t.string "plug_play_token"
+    t.boolean "reservations_sync_enabled"
+    t.datetime "last_synced_at"
+    t.string "leader_whatsapp"
+    t.string "reservation_source_tag"
+    t.boolean "payment_receipt_review_enabled", default: false, null: false
+    t.text "inter_cert_content"
+    t.text "inter_key_content"
+    t.datetime "webhook_configured_at"
+    t.boolean "proactive_pix_polling_enabled", default: false, null: false
+    t.index ["account_id"], name: "index_captain_units_on_account_id"
+    t.index ["captain_brand_id"], name: "index_captain_units_on_captain_brand_id"
+    t.index ["inbox_id"], name: "index_captain_units_on_inbox_id"
+  end
+
   create_table "categories", force: :cascade do |t|
     t.integer "account_id", null: false
     t.integer "portal_id", null: false
     t.string "name"
     t.text "description"
     t.integer "position"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.string "locale", default: "en"
     t.string "slug", null: false
     t.bigint "parent_category_id"
@@ -407,8 +826,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
   create_table "channel_api", force: :cascade do |t|
     t.integer "account_id", null: false
     t.string "webhook_url"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.string "identifier"
     t.string "hmac_token"
     t.boolean "hmac_mandatory", default: false
@@ -421,8 +840,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.integer "account_id", null: false
     t.string "email", null: false
     t.string "forward_to_email", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.boolean "imap_enabled", default: false
     t.string "imap_address", default: ""
     t.integer "imap_port", default: 0
@@ -473,8 +892,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.string "line_channel_id", null: false
     t.string "line_channel_secret", null: false
     t.string "line_channel_token", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["line_channel_id"], name: "index_channel_line_on_line_channel_id", unique: true
   end
 
@@ -483,8 +902,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.string "phone_number", null: false
     t.string "provider", default: "default"
     t.jsonb "provider_config", default: {}
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["phone_number"], name: "index_channel_sms_on_phone_number", unique: true
   end
 
@@ -492,8 +911,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.string "bot_name"
     t.integer "account_id", null: false
     t.string "bot_token", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["bot_token"], name: "index_channel_telegram_on_bot_token", unique: true
   end
 
@@ -514,8 +933,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.string "auth_token", null: false
     t.string "account_sid", null: false
     t.integer "account_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.integer "medium", default: 0
     t.string "messaging_service_sid"
     t.string "api_key_sid"
@@ -531,8 +950,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.string "twitter_access_token", null: false
     t.string "twitter_access_token_secret", null: false
     t.integer "account_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.boolean "tweets_enabled", default: true
     t.index ["account_id", "profile_id"], name: "index_channel_twitter_profiles_on_account_id_and_profile_id", unique: true
   end
@@ -575,10 +994,16 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.string "phone_number", null: false
     t.string "provider", default: "default"
     t.jsonb "provider_config", default: {}
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.jsonb "message_templates", default: {}
     t.datetime "message_templates_last_updated", precision: nil
+    t.string "wuzapi_user_token"
+    t.string "wuzapi_user_token_iv"
+    t.string "wuzapi_admin_token"
+    t.string "wuzapi_admin_token_iv"
+    t.string "evolution_api_token"
+    t.string "evolution_api_token_iv"
     t.jsonb "provider_connection", default: {}
     t.index ["phone_number"], name: "index_channel_whatsapp_on_phone_number", unique: true
     t.index ["provider_connection"], name: "index_channel_whatsapp_provider_connection", where: "((provider)::text = ANY ((ARRAY['baileys'::character varying, 'zapi'::character varying])::text[]))", using: :gin
@@ -591,7 +1016,7 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.bigint "account_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.integer "contacts_count"
+    t.integer "contacts_count", default: 0, null: false
     t.index ["account_id", "domain"], name: "index_companies_on_account_and_domain", unique: true, where: "(domain IS NOT NULL)"
     t.index ["account_id"], name: "index_companies_on_account_id"
     t.index ["name", "account_id"], name: "index_companies_on_name_and_account_id"
@@ -601,8 +1026,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.bigint "contact_id"
     t.bigint "inbox_id"
     t.text "source_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.boolean "hmac_verified", default: false
     t.string "pubsub_token"
     t.index ["contact_id"], name: "index_contact_inboxes_on_contact_id"
@@ -644,12 +1069,37 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.index ["phone_number", "account_id"], name: "index_contacts_on_phone_number_and_account_id"
   end
 
+  create_table "conversation_crm_insights", force: :cascade do |t|
+    t.bigint "conversation_id", null: false
+    t.bigint "contact_id", null: false
+    t.text "summary_text"
+    t.jsonb "structured_data", default: {}
+    t.integer "contact_sessions_count", default: 0, null: false
+    t.datetime "last_contact_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.bigint "account_id"
+    t.datetime "generated_at"
+    t.bigint "range_from_message_id"
+    t.bigint "range_to_message_id"
+    t.string "status", default: "success"
+    t.text "error_message"
+    t.string "schema_version"
+    t.string "model"
+    t.float "confidence"
+    t.index ["account_id"], name: "index_conversation_crm_insights_on_account_id"
+    t.index ["contact_id"], name: "index_conversation_crm_insights_on_contact_id"
+    t.index ["conversation_id", "generated_at"], name: "idx_on_conversation_id_generated_at_44d5836366"
+    t.index ["conversation_id"], name: "index_conversation_crm_insights_on_conversation_id"
+    t.index ["status"], name: "index_conversation_crm_insights_on_status"
+  end
+
   create_table "conversation_participants", force: :cascade do |t|
     t.bigint "account_id", null: false
     t.bigint "user_id", null: false
     t.bigint "conversation_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["account_id"], name: "index_conversation_participants_on_account_id"
     t.index ["conversation_id"], name: "index_conversation_participants_on_conversation_id"
     t.index ["user_id", "conversation_id"], name: "index_conversation_participants_on_user_id_and_conversation_id", unique: true
@@ -683,10 +1133,14 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.datetime "waiting_since"
     t.text "cached_label_list"
     t.bigint "assignee_agent_bot_id"
+    t.string "active_scenario_key"
+    t.datetime "active_scenario_expires_at"
+    t.jsonb "active_scenario_state", default: {}, null: false
     t.index ["account_id", "display_id"], name: "index_conversations_on_account_id_and_display_id", unique: true
     t.index ["account_id", "id"], name: "index_conversations_on_id_and_account_id"
     t.index ["account_id", "inbox_id", "status", "assignee_id"], name: "conv_acid_inbid_stat_asgnid_idx"
     t.index ["account_id"], name: "index_conversations_on_account_id"
+    t.index ["active_scenario_key"], name: "index_conversations_on_active_scenario_key"
     t.index ["assignee_id", "account_id"], name: "index_conversations_on_assignee_id_and_account_id"
     t.index ["campaign_id"], name: "index_conversations_on_campaign_id"
     t.index ["contact_id"], name: "index_conversations_on_contact_id"
@@ -733,8 +1187,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.text "feedback_message"
     t.bigint "contact_id", null: false
     t.bigint "assigned_agent_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.text "csat_review_notes"
     t.datetime "review_notes_updated_at"
     t.bigint "review_notes_updated_by_id"
@@ -753,8 +1207,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.integer "default_value"
     t.integer "attribute_model", default: 0
     t.bigint "account_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.text "attribute_description"
     t.jsonb "attribute_values", default: []
     t.string "regex_pattern"
@@ -769,8 +1223,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.jsonb "query", default: "{}", null: false
     t.bigint "account_id", null: false
     t.bigint "user_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["account_id"], name: "index_custom_filters_on_account_id"
     t.index ["user_id"], name: "index_custom_filters_on_user_id"
   end
@@ -790,8 +1244,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.jsonb "content", default: []
     t.bigint "account_id", null: false
     t.bigint "user_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.boolean "show_on_sidebar", default: false, null: false
     t.index ["account_id"], name: "index_dashboard_apps_on_account_id"
     t.index ["user_id"], name: "index_dashboard_apps_on_user_id"
@@ -804,8 +1258,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.text "processing_errors"
     t.integer "total_records"
     t.integer "processed_records"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["account_id"], name: "index_data_imports_on_account_id"
   end
 
@@ -815,8 +1269,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.integer "account_id"
     t.integer "template_type", default: 1
     t.integer "locale", default: 0, null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["name", "account_id"], name: "index_email_templates_on_name_and_account_id", unique: true
   end
 
@@ -824,8 +1278,19 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.integer "account_id", null: false
     t.integer "category_id", null: false
     t.string "name"
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
+  end
+
+  create_table "frequent_questions", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.string "label"
+    t.string "question_text"
+    t.integer "occurrence_count"
+    t.date "cluster_date"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_frequent_questions_on_account_id"
   end
 
   create_table "inbox_assignment_policies", force: :cascade do |t|
@@ -880,6 +1345,9 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.integer "sender_name_type", default: 0, null: false
     t.string "business_name"
     t.jsonb "csat_config", default: {}, null: false
+    t.integer "auto_resolve_duration"
+    t.boolean "message_signature_enabled"
+    t.integer "typing_delay", default: 0
     t.index ["account_id"], name: "index_inboxes_on_account_id"
     t.index ["channel_id", "channel_type"], name: "index_inboxes_on_channel_id_and_channel_type"
     t.index ["portal_id"], name: "index_inboxes_on_portal_id"
@@ -888,8 +1356,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
   create_table "installation_configs", force: :cascade do |t|
     t.string "name", null: false
     t.jsonb "serialized_value", default: {}, null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.boolean "locked", default: true, null: false
     t.index ["name", "created_at"], name: "index_installation_configs_on_name_and_created_at", unique: true
     t.index ["name"], name: "index_installation_configs_on_name", unique: true
@@ -903,9 +1371,111 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.integer "hook_type", default: 0
     t.string "reference_id"
     t.string "access_token"
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
+    t.jsonb "settings", default: {}
+  end
+
+  create_table "jasmine_collections", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.string "name", null: false
+    t.text "description"
+    t.bigint "owner_inbox_id"
+    t.integer "visibility", default: 0
+    t.boolean "is_active", default: true
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.jsonb "settings", default: {}
+    t.index ["account_id", "owner_inbox_id"], name: "index_jasmine_collections_on_account_id_and_owner_inbox_id"
+    t.index ["account_id", "visibility"], name: "index_jasmine_collections_on_account_id_and_visibility"
+    t.index ["account_id"], name: "index_jasmine_collections_on_account_id"
+    t.index ["owner_inbox_id"], name: "index_jasmine_collections_on_owner_inbox_id"
+  end
+
+  create_table "jasmine_document_chunks", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "collection_id", null: false
+    t.bigint "document_id", null: false
+    t.text "content"
+    t.jsonb "metadata", default: {}
+    t.vector "embedding", limit: 1536
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id", "collection_id", "document_id"], name: "index_jasmine_chunks_on_acc_coll_doc"
+    t.index ["account_id"], name: "index_jasmine_document_chunks_on_account_id"
+    t.index ["collection_id"], name: "index_jasmine_document_chunks_on_collection_id"
+    t.index ["document_id"], name: "index_jasmine_document_chunks_on_document_id"
+    t.index ["embedding"], name: "index_jasmine_document_chunks_on_embedding", opclass: :vector_cosine_ops, using: :hnsw
+  end
+
+  create_table "jasmine_documents", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "collection_id", null: false
+    t.string "title"
+    t.text "content"
+    t.jsonb "metadata", default: {}
+    t.integer "source_type", default: 0
+    t.integer "status", default: 0
+    t.text "error_message"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id", "collection_id", "status"], name: "index_jasmine_docs_on_acc_coll_status"
+    t.index ["account_id"], name: "index_jasmine_documents_on_account_id"
+    t.index ["collection_id"], name: "index_jasmine_documents_on_collection_id"
+  end
+
+  create_table "jasmine_inbox_collections", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "inbox_id", null: false
+    t.bigint "collection_id", null: false
+    t.boolean "is_enabled", default: true
+    t.integer "priority", default: 0
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id", "collection_id"], name: "idx_on_account_id_collection_id_3011aaebad"
+    t.index ["account_id", "inbox_id", "collection_id"], name: "index_jasmine_inbox_collections_uniqueness", unique: true
+    t.index ["account_id", "inbox_id"], name: "index_jasmine_inbox_collections_on_account_id_and_inbox_id"
+    t.index ["account_id"], name: "index_jasmine_inbox_collections_on_account_id"
+    t.index ["collection_id"], name: "index_jasmine_inbox_collections_on_collection_id"
+    t.index ["inbox_id"], name: "index_jasmine_inbox_collections_on_inbox_id"
+  end
+
+  create_table "jasmine_inbox_settings", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "inbox_id", null: false
+    t.string "name", default: "Jasmine"
+    t.text "system_prompt"
+    t.boolean "is_enabled", default: false
+    t.integer "mode", default: 0
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.text "playbook_prompt"
+    t.float "rag_distance_threshold", default: 0.35
+    t.integer "rag_max_results", default: 3
+    t.string "model", default: "gpt-4o-mini"
+    t.float "temperature", default: 0.7
+    t.jsonb "intent_keywords", default: {}
+    t.index ["account_id", "inbox_id"], name: "index_jasmine_inbox_settings_on_account_id_and_inbox_id", unique: true
+    t.index ["account_id"], name: "index_jasmine_inbox_settings_on_account_id"
+    t.index ["inbox_id"], name: "index_jasmine_inbox_settings_on_inbox_id"
+  end
+
+  create_table "jasmine_tool_configs", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "inbox_id", null: false
+    t.string "tool_key", null: false
+    t.boolean "is_enabled", default: false, null: false
+    t.string "plug_play_id"
+    t.text "plug_play_token"
+    t.datetime "last_tested_at"
+    t.integer "last_test_status"
+    t.text "last_test_error"
+    t.integer "last_test_duration_ms"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id", "inbox_id", "tool_key"], name: "index_jasmine_tools_on_account_inbox_key", unique: true
+    t.index ["account_id"], name: "index_jasmine_tool_configs_on_account_id"
+    t.index ["inbox_id"], name: "index_jasmine_tool_configs_on_inbox_id"
+    t.index ["tool_key"], name: "index_jasmine_tool_configs_on_tool_key"
   end
 
   create_table "labels", force: :cascade do |t|
@@ -914,8 +1484,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.string "color", default: "#1f93ff", null: false
     t.boolean "show_on_sidebar"
     t.bigint "account_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["account_id"], name: "index_labels_on_account_id"
     t.index ["title", "account_id"], name: "index_labels_on_title_and_account_id", unique: true
   end
@@ -945,8 +1515,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.bigint "created_by_id"
     t.bigint "updated_by_id"
     t.jsonb "actions", default: {}, null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["account_id"], name: "index_macros_on_account_id"
   end
 
@@ -955,8 +1525,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.bigint "conversation_id", null: false
     t.bigint "account_id", null: false
     t.datetime "mentioned_at", precision: nil, null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["account_id"], name: "index_mentions_on_account_id"
     t.index ["conversation_id"], name: "index_mentions_on_conversation_id"
     t.index ["user_id", "conversation_id"], name: "index_mentions_on_user_id_and_conversation_id", unique: true
@@ -982,6 +1552,7 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.jsonb "additional_attributes", default: {}
     t.text "processed_message_content"
     t.jsonb "sentiment", default: {}
+    t.integer "in_reply_to_id"
     t.index "((additional_attributes -> 'campaign_id'::text))", name: "index_messages_on_additional_attributes_campaign_id", using: :gin
     t.index ["account_id", "content_type", "created_at"], name: "idx_messages_account_content_created"
     t.index ["account_id", "created_at", "message_type"], name: "index_messages_on_account_created_type"
@@ -991,6 +1562,7 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.index ["conversation_id", "account_id", "message_type", "created_at"], name: "index_messages_on_conversation_account_type_created"
     t.index ["conversation_id"], name: "index_messages_on_conversation_id"
     t.index ["created_at"], name: "index_messages_on_created_at"
+    t.index ["in_reply_to_id"], name: "index_messages_on_in_reply_to_id"
     t.index ["inbox_id"], name: "index_messages_on_inbox_id"
     t.index ["sender_type", "sender_id"], name: "index_messages_on_sender_type_and_sender_id"
     t.index ["source_id"], name: "index_messages_on_source_id"
@@ -1001,8 +1573,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.bigint "account_id", null: false
     t.bigint "contact_id", null: false
     t.bigint "user_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["account_id"], name: "index_notes_on_account_id"
     t.index ["contact_id"], name: "index_notes_on_contact_id"
     t.index ["user_id"], name: "index_notes_on_user_id"
@@ -1012,8 +1584,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.integer "account_id"
     t.integer "user_id"
     t.integer "email_flags", default: 0, null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.integer "push_flags", default: 0, null: false
     t.index ["account_id", "user_id"], name: "by_account_user", unique: true
   end
@@ -1022,8 +1594,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.bigint "user_id", null: false
     t.integer "subscription_type", null: false
     t.jsonb "subscription_attributes", default: {}, null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.text "identifier"
     t.index ["identifier"], name: "index_notification_subscriptions_on_identifier", unique: true
     t.index ["user_id"], name: "index_notification_subscriptions_on_user_id"
@@ -1038,8 +1610,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.string "secondary_actor_type"
     t.bigint "secondary_actor_id"
     t.datetime "read_at", precision: nil
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.datetime "snoozed_until"
     t.datetime "last_activity_at", default: -> { "CURRENT_TIMESTAMP" }
     t.jsonb "meta", default: {}
@@ -1055,8 +1627,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.bigint "platform_app_id", null: false
     t.string "permissible_type", null: false
     t.bigint "permissible_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["permissible_type", "permissible_id"], name: "index_platform_app_permissibles_on_permissibles"
     t.index ["platform_app_id", "permissible_id", "permissible_type"], name: "unique_permissibles_index", unique: true
     t.index ["platform_app_id"], name: "index_platform_app_permissibles_on_platform_app_id"
@@ -1064,8 +1636,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
 
   create_table "platform_apps", force: :cascade do |t|
     t.string "name", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
   end
 
   create_table "portals", force: :cascade do |t|
@@ -1077,8 +1649,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.string "homepage_link"
     t.string "page_title"
     t.text "header_text"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.jsonb "config", default: {"allowed_locales" => ["en"]}
     t.boolean "archived", default: false
     t.bigint "channel_web_widget_id"
@@ -1099,8 +1671,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
   create_table "related_categories", force: :cascade do |t|
     t.bigint "category_id"
     t.bigint "related_category_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["category_id", "related_category_id"], name: "index_related_categories_on_category_id_and_related_category_id", unique: true
     t.index ["related_category_id", "category_id"], name: "index_related_categories_on_related_category_id_and_category_id", unique: true
   end
@@ -1112,8 +1684,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.integer "inbox_id"
     t.integer "user_id"
     t.integer "conversation_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.float "value_in_business_hours"
     t.datetime "event_start_time", precision: nil
     t.datetime "event_end_time", precision: nil
@@ -1212,8 +1784,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
   create_table "team_members", force: :cascade do |t|
     t.bigint "team_id", null: false
     t.bigint "user_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["team_id", "user_id"], name: "index_team_members_on_team_id_and_user_id", unique: true
     t.index ["team_id"], name: "index_team_members_on_team_id"
     t.index ["user_id"], name: "index_team_members_on_user_id"
@@ -1224,8 +1796,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.text "description"
     t.boolean "allow_auto_assign", default: true
     t.bigint "account_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["account_id"], name: "index_teams_on_account_id"
     t.index ["name", "account_id"], name: "index_teams_on_name_and_account_id", unique: true
   end
@@ -1260,7 +1832,7 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.text "message_signature"
     t.string "otp_secret"
     t.integer "consumed_timestep"
-    t.boolean "otp_required_for_login", default: false
+    t.boolean "otp_required_for_login", default: false, null: false
     t.text "otp_backup_codes"
     t.index ["email"], name: "index_users_on_email"
     t.index ["otp_required_for_login"], name: "index_users_on_otp_required_for_login"
@@ -1274,14 +1846,45 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.integer "account_id"
     t.integer "inbox_id"
     t.text "url"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.integer "webhook_type", default: 0
     t.jsonb "subscriptions", default: ["conversation_status_changed", "conversation_updated", "conversation_created", "contact_created", "contact_updated", "message_created", "message_updated", "webwidget_triggered"]
     t.string "name"
     t.index ["account_id", "url"], name: "index_webhooks_on_account_id_and_url", unique: true
   end
 
+  create_table "whatsapp_campaign_hits", force: :cascade do |t|
+    t.bigint "campaign_id", null: false
+    t.string "ip"
+    t.string "user_agent"
+    t.datetime "timestamp"
+    t.text "referer"
+    t.string "utm_source"
+    t.string "utm_medium"
+    t.string "utm_campaign"
+    t.string "utm_term"
+    t.string "utm_content"
+    t.string "country_code"
+    t.string "city"
+    t.index ["campaign_id", "timestamp"], name: "index_whatsapp_campaign_hits_on_campaign_id_and_timestamp"
+    t.index ["campaign_id"], name: "index_whatsapp_campaign_hits_on_campaign_id"
+    t.index ["timestamp"], name: "index_whatsapp_campaign_hits_on_timestamp"
+  end
+
+  create_table "whatsapp_campaigns", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.string "name", null: false
+    t.string "slug", null: false
+    t.string "phone", null: false
+    t.string "default_message"
+    t.boolean "active", default: true
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_whatsapp_campaigns_on_account_id"
+    t.index ["slug"], name: "index_whatsapp_campaigns_on_slug", unique: true
+  end
+
   create_table "working_hours", force: :cascade do |t|
     t.bigint "inbox_id"
     t.bigint "account_id"
@@ -1291,8 +1894,8 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
     t.integer "open_minutes"
     t.integer "close_hour"
     t.integer "close_minutes"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.boolean "open_all_day", default: false
     t.index ["account_id"], name: "index_working_hours_on_account_id"
     t.index ["inbox_id"], name: "index_working_hours_on_inbox_id"
@@ -1300,11 +1903,78 @@ ActiveRecord::Schema[7.1].define(version: 2026_02_01_162122) do
 
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
+  add_foreign_key "captain_assets", "accounts"
+  add_foreign_key "captain_assets", "captain_suites"
+  add_foreign_key "captain_brands", "accounts"
+  add_foreign_key "captain_configurations", "accounts"
+  add_foreign_key "captain_extras", "accounts"
+  add_foreign_key "captain_gallery_items", "accounts"
+  add_foreign_key "captain_gallery_items", "captain_units"
+  add_foreign_key "captain_gallery_items", "inboxes"
+  add_foreign_key "captain_gallery_items", "users", column: "created_by_id"
+  add_foreign_key "captain_inbox_automations", "accounts"
+  add_foreign_key "captain_inbox_automations", "inboxes"
+  add_foreign_key "captain_inbox_reminder_settings", "accounts"
+  add_foreign_key "captain_inbox_reminder_settings", "inboxes"
+  add_foreign_key "captain_inboxes", "captain_units"
+  add_foreign_key "captain_pix_charges", "captain_reservations", column: "reservation_id"
+  add_foreign_key "captain_pix_charges", "captain_units", column: "unit_id"
+  add_foreign_key "captain_pricings", "accounts"
+  add_foreign_key "captain_pricings", "captain_brands"
+  add_foreign_key "captain_prompt_audit_events", "captain_prompt_profiles", column: "prompt_profile_id"
+  add_foreign_key "captain_prompt_audit_events", "captain_prompt_versions", column: "prompt_version_id"
+  add_foreign_key "captain_prompt_block_versions", "captain_prompt_blocks", column: "prompt_block_id"
+  add_foreign_key "captain_prompt_blocks", "captain_prompt_profiles", column: "prompt_profile_id"
+  add_foreign_key "captain_prompt_improvement_cases", "captain_prompt_profiles", column: "prompt_profile_id"
+  add_foreign_key "captain_prompt_profiles", "accounts"
+  add_foreign_key "captain_prompt_profiles", "captain_assistants"
+  add_foreign_key "captain_prompt_profiles", "captain_prompt_versions", column: "active_version_id"
+  add_foreign_key "captain_prompt_versions", "captain_prompt_improvement_cases", column: "source_case_id"
+  add_foreign_key "captain_prompt_versions", "captain_prompt_profiles", column: "prompt_profile_id"
+  add_foreign_key "captain_reminders", "accounts"
+  add_foreign_key "captain_reminders", "contact_inboxes"
+  add_foreign_key "captain_reminders", "contacts"
+  add_foreign_key "captain_reminders", "conversations"
+  add_foreign_key "captain_reminders", "inboxes"
+  add_foreign_key "captain_reservations", "accounts"
+  add_foreign_key "captain_reservations", "captain_brands"
+  add_foreign_key "captain_reservations", "captain_units"
+  add_foreign_key "captain_reservations", "contact_inboxes"
+  add_foreign_key "captain_reservations", "contacts"
+  add_foreign_key "captain_reservations", "conversations"
+  add_foreign_key "captain_reservations", "inboxes"
+  add_foreign_key "captain_suites", "accounts"
+  add_foreign_key "captain_tool_configs", "accounts"
+  add_foreign_key "captain_tool_configs", "inboxes"
+  add_foreign_key "captain_units", "accounts"
+  add_foreign_key "captain_units", "captain_brands"
+  add_foreign_key "captain_units", "inboxes"
+  add_foreign_key "conversation_crm_insights", "accounts"
+  add_foreign_key "conversation_crm_insights", "contacts"
+  add_foreign_key "conversation_crm_insights", "conversations"
+  add_foreign_key "frequent_questions", "accounts"
   add_foreign_key "inboxes", "portals"
+  add_foreign_key "jasmine_collections", "accounts"
+  add_foreign_key "jasmine_collections", "inboxes", column: "owner_inbox_id"
+  add_foreign_key "jasmine_document_chunks", "accounts"
+  add_foreign_key "jasmine_document_chunks", "jasmine_collections", column: "collection_id"
+  add_foreign_key "jasmine_document_chunks", "jasmine_documents", column: "document_id"
+  add_foreign_key "jasmine_documents", "accounts"
+  add_foreign_key "jasmine_documents", "jasmine_collections", column: "collection_id"
+  add_foreign_key "jasmine_inbox_collections", "accounts"
+  add_foreign_key "jasmine_inbox_collections", "inboxes"
+  add_foreign_key "jasmine_inbox_collections", "jasmine_collections", column: "collection_id"
+  add_foreign_key "jasmine_inbox_settings", "accounts"
+  add_foreign_key "jasmine_inbox_settings", "inboxes"
+  add_foreign_key "jasmine_tool_configs", "accounts"
+  add_foreign_key "jasmine_tool_configs", "inboxes"
+  add_foreign_key "messages", "messages", column: "in_reply_to_id"
   add_foreign_key "scheduled_messages", "accounts"
   add_foreign_key "scheduled_messages", "conversations"
   add_foreign_key "scheduled_messages", "inboxes"
   add_foreign_key "scheduled_messages", "messages"
+  add_foreign_key "whatsapp_campaign_hits", "whatsapp_campaigns", column: "campaign_id"
+  add_foreign_key "whatsapp_campaigns", "accounts"
   create_trigger("accounts_after_insert_row_tr", :generated => true, :compatibility => 1).
       on("accounts").
       after(:insert).
diff --git a/docker-compose.production.yaml b/docker-compose.production.yaml
index bf6ecbb6b..7c4627073 100644
--- a/docker-compose.production.yaml
+++ b/docker-compose.production.yaml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   base: &base
-    image: chatwoot/chatwoot:latest
+    image: ${CW_DOCKER_IMAGE:-ghcr.io/rodribm10/iachat:latest}
     env_file: .env ## Change this file for customized env variables
     volumes:
       - storage_data:/app/storage
diff --git a/enterprise/app/controllers/api/v1/accounts/captain/gallery_items_controller.rb b/enterprise/app/controllers/api/v1/accounts/captain/gallery_items_controller.rb
new file mode 100644
index 000000000..ac8ac0ef3
--- /dev/null
+++ b/enterprise/app/controllers/api/v1/accounts/captain/gallery_items_controller.rb
@@ -0,0 +1,128 @@
+class Api::V1::Accounts::Captain::GalleryItemsController < Api::V1::Accounts::BaseController
+  before_action :set_gallery_item, only: [:show, :update, :destroy]
+
+  # rubocop:disable Metrics/AbcSize
+  def index
+    items = Current.account.captain_gallery_items
+                   .includes(:captain_unit, :inbox, image_attachment: :blob)
+                   .ordered
+
+    items = items.where(scope: permitted_params[:scope]) if permitted_params[:scope].present?
+    items = items.where(inbox_id: permitted_params[:inbox_id]) if permitted_params[:inbox_id].present?
+    items = items.where(captain_unit_id: permitted_params[:captain_unit_id]) if permitted_params[:captain_unit_id].present?
+    items = items.where('LOWER(suite_category) = ?', permitted_params[:suite_category].to_s.downcase) if permitted_params[:suite_category].present?
+    items = items.where('LOWER(suite_number) = ?', permitted_params[:suite_number].to_s.downcase) if permitted_params[:suite_number].present?
+
+    render json: items.map { |item| serialize_item(item) }
+  end
+  # rubocop:enable Metrics/AbcSize
+
+  def show
+    render json: serialize_item(@gallery_item)
+  end
+
+  def create
+    @gallery_item = Current.account.captain_gallery_items.build(gallery_item_attributes)
+    @gallery_item.created_by = Current.user if Current.user.present?
+    attach_image(@gallery_item)
+    @gallery_item.save!
+
+    render json: serialize_item(@gallery_item), status: :created
+  rescue ActiveRecord::RecordInvalid
+    render json: { errors: @gallery_item.errors.full_messages }, status: :unprocessable_entity
+  end
+
+  def update
+    @gallery_item.assign_attributes(gallery_item_attributes)
+    attach_image(@gallery_item)
+    @gallery_item.save!
+
+    render json: serialize_item(@gallery_item)
+  rescue ActiveRecord::RecordInvalid
+    render json: { errors: @gallery_item.errors.full_messages }, status: :unprocessable_entity
+  end
+
+  def destroy
+    @gallery_item.destroy!
+    head :no_content
+  end
+
+  private
+
+  def set_gallery_item
+    @gallery_item = Current.account.captain_gallery_items.find(permitted_params[:id])
+  end
+
+  def permitted_params
+    params.permit(:id, :scope, :inbox_id, :captain_unit_id, :suite_category, :suite_number)
+  end
+
+  def gallery_item_params
+    params.require(:captain_gallery_item).permit(
+      :scope,
+      :inbox_id,
+      :captain_unit_id,
+      :suite_category,
+      :suite_number,
+      :description,
+      :active,
+      :image
+    )
+  end
+
+  def gallery_item_attributes
+    attrs = gallery_item_params.except(:image)
+    normalize_gallery_scope!(attrs)
+    attrs
+  end
+
+  def attach_image(gallery_item)
+    image = gallery_item_params[:image]
+    return if image.blank?
+
+    gallery_item.image.attach(image)
+  end
+
+  # rubocop:disable Metrics/AbcSize
+  def serialize_item(item)
+    {
+      id: item.id,
+      account_id: item.account_id,
+      scope: item.scope,
+      inbox_id: item.inbox_id,
+      inbox_name: item.inbox&.name,
+      captain_unit_id: item.captain_unit_id,
+      captain_unit_name: item.captain_unit&.name,
+      suite_category: item.suite_category,
+      suite_number: item.suite_number,
+      description: item.description,
+      active: item.active,
+      image_url: image_url(item),
+      image_filename: item.image.attached? ? item.image.filename.to_s : nil,
+      image_content_type: item.image.attached? ? item.image.content_type : nil,
+      image_byte_size: item.image.attached? ? item.image.byte_size : nil,
+      created_at: item.created_at.to_i,
+      updated_at: item.updated_at.to_i
+    }
+  end
+  # rubocop:enable Metrics/AbcSize
+
+  def image_url(item)
+    return nil unless item.image.attached?
+
+    Rails.application.routes.url_helpers.rails_blob_path(item.image, only_path: true)
+  end
+
+  def normalize_gallery_scope!(attrs)
+    if attrs[:inbox_id].blank? && attrs[:captain_unit_id].present?
+      unit = Current.account.captain_units.find_by(id: attrs[:captain_unit_id])
+      attrs[:inbox_id] = unit&.inbox_id
+    end
+
+    scope = attrs[:scope].presence
+    scope = attrs[:inbox_id].present? ? 'inbox' : 'global' if scope.blank?
+
+    attrs[:scope] = scope
+    attrs[:inbox_id] = nil if scope == 'global'
+  end
+end
diff --git a/enterprise/app/controllers/api/v1/accounts/captain/inboxes_controller.rb b/enterprise/app/controllers/api/v1/accounts/captain/inboxes_controller.rb
index f4ec303b6..39741549f 100644
--- a/enterprise/app/controllers/api/v1/accounts/captain/inboxes_controller.rb
+++ b/enterprise/app/controllers/api/v1/accounts/captain/inboxes_controller.rb
@@ -4,13 +4,22 @@ class Api::V1::Accounts::Captain::InboxesController < Api::V1::Accounts::BaseCon
 
   before_action :set_assistant
   def index
-    @inboxes = @assistant.inboxes
+    @captain_inboxes = @assistant.captain_inboxes.includes(:inbox, :captain_unit)
   end
 
   def create
     inbox = Current.account.inboxes.find(assistant_params[:inbox_id])
-    @captain_inbox = @assistant.captain_inboxes.build(inbox: inbox)
+    @captain_inbox = CaptainInbox.find_or_initialize_by(inbox_id: inbox.id)
+
+    if @captain_inbox.persisted? && @captain_inbox.captain_assistant_id != @assistant.id
+      render json: { error: 'Inbox já está conectada a outro assistente.' }, status: :unprocessable_entity
+      return
+    end
+
+    @captain_inbox.captain_assistant = @assistant
+    @captain_inbox.captain_unit_id = linked_captain_unit_id_for(inbox)
     @captain_inbox.save!
+    move_open_conversations_to_pending(inbox)
   end
 
   def destroy
@@ -36,4 +45,16 @@ class Api::V1::Accounts::Captain::InboxesController < Api::V1::Accounts::BaseCon
   def assistant_params
     params.require(:inbox).permit(:inbox_id)
   end
+
+  def move_open_conversations_to_pending(inbox)
+    inbox.conversations.open.unassigned
+         .where(assignee_agent_bot_id: nil)
+         .update_all(status: Conversation.statuses[:pending], updated_at: Time.current)
+  end
+
+  def linked_captain_unit_id_for(inbox)
+    return nil unless defined?(Captain::Unit)
+
+    Current.account.captain_units.find_by(inbox_id: inbox.id)&.id
+  end
 end
diff --git a/enterprise/app/controllers/api/v1/accounts/captain/reservations_controller.rb b/enterprise/app/controllers/api/v1/accounts/captain/reservations_controller.rb
new file mode 100644
index 000000000..c267456dd
--- /dev/null
+++ b/enterprise/app/controllers/api/v1/accounts/captain/reservations_controller.rb
@@ -0,0 +1,156 @@
+class Api::V1::Accounts::Captain::ReservationsController < Api::V1::Accounts::BaseController
+  CONFIRMED_STATUSES = %i[scheduled active completed].freeze
+  RESULTS_PER_PAGE = 25
+  MAX_RESULTS_PER_PAGE = 100
+  SORTABLE_FIELDS = %w[check_in_at created_at updated_at].freeze
+
+  before_action :current_account
+  before_action -> { check_authorization(Captain::Assistant) }
+  before_action :set_current_page, only: [:index]
+  before_action :set_per_page, only: [:index]
+  before_action :set_reservations_scope
+  before_action :set_reservation, only: [:show, :pix]
+
+  def index
+    scoped = apply_filters(@reservations_scope)
+    scoped = apply_sort(scoped)
+    @reservations_count = scoped.count
+    @reservations = scoped.page(@current_page).per(@per_page)
+  end
+
+  def revenue
+    scoped = apply_common_filters(@reservations_scope.where(status: CONFIRMED_STATUSES))
+    render json: Captain::Reservations::RevenueSummaryService.new(scope: scoped).perform
+  end
+
+  def show
+    @marker = Captain::Reservations::MarkerBuilder.build_for(@reservation)
+  end
+
+  def pix
+    marker = Captain::Reservations::MarkerBuilder.build_for(@reservation)
+    render json: {
+      reservation_id: @reservation.id,
+      pix_copy_paste: marker['pix_copy_paste'],
+      reason: marker['pix_reason'],
+      status: marker['pix_status']
+    }
+  end
+
+  private
+
+  def set_reservations_scope
+    @reservations_scope = Current.account.captain_reservations
+                                 .includes(:contact, :unit, :conversation, :current_pix_charge)
+  end
+
+  def set_reservation
+    @reservation = @reservations_scope.find(permitted_params[:id])
+  end
+
+  def set_current_page
+    @current_page = permitted_params[:page].presence || 1
+  end
+
+  def set_per_page
+    requested = permitted_params[:per_page].presence || RESULTS_PER_PAGE
+    @per_page = [requested.to_i, MAX_RESULTS_PER_PAGE].min
+    @per_page = RESULTS_PER_PAGE if @per_page <= 0
+  end
+
+  def apply_filters(scope)
+    apply_status_filter(apply_common_filters(scope))
+  end
+
+  def apply_common_filters(scope)
+    scoped = scope
+    scoped = apply_date_filter(scoped)
+    scoped = scoped.where(captain_unit_id: permitted_params[:unit_id]) if permitted_params[:unit_id].present?
+    scoped = apply_suite_filter(scoped)
+    apply_search(scoped)
+  end
+
+  def apply_status_filter(scope)
+    status = permitted_params[:status].to_s
+    return scope if status.blank? || status == 'all'
+
+    return scope.where(status: CONFIRMED_STATUSES) if status == 'confirmed'
+
+    return scope unless Captain::Reservation.statuses.key?(status)
+
+    scope.where(status: status)
+  end
+
+  def apply_suite_filter(scope)
+    suite = permitted_params[:suite].to_s.strip
+    return scope if suite.blank?
+
+    scope.where('LOWER(captain_reservations.suite_identifier) LIKE ?', "%#{suite.downcase}%")
+  end
+
+  def apply_date_filter(scope)
+    from = parse_date(permitted_params[:date_from])
+    to = parse_date(permitted_params[:date_to])
+    return scope if from.blank? && to.blank?
+
+    if from.present? && to.present?
+      scope.where(check_in_at: from.beginning_of_day..to.end_of_day)
+    elsif from.present?
+      scope.where('check_in_at >= ?', from.beginning_of_day)
+    else
+      scope.where('check_in_at <= ?', to.end_of_day)
+    end
+  end
+
+  def apply_search(scope)
+    query = permitted_params[:q].to_s.strip
+    return scope if query.blank?
+
+    like = "%#{query.downcase}%"
+
+    scope.joins(:contact).where(
+      "LOWER(contacts.name) LIKE :q OR LOWER(contacts.phone_number) LIKE :q OR LOWER(COALESCE(contacts.custom_attributes ->> 'cpf', '')) LIKE :q",
+      q: like
+    )
+  end
+
+  def apply_sort(scope)
+    return default_order(scope) if permitted_params[:sort].blank?
+
+    sort_field = permitted_params[:sort].to_s
+    return default_order(scope) unless SORTABLE_FIELDS.include?(sort_field)
+
+    direction = permitted_params[:direction].to_s.downcase == 'asc' ? 'ASC' : 'DESC'
+    scope.order(Arel.sql("#{sort_field} #{direction}"))
+  end
+
+  def default_order(scope)
+    scope.order(
+      Arel.sql(
+        'CASE captain_reservations.status ' \
+        "WHEN #{Captain::Reservation.statuses[:pending_payment]} THEN 0 " \
+        "WHEN #{Captain::Reservation.statuses[:draft]} THEN 1 " \
+        "WHEN #{Captain::Reservation.statuses[:scheduled]} THEN 2 " \
+        "WHEN #{Captain::Reservation.statuses[:active]} THEN 2 " \
+        "WHEN #{Captain::Reservation.statuses[:completed]} THEN 2 " \
+        "WHEN #{Captain::Reservation.statuses[:cancelled]} THEN 3 " \
+        'ELSE 4 END ASC, captain_reservations.check_in_at ASC'
+      )
+    )
+  end
+
+  def parse_date(value)
+    return nil if value.blank?
+
+    Date.parse(value)
+  rescue ArgumentError
+    nil
+  end
+
+  def permitted_params
+    params.permit(
+      :id, :account_id, :status, :date_from, :date_to, :unit_id, :suite, :q,
+      :page, :per_page, :sort, :direction
+    )
+  end
+end
diff --git a/enterprise/app/jobs/captain/conversation/response_builder_job.rb b/enterprise/app/jobs/captain/conversation/response_builder_job.rb
index 698ec56e7..ff94c10dd 100644
--- a/enterprise/app/jobs/captain/conversation/response_builder_job.rb
+++ b/enterprise/app/jobs/captain/conversation/response_builder_job.rb
@@ -1,13 +1,36 @@
+require_dependency 'captain/conversation/reaction_policy'
+
 class Captain::Conversation::ResponseBuilderJob < ApplicationJob
+  include Captain::Conversation::ReactionPolicy
+
   MAX_MESSAGE_LENGTH = 10_000
+  REACTION_SAMPLE_RATE = Captain::Conversation::ReactionPolicy::REACTION_SAMPLE_RATE
+
   retry_on ActiveStorage::FileNotFoundError, attempts: 3, wait: 2.seconds
   retry_on Faraday::BadRequestError, attempts: 3, wait: 2.seconds
 
-  def perform(conversation, assistant)
+  def perform(conversation, assistant, message = nil)
     @conversation = conversation
     @inbox = conversation.inbox
     @assistant = assistant
 
+    # Cancel if there are newer messages after the provided message
+    return if debounce_requested?(message)
+
+    # Trigger typing on before processing
+    simulate_typing('typing_on')
+    @start_time = Time.zone.now
+
+    begin
+      execute_agent_response
+    ensure
+      simulate_typing('typing_off')
+    end
+  end
+
+  private
+
+  def execute_agent_response
     Current.executed_by = @assistant
 
     if captain_v2_enabled?
@@ -23,7 +46,27 @@ class Captain::Conversation::ResponseBuilderJob < ApplicationJob
     Current.executed_by = nil
   end
 
-  private
+  def debounce_requested?(message)
+    return false if message.blank?
+
+    last_incoming = @conversation.messages.where(message_type: :incoming).last
+    last_incoming.present? && last_incoming.id != message.id
+  end
+
+  def simulate_typing(status)
+    # Trigger ActionCable for the Chatwoot dashboard
+    cable_status = status == 'typing_on' ? 'on' : 'off'
+    Conversations::TypingStatusManager.new(
+      @conversation,
+      @assistant,
+      { typing_status: cable_status, is_private: false }
+    ).toggle_typing_status
+
+    # Trigger external typing indicator (WhatsApp, API channels, etc)
+    @inbox.channel.toggle_typing_status(status, conversation: @conversation) if @inbox.channel.respond_to?(:toggle_typing_status)
+  rescue StandardError => e
+    Rails.logger.error("[CAPTAIN] Failed to simulate typing #{status}: #{e.message}")
+  end
 
   delegate :account, :inbox, to: :@conversation
 
@@ -46,6 +89,7 @@ class Captain::Conversation::ResponseBuilderJob < ApplicationJob
       if handoff_requested?
         process_action('handoff')
       else
+        humanized_delay(@response['response'])
         create_messages
         Rails.logger.info("[CAPTAIN][ResponseBuilderJob] Incrementing response usage for #{account.id}")
         account.increment_response_usage
@@ -53,6 +97,23 @@ class Captain::Conversation::ResponseBuilderJob < ApplicationJob
     end
   end
 
+  def humanized_delay(response_text)
+    return if response_text.blank?
+
+    # Simulação: ~45ms por caracter (digitadores rápidos / humanos focados)
+    typing_speed = 45
+    target_delay = (response_text.length * typing_speed) / 1000.0
+
+    # Limite Mínimo (2s) para não parecer robótico demais em palavras como "Sim".
+    # Limite Máximo (7s) para não prender a UI do chat por longo tempo dando ansiedade ao usuário
+    target_delay = target_delay.clamp(2.0, 7.0)
+
+    elapsed_time = Time.zone.now - @start_time
+    remaining_delay = target_delay - elapsed_time
+
+    sleep(remaining_delay) if remaining_delay.positive?
+  end
+
   def collect_previous_messages
     @conversation
       .messages
@@ -109,10 +170,28 @@ class Captain::Conversation::ResponseBuilderJob < ApplicationJob
   end
 
   def create_messages
+    target_message = last_incoming_message
+    create_reaction(target_message) if should_send_reaction_for?(target_message)
+
     validate_message_content!(@response['response'])
     create_outgoing_message(@response['response'], agent_name: @response['agent_name'])
   end
 
+  def create_reaction(target_message)
+    @conversation.messages.create!(
+      message_type: :outgoing,
+      account_id: account.id,
+      inbox_id: inbox.id,
+      sender: @assistant,
+      content: @response['reaction_emoji'],
+      content_attributes: {
+        'is_reaction' => true,
+        'in_reply_to' => target_message.id,
+        'in_reply_to_external_id' => target_message.source_id
+      }
+    )
+  end
+
   def validate_message_content!(content)
     raise ArgumentError, 'Message content cannot be blank' if content.blank?
   end
diff --git a/enterprise/app/jobs/captain/documents/crawl_job.rb b/enterprise/app/jobs/captain/documents/crawl_job.rb
index 3fa5b6d56..fd41580ad 100644
--- a/enterprise/app/jobs/captain/documents/crawl_job.rb
+++ b/enterprise/app/jobs/captain/documents/crawl_job.rb
@@ -1,7 +1,10 @@
 class Captain::Documents::CrawlJob < ApplicationJob
   queue_as :low
 
-  def perform(document)
+  def perform(document_or_id)
+    document = resolve_document(document_or_id)
+    return if document.nil?
+
     if document.pdf_document?
       perform_pdf_processing(document)
     elsif InstallationConfig.find_by(name: 'CAPTAIN_FIRECRAWL_API_KEY')&.value.present?
@@ -58,4 +61,13 @@ class Captain::Documents::CrawlJob < ApplicationJob
 
     "#{webhook_url}?assistant_id=#{document.assistant_id}&token=#{generate_firecrawl_token(document.assistant_id, document.account_id)}"
   end
+
+  def resolve_document(document_or_id)
+    return document_or_id if document_or_id.is_a?(Captain::Document)
+
+    Captain::Document.find(document_or_id)
+  rescue ActiveRecord::RecordNotFound
+    Rails.logger.info("Captain::Documents::CrawlJob skipped. Document not found: #{document_or_id}")
+    nil
+  end
 end
diff --git a/enterprise/app/jobs/captain/documents/response_builder_job.rb b/enterprise/app/jobs/captain/documents/response_builder_job.rb
index 553cec110..1338a80e8 100644
--- a/enterprise/app/jobs/captain/documents/response_builder_job.rb
+++ b/enterprise/app/jobs/captain/documents/response_builder_job.rb
@@ -1,7 +1,10 @@
 class Captain::Documents::ResponseBuilderJob < ApplicationJob
   queue_as :low
 
-  def perform(document, options = {})
+  def perform(document_or_id, options = {})
+    document = resolve_document(document_or_id)
+    return if document.nil?
+
     reset_previous_responses(document)
 
     faqs = generate_faqs(document, options)
@@ -75,4 +78,13 @@ class Captain::Documents::ResponseBuilderJob < ApplicationJob
   rescue ActiveRecord::RecordInvalid => e
     Rails.logger.error I18n.t('captain.documents.response_creation_error', error: e.message)
   end
+
+  def resolve_document(document_or_id)
+    return document_or_id if document_or_id.is_a?(Captain::Document)
+
+    Captain::Document.find(document_or_id)
+  rescue ActiveRecord::RecordNotFound
+    Rails.logger.info("Captain::Documents::ResponseBuilderJob skipped. Document not found: #{document_or_id}")
+    nil
+  end
 end
diff --git a/enterprise/app/jobs/captain/payments/poll_pix_charge_status_job.rb b/enterprise/app/jobs/captain/payments/poll_pix_charge_status_job.rb
new file mode 100644
index 000000000..05325729e
--- /dev/null
+++ b/enterprise/app/jobs/captain/payments/poll_pix_charge_status_job.rb
@@ -0,0 +1,92 @@
+class Captain::Payments::PollPixChargeStatusJob < MutexApplicationJob
+  queue_as :scheduled_jobs
+  retry_on LockAcquisitionError, wait: 1.second, attempts: 3
+
+  def perform(pix_charge_id)
+    charge = Captain::PixCharge.includes(:reservation, :unit).find_by(id: pix_charge_id)
+    return if charge.blank?
+
+    with_lock(lock_key(charge.id), 30.seconds) do
+      process_charge(charge)
+    end
+  rescue LockAcquisitionError
+    Rails.logger.warn("[PixPolling] lock timeout for charge #{pix_charge_id}")
+  rescue StandardError => e
+    Rails.logger.error("[PixPolling] failure for charge #{pix_charge_id}: #{e.class} - #{e.message}")
+  end
+
+  private
+
+  def process_charge(charge)
+    return unless eligible_for_polling?(charge)
+
+    if charge.expired_by_time?
+      expire_charge!(charge)
+      return
+    end
+
+    status_result = Captain::Inter::CobStatusService.new(charge).call
+    if status_result[:paid]
+      mark_charge_as_paid!(charge, status_result)
+    elsif charge.expired_by_time?
+      expire_charge!(charge)
+    else
+      Rails.logger.info("[PixPolling] charge #{charge.id} still pending (inter_status=#{status_result[:status]})")
+    end
+  end
+
+  def eligible_for_polling?(charge)
+    reservation = charge.reservation
+    unit = charge.unit
+    return false unless reservation.present? && unit.present?
+    return false unless charge_and_reservation_eligible?(charge, reservation)
+    return false unless unit_eligible?(unit)
+
+    true
+  end
+
+  def charge_and_reservation_eligible?(charge, reservation)
+    charge.active? &&
+      reservation.pending_payment? &&
+      reservation.payment_status.to_s == 'pending'
+  end
+
+  def unit_eligible?(unit)
+    unit.proactive_pix_polling_enabled? && unit.inter_credentials_present?
+  end
+
+  def mark_charge_as_paid!(charge, status_result)
+    update_attrs = {
+      status: 'paid',
+      raw_webhook_payload: status_result[:raw_payload]
+    }
+    update_attrs[:e2eid] = status_result[:end_to_end_id] if charge.e2eid.blank? && status_result[:end_to_end_id].present?
+    update_attrs[:paid_at] = Time.current if charge.paid_at.blank?
+    charge.update!(update_attrs)
+
+    reservation = charge.reservation
+    return if reservation.blank? || reservation.payment_status.to_s == 'paid'
+
+    Captain::Payments::ConfirmationService.new(
+      reservation: reservation,
+      source: 'inter_cob_query_polling',
+      payload: status_result[:raw_payload]
+    ).perform
+  end
+
+  def expire_charge!(charge)
+    return if charge.expired?
+
+    charge.update!(status: 'expired')
+
+    conversation = charge.reservation&.conversation
+    return if conversation.blank?
+
+    labels = conversation.label_list - %w[aguardando_pagamento]
+    conversation.update_labels(labels)
+  end
+
+  def lock_key(charge_id)
+    "captain:pix_poll:charge:#{charge_id}"
+  end
+end
diff --git a/enterprise/app/jobs/captain/payments/proactive_pix_polling_scheduler_job.rb b/enterprise/app/jobs/captain/payments/proactive_pix_polling_scheduler_job.rb
new file mode 100644
index 000000000..91b4261cf
--- /dev/null
+++ b/enterprise/app/jobs/captain/payments/proactive_pix_polling_scheduler_job.rb
@@ -0,0 +1,28 @@
+class Captain::Payments::ProactivePixPollingSchedulerJob < ApplicationJob
+  queue_as :scheduled_jobs
+
+  MAX_SCAN_AGE = 2.hours
+
+  def perform
+    eligible_scope.in_batches(of: 100) do |batch|
+      batch.pluck(:id).each do |charge_id|
+        Captain::Payments::PollPixChargeStatusJob.perform_later(charge_id)
+      end
+    end
+  end
+
+  private
+
+  def eligible_scope
+    Captain::PixCharge
+      .joins(:reservation, :unit)
+      .where(status: 'active')
+      .where(captain_reservations: {
+               status: Captain::Reservation.statuses[:pending_payment],
+               payment_status: 'pending'
+             })
+      .where(captain_units: { proactive_pix_polling_enabled: true })
+      .where('captain_pix_charges.created_at >= ?', MAX_SCAN_AGE.ago)
+      .order(:id)
+  end
+end
diff --git a/enterprise/app/models/captain/assistant.rb b/enterprise/app/models/captain/assistant.rb
index 4f039d57a..908518882 100644
--- a/enterprise/app/models/captain/assistant.rb
+++ b/enterprise/app/models/captain/assistant.rb
@@ -2,15 +2,19 @@
 #
 # Table name: captain_assistants
 #
-#  id                  :bigint           not null, primary key
-#  config              :jsonb            not null
-#  description         :string
-#  guardrails          :jsonb
-#  name                :string           not null
-#  response_guidelines :jsonb
-#  created_at          :datetime         not null
-#  updated_at          :datetime         not null
-#  account_id          :bigint           not null
+#  id                     :bigint           not null, primary key
+#  api_key                :text
+#  config                 :jsonb            not null
+#  description            :string
+#  guardrails             :jsonb
+#  handoff_webhook_config :jsonb
+#  llm_model              :string           default("gpt-3.5-turbo")
+#  llm_provider           :string           default("openai")
+#  name                   :string           not null
+#  response_guidelines    :jsonb
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
+#  account_id             :bigint           not null
 #
 # Indexes
 #
@@ -63,6 +67,10 @@ class Captain::Assistant < ApplicationRecord
     available_agent_tools.pluck(:id)
   end
 
+  def pubsub_token
+    nil
+  end
+
   def push_event_data
     {
       id: id,
diff --git a/enterprise/app/models/captain/brand.rb b/enterprise/app/models/captain/brand.rb
new file mode 100644
index 000000000..790bf12de
--- /dev/null
+++ b/enterprise/app/models/captain/brand.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: captain_brands
+#
+#  id                  :bigint           not null, primary key
+#  name                :string           not null
+#  pricing_page_config :jsonb            not null
+#  stay_durations      :jsonb            not null
+#  suite_categories    :jsonb            not null
+#  suite_descriptions  :jsonb            not null
+#  suite_images        :jsonb            not null
+#  suite_keywords      :jsonb
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
+#  account_id          :bigint           not null
+#
+# Indexes
+#
+#  index_captain_brands_on_account_id  (account_id)
+#
+# Foreign Keys
+#
+#  fk_rails_...  (account_id => accounts.id)
+#
+class Captain::Brand < ApplicationRecord
+  self.table_name = 'captain_brands'
+
+  attribute :suite_keywords, :jsonb, default: -> { {} }
+  attribute :suite_descriptions, :jsonb, default: -> { {} }
+  attribute :pricing_page_config, :jsonb, default: -> { {} }
+
+  belongs_to :account
+  has_many :units, class_name: 'Captain::Unit', foreign_key: 'captain_brand_id', dependent: :destroy
+  has_many :pricings, class_name: 'Captain::Pricing', foreign_key: 'captain_brand_id', dependent: :destroy
+  has_many :reservations, class_name: 'Captain::Reservation', foreign_key: 'captain_brand_id'
+
+  validates :name, presence: true
+
+  def pricing_page_enabled?
+    pricing_page_config['enabled'] == true
+  end
+end
diff --git a/enterprise/app/models/captain/custom_tool.rb b/enterprise/app/models/captain/custom_tool.rb
index bf3f351dd..5b4785c61 100644
--- a/enterprise/app/models/captain/custom_tool.rb
+++ b/enterprise/app/models/captain/custom_tool.rb
@@ -49,7 +49,7 @@ class Captain::CustomTool < ApplicationRecord
   belongs_to :account
 
   enum :http_method, %w[GET POST].index_by(&:itself), validate: true
-  enum :auth_type, %w[none bearer basic api_key].index_by(&:itself), default: :none, validate: true, prefix: :auth
+  enum :auth_type, %w[none bearer basic api_key custom_headers].index_by(&:itself), default: :none, validate: true, prefix: :auth
 
   before_validation :generate_slug
 
diff --git a/enterprise/app/models/captain/document.rb b/enterprise/app/models/captain/document.rb
index 751162b28..49b530292 100644
--- a/enterprise/app/models/captain/document.rb
+++ b/enterprise/app/models/captain/document.rb
@@ -91,13 +91,13 @@ class Captain::Document < ApplicationRecord
   def enqueue_crawl_job
     return if status != 'in_progress'
 
-    Captain::Documents::CrawlJob.perform_later(self)
+    Captain::Documents::CrawlJob.perform_later(id)
   end
 
   def enqueue_response_builder_job
     return unless should_enqueue_response_builder?
 
-    Captain::Documents::ResponseBuilderJob.perform_later(self)
+    Captain::Documents::ResponseBuilderJob.perform_later(id)
   end
 
   def should_enqueue_response_builder?
diff --git a/enterprise/app/models/captain/gallery_item.rb b/enterprise/app/models/captain/gallery_item.rb
new file mode 100644
index 000000000..ce7b7e536
--- /dev/null
+++ b/enterprise/app/models/captain/gallery_item.rb
@@ -0,0 +1,114 @@
+# == Schema Information
+#
+# Table name: captain_gallery_items
+#
+#  id              :bigint           not null, primary key
+#  active          :boolean          default(TRUE), not null
+#  description     :text             not null
+#  scope           :string           default("inbox"), not null
+#  suite_category  :string           not null
+#  suite_number    :string           not null
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  account_id      :bigint           not null
+#  captain_unit_id :bigint
+#  created_by_id   :bigint
+#  inbox_id        :bigint
+#
+# Indexes
+#
+#  index_captain_gallery_items_on_account_and_category      (account_id,suite_category)
+#  index_captain_gallery_items_on_account_and_inbox         (account_id,inbox_id)
+#  index_captain_gallery_items_on_account_and_suite_number  (account_id,suite_number)
+#  index_captain_gallery_items_on_account_and_unit          (account_id,captain_unit_id)
+#  index_captain_gallery_items_on_account_id                (account_id)
+#  index_captain_gallery_items_on_account_scope_and_inbox   (account_id,scope,inbox_id)
+#  index_captain_gallery_items_on_captain_unit_id           (captain_unit_id)
+#  index_captain_gallery_items_on_created_by_id             (created_by_id)
+#  index_captain_gallery_items_on_inbox_id                  (inbox_id)
+#
+# Foreign Keys
+#
+#  fk_rails_...  (account_id => accounts.id)
+#  fk_rails_...  (captain_unit_id => captain_units.id)
+#  fk_rails_...  (created_by_id => users.id)
+#  fk_rails_...  (inbox_id => inboxes.id)
+#
+class Captain::GalleryItem < ApplicationRecord
+  self.table_name = 'captain_gallery_items'
+
+  belongs_to :account
+  belongs_to :captain_unit, class_name: 'Captain::Unit', inverse_of: :gallery_items, optional: true
+  belongs_to :inbox, optional: true
+  belongs_to :created_by, class_name: 'User', optional: true
+
+  has_one_attached :image
+
+  enum :scope, { inbox: 'inbox', global: 'global' }, prefix: true
+
+  scope :active, -> { where(active: true) }
+  scope :ordered, -> { order(created_at: :desc) }
+
+  before_validation :infer_inbox_from_unit
+  before_validation :normalize_scope
+  before_validation :clear_inbox_for_global_scope
+
+  validates :description, :suite_category, :suite_number, presence: true
+  validates :scope, inclusion: { in: scopes.keys }
+  validates :suite_category, length: { maximum: 120 }
+  validates :suite_number, length: { maximum: 60 }
+  validate :inbox_presence_for_inbox_scope
+  validate :inbox_belongs_to_account
+  validate :captain_unit_belongs_to_account
+  validate :image_presence
+  validate :image_is_supported
+
+  private
+
+  def infer_inbox_from_unit
+    return if inbox_id.present? || captain_unit.blank?
+
+    self.inbox_id = captain_unit.inbox_id
+  end
+
+  def normalize_scope
+    return if scope.present?
+
+    self.scope = inbox_id.present? ? 'inbox' : 'global'
+  end
+
+  def clear_inbox_for_global_scope
+    self.inbox_id = nil if scope_global?
+  end
+
+  def inbox_presence_for_inbox_scope
+    return unless scope_inbox? && inbox_id.blank?
+
+    errors.add(:inbox, 'é obrigatória para escopo de caixa de entrada')
+  end
+
+  def inbox_belongs_to_account
+    return if inbox_id.blank? || inbox.blank?
+    return if inbox.account_id == account_id
+
+    errors.add(:inbox_id, 'não pertence à conta atual')
+  end
+
+  def captain_unit_belongs_to_account
+    return if captain_unit_id.blank? || captain_unit.blank?
+    return if captain_unit.account_id == account_id
+
+    errors.add(:captain_unit_id, 'não pertence à conta atual')
+  end
+
+  def image_presence
+    errors.add(:image, 'é obrigatória') unless image.attached?
+  end
+
+  def image_is_supported
+    return unless image.attached?
+    return if image.content_type.to_s.start_with?('image/')
+
+    errors.add(:image, 'deve ser uma imagem válida (png, jpg, jpeg, webp)')
+  end
+end
diff --git a/enterprise/app/models/captain/pix_charge.rb b/enterprise/app/models/captain/pix_charge.rb
new file mode 100644
index 000000000..210633324
--- /dev/null
+++ b/enterprise/app/models/captain/pix_charge.rb
@@ -0,0 +1,68 @@
+# == Schema Information
+#
+# Table name: captain_pix_charges
+#
+#  id                  :bigint           not null, primary key
+#  e2eid               :string
+#  paid_at             :datetime
+#  pix_copia_e_cola    :text
+#  raw_webhook_payload :jsonb
+#  status              :string
+#  txid                :string
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
+#  reservation_id      :bigint           not null
+#  unit_id             :bigint           not null
+#
+# Indexes
+#
+#  idx_cp_charges_e2eid                         (e2eid)
+#  idx_cp_charges_txid                          (txid) UNIQUE
+#  index_captain_pix_charges_on_e2eid           (e2eid)
+#  index_captain_pix_charges_on_reservation_id  (reservation_id)
+#  index_captain_pix_charges_on_txid            (txid)
+#  index_captain_pix_charges_on_unit_id         (unit_id)
+#
+# Foreign Keys
+#
+#  fk_rails_...  (reservation_id => captain_reservations.id)
+#  fk_rails_...  (unit_id => captain_units.id)
+#
+class Captain::PixCharge < ApplicationRecord
+  self.table_name = 'captain_pix_charges'
+
+  EXPIRATION_SECONDS = 3600 # 1 hora
+
+  belongs_to :reservation, class_name: 'Captain::Reservation'
+  belongs_to :unit, class_name: 'Captain::Unit'
+
+  enum status: { active: 'active', paid: 'paid', expired: 'expired', failed: 'failed' }
+
+  validates :txid, presence: true, uniqueness: true
+  validates :unit_id, presence: true
+
+  def expires_at
+    return nil unless created_at
+
+    created_at + EXPIRATION_SECONDS.seconds
+  end
+
+  def expired_by_time?(now = Time.current)
+    return false unless created_at
+
+    now > expires_at
+  end
+
+  # Retorna o valor original da cobrança a partir do payload da Inter
+  def original_value
+    if raw_webhook_payload.present?
+      payload = raw_webhook_payload.is_a?(String) ? JSON.parse(raw_webhook_payload) : raw_webhook_payload
+
+      # Inter V2: { "valor": { "original": "140.00" } }
+      val = payload.dig('valor', 'original')
+      return val.to_f if val.present?
+    end
+
+    reservation&.total_amount
+  end
+end
diff --git a/enterprise/app/models/captain/reservation.rb b/enterprise/app/models/captain/reservation.rb
new file mode 100644
index 000000000..c33483803
--- /dev/null
+++ b/enterprise/app/models/captain/reservation.rb
@@ -0,0 +1,128 @@
+# == Schema Information
+#
+# Table name: captain_reservations
+#
+#  id                    :bigint           not null, primary key
+#  check_in_at           :datetime         not null
+#  check_out_at          :datetime         not null
+#  created_by_type       :string
+#  metadata              :jsonb            not null
+#  payment_status        :string           default("pending")
+#  status                :integer          default("scheduled"), not null
+#  suite_identifier      :string
+#  total_amount          :decimal(10, 2)
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  account_id            :bigint           not null
+#  captain_brand_id      :bigint
+#  captain_unit_id       :bigint
+#  contact_id            :bigint           not null
+#  contact_inbox_id      :bigint           not null
+#  conversation_id       :bigint
+#  created_by_id         :bigint
+#  current_pix_charge_id :bigint
+#  inbox_id              :bigint           not null
+#  integracao_id         :string
+#
+# Indexes
+#
+#  idx_reservations_account_payment_status                  (account_id,payment_status)
+#  idx_reservations_account_status                          (account_id,status)
+#  idx_reservations_board_unit_checkin_status               (captain_unit_id,check_in_at,status)
+#  idx_reservations_board_unit_checkout_status              (captain_unit_id,check_out_at,status)
+#  index_captain_reservations_on_account_id                 (account_id)
+#  index_captain_reservations_on_account_id_and_inbox_id    (account_id,inbox_id)
+#  index_captain_reservations_on_captain_brand_id           (captain_brand_id)
+#  index_captain_reservations_on_captain_unit_id            (captain_unit_id)
+#  index_captain_reservations_on_contact_id                 (contact_id)
+#  index_captain_reservations_on_contact_id_and_inbox_id    (contact_id,inbox_id)
+#  index_captain_reservations_on_contact_inbox_id           (contact_inbox_id)
+#  index_captain_reservations_on_conversation_id            (conversation_id)
+#  index_captain_reservations_on_inbox_id                   (inbox_id)
+#  index_captain_reservations_on_integracao_id              (integracao_id)
+#  index_captain_reservations_on_integracao_id_and_unit_id  (integracao_id,captain_unit_id) UNIQUE
+#
+# Foreign Keys
+#
+#  fk_rails_...  (account_id => accounts.id)
+#  fk_rails_...  (captain_brand_id => captain_brands.id)
+#  fk_rails_...  (captain_unit_id => captain_units.id)
+#  fk_rails_...  (contact_id => contacts.id)
+#  fk_rails_...  (contact_inbox_id => contact_inboxes.id)
+#  fk_rails_...  (conversation_id => conversations.id)
+#  fk_rails_...  (inbox_id => inboxes.id)
+#
+class Captain::Reservation < ApplicationRecord
+  self.table_name = 'captain_reservations'
+
+  belongs_to :account
+  belongs_to :inbox
+  belongs_to :contact
+  belongs_to :contact_inbox
+  belongs_to :conversation, class_name: '::Conversation', optional: true
+  belongs_to :brand, class_name: 'Captain::Brand', foreign_key: 'captain_brand_id', optional: true
+  belongs_to :unit, class_name: 'Captain::Unit', foreign_key: 'captain_unit_id', optional: true
+  belongs_to :current_pix_charge, class_name: 'Captain::PixCharge', optional: true
+
+  enum status: { scheduled: 0, active: 1, completed: 2, cancelled: 3, pending_payment: 4, draft: 5 }
+
+  validates :suite_identifier, presence: true
+  validates :check_in_at, presence: true
+  validates :check_out_at, presence: true
+  validate :check_out_after_check_in
+
+  scope :filter_by_status, ->(status) { where(status: status) if status.present? && status != 'all' }
+  scope :filter_by_date_range, lambda { |from, to|
+    if from.present? && to.present?
+      where(check_in_at: from..to)
+    elsif from.present?
+      where('check_in_at >= ?', from)
+    elsif to.present?
+      where('check_in_at <= ?', to)
+    end
+  }
+
+  scope :in_house, -> { where(status: 'active') }
+
+  delegate :name, :email, :phone_number, to: :contact, prefix: true
+
+  before_validation :set_captain_unit_id, on: :create
+  after_commit :sync_conversation_marker_snapshot
+
+  def ui_status
+    Captain::Reservations::MarkerBuilder.ui_status(status)
+  end
+
+  def ui_status_label
+    Captain::Reservations::MarkerBuilder.status_label(ui_status)
+  end
+
+  private
+
+  def set_captain_unit_id
+    return if captain_unit_id.present?
+
+    # Primeiro tenta a associação via CaptainInbox (fluxo principal do Captain).
+    captain_inbox = CaptainInbox.find_by(inbox_id: inbox_id)
+    if captain_inbox&.captain_unit_id.present?
+      self.captain_unit_id = captain_inbox.captain_unit_id
+      return
+    end
+
+    # Fallback: usa vínculo direto da Unidade Pix com o inbox.
+    linked_unit = Captain::Unit.find_by(account_id: account_id, inbox_id: inbox_id)
+    self.captain_unit_id = linked_unit&.id
+  end
+
+  def check_out_after_check_in
+    return unless check_in_at.present? && check_out_at.present?
+
+    errors.add(:check_out_at, 'deve ser posterior ao check-in') if check_out_at <= check_in_at
+  end
+
+  def sync_conversation_marker_snapshot
+    Captain::Reservations::ConversationMarkerSyncService.new(reservation: self).perform
+  rescue StandardError => e
+    Rails.logger.error("[Captain::Reservation] failed to sync conversation marker: #{e.class} - #{e.message}")
+  end
+end
diff --git a/enterprise/app/models/captain/scenario.rb b/enterprise/app/models/captain/scenario.rb
index c43468804..de161054c 100644
--- a/enterprise/app/models/captain/scenario.rb
+++ b/enterprise/app/models/captain/scenario.rb
@@ -2,16 +2,18 @@
 #
 # Table name: captain_scenarios
 #
-#  id           :bigint           not null, primary key
-#  description  :text
-#  enabled      :boolean          default(TRUE), not null
-#  instruction  :text
-#  title        :string
-#  tools        :jsonb
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
-#  account_id   :bigint           not null
-#  assistant_id :bigint           not null
+#  id               :bigint           not null, primary key
+#  description      :text
+#  enabled          :boolean          default(TRUE), not null
+#  fallback_message :text
+#  instruction      :text
+#  title            :string
+#  tools            :jsonb
+#  trigger_keywords :text
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#  account_id       :bigint           not null
+#  assistant_id     :bigint           not null
 #
 # Indexes
 #
@@ -24,6 +26,8 @@ class Captain::Scenario < ApplicationRecord
   include Concerns::CaptainToolsHelpers
   include Concerns::Agentable
 
+  DEFAULT_TOOL_IDS = %w[faq_lookup].freeze
+
   self.table_name = 'captain_scenarios'
 
   belongs_to :assistant, class_name: 'Captain::Assistant'
@@ -68,14 +72,20 @@ class Captain::Scenario < ApplicationRecord
   end
 
   def resolved_tools
-    return [] if tools.blank?
-
     available_tools = assistant.available_agent_tools
-    tools.filter_map do |tool_id|
+    tool_ids = (Array(tools) + default_tool_ids).uniq
+
+    tool_ids.filter_map do |tool_id|
       available_tools.find { |tool| tool[:id] == tool_id }
     end
   end
 
+  def default_tool_ids
+    return [] unless ActiveModel::Type::Boolean.new.cast(feature_faq)
+
+    DEFAULT_TOOL_IDS
+  end
+
   def resolve_tool_instance(tool_metadata)
     tool_id = tool_metadata[:id]
 
diff --git a/enterprise/app/models/captain/unit.rb b/enterprise/app/models/captain/unit.rb
new file mode 100644
index 000000000..c10b887fd
--- /dev/null
+++ b/enterprise/app/models/captain/unit.rb
@@ -0,0 +1,109 @@
+# == Schema Information
+#
+# Table name: captain_units
+#
+#  id                             :bigint           not null, primary key
+#  inter_account_number           :string
+#  inter_cert_content             :text
+#  inter_cert_path                :string
+#  inter_client_secret            :string
+#  inter_key_content              :text
+#  inter_key_path                 :string
+#  inter_pix_key                  :string
+#  last_synced_at                 :datetime
+#  leader_whatsapp                :string
+#  name                           :string           not null
+#  payment_receipt_review_enabled :boolean          default(FALSE), not null
+#  plug_play_token                :string
+#  proactive_pix_polling_enabled  :boolean          default(FALSE), not null
+#  reservation_source_tag         :string
+#  reservations_sync_enabled      :boolean
+#  status                         :string
+#  suite_category_images          :jsonb            not null
+#  visible_suite_categories       :jsonb            not null
+#  webhook_configured_at          :datetime
+#  webhook_url                    :string
+#  created_at                     :datetime         not null
+#  updated_at                     :datetime         not null
+#  account_id                     :bigint           not null
+#  captain_brand_id               :bigint           not null
+#  inbox_id                       :bigint
+#  inter_client_id                :string
+#  plug_play_id                   :string
+#
+# Indexes
+#
+#  index_captain_units_on_account_id        (account_id)
+#  index_captain_units_on_captain_brand_id  (captain_brand_id)
+#  index_captain_units_on_inbox_id          (inbox_id)
+#
+# Foreign Keys
+#
+#  fk_rails_...  (account_id => accounts.id)
+#  fk_rails_...  (captain_brand_id => captain_brands.id)
+#  fk_rails_...  (inbox_id => inboxes.id)
+#
+class Captain::Unit < ApplicationRecord
+  self.table_name = 'captain_units'
+
+  belongs_to :account
+  belongs_to :brand, class_name: 'Captain::Brand', foreign_key: 'captain_brand_id', inverse_of: :units
+  belongs_to :inbox, optional: true
+  has_many :pix_charges, class_name: 'Captain::PixCharge', dependent: :restrict_with_error
+  has_many :gallery_items, class_name: 'Captain::GalleryItem', foreign_key: :captain_unit_id, inverse_of: :captain_unit,
+                           dependent: :destroy
+
+  encrypts :inter_client_secret
+  encrypts :inter_account_number
+  encrypts :inter_cert_content
+  encrypts :inter_key_content
+
+  enum status: { active: 'active', inactive: 'inactive' }, _default: 'active'
+
+  validates :name, presence: true
+  validate :proactive_pix_polling_requires_inter_credentials
+
+  def inter_credentials_present?
+    inter_client_id.present? &&
+      inter_client_secret.present? &&
+      inter_pix_key.present? &&
+      (inter_cert_content.present? || resolved_inter_cert_path.present?) &&
+      (inter_key_content.present? || resolved_inter_key_path.present?)
+  end
+
+  def resolved_inter_cert_path
+    resolve_certificate_path(inter_cert_path)
+  end
+
+  def resolved_inter_key_path
+    resolve_certificate_path(inter_key_path)
+  end
+
+  private
+
+  def proactive_pix_polling_requires_inter_credentials
+    return unless proactive_pix_polling_enabled?
+    return if inter_credentials_present?
+
+    errors.add(
+      :proactive_pix_polling_enabled,
+      'só pode ser habilitado quando a integração Inter estiver completa (client id/secret, chave pix, cert e key)'
+    )
+  end
+
+  # Resolve o path do certificado — suporta caminho absoluto, relativo ao Rails.root
+  # ou nome de arquivo simples dentro de storage/certs/.
+  def resolve_certificate_path(path)
+    return nil if path.blank?
+    return path if File.exist?(path)
+
+    rails_root_path = Rails.root.join(path).to_s
+    return rails_root_path if File.exist?(rails_root_path)
+
+    filename = File.basename(path)
+    fallback_path = Rails.root.join('storage/certs', filename).to_s
+    return fallback_path if File.exist?(fallback_path)
+
+    path # Retorna original se nenhum caminho for encontrado
+  end
+end
diff --git a/enterprise/app/models/captain_inbox.rb b/enterprise/app/models/captain_inbox.rb
index 0b57b2d02..bc025e0fa 100644
--- a/enterprise/app/models/captain_inbox.rb
+++ b/enterprise/app/models/captain_inbox.rb
@@ -2,21 +2,29 @@
 #
 # Table name: captain_inboxes
 #
-#  id                   :bigint           not null, primary key
-#  created_at           :datetime         not null
-#  updated_at           :datetime         not null
-#  captain_assistant_id :bigint           not null
-#  inbox_id             :bigint           not null
+#  id                       :bigint           not null, primary key
+#  always_use_reminder_tool :boolean          default(FALSE), not null
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
+#  captain_assistant_id     :bigint           not null
+#  captain_unit_id          :bigint
+#  inbox_id                 :bigint           not null
 #
 # Indexes
 #
 #  index_captain_inboxes_on_captain_assistant_id               (captain_assistant_id)
 #  index_captain_inboxes_on_captain_assistant_id_and_inbox_id  (captain_assistant_id,inbox_id) UNIQUE
+#  index_captain_inboxes_on_captain_unit_id                    (captain_unit_id)
 #  index_captain_inboxes_on_inbox_id                           (inbox_id)
 #
+# Foreign Keys
+#
+#  fk_rails_...  (captain_unit_id => captain_units.id)
+#
 class CaptainInbox < ApplicationRecord
   belongs_to :captain_assistant, class_name: 'Captain::Assistant'
   belongs_to :inbox
+  belongs_to :captain_unit, class_name: 'Captain::Unit', optional: true
 
   validates :inbox_id, uniqueness: true
 end
diff --git a/enterprise/app/models/company.rb b/enterprise/app/models/company.rb
index d96344f9b..4c228bc97 100644
--- a/enterprise/app/models/company.rb
+++ b/enterprise/app/models/company.rb
@@ -3,7 +3,7 @@
 # Table name: companies
 #
 #  id             :bigint           not null, primary key
-#  contacts_count :integer
+#  contacts_count :integer          default(0), not null
 #  description    :text
 #  domain         :string
 #  name           :string           not null
diff --git a/enterprise/app/models/concerns/toolable.rb b/enterprise/app/models/concerns/toolable.rb
index 51ec1be3e..24ea79eaa 100644
--- a/enterprise/app/models/concerns/toolable.rb
+++ b/enterprise/app/models/concerns/toolable.rb
@@ -55,6 +55,13 @@ module Concerns::Toolable
       else
         {}
       end
+    when 'custom_headers'
+      # Suporta múltiplos headers configurados pelo usuário via UI.
+      # Formato esperado em auth_config: { "headers": [{"name": "X-API-ID", "value": "123"}, ...] }
+      headers = auth_config['headers'] || []
+      headers.each_with_object({}) do |h, acc|
+        acc[h['name']] = h['value'] if h['name'].present? && h['value'].present?
+      end
     else
       {}
     end
diff --git a/enterprise/app/models/enterprise/concerns/conversation.rb b/enterprise/app/models/enterprise/concerns/conversation.rb
index 057a30d1d..f1a517ec9 100644
--- a/enterprise/app/models/enterprise/concerns/conversation.rb
+++ b/enterprise/app/models/enterprise/concerns/conversation.rb
@@ -10,6 +10,17 @@ module Enterprise::Concerns::Conversation
     around_save :ensure_applied_sla_is_created, if: -> { sla_policy_id_changed? }
   end
 
+  def reservation_marker_payload
+    marker = additional_attributes.to_h['reservation_marker']
+    marker = marker.to_h if marker.respond_to?(:to_h)
+
+    return marker if marker.is_a?(Hash) && marker['visible'].present?
+
+    Captain::Reservations::MarkerBuilder.hidden_payload
+  rescue StandardError
+    Captain::Reservations::MarkerBuilder.hidden_payload
+  end
+
   private
 
   def validate_sla_policy
diff --git a/enterprise/app/policies/captain/assistant_policy.rb b/enterprise/app/policies/captain/assistant_policy.rb
index 7fbb47aa9..ee35b32f8 100644
--- a/enterprise/app/policies/captain/assistant_policy.rb
+++ b/enterprise/app/policies/captain/assistant_policy.rb
@@ -26,4 +26,12 @@ class Captain::AssistantPolicy < ApplicationPolicy
   def playground?
     true
   end
+
+  def pix?
+    true
+  end
+
+  def revenue?
+    true
+  end
 end
diff --git a/enterprise/app/services/captain/assistant/agent_runner_service.rb b/enterprise/app/services/captain/assistant/agent_runner_service.rb
index c832da93e..519b910fc 100644
--- a/enterprise/app/services/captain/assistant/agent_runner_service.rb
+++ b/enterprise/app/services/captain/assistant/agent_runner_service.rb
@@ -1,9 +1,23 @@
 require 'agents'
 require 'agents/instrumentation'
+require 'json'
 
 class Captain::Assistant::AgentRunnerService
   include Integrations::LlmInstrumentationConstants
 
+  FAQ_UNCERTAINTY_PATTERNS = [
+    /\bnao (sei|tenho|consigo|possuo)\b/i,
+    /\bi do not (know|have access)\b/i,
+    /\bi don't (know|have|have access)\b/i,
+    /\bcan'?t (access|help|provide)\b/i
+  ].freeze
+  FAQ_PRICE_PATTERNS = [
+    /r\$\s*\d+/i,
+    /\b\d+[,.]?\d*\s*(reais|real)\b/i,
+    /\b(preco|preço|valor|diaria|diária|pernoite|sinal)\b/i
+  ].freeze
+  FAQ_NOT_FOUND_FALLBACK = 'Consultei o FAQ e não encontrei essa informação cadastrada ainda. Posso te ajudar com outro tema ou te transferir para um atendente.'.freeze
+
   CONVERSATION_STATE_ATTRIBUTES = %i[
     id display_id inbox_id contact_id status priority
     label_list custom_attributes additional_attributes
@@ -30,7 +44,7 @@ class Captain::Assistant::AgentRunnerService
     install_instrumentation(runner)
     result = runner.run(message_to_process, context: context, max_turns: 100)
 
-    process_agent_result(result)
+    process_agent_result(result, original_query: message_to_process)
   rescue StandardError => e
     # when running the agent runner service in a rake task, the conversation might not have an account associated
     # for regular production usage, it will run just fine
@@ -50,47 +64,161 @@ class Captain::Assistant::AgentRunnerService
       {
         role: msg[:role].to_sym,
         content: content,
-        agent_name: msg[:agent_name]
+        # AgentRunner selects the starting agent from the last assistant message
+        # with `agent_name` in conversation_history. We always want each turn to
+        # start from the orchestrator and let it decide whether to handoff again.
+        agent_name: nil
       }
     end
 
     {
       session_id: "#{@assistant.account_id}_#{@conversation&.display_id}",
+      # Always start each turn from the orchestrator agent so factual questions
+      # don't remain trapped inside a previously active scenario agent.
+      current_agent: assistant_agent_name,
       conversation_history: conversation_history,
       state: build_state
     }
   end
 
+  def assistant_agent_name
+    @assistant.name.to_s.parameterize(separator: '_')
+  end
+
   def extract_last_user_message(message_history)
     last_user_msg = message_history.reverse.find { |msg| msg[:role] == 'user' }
 
-    extract_text_from_content(last_user_msg[:content])
+    extract_text_from_content(last_user_msg[:content], as_string: true)
   end
 
-  def extract_text_from_content(content)
+  def extract_text_from_content(content, as_string: false)
+    raw_content = content.is_a?(RubyLLM::Content::Raw) ? content.value : content
+
     # Handle structured output from agents
-    return content[:response] || content['response'] || content.to_s if content.is_a?(Hash)
+    return raw_content[:response] || raw_content['response'] || raw_content.to_s if raw_content.is_a?(Hash)
 
-    return content unless content.is_a?(Array)
+    return raw_content unless raw_content.is_a?(Array)
 
-    text_parts = content.select { |part| part[:type] == 'text' }.pluck(:text)
-    text_parts.join(' ')
+    if as_string
+      text_parts = raw_content.select { |part| part[:type] == 'text' }.pluck(:text)
+      text_parts.join(' ')
+    else
+      content
+    end
   end
 
   # Response formatting methods
-  def process_agent_result(result)
+  def process_agent_result(result, original_query:)
     Rails.logger.info "[Captain V2] Agent result: #{result.inspect}"
     response = format_response(result.output)
 
     # Extract agent name from context
     response['agent_name'] = result.context&.dig(:current_agent)
+    enforce_faq_guardrail(response, result, original_query: original_query)
+  end
+
+  def enforce_faq_guardrail(response, result, original_query:)
+    return response unless faq_feature_enabled?
+    return response if response['response'] == 'conversation_handoff'
+
+    guardrail_reason = faq_guardrail_reason(response['response'])
+    return response if guardrail_reason.blank?
+    return response if faq_lookup_called?(result, original_query: original_query)
+    return response if original_query.blank?
+
+    fallback_answer = faq_fallback_answer(original_query, response_text: response['response'])
+    Rails.logger.warn("[Captain V2] FAQ guardrail triggered (#{guardrail_reason}) for query: #{original_query.inspect}")
+
+    if fallback_answer.present?
+      response['response'] = fallback_answer
+      response['reasoning'] = "FAQ guardrail applied due to #{guardrail_reason} response without faq_lookup call."
+    else
+      response['response'] = FAQ_NOT_FOUND_FALLBACK
+      response['reasoning'] = 'FAQ guardrail applied; no FAQ entry found for query.'
+    end
 
     response
   end
 
+  def faq_feature_enabled?
+    ActiveModel::Type::Boolean.new.cast(@assistant.feature_faq)
+  end
+
+  def uncertainty_response?(text)
+    normalized = I18n.transliterate(text.to_s).downcase
+    FAQ_UNCERTAINTY_PATTERNS.any? { |pattern| normalized.match?(pattern) }
+  end
+
+  def price_response?(text)
+    normalized = I18n.transliterate(text.to_s).downcase
+    FAQ_PRICE_PATTERNS.any? { |pattern| normalized.match?(pattern) }
+  end
+
+  def faq_guardrail_reason(text)
+    return 'uncertain' if uncertainty_response?(text)
+    return 'price' if price_response?(text)
+
+    nil
+  end
+
+  def faq_lookup_called?(result, original_query:)
+    messages_for_current_turn(result, original_query).any? do |message|
+      tool_calls = message[:tool_calls] || message['tool_calls'] || []
+      Array(tool_calls).any? do |tool_call|
+        tool_name = (tool_call[:name] || tool_call['name']).to_s
+        tool_name.end_with?('faq_lookup')
+      end
+    end
+  end
+
+  def messages_for_current_turn(result, original_query)
+    messages = Array(result.messages)
+    return messages if messages.empty? || original_query.blank?
+
+    normalized_query = original_query.to_s.strip
+    last_user_index = messages.rindex do |message|
+      role = (message[:role] || message['role']).to_s
+      next false unless role == 'user'
+
+      message_content = extract_text_from_content(message[:content] || message['content']).to_s.strip
+      message_content == normalized_query
+    end
+
+    return messages unless last_user_index
+
+    messages[(last_user_index + 1)..] || []
+  end
+
+  def faq_fallback_answer(query, response_text: nil)
+    faq_query_candidates(query, response_text: response_text).each do |candidate|
+      responses = @assistant.responses.approved.search(candidate).to_a
+      Rails.logger.info "[Captain V2] FAQ guardrail fallback results=#{responses.size} query=#{candidate.inspect}"
+      return responses.first&.answer if responses.present?
+    end
+
+    nil
+  rescue StandardError => e
+    Rails.logger.warn("[Captain V2] FAQ guardrail fallback failed: #{e.message}")
+    nil
+  end
+
+  def faq_query_candidates(original_query, response_text: nil)
+    candidates = [original_query.to_s]
+    response_body = response_text.to_s
+    candidates << response_body if response_body.present?
+
+    suite_hint = response_body.match(/su[ií]te\s+([a-z0-9]+)/i)&.captures&.first
+    candidates << "valor da suíte #{suite_hint}" if suite_hint.present?
+
+    candidates.map(&:squish).reject(&:blank?).uniq
+  end
+
   def format_response(output)
     return output.with_indifferent_access if output.is_a?(Hash)
 
+    parsed_output = parse_structured_output_string(output.to_s)
+    return parsed_output if parsed_output.present?
+
     # Fallback for backwards compatibility
     {
       'response' => output.to_s,
@@ -105,6 +233,65 @@ class Captain::Assistant::AgentRunnerService
     }
   end
 
+  def parse_structured_output_string(output_text)
+    return nil if output_text.blank?
+
+    parsed_candidates = extract_json_objects(output_text).filter_map do |json_object|
+      JSON.parse(json_object)
+    rescue JSON::ParserError
+      nil
+    end
+
+    candidate = parsed_candidates.reverse.find do |item|
+      item.is_a?(Hash) && item['response'].present?
+    end
+    return nil unless candidate
+
+    {
+      'response' => candidate['response'].to_s,
+      'reasoning' => candidate['reasoning'].presence || 'Processed by agent',
+      'reaction_emoji' => candidate['reaction_emoji'].to_s
+    }
+  end
+
+  def extract_json_objects(text)
+    objects = []
+    start_index = nil
+    depth = 0
+    in_string = false
+    escaped = false
+
+    text.each_char.with_index do |char, index|
+      if in_string
+        if escaped
+          escaped = false
+        elsif char == '\\'
+          escaped = true
+        elsif char == '"'
+          in_string = false
+        end
+        next
+      end
+
+      if char == '"'
+        in_string = true
+      elsif char == '{'
+        start_index = index if depth.zero?
+        depth += 1
+      elsif char == '}'
+        next if depth.zero?
+
+        depth -= 1
+        if depth.zero? && start_index
+          objects << text[start_index..index]
+          start_index = nil
+        end
+      end
+    end
+
+    objects
+  end
+
   def build_state
     state = {
       account_id: @assistant.account_id,
diff --git a/enterprise/app/services/captain/inter/auth_service.rb b/enterprise/app/services/captain/inter/auth_service.rb
new file mode 100644
index 000000000..4baf33a8b
--- /dev/null
+++ b/enterprise/app/services/captain/inter/auth_service.rb
@@ -0,0 +1,60 @@
+require 'faraday'
+
+# Obtém um token OAuth da API do Banco Inter usando mTLS.
+# O token é cacheado no Redis pelo tempo de expiração menos 5 minutos de margem.
+class Captain::Inter::AuthService
+  API_BASE_URL = 'https://cdpj.partners.bancointer.com.br'.freeze
+  TOKEN_URL = '/oauth/v2/token'.freeze
+
+  def initialize(unit)
+    @unit = unit
+  end
+
+  def token
+    cached_token = Redis::Alfred.get(cache_key)
+    return cached_token if cached_token.present?
+
+    fetch_new_token
+  end
+
+  private
+
+  def cache_key
+    "inter_token:unit_#{@unit.id}"
+  end
+
+  def fetch_new_token
+    raise "Unit #{@unit.name} is inactive" unless @unit.active?
+
+    response = connection.post(TOKEN_URL) do |req|
+      req.headers['Content-Type'] = 'application/x-www-form-urlencoded'
+      req.headers['Authorization'] = "Basic #{Base64.strict_encode64("#{@unit.inter_client_id}:#{@unit.inter_client_secret}")}"
+      req.body = URI.encode_www_form({
+                                       grant_type: 'client_credentials',
+                                       scope: 'cob.write cob.read pix.write pix.read webhook.read webhook.write'
+                                     })
+    end
+
+    raise "Auth Failed: #{response.body}" unless response.success?
+
+    data = JSON.parse(response.body)
+    access_token = data['access_token']
+    expires_in = data['expires_in'].to_i
+
+    # Cacheia com margem de 5 minutos antes do vencimento
+    Redis::Alfred.setex(cache_key, access_token, expires_in - 300)
+
+    access_token
+  end
+
+  def connection
+    @connection ||= Faraday.new(url: API_BASE_URL) do |conn|
+      cert_raw = @unit.inter_cert_content.presence || File.read(@unit.resolved_inter_cert_path)
+      key_raw  = @unit.inter_key_content.presence  || File.read(@unit.resolved_inter_key_path)
+
+      conn.ssl[:client_cert] = OpenSSL::X509::Certificate.new(cert_raw)
+      conn.ssl[:client_key]  = OpenSSL::PKey::RSA.new(key_raw)
+      conn.adapter Faraday.default_adapter
+    end
+  end
+end
diff --git a/enterprise/app/services/captain/inter/cob_service.rb b/enterprise/app/services/captain/inter/cob_service.rb
new file mode 100644
index 000000000..b05aaaeb7
--- /dev/null
+++ b/enterprise/app/services/captain/inter/cob_service.rb
@@ -0,0 +1,89 @@
+# Cria uma cobrança PIX na API do Banco Inter (endpoint /pix/v2/cob).
+# Requer certificados mTLS e credenciais configuradas na unidade.
+class Captain::Inter::CobService
+  API_BASE_URL = 'https://cdpj.partners.bancointer.com.br'.freeze
+
+  def initialize(reservation, amount: nil)
+    @reservation = reservation
+    @unit = reservation.unit
+    @amount = amount
+  end
+
+  def call
+    raise 'Unit not configured for Pix' if @unit&.inter_pix_key.blank?
+    raise 'Missing Inter certificates' unless @unit.inter_credentials_present?
+
+    token = Captain::Inter::AuthService.new(@unit).token
+    payload = build_payload
+
+    response = connection(token).post('/pix/v2/cob', payload.to_json)
+    safe_body = normalize_text(response.body)
+    raise "Pix Creation Failed: #{safe_body}" unless response.success?
+
+    data = JSON.parse(safe_body)
+
+    Rails.logger.info "[BANCO INTER] Pix charge created (txid: #{data['txid']})"
+
+    persist_charge(data)
+  end
+
+  private
+
+  def build_payload
+    amount = @amount.present? ? @amount.to_f.round(2) : @reservation.total_amount.to_f.round(2)
+
+    {
+      calendario: { expiracao: Captain::PixCharge::EXPIRATION_SECONDS },
+      devedor: {
+        cpf: @reservation.contact.custom_attributes['cpf'] || '00000000000',
+        nome: @reservation.contact.name || 'Cliente'
+      },
+      valor: { original: format('%.2f', amount) },
+      chave: @unit.inter_pix_key,
+      solicitacaoPagador: "Reserva #{@reservation.id}"
+    }
+  end
+
+  def persist_charge(data)
+    pix_code = data['pixCopiaECola'] ||
+               data.dig('pix', 'copiaECola') ||
+               data['qrcode'] ||
+               data['textoImagemQRcode']
+
+    charge = @unit.pix_charges.create!(
+      reservation: @reservation,
+      txid: data['txid'],
+      pix_copia_e_cola: pix_code,
+      status: 'active',
+      e2eid: nil,
+      raw_webhook_payload: data.to_json
+    )
+
+    @reservation.update!(current_pix_charge_id: charge.id)
+    charge
+  end
+
+  def connection(token)
+    Faraday.new(url: API_BASE_URL) do |conn|
+      conn.headers['Authorization']    = "Bearer #{token}"
+      conn.headers['Content-Type']     = 'application/json'
+      conn.headers['x-conta-corrente'] = @unit.inter_account_number
+
+      cert_raw = @unit.inter_cert_content.presence || File.read(@unit.resolved_inter_cert_path.to_s)
+      key_raw  = @unit.inter_key_content.presence  || File.read(@unit.resolved_inter_key_path.to_s)
+
+      conn.ssl[:client_cert] = OpenSSL::X509::Certificate.new(cert_raw)
+      conn.ssl[:client_key]  = OpenSSL::PKey::RSA.new(key_raw)
+      conn.adapter Faraday.default_adapter
+    end
+  end
+
+  def normalize_text(value)
+    value.to_s
+         .dup
+         .force_encoding(Encoding::UTF_8)
+         .encode(Encoding::UTF_8, invalid: :replace, undef: :replace, replace: '')
+  rescue StandardError
+    value.to_s.encode(Encoding::UTF_8, invalid: :replace, undef: :replace, replace: '')
+  end
+end
diff --git a/enterprise/app/services/captain/inter/cob_status_service.rb b/enterprise/app/services/captain/inter/cob_status_service.rb
new file mode 100644
index 000000000..6a2b7e2d9
--- /dev/null
+++ b/enterprise/app/services/captain/inter/cob_status_service.rb
@@ -0,0 +1,89 @@
+require 'faraday'
+
+# Consulta uma cobrança PIX no Banco Inter (endpoint /pix/v2/cob/{txid}).
+# Útil como fallback quando o cliente informa pagamento e o webhook ainda não chegou.
+class Captain::Inter::CobStatusService
+  API_BASE_URL = 'https://cdpj.partners.bancointer.com.br'.freeze
+  PAID_STATUSES = %w[CONCLUIDA].freeze
+
+  def initialize(pix_charge)
+    @pix_charge = pix_charge
+    @unit = pix_charge.unit
+  end
+
+  def call
+    raise 'Cobrança Pix inválida para consulta' if @pix_charge.blank?
+    raise 'Cobrança Pix sem txid' if @pix_charge.txid.blank?
+    raise 'Unit not configured for Pix' if @unit&.inter_pix_key.blank?
+    raise 'Missing Inter certificates' unless @unit.inter_credentials_present?
+
+    token = Captain::Inter::AuthService.new(@unit).token
+    response = connection(token).get(cob_path)
+    safe_body = normalize_text(response.body)
+
+    raise "Pix Status Check Failed: HTTP #{response.status} - #{safe_body}" unless response.success?
+
+    payload = JSON.parse(safe_body)
+    parse_payload(payload)
+  end
+
+  private
+
+  def cob_path
+    encoded_txid = ERB::Util.url_encode(@pix_charge.txid.to_s)
+    "/pix/v2/cob/#{encoded_txid}"
+  end
+
+  def parse_payload(payload)
+    status = payload['status'].to_s.upcase
+    pix_items = Array(payload['pix'])
+    pix_paid_entry = pix_items.find { |item| item['endToEndId'].present? } || pix_items.first
+
+    paid = PAID_STATUSES.include?(status) || pix_paid_entry.present?
+
+    {
+      success: true,
+      txid: payload['txid'].presence || @pix_charge.txid,
+      status: status,
+      paid: paid,
+      end_to_end_id: pix_paid_entry&.[]('endToEndId'),
+      paid_value: pix_paid_entry&.[]('valor'),
+      raw_payload: payload
+    }
+  end
+
+  def connection(token)
+    Faraday.new(url: API_BASE_URL) do |conn|
+      apply_headers(conn, token)
+      apply_mtls(conn)
+      conn.adapter Faraday.default_adapter
+    end
+  end
+
+  def apply_headers(conn, token)
+    conn.headers['Authorization'] = "Bearer #{token}"
+    conn.headers['Content-Type'] = 'application/json'
+    conn.headers['x-conta-corrente'] = @unit.inter_account_number if @unit.inter_account_number.present?
+  end
+
+  def apply_mtls(conn)
+    cert_raw, key_raw = cert_material
+    conn.ssl[:client_cert] = OpenSSL::X509::Certificate.new(cert_raw)
+    conn.ssl[:client_key] = OpenSSL::PKey::RSA.new(key_raw)
+  end
+
+  def cert_material
+    cert_raw = @unit.inter_cert_content.presence || File.read(@unit.resolved_inter_cert_path.to_s)
+    key_raw = @unit.inter_key_content.presence || File.read(@unit.resolved_inter_key_path.to_s)
+    [cert_raw, key_raw]
+  end
+
+  def normalize_text(value)
+    value.to_s
+         .dup
+         .force_encoding(Encoding::UTF_8)
+         .encode(Encoding::UTF_8, invalid: :replace, undef: :replace, replace: '')
+  rescue StandardError
+    value.to_s.encode(Encoding::UTF_8, invalid: :replace, undef: :replace, replace: '')
+  end
+end
diff --git a/enterprise/app/services/captain/inter/webhook_setup_service.rb b/enterprise/app/services/captain/inter/webhook_setup_service.rb
new file mode 100644
index 000000000..a5842860b
--- /dev/null
+++ b/enterprise/app/services/captain/inter/webhook_setup_service.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require 'faraday'
+
+# Configura webhook do Banco Inter para receber notificações de PIX pago
+# Documentação: https://developers.inter.co/references/pix#tag/Webhook-de-Pix-Cobranca/operation/webhookPut
+class Captain::Inter::WebhookSetupService
+  API_BASE_URL = 'https://cdpj.partners.bancointer.com.br'
+  WEBHOOK_ENDPOINT = '/pix/v2/webhook'
+
+  def initialize(unit)
+    @unit = unit
+    @auth_service = Captain::Inter::AuthService.new(unit)
+  end
+
+  def call
+    raise 'Chave PIX não configurada para esta unidade' if @unit.inter_pix_key.blank?
+
+    # Monta URL do webhook (nosso endpoint)
+    base_url = InstallationConfig.find_by(name: 'FRONTEND_URL')&.value.presence ||
+               ENV.fetch('FRONTEND_URL', 'http://localhost:3000')
+
+    webhook_url = "#{base_url}/api/v1/captain/webhooks/inter_pix"
+
+    # Registra webhook no Inter
+    response = connection.put(webhook_path) do |req|
+      req.headers['Authorization'] = "Bearer #{@auth_service.token}"
+      req.headers['Content-Type'] = 'application/json'
+      req.headers['x-conta-corrente'] = @unit.inter_account_number if @unit.inter_account_number.present?
+      req.body = { webhookUrl: webhook_url }.to_json
+    end
+
+    if response.status == 204
+      # Sucesso - atualiza unidade
+      @unit.update!(
+        webhook_url: webhook_url,
+        webhook_configured_at: Time.current
+      )
+
+      Rails.logger.info "[WebhookSetup] Webhook configurado para #{@unit.name}: #{webhook_url}"
+      { success: true, webhook_url: webhook_url }
+    else
+      error_msg = "Falha ao configurar webhook: HTTP #{response.status} - #{response.body}"
+      Rails.logger.error "[WebhookSetup] #{error_msg}"
+      { success: false, error: error_msg }
+    end
+  rescue StandardError => e
+    Rails.logger.error "[WebhookSetup] Erro: #{e.class} - #{e.message}"
+    { success: false, error: e.message }
+  end
+
+  private
+
+  def webhook_path
+    # URL-encode da chave PIX
+    encoded_key = ERB::Util.url_encode(@unit.inter_pix_key)
+    "#{WEBHOOK_ENDPOINT}/#{encoded_key}"
+  end
+
+  def connection
+    @connection ||= Faraday.new(url: API_BASE_URL) do |conn|
+      cert_raw = @unit.inter_cert_content.presence || File.read(@unit.resolved_inter_cert_path)
+      key_raw  = @unit.inter_key_content.presence  || File.read(@unit.resolved_inter_key_path)
+
+      conn.ssl[:client_cert] = OpenSSL::X509::Certificate.new(cert_raw)
+      conn.ssl[:client_key]  = OpenSSL::PKey::RSA.new(key_raw)
+      conn.adapter Faraday.default_adapter
+    end
+  end
+end
diff --git a/enterprise/app/services/captain/llm/system_prompts_service.rb b/enterprise/app/services/captain/llm/system_prompts_service.rb
index ba8834c1f..b48808ab7 100644
--- a/enterprise/app/services/captain/llm/system_prompts_service.rb
+++ b/enterprise/app/services/captain/llm/system_prompts_service.rb
@@ -176,7 +176,9 @@ class Captain::Llm::SystemPromptsService
         - Use discourse markers to ease comprehension. Never use the list format.
         - Do not generate a response more than three sentences.
         - Keep the conversation flowing.
-        - Do not use use your own understanding and training data to provide an answer.
+        - ABSOLUTELY DO NOT use your own understanding and training data to provide an answer. You must ONLY use the provided documentation/context.
+        - NEVER invent, assume, or guess any information not explicitly provided in the context. This includes, but is not limited to: prices, room names, features, wait times, or policies.
+        - If the user asks a question and the answer is NOT strictly found in the provided documentation/context, you MUST reply saying that you don't have that information. Do NOT attempt to provide an approximate or likely answer.
         - Clarify: when there is ambiguity, ask clarifying questions, rather than make assumptions.
         - Don't implicitly or explicitly try to end the chat (i.e. do not end a response with "Talk soon!" or "Enjoy!").
         - Sometimes the user might just want to chat. Ask them relevant follow-up questions.
diff --git a/enterprise/app/services/captain/open_ai_message_builder_service.rb b/enterprise/app/services/captain/open_ai_message_builder_service.rb
index 54c959761..e7e0432b9 100644
--- a/enterprise/app/services/captain/open_ai_message_builder_service.rb
+++ b/enterprise/app/services/captain/open_ai_message_builder_service.rb
@@ -1,12 +1,13 @@
 class Captain::OpenAiMessageBuilderService
+  require 'base64'
   pattr_initialize [:message!]
 
-  # Extracts text and image URLs from multimodal content array (reverse of generate_content)
   def self.extract_text_and_attachments(content)
-    return [content, []] unless content.is_a?(Array)
+    raw_content = content.is_a?(RubyLLM::Content::Raw) ? content.value : content
+    return [raw_content, []] unless raw_content.is_a?(Array)
 
-    text_parts = content.select { |part| part[:type] == 'text' }.pluck(:text)
-    image_urls = content.select { |part| part[:type] == 'image_url' }.filter_map { |part| part.dig(:image_url, :url) }
+    text_parts = raw_content.select { |part| part[:type] == 'text' }.pluck(:text)
+    image_urls = raw_content.select { |part| part[:type] == 'image_url' }.filter_map { |part| part.dig(:image_url, :url) }
     [text_parts.join(' ').presence, image_urls]
   end
 
@@ -18,7 +19,19 @@ class Captain::OpenAiMessageBuilderService
     return 'Message without content' if parts.blank?
     return parts.first[:text] if parts.one? && parts.first[:type] == 'text'
 
-    parts
+    RubyLLM::Content::Raw.new(parts)
+  end
+
+  def generate_text_content
+    content = generate_content
+    return content if content.is_a?(String)
+
+    raw_parts = content.is_a?(RubyLLM::Content::Raw) ? content.value : content
+    return '' unless raw_parts.is_a?(Array)
+
+    raw_parts.map do |part|
+      part[:type] == 'text' ? part[:text] : "[#{part[:type]}]"
+    end.join("\n")
   end
 
   private
@@ -51,12 +64,26 @@ class Captain::OpenAiMessageBuilderService
   end
 
   def get_attachment_url(attachment)
+    if attachment.file.attached? && attachment.file.image?
+      begin
+        return "data:#{attachment.file.content_type};base64,#{encode_image(attachment)}"
+      rescue StandardError => e
+        Rails.logger.error "[Captain::OpenAiMessageBuilderService] Failed to encode image to Base64: #{e.message}"
+      end
+    end
+
     return attachment.download_url if attachment.download_url.present?
     return attachment.external_url if attachment.external_url.present?
 
     attachment.file.attached? ? attachment.file_url : nil
   end
 
+  def encode_image(attachment)
+    attachment.file.blob.open do |file|
+      Base64.strict_encode64(file.read)
+    end
+  end
+
   def extract_audio_transcriptions(attachments)
     audio_attachments = attachments.where(file_type: :audio)
     return '' if audio_attachments.blank?
diff --git a/enterprise/app/services/captain/payments/confirmation_service.rb b/enterprise/app/services/captain/payments/confirmation_service.rb
new file mode 100644
index 000000000..fcb35988e
--- /dev/null
+++ b/enterprise/app/services/captain/payments/confirmation_service.rb
@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+# Serviço para confirmar pagamento de uma reserva
+# Atualiza status, labels e cria nota interna
+class Captain::Payments::ConfirmationService
+  def initialize(reservation:, source:, payload: nil, actor: nil)
+    @reservation = reservation
+    @source = source.to_s
+    @payload = payload
+    @actor = actor
+  end
+
+  def perform
+    ActiveRecord::Base.transaction do
+      mark_reservation_paid!
+      sync_conversation_labels!
+      create_internal_note_once!
+    end
+
+    Rails.logger.info "[PaymentConfirmation] Reserva #{@reservation.id} confirmada (#{source_label})"
+  end
+
+  private
+
+  attr_reader :reservation, :source, :payload, :actor
+
+  def mark_reservation_paid!
+    attrs = { payment_status: :paid }
+    attrs[:status] = :active if reservation.respond_to?(:active?) && !reservation.active?
+    reservation.update!(attrs)
+  end
+
+  def sync_conversation_labels!
+    conversation = reservation.conversation
+    return if conversation.blank?
+
+    current = conversation.label_list
+    merged = (current + %w[pagamento_confirmado reserva_feita]).uniq
+    merged -= %w[aguardando_pagamento comprovante_recebido pagamento_em_revisao]
+    conversation.update_labels(merged)
+  end
+
+  def create_internal_note_once!
+    conversation = reservation.conversation
+    return if conversation.blank?
+    return if confirmation_note_already_created?
+
+    content = [
+      "💰 Pagamento confirmado automaticamente (#{source_label}).",
+      "📋 Reserva ##{reservation.id}",
+      ("🔗 Origem: #{source}" if source.present?)
+    ].compact.join("\n")
+
+    Messages::MessageBuilder.new(actor, conversation, { content: content, private: true }).perform
+    mark_note_created!
+  end
+
+  def source_label
+    case source
+    when 'webhook_inter_pix' then 'webhook Inter Pix'
+    when 'payment_callback' then 'callback de pagamento'
+    when 'inter_cob_query_polling' then 'consulta periódica no Inter'
+    when 'inter_cob_query' then 'consulta manual no Inter'
+    else
+      'integração de pagamento'
+    end
+  end
+
+  def confirmation_note_already_created?
+    reservation.metadata.to_h['payment_confirmed_note_at'].present?
+  end
+
+  def mark_note_created!
+    metadata = reservation.metadata.to_h
+    metadata['payment_confirmed_note_at'] ||= Time.current.iso8601
+    metadata['payment_confirmed_source'] ||= source
+    metadata['payment_confirmed_payload'] ||= payload if payload.present?
+    reservation.update_column(:metadata, metadata)
+  end
+end
diff --git a/enterprise/app/services/captain/reservations/conversation_marker_sync_service.rb b/enterprise/app/services/captain/reservations/conversation_marker_sync_service.rb
new file mode 100644
index 000000000..2ee0f3965
--- /dev/null
+++ b/enterprise/app/services/captain/reservations/conversation_marker_sync_service.rb
@@ -0,0 +1,27 @@
+class Captain::Reservations::ConversationMarkerSyncService
+  def initialize(reservation: nil, conversation: nil)
+    @reservation = reservation
+    @conversation = conversation
+  end
+
+  def perform
+    conversation = target_conversation
+    return if conversation.blank?
+
+    marker = Captain::Reservations::MarkerBuilder.build_for_conversation(conversation)
+    attrs = conversation.additional_attributes.to_h.deep_dup
+    attrs['reservation_marker'] = marker
+    return if attrs == conversation.additional_attributes.to_h
+
+    conversation.update!(additional_attributes: attrs)
+  end
+
+  private
+
+  def target_conversation
+    return @conversation if @conversation.present?
+    return @reservation.conversation if @reservation&.conversation.present?
+
+    Conversation.find_by(id: @reservation&.conversation_id)
+  end
+end
diff --git a/enterprise/app/services/captain/reservations/marker_builder.rb b/enterprise/app/services/captain/reservations/marker_builder.rb
new file mode 100644
index 000000000..c53ae0331
--- /dev/null
+++ b/enterprise/app/services/captain/reservations/marker_builder.rb
@@ -0,0 +1,84 @@
+class Captain::Reservations::MarkerBuilder
+  UI_STATUS_MAP = {
+    'draft' => 'draft',
+    'pending_payment' => 'pending_payment',
+    'scheduled' => 'confirmed',
+    'active' => 'confirmed',
+    'completed' => 'confirmed',
+    'cancelled' => 'cancelled'
+  }.freeze
+
+  STATUS_LABELS = {
+    'draft' => 'Rascunho',
+    'pending_payment' => 'Aguardando pagamento',
+    'confirmed' => 'Confirmada',
+    'cancelled' => 'Cancelada'
+  }.freeze
+
+  def self.hidden_payload
+    {
+      'visible' => false
+    }
+  end
+
+  def self.ui_status(status)
+    UI_STATUS_MAP[status.to_s] || 'draft'
+  end
+
+  def self.status_label(ui_status)
+    STATUS_LABELS[ui_status.to_s] || STATUS_LABELS['draft']
+  end
+
+  def self.build_for_conversation(conversation)
+    reservation = Captain::Reservation.where(conversation_id: conversation.id).order(updated_at: :desc).first
+    build_for(reservation)
+  end
+
+  def self.build_for(reservation)
+    return hidden_payload if reservation.blank?
+
+    metadata = reservation.metadata.to_h
+    deposit_amount = metadata['deposit_amount'].presence&.to_f
+    amount = deposit_amount&.positive? ? deposit_amount : reservation.total_amount.to_f
+    amount_kind = deposit_amount&.positive? ? 'deposit' : 'total'
+    normalized_status = ui_status(reservation.status)
+    pix_payload = pix_payload_for(reservation)
+
+    {
+      'visible' => true,
+      'status' => normalized_status,
+      'status_label' => status_label(normalized_status),
+      'amount' => amount.to_f,
+      'amount_kind' => amount_kind,
+      'check_in_at' => reservation.check_in_at&.iso8601,
+      'check_out_at' => reservation.check_out_at&.iso8601,
+      'suite' => reservation.suite_identifier,
+      'reservation_id' => reservation.id,
+      'updated_at' => reservation.updated_at&.iso8601,
+      'total_amount' => reservation.total_amount.to_f,
+      'deposit_amount' => deposit_amount&.to_f,
+      'payment_status' => reservation.payment_status,
+      'pix_status' => pix_payload[:status],
+      'pix_copy_paste' => pix_payload[:pix_copy_paste],
+      'pix_reason' => pix_payload[:reason]
+    }
+  end
+
+  def self.pix_payload_for(reservation)
+    charge = reservation.current_pix_charge || Captain::PixCharge.where(reservation_id: reservation.id).order(created_at: :desc).first
+    return { pix_copy_paste: nil, reason: 'not_generated', status: 'not_generated' } if charge.blank? && reservation.pending_payment?
+    return { pix_copy_paste: nil, reason: nil, status: nil } if charge.blank?
+
+    expired = charge.expired? || charge.expired_by_time?
+
+    return { pix_copy_paste: nil, reason: 'expired', status: 'expired' } if reservation.pending_payment? && expired
+
+    return { pix_copy_paste: nil, reason: 'not_generated', status: charge.status } if reservation.pending_payment? && charge.pix_copia_e_cola.blank?
+
+    {
+      pix_copy_paste: charge.pix_copia_e_cola.presence,
+      reason: nil,
+      status: charge.status
+    }
+  end
+end
diff --git a/enterprise/app/services/captain/reservations/revenue_summary_service.rb b/enterprise/app/services/captain/reservations/revenue_summary_service.rb
new file mode 100644
index 000000000..95b185bfe
--- /dev/null
+++ b/enterprise/app/services/captain/reservations/revenue_summary_service.rb
@@ -0,0 +1,72 @@
+class Captain::Reservations::RevenueSummaryService
+  def initialize(scope:)
+    @scope = scope
+  end
+
+  def perform
+    {
+      summary: {
+        total_revenue: total_revenue,
+        confirmed_count: confirmed_count,
+        average_ticket: average_ticket
+      },
+      by_unit: grouped_revenue_by_unit,
+      by_suite: grouped_revenue_by_suite
+    }
+  end
+
+  private
+
+  attr_reader :scope
+
+  def total_revenue
+    scope.sum(:total_amount).to_f
+  end
+
+  def confirmed_count
+    scope.count
+  end
+
+  def average_ticket
+    return 0.0 unless confirmed_count.positive?
+
+    total_revenue / confirmed_count
+  end
+
+  def grouped_revenue_by_unit
+    scope.left_joins(:unit)
+         .group('captain_units.id', 'captain_units.name')
+         .order(Arel.sql('COALESCE(SUM(captain_reservations.total_amount), 0) DESC'))
+         .pluck(
+           'captain_units.id',
+           'captain_units.name',
+           Arel.sql('COUNT(captain_reservations.id)'),
+           Arel.sql('COALESCE(SUM(captain_reservations.total_amount), 0)')
+         )
+         .map do |unit_id, unit_name, count, amount|
+      {
+        unit_id: unit_id,
+        unit_name: unit_name,
+        reservations_count: count.to_i,
+        total_revenue: amount.to_f
+      }
+    end
+  end
+
+  def grouped_revenue_by_suite
+    scope.group(:suite_identifier)
+         .order(Arel.sql('COALESCE(SUM(captain_reservations.total_amount), 0) DESC'))
+         .pluck(
+           :suite_identifier,
+           Arel.sql('COUNT(captain_reservations.id)'),
+           Arel.sql('COALESCE(SUM(captain_reservations.total_amount), 0)')
+         )
+         .map do |suite_identifier, count, amount|
+      {
+        suite_identifier: suite_identifier,
+        reservations_count: count.to_i,
+        total_revenue: amount.to_f
+      }
+    end
+  end
+end
diff --git a/enterprise/app/services/captain/tools/check_pix_payment_tool.rb b/enterprise/app/services/captain/tools/check_pix_payment_tool.rb
new file mode 100644
index 000000000..09cf18593
--- /dev/null
+++ b/enterprise/app/services/captain/tools/check_pix_payment_tool.rb
@@ -0,0 +1,238 @@
+# rubocop:disable Metrics/ClassLength
+class Captain::Tools::CheckPixPaymentTool < Captain::Tools::BaseTool
+  def name
+    'check_pix_payment'
+  end
+
+  def description
+    'Consulta o status de pagamento de um Pix no Banco Inter. ' \
+      'Use quando o cliente informar que já pagou e você precisar confirmar no banco.'
+  end
+
+  def tool_parameters_schema
+    {
+      type: 'object',
+      properties: {
+        txid: {
+          type: 'string',
+          description: 'Opcional. TXID da cobrança Pix para consulta direta.'
+        }
+      }
+    }
+  end
+
+  def execute(*args, **params)
+    actual_params = setup_execution_context!(args, params)
+    return error_response('Erro técnico ao consultar pagamento. Não foi possível identificar a conversa atual.') if @conversation.blank?
+
+    process_payment_check(actual_params)
+  rescue StandardError => e
+    Rails.logger.error("[CheckPixPaymentTool] Falha ao consultar pagamento: #{e.class} - #{normalize_text(e.message)}")
+    tool_feedback_response(map_error_message(e))
+  end
+
+  private
+
+  def setup_execution_context!(args, params)
+    actual_params = resolve_params(args, params)
+    @conversation ||= resolve_conversation(args, params)
+    actual_params
+  end
+
+  def process_payment_check(actual_params)
+    charge = find_charge(actual_params[:txid])
+    return not_found_response if charge.blank?
+    return already_paid_response(charge) if charge.paid? || charge.reservation&.payment_status.to_s == 'paid'
+
+    status_result = Captain::Inter::CobStatusService.new(charge).call
+    return pending_response(status_result[:status]) unless status_result[:paid]
+
+    mark_charge_as_paid!(charge, status_result)
+    paid_response(charge, status_result)
+  end
+
+  def find_charge(txid_param)
+    if txid_param.present?
+      return Captain::PixCharge.joins(:reservation)
+                               .where(txid: txid_param.to_s.strip)
+                               .where(captain_reservations: { conversation_id: @conversation.id, account_id: @conversation.account_id })
+                               .order(created_at: :desc)
+                               .first
+    end
+
+    Captain::PixCharge.joins(:reservation)
+                      .where(captain_reservations: { conversation_id: @conversation.id, account_id: @conversation.account_id })
+                      .order(created_at: :desc)
+                      .first
+  end
+
+  def mark_charge_as_paid!(charge, status_result)
+    update_attrs = {
+      status: 'paid',
+      raw_webhook_payload: status_result[:raw_payload]
+    }
+    update_attrs[:e2eid] = status_result[:end_to_end_id] if charge.e2eid.blank? && status_result[:end_to_end_id].present?
+    update_attrs[:paid_at] = Time.current if charge.paid_at.blank?
+
+    charge.update!(update_attrs)
+
+    reservation = charge.reservation
+    return if reservation.blank?
+    return if reservation.payment_status.to_s == 'paid'
+
+    Captain::Payments::ConfirmationService.new(
+      reservation: reservation,
+      source: 'inter_cob_query',
+      payload: status_result[:raw_payload]
+    ).perform
+  end
+
+  def not_found_response
+    tool_feedback_response(
+      'Não encontrei uma cobrança Pix vinculada a esta conversa. ' \
+      'Se quiser, posso gerar um novo Pix.'
+    )
+  end
+
+  def already_paid_response(charge)
+    reservation_id = charge.reservation_id
+    tool_feedback_response(
+      "Pagamento já confirmado para a reserva ##{reservation_id}. " \
+      'Se precisar, posso seguir com os próximos passos da reserva.'
+    )
+  end
+
+  def paid_response(charge, status_result)
+    reservation_id = charge.reservation_id
+    value = status_result[:paid_value].presence || charge.original_value
+    tool_feedback_response(
+      "Pagamento confirmado no Banco Inter para a reserva ##{reservation_id} " \
+      "(TXID: #{charge.txid}, valor: R$ #{format('%.2f', value.to_f)})."
+    )
+  end
+
+  def pending_response(inter_status)
+    status_label = inter_status.presence || 'ATIVA'
+    tool_feedback_response(
+      "Ainda não apareceu como pago no Banco Inter (status: #{status_label}). " \
+      'Pode levar alguns instantes. Se quiser, eu consulto novamente em seguida.'
+    )
+  end
+
+  def error_response(msg)
+    { formatted_message: msg, success: false }
+  end
+
+  def tool_feedback_response(msg)
+    { formatted_message: msg, success: true }
+  end
+
+  def map_error_message(error)
+    message = normalize_text(error.message).downcase
+    if message.include?('login/senha inválido') || message.include?('login/senha invalido')
+      return 'Não consegui validar o pagamento no Inter porque as credenciais da integração estão inválidas. ' \
+             'Peça para o gestor revisar Client ID/Secret/certificados.'
+    end
+    if message.include?('unit not configured for pix')
+      return 'Não consegui validar o pagamento porque a unidade da conversa não está configurada para Pix.'
+    end
+
+    'Não consegui validar o pagamento agora por instabilidade técnica. Tente novamente em instantes.'
+  end
+
+  def resolve_params(args, params)
+    merged = params.to_h
+
+    args.each do |arg|
+      next unless arg.is_a?(Hash)
+      next if tool_context_hash?(arg)
+
+      merged = arg.merge(merged)
+    end
+
+    merged.with_indifferent_access
+  end
+
+  # rubocop:disable Metrics/CyclomaticComplexity
+  def resolve_conversation(args, params)
+    state = extract_state(args, params)
+    return nil if state.blank?
+
+    conversation_state = state_from_context_hash(state, :conversation) || {}
+    conversation_id = state_from_context_hash(conversation_state, :id)
+    display_id = state_from_context_hash(conversation_state, :display_id)
+    account_id = state[:account_id] || state['account_id']
+
+    conversation = Conversation.find_by(id: conversation_id) if conversation_id.present?
+    return conversation if conversation.present?
+    return nil if display_id.blank?
+
+    scope = Conversation.where(display_id: display_id)
+    scope = scope.where(account_id: account_id) if account_id.present?
+    scope.first
+  end
+  # rubocop:enable Metrics/CyclomaticComplexity
+
+  def extract_state(args, params)
+    context_sources = [
+      *args,
+      params[:tool_context],
+      params['tool_context'],
+      params[:context_wrapper],
+      params['context_wrapper'],
+      params[:context],
+      params['context']
+    ].compact
+
+    context_sources.each do |source|
+      state = extract_state_from_source(source)
+      return state if state.present?
+    end
+
+    {}
+  end
+
+  def extract_state_from_source(source)
+    return source.state if source.respond_to?(:state)
+    return state_from_source_context(source) if source.respond_to?(:context)
+    return state_from_hash_source(source) if source.is_a?(Hash)
+
+    nil
+  end
+
+  def state_from_source_context(source)
+    context = source.context
+    return nil unless context.is_a?(Hash)
+
+    state_from_context_hash(context, :state)
+  end
+
+  def state_from_hash_source(source)
+    state_from_context_hash(source, :state) ||
+      source.dig(:context, :state) ||
+      source.dig('context', 'state')
+  end
+
+  def state_from_context_hash(hash, key)
+    hash[key] || hash[key.to_s]
+  end
+
+  def tool_context_hash?(hash)
+    hash.key?(:state) ||
+      hash.key?('state') ||
+      hash.key?(:context) ||
+      hash.key?('context') ||
+      hash.key?(:conversation) ||
+      hash.key?('conversation')
+  end
+
+  def normalize_text(value)
+    value.to_s
+         .dup
+         .force_encoding(Encoding::UTF_8)
+         .encode(Encoding::UTF_8, invalid: :replace, undef: :replace, replace: '')
+  rescue StandardError
+    value.to_s.encode(Encoding::UTF_8, invalid: :replace, undef: :replace, replace: '')
+  end
+end
+# rubocop:enable Metrics/ClassLength
diff --git a/enterprise/app/services/captain/tools/generate_pix_tool.rb b/enterprise/app/services/captain/tools/generate_pix_tool.rb
new file mode 100644
index 000000000..4808b9415
--- /dev/null
+++ b/enterprise/app/services/captain/tools/generate_pix_tool.rb
@@ -0,0 +1,722 @@
+class Captain::Tools::GeneratePixTool < Captain::Tools::BaseTool
+  CPF_WITH_LABEL_REGEX = /cpf[^\d]*(\d{3}\.?\d{3}\.?\d{3}-?\d{2}|\d{11})/i
+  CPF_FALLBACK_REGEX = /\b\d{11}\b/
+  NAME_WITH_LABEL_REGEX = /nome\s*[:\-]\s*([^\n\r,;]+)/i
+  SUITE_REGEX = /su[ií]te\s+([^\n\r,.!?]+)/i
+  DDMMYYYY_REGEX = %r{\b(\d{1,2}/\d{1,2}/\d{2,4})\b}
+  CURRENCY_REGEX = /r\$\s*([\d.,]+)/i
+  TOTAL_AMOUNT_REGEX = /valor\s+total[^\n\r]{0,80}/i
+  DEPOSIT_AMOUNT_REGEX = /(sinal|entrada)[^\n\r]{0,80}/i
+  NIGHTS_REGEX = /(\d+)\s*(?:noite|noites|di[aá]ria|di[aá]rias)/i
+  ONE_NIGHT_REGEX = /\b(uma|um)\s+pernoite\b/i
+
+  def name
+    'generate_pix'
+  end
+
+  def description
+    'Gera uma cobrança Pix para a reserva da conversa. Se ainda não existir rascunho, tenta criar automaticamente. ' \
+      'Retorna um objeto com formatted_message (link de pagamento) e raw_payload (código copia e cola).'
+  end
+
+  def tool_parameters_schema
+    {
+      type: 'object',
+      properties: {
+        amount: {
+          type: 'number',
+          description: 'Opcional. Valor exato a cobrar. Se informado, substitui o valor padrão da reserva.'
+        },
+        suite: {
+          type: 'string',
+          description: 'Opcional. Nome da suíte.'
+        },
+        check_in: {
+          type: 'string',
+          description: 'Opcional. Data de check-in (YYYY-MM-DD ou DD/MM/YYYY).'
+        },
+        check_out: {
+          type: 'string',
+          description: 'Opcional. Data de check-out (YYYY-MM-DD ou DD/MM/YYYY).'
+        },
+        nights: {
+          type: 'integer',
+          description: 'Opcional. Quantidade de noites para inferir check-out.'
+        },
+        total_amount: {
+          type: 'number',
+          description: 'Opcional. Valor total da reserva.'
+        }
+      }
+    }
+  end
+
+  MAX_PIX_AMOUNT = 50_000.0
+  MIN_PIX_AMOUNT = 1.0
+
+  def execute(*args, **params)
+    actual_params = resolve_params(args, params)
+    @conversation ||= resolve_conversation(args, params)
+    return error_response('Erro técnico ao gerar o Pix. Não foi possível identificar a conversa atual.') if @conversation.blank?
+
+    input_amount = actual_params[:amount].to_s.gsub(/[^\d,.]/, '').tr(',', '.')
+    override_amount = input_amount.to_f if input_amount.present? && input_amount.to_f.positive?
+
+    if override_amount
+      return error_response("Valor mínimo para Pix é R$ #{format('%.2f', MIN_PIX_AMOUNT)}") if override_amount < MIN_PIX_AMOUNT
+      return error_response("Valor máximo para Pix é R$ #{format('%.2f', MAX_PIX_AMOUNT)}") if override_amount > MAX_PIX_AMOUNT
+    end
+
+    contact = @conversation.contact
+    hydrate_contact_identity_from_conversation!(contact, @conversation)
+    return missing_cpf_response if contact_cpf(contact).blank?
+    return missing_name_response if valid_contact_name?(contact.name).blank?
+
+    # Verifica se já existe reserva pendente de pagamento
+    pending = Captain::Reservation.where(conversation_id: @conversation.id, status: 'pending_payment').last
+    return handle_pending_reservation(pending, override_amount) if pending
+
+    reservation = find_recent_draft_reservation
+    unless reservation
+      reservation = ensure_draft_reservation!(actual_params, override_amount)
+      return reservation if reservation.is_a?(Hash)
+    end
+
+    charge_amount = override_amount || default_charge_amount(reservation)
+    merge_reservation_amount_metadata!(reservation, deposit_amount: charge_amount)
+    Rails.logger.info "[GeneratePixTool] Reserva ID #{reservation.id} | Valor: #{charge_amount}"
+    generate_new_pix(reservation, amount: charge_amount)
+  end
+
+  private
+
+  def resolve_params(args, params)
+    merged = params.to_h
+
+    args.each do |arg|
+      next unless arg.is_a?(Hash)
+      next if tool_context_hash?(arg)
+
+      merged = arg.merge(merged)
+    end
+
+    merged.with_indifferent_access
+  end
+
+  def hydrate_contact_identity_from_conversation!(contact, conversation)
+    return if contact.blank? || conversation.blank?
+
+    extracted = extract_identity_from_recent_messages(conversation)
+    return if extracted.blank?
+
+    updates = {}
+    current_custom_attributes = contact.custom_attributes.to_h
+
+    updates[:custom_attributes] = current_custom_attributes.merge('cpf' => extracted[:cpf]) if contact_cpf(contact).blank? && extracted[:cpf].present?
+
+    updates[:name] = extracted[:name] if valid_contact_name?(contact.name).blank? && extracted[:name].present?
+
+    return if updates.blank?
+
+    contact.update!(updates)
+    Rails.logger.info("[GeneratePixTool] Contato #{contact.id} hidratado com dados da conversa")
+  rescue StandardError => e
+    Rails.logger.warn("[GeneratePixTool] Falha ao hidratar contato #{contact&.id}: #{e.class} - #{e.message}")
+  end
+
+  def extract_identity_from_recent_messages(conversation)
+    recent_messages = conversation.messages
+                                  .where(message_type: :incoming, sender_type: 'Contact')
+                                  .reorder(created_at: :desc)
+                                  .limit(20)
+
+    cpf = nil
+    name = nil
+
+    recent_messages.each do |message|
+      content = normalize_text(message.content)
+      next if content.blank?
+
+      cpf ||= extract_cpf_from_text(content)
+      name ||= extract_name_from_text(content)
+      break if cpf.present? && name.present?
+    end
+
+    {
+      cpf: cpf,
+      name: name
+    }.compact
+  end
+
+  def extract_cpf_from_text(text)
+    text = normalize_text(text)
+    candidate = text[CPF_WITH_LABEL_REGEX, 1]
+    candidate ||= text[CPF_FALLBACK_REGEX]
+
+    digits_only = candidate.to_s.gsub(/\D/, '')
+    return if digits_only.length != 11
+
+    digits_only
+  end
+
+  def extract_name_from_text(text)
+    text = normalize_text(text)
+    candidate = text[NAME_WITH_LABEL_REGEX, 1].to_s.squish
+    return if candidate.blank? || candidate.length < 3
+
+    candidate.titleize
+  end
+
+  def contact_cpf(contact)
+    attrs = contact.custom_attributes.to_h.with_indifferent_access
+    digits_only = attrs[:cpf].to_s.gsub(/\D/, '')
+    return if digits_only.length != 11
+
+    digits_only
+  end
+
+  def valid_contact_name?(name)
+    candidate = name.to_s.squish
+    return if candidate.blank?
+    return unless candidate.match?(/\p{L}/)
+
+    candidate
+  end
+
+  def missing_cpf_response
+    normalize_payload(
+      {
+        formatted_message: 'Para gerar o Pix e seguir com sua reserva, preciso do seu CPF com 11 dígitos. ' \
+                           'Pode me enviar agora? Se preferir, pode mandar só os números.',
+        success: true,
+        requires_input: true,
+        missing_field: 'cpf'
+      }
+    )
+  end
+
+  def missing_name_response
+    normalize_payload(
+      {
+        formatted_message: 'Perfeito. Para gerar o Pix, preciso confirmar seu nome completo. Pode me informar?',
+        success: true,
+        requires_input: true,
+        missing_field: 'name'
+      }
+    )
+  end
+
+  def missing_reservation_details_response(missing_fields)
+    labels = []
+    labels << 'a suíte desejada' if missing_fields.include?('suite')
+    labels << 'a data de check-in' if missing_fields.include?('check_in')
+    labels << 'a duração da estadia (quantidade de noites)' if missing_fields.include?('check_out')
+    labels << 'o valor total da reserva' if missing_fields.include?('amount')
+
+    normalize_payload(
+      {
+        formatted_message: "Para gerar o Pix certinho, preciso confirmar #{human_sentence(labels)}. Pode me passar?",
+        success: true,
+        requires_input: true,
+        missing_fields: missing_fields
+      }
+    )
+  end
+
+  def resolve_conversation(args, params)
+    state = extract_state(args, params)
+    return nil if state.blank?
+
+    conversation_state = state[:conversation] || state['conversation'] || {}
+    conversation_id = conversation_state[:id] || conversation_state['id']
+    display_id = conversation_state[:display_id] || conversation_state['display_id']
+    account_id = state[:account_id] || state['account_id']
+
+    conversation = Conversation.find_by(id: conversation_id) if conversation_id.present?
+    return conversation if conversation.present?
+    return nil if display_id.blank?
+
+    scope = Conversation.where(display_id: display_id)
+    scope = scope.where(account_id: account_id) if account_id.present?
+    scope.first
+  end
+
+  def extract_state(args, params)
+    context_sources = [
+      *args,
+      params[:tool_context],
+      params['tool_context'],
+      params[:context_wrapper],
+      params['context_wrapper'],
+      params[:context],
+      params['context']
+    ].compact
+
+    context_sources.each do |source|
+      state = extract_state_from_source(source)
+      return state if state.present?
+    end
+
+    {}
+  end
+
+  def extract_state_from_source(source)
+    return source.state if source.respond_to?(:state)
+
+    if source.respond_to?(:context)
+      context = source.context
+      return context[:state] || context['state'] if context.is_a?(Hash)
+    end
+
+    return nil unless source.is_a?(Hash)
+
+    source[:state] || source['state'] || source.dig(:context, :state) || source.dig('context', 'state')
+  end
+
+  def tool_context_hash?(hash)
+    hash.key?(:state) ||
+      hash.key?('state') ||
+      hash.key?(:context) ||
+      hash.key?('context') ||
+      hash.key?(:conversation) ||
+      hash.key?('conversation')
+  end
+
+  def handle_pending_reservation(pending, override_amount)
+    charge_amount = default_charge_amount(pending)
+
+    if override_amount
+      Rails.logger.info "[GeneratePixTool] Valor alterado para #{override_amount}. Forçando novo Pix."
+      merge_reservation_amount_metadata!(pending, deposit_amount: override_amount)
+      Captain::PixCharge.where(reservation_id: pending.id).update_all(status: 'expired')
+      return generate_new_pix(
+        pending,
+        amount: override_amount,
+        prefix: "Atualizei o valor para R$ #{format('%.2f', override_amount)}. Novo Pix abaixo:"
+      )
+    end
+
+    charge = current_pix_charge_for(pending)
+    if charge&.pix_copia_e_cola.present?
+      if charge.expired? || charge.expired_by_time?
+        charge.update!(status: 'expired') unless charge.expired?
+        return generate_new_pix(pending, amount: charge_amount, prefix: 'Pix expirado. Gerando um novo agora.')
+      end
+
+      return build_pix_response(charge, pending, amount: charge_amount, prefix: 'Pix ainda válido. Segue abaixo para pagamento:')
+    end
+
+    generate_new_pix(pending, amount: charge_amount, prefix: 'Nenhuma cobrança ativa encontrada. Gerando um novo Pix.')
+  end
+
+  def error_response(msg)
+    normalize_payload({ formatted_message: msg, success: false })
+  end
+
+  def tool_feedback_response(msg)
+    normalize_payload({ formatted_message: msg, success: true })
+  end
+
+  def current_pix_charge_for(reservation)
+    return nil unless reservation
+
+    Captain::PixCharge.where(reservation_id: reservation.id).order(created_at: :desc).first
+  end
+
+  def generate_new_pix(reservation, amount: nil, prefix: nil)
+    charge_amount = amount || default_charge_amount(reservation)
+    service = Captain::Inter::CobService.new(reservation, amount: charge_amount)
+    charge = service.call
+
+    reservation.update!(status: 'pending_payment')
+    mark_conversation_as_awaiting_payment(reservation)
+    Rails.logger.info "[GeneratePixTool] Reserva #{reservation.id} → pending_payment"
+
+    final_prefix = prefix || 'Cobrança Pix gerada com sucesso.'
+    build_pix_response(charge, reservation, amount: charge_amount, prefix: final_prefix)
+  rescue StandardError => e
+    safe_error_message = normalize_text(e.message)
+    Rails.logger.error("[GeneratePixTool] Falha ao gerar Pix: #{e.class} - #{safe_error_message}")
+    mapped_error = map_pix_error_message(e)
+    return mapped_error if mapped_error.is_a?(Hash)
+
+    tool_feedback_response(mapped_error)
+  end
+
+  def map_pix_error_message(error)
+    msg = normalize_text(error.message)
+    msg_downcase = msg.downcase
+    return missing_cpf_response if msg.match?(/cpf/i)
+
+    if msg_downcase.include?('login/senha inválido') || msg_downcase.include?('login/senha invalido')
+      return 'Não foi possível gerar o Pix — login/senha inválidos na integração Inter. Peça para o gestor revisar Client ID/Secret/certificados.'
+    end
+    if msg_downcase.include?('unit not configured for pix')
+      return 'Não foi possível gerar o Pix — unidade não configurada para Pix. Revise chave Pix e dados Inter.'
+    end
+    if msg_downcase.include?('certificate file not found') || msg_downcase.include?('key file not found')
+      return 'Não foi possível gerar o Pix — certificado ausente. Revise os arquivos .crt/.key da integração Inter.'
+    end
+
+    'Erro técnico ao gerar o Pix. Por favor, tente novamente em alguns instantes.'
+  end
+
+  def find_recent_draft_reservation
+    Captain::Reservation.where(conversation_id: @conversation.id, status: 'draft')
+                        .where('updated_at > ?', 2.hours.ago)
+                        .order(created_at: :desc)
+                        .first
+  end
+
+  def ensure_draft_reservation!(actual_params, override_amount)
+    reservation_data = build_reservation_data(actual_params, override_amount)
+
+    missing_fields = []
+    missing_fields << 'suite' if reservation_data[:suite_identifier].blank?
+    missing_fields << 'check_in' if reservation_data[:check_in_at].blank?
+    missing_fields << 'check_out' if reservation_data[:check_in_at].present? && reservation_data[:check_out_at].blank?
+    missing_fields << 'amount' if reservation_data[:total_amount].to_f <= 0
+    return missing_reservation_details_response(missing_fields) if missing_fields.present?
+    if @conversation.contact_inbox.blank?
+      return error_response('Não consegui gerar o Pix porque este contato não está vinculado a esta caixa de entrada.')
+    end
+
+    reservation = Captain::Reservation.create!(
+      account: @conversation.account,
+      inbox: @conversation.inbox,
+      contact: @conversation.contact,
+      contact_inbox: @conversation.contact_inbox,
+      conversation: @conversation,
+      suite_identifier: reservation_data[:suite_identifier],
+      check_in_at: reservation_data[:check_in_at],
+      check_out_at: reservation_data[:check_out_at],
+      status: :draft,
+      payment_status: 'pending',
+      total_amount: reservation_data[:total_amount],
+      metadata: reservation_data[:metadata]
+    )
+
+    Rails.logger.info("[GeneratePixTool] Reserva draft criada automaticamente ##{reservation.id} para conversa #{@conversation.id}")
+    reservation
+  rescue ActiveRecord::RecordInvalid => e
+    Rails.logger.warn("[GeneratePixTool] Falha ao criar reserva draft: #{e.record.errors.full_messages.join(', ')}")
+    error_response('Não consegui preparar a reserva para gerar o Pix. Pode confirmar os dados da reserva para eu tentar novamente?')
+  rescue StandardError => e
+    Rails.logger.error("[GeneratePixTool] Erro ao criar reserva draft: #{e.class} - #{e.message}")
+    error_response('Erro técnico ao preparar a reserva para o Pix. Por favor, tente novamente em instantes.')
+  end
+
+  def build_reservation_data(actual_params, override_amount)
+    inferred = infer_reservation_data_from_conversation(@conversation)
+    suite_identifier = normalize_suite_name(actual_params[:suite] || actual_params[:suite_identifier]) || inferred[:suite_identifier]
+    check_in_at = parse_datetime_in_account_zone(actual_params[:check_in]) || inferred[:check_in_at]
+    check_out_at = parse_datetime_in_account_zone(actual_params[:check_out]) || inferred[:check_out_at]
+
+    nights = actual_params[:nights].to_i
+    inferred_nights = inferred[:nights].to_i
+    nights = inferred_nights if nights <= 0 && inferred_nights.positive?
+    nights = 1 if nights <= 0
+    check_out_at ||= infer_check_out_at(check_in_at, nights)
+
+    parsed_total = parse_amount(actual_params[:total_amount])
+    total_amount = parsed_total || inferred[:total_amount]
+    deposit_amount = override_amount || inferred[:deposit_amount]
+    total_amount ||= (deposit_amount * 2.0).round(2) if deposit_amount.present?
+
+    metadata = {
+      'full_amount' => total_amount&.to_f,
+      'deposit_amount' => deposit_amount&.to_f,
+      'created_by' => 'generate_pix_tool',
+      'auto_intent' => true
+    }.compact
+
+    {
+      suite_identifier: suite_identifier,
+      check_in_at: check_in_at,
+      check_out_at: check_out_at,
+      total_amount: total_amount&.to_f,
+      metadata: metadata
+    }
+  end
+
+  def infer_reservation_data_from_conversation(conversation)
+    return {} if conversation.blank?
+
+    suite_identifier = nil
+    check_in_date = nil
+    nights = nil
+    total_amount = nil
+    deposit_amount = nil
+
+    recent_messages_for_reservation_scan(conversation).each do |message|
+      content = normalize_text(message.content)
+      next if content.blank?
+
+      suite_identifier ||= extract_suite_from_text(content)
+      check_in_date ||= extract_check_in_date_from_text(content)
+      nights ||= extract_nights_from_text(content)
+      total_amount ||= extract_total_amount_from_text(content)
+      deposit_amount ||= extract_deposit_amount_from_text(content)
+      break if suite_identifier && check_in_date && nights && total_amount && deposit_amount
+    end
+
+    check_in_at = normalize_check_in_datetime(check_in_date)
+    check_out_at = infer_check_out_at(check_in_at, nights || 1)
+
+    {
+      suite_identifier: suite_identifier,
+      check_in_at: check_in_at,
+      check_out_at: check_out_at,
+      nights: nights,
+      total_amount: total_amount,
+      deposit_amount: deposit_amount
+    }.compact
+  end
+
+  def recent_messages_for_reservation_scan(conversation)
+    conversation.messages
+                .where(message_type: %i[incoming outgoing], private: false)
+                .reorder(created_at: :desc)
+                .limit(30)
+  end
+
+  def extract_suite_from_text(text)
+    text = normalize_text(text)
+    raw_suite = text[SUITE_REGEX, 1].to_s.squish
+    return if raw_suite.blank?
+
+    normalize_suite_name(raw_suite)
+  end
+
+  def normalize_suite_name(raw_suite)
+    cleaned = normalize_text(raw_suite)
+              .gsub(/\b(amanh[ãa]|hoje|no dia)\b/i, '')
+              .gsub(/\s+/, ' ')
+              .strip
+    return if cleaned.blank? || cleaned.length < 3
+
+    cleaned
+  end
+
+  def extract_check_in_date_from_text(text)
+    text = normalize_text(text)
+    date_match = text[DDMMYYYY_REGEX, 1]
+    return parse_date_value(date_match) if date_match.present?
+
+    current_date = account_current_date
+    return current_date + 2.days if text.match?(/depois\s+de\s+amanh[ãa]/i)
+    return current_date + 1.day if text.match?(/\bamanh[ãa]\b/i)
+    return current_date if text.match?(/\bhoje\b/i)
+
+    nil
+  end
+
+  def extract_nights_from_text(text)
+    text = normalize_text(text)
+    return 1 if text.match?(ONE_NIGHT_REGEX)
+    return 1 if text.match?(/\bpernoite\b/i)
+
+    matches = text.scan(NIGHTS_REGEX)
+    nights = matches.flatten.compact.map(&:to_i).find(&:positive?)
+    nights if nights&.positive?
+  end
+
+  def extract_total_amount_from_text(text)
+    text = normalize_text(text)
+    segment = text[TOTAL_AMOUNT_REGEX]
+    segment ||= text if text.match?(/valor\s+total/i)
+    parse_amount_from_text(segment)
+  end
+
+  def extract_deposit_amount_from_text(text)
+    text = normalize_text(text)
+    segment = text[DEPOSIT_AMOUNT_REGEX]
+    segment ||= text if text.match?(/sinal|entrada/i)
+    parse_amount_from_text(segment)
+  end
+
+  def parse_amount_from_text(text)
+    text = normalize_text(text)
+    return if text.blank?
+
+    raw = text[CURRENCY_REGEX, 1]
+    parse_amount(raw)
+  end
+
+  def parse_amount(value)
+    clean = normalize_text(value).gsub(/[^\d.,]/, '')
+    return if clean.blank?
+
+    normalized = if clean.include?(',')
+                   clean.delete('.').tr(',', '.')
+                 else
+                   clean
+                 end
+    amount = normalized.to_f
+    amount if amount.positive?
+  end
+
+  def parse_datetime_in_account_zone(raw_value)
+    return if raw_value.blank?
+    return normalize_check_in_datetime(raw_value) if raw_value.is_a?(Date) || raw_value.is_a?(Time)
+
+    normalized_raw = normalize_text(raw_value)
+    parsed_date = parse_date_value(normalized_raw)
+    return normalize_check_in_datetime(parsed_date) if parsed_date.present?
+
+    with_account_time_zone { Time.zone.parse(normalized_raw) }
+  rescue ArgumentError, TypeError
+    nil
+  end
+
+  def parse_date_value(raw_value)
+    string_value = normalize_text(raw_value).strip
+    return if string_value.blank?
+
+    Date.strptime(string_value, '%d/%m/%Y')
+  rescue ArgumentError
+    begin
+      Date.strptime(string_value, '%d/%m/%y')
+    rescue ArgumentError
+      begin
+        Date.iso8601(string_value)
+      rescue ArgumentError
+        nil
+      end
+    end
+  end
+
+  def normalize_check_in_datetime(value)
+    return if value.blank?
+
+    return value.in_time_zone(account_timezone) if value.is_a?(Time)
+
+    date = value.to_date
+    with_account_time_zone { Time.zone.local(date.year, date.month, date.day, 19, 0, 0) }
+  end
+
+  def infer_check_out_at(check_in_at, nights)
+    return if check_in_at.blank?
+
+    total_nights = nights.to_i.positive? ? nights.to_i : 1
+    check_out_date = check_in_at.to_date + total_nights.days
+    with_account_time_zone { Time.zone.local(check_out_date.year, check_out_date.month, check_out_date.day, 12, 0, 0) }
+  end
+
+  def account_current_date
+    with_account_time_zone { Time.zone.today }
+  end
+
+  def with_account_time_zone(&)
+    Time.use_zone(account_timezone, &)
+  end
+
+  def account_timezone
+    account = @conversation&.account
+    configured_timezone = if account.respond_to?(:timezone)
+                            account.timezone
+                          elsif account.respond_to?(:time_zone)
+                            account.time_zone
+                          else
+                            account&.settings&.dig('timezone')
+                          end
+    configured_timezone.presence || Time.zone.name
+  end
+
+  def human_sentence(labels)
+    return labels.first.to_s if labels.length <= 1
+
+    "#{labels[0..-2].join(', ')} e #{labels.last}"
+  end
+
+  def normalize_text(value)
+    value.to_s
+         .dup
+         .force_encoding(Encoding::UTF_8)
+         .encode(Encoding::UTF_8, invalid: :replace, undef: :replace, replace: '')
+  rescue StandardError
+    value.to_s.encode(Encoding::UTF_8, invalid: :replace, undef: :replace, replace: '')
+  end
+
+  def normalize_payload(value)
+    case value
+    when String
+      normalize_text(value)
+    when Array
+      value.map { |item| normalize_payload(item) }
+    when Hash
+      normalized = value.each_with_object({}) do |(key, item), acc|
+        normalized_key = key.is_a?(String) ? normalize_text(key) : key
+        acc[normalized_key] = normalize_payload(item)
+      end
+      value.is_a?(ActiveSupport::HashWithIndifferentAccess) ? normalized.with_indifferent_access : normalized
+    else
+      value
+    end
+  end
+
+  def build_pix_response(charge, reservation, amount:, prefix: nil)
+    intro = prefix.present? ? "#{prefix}\n\n" : ''
+
+    base_url = InstallationConfig.find_by(name: 'FRONTEND_URL')&.value.presence ||
+               ENV.fetch('FRONTEND_URL', 'http://localhost:3000')
+    base_url = base_url.gsub('0.0.0.0', '127.0.0.1') if base_url.include?('0.0.0.0')
+
+    token = charge.to_sgid(expires_in: 2.hours, purpose: :pix_payment).to_s
+    link  = Rails.application.routes.url_helpers.short_payment_link_url(token, host: base_url)
+
+    instructions = "Para facilitar, gerei um link de pagamento rápido com botão COPIAR.\n" \
+                   "1. Clique no link abaixo\n" \
+                   "2. Aperte 'COPIAR CÓDIGO PIX'\n" \
+                   "3. Cole no app do seu banco e pague.\n\n" \
+                   "Link Seguro: #{link}\n\n" \
+                   '(IMPORTANTE PARA A I.A.: Envie este link EXATAMENTE como está acima. NÃO use formatação Markdown [texto](url). ' \
+                   'O WhatsApp não reconhece. Envie APENAS a URL pura, solta no texto.)'
+
+    final_code = charge.pix_copia_e_cola.to_s.strip
+    if final_code.start_with?('/spi/')
+      header = '00020101021226930014BR.GOV.BCB.PIX2571spi-qrcode.bancointer.com.br'
+      final_code = "#{header}#{final_code}"
+    end
+
+    final_code = normalize_text(final_code)
+
+    normalize_payload(
+      {
+        formatted_message: "#{intro}#{instructions}",
+        raw_payload: final_code,
+        payment_link: link,
+        amount: amount.to_f,
+        reservation_id: reservation.id,
+        success: true
+      }
+    )
+  end
+
+  def default_charge_amount(reservation)
+    metadata = reservation.metadata.to_h
+    configured = metadata['deposit_amount']
+    return configured.to_f if configured.present? && configured.to_f.positive?
+
+    (reservation.total_amount.to_f / 2.0).round(2)
+  end
+
+  def merge_reservation_amount_metadata!(reservation, deposit_amount:)
+    metadata = reservation.metadata.to_h
+    merged = metadata.merge(
+      'full_amount' => metadata['full_amount'].presence || reservation.total_amount.to_f,
+      'deposit_amount' => deposit_amount.to_f
+    )
+    reservation.update!(metadata: merged)
+  end
+
+  def mark_conversation_as_awaiting_payment(reservation)
+    conversation = reservation.conversation || @conversation
+    return if conversation.blank?
+
+    current = conversation.label_list
+    merged  = (current + ['aguardando_pagamento']).uniq
+    merged -= %w[pagamento_confirmado reserva_feita]
+    conversation.update_labels(merged)
+  end
+end
diff --git a/enterprise/app/services/captain/tools/send_suite_images_tool.rb b/enterprise/app/services/captain/tools/send_suite_images_tool.rb
new file mode 100644
index 000000000..04bf46189
--- /dev/null
+++ b/enterprise/app/services/captain/tools/send_suite_images_tool.rb
@@ -0,0 +1,252 @@
+# rubocop:disable Metrics/ClassLength
+class Captain::Tools::SendSuiteImagesTool < Captain::Tools::BaseTool
+  DEFAULT_LIMIT = 3
+  MAX_LIMIT = 5
+
+  def name
+    'send_suite_images'
+  end
+
+  def description
+    'Envia fotos de suítes para o cliente usando a galeria da caixa de entrada atual, com fallback para acervo global.'
+  end
+
+  # rubocop:disable Metrics/MethodLength
+  def tool_parameters_schema
+    {
+      type: 'object',
+      properties: {
+        suite_category: {
+          type: 'string',
+          description: 'Opcional. Categoria da suíte (ex: luxo, hidro, master).'
+        },
+        suite_number: {
+          type: 'string',
+          description: 'Opcional. Número/identificador da suíte (ex: 101, alexa, aluba).'
+        },
+        limit: {
+          type: 'integer',
+          description: 'Opcional. Quantidade de imagens para enviar (padrão: 3, máximo: 5).'
+        },
+        inbox_id: {
+          type: 'integer',
+          description: 'Opcional. Força uma caixa de entrada específica para busca das fotos.'
+        },
+        captain_unit_id: {
+          type: 'integer',
+          description: 'Opcional (legado). Filtra por uma unidade específica dentro da galeria.'
+        }
+      }
+    }
+  end
+  # rubocop:enable Metrics/MethodLength
+
+  def execute(*args, **params)
+    actual_params = resolve_params(args, params)
+    @conversation ||= resolve_conversation(args, params)
+    return error_response('Erro técnico ao enviar fotos. Não consegui identificar a conversa atual.') if @conversation.blank?
+
+    selected_items = find_selected_items(actual_params)
+    return no_images_response(actual_params) if selected_items.blank?
+
+    sent_count = send_images(selected_items)
+    success_payload(selected_items, sent_count, actual_params)
+  rescue StandardError => e
+    Rails.logger.error("[SendSuiteImagesTool] Falha ao enviar fotos: #{e.class} - #{normalize_text(e.message)}")
+    error_response('Não consegui enviar as fotos agora. Tente novamente em instantes.')
+  end
+
+  private
+
+  def resolve_params(args, params)
+    merged = params.to_h
+
+    args.each do |arg|
+      next unless arg.is_a?(Hash)
+      next if tool_context_hash?(arg)
+
+      merged = arg.merge(merged)
+    end
+
+    merged.with_indifferent_access
+  end
+
+  def resolve_conversation(args, params)
+    state = extract_state(args, params)
+    return nil if state.blank?
+
+    conversation_state = state_from_context_hash(state, :conversation) || {}
+    conversation_id = state_from_context_hash(conversation_state, :id)
+    display_id = state_from_context_hash(conversation_state, :display_id)
+    account_id = state[:account_id] || state['account_id']
+
+    conversation = Conversation.find_by(id: conversation_id) if conversation_id.present?
+    return conversation if conversation.present?
+    return nil if display_id.blank?
+
+    scope = Conversation.where(display_id: display_id)
+    scope = scope.where(account_id: account_id) if account_id.present?
+    scope.first
+  end
+
+  def extract_state(args, params)
+    context_sources = [
+      *args,
+      params[:tool_context],
+      params['tool_context'],
+      params[:context_wrapper],
+      params['context_wrapper'],
+      params[:context],
+      params['context']
+    ].compact
+
+    context_sources.each do |source|
+      state = extract_state_from_source(source)
+      return state if state.present?
+    end
+
+    {}
+  end
+
+  def extract_state_from_source(source)
+    return source.state if source.respond_to?(:state)
+    return state_from_source_context(source) if source.respond_to?(:context)
+    return state_from_hash_source(source) if source.is_a?(Hash)
+
+    nil
+  end
+
+  def state_from_source_context(source)
+    context = source.context
+    return nil unless context.is_a?(Hash)
+
+    state_from_context_hash(context, :state)
+  end
+
+  def state_from_hash_source(source)
+    state_from_context_hash(source, :state) ||
+      source.dig(:context, :state) ||
+      source.dig('context', 'state')
+  end
+
+  def state_from_context_hash(hash, key)
+    hash[key] || hash[key.to_s]
+  end
+
+  def tool_context_hash?(hash)
+    hash.key?(:state) ||
+      hash.key?('state') ||
+      hash.key?(:context) ||
+      hash.key?('context') ||
+      hash.key?(:conversation) ||
+      hash.key?('conversation')
+  end
+
+  def find_items(actual_params)
+    scope = Captain::GalleryItem
+            .active
+            .where(account_id: @conversation.account_id)
+            .includes(image_attachment: :blob)
+            .ordered
+
+    unit_id = actual_params[:captain_unit_id].presence
+    scope = scope.where(captain_unit_id: unit_id) if unit_id.present?
+
+    category = normalize_filter(actual_params[:suite_category])
+    suite_number = normalize_filter(actual_params[:suite_number])
+
+    scope = scope.where('LOWER(suite_category) = ?', category.downcase) if category.present?
+    scope = scope.where('LOWER(suite_number) = ?', suite_number.downcase) if suite_number.present?
+
+    inbox_scope = scope.where(scope: 'inbox', inbox_id: resolve_target_inbox_id(actual_params))
+    return inbox_scope if inbox_scope.exists?
+
+    scope.where(scope: 'global')
+  end
+
+  def find_selected_items(actual_params)
+    items = find_items(actual_params)
+    return items if items.blank?
+
+    items.limit(normalize_limit(actual_params[:limit]))
+  end
+
+  def send_images(items)
+    items.count do |item|
+      next false unless item.image.attached?
+
+      Messages::MessageBuilder.new(@assistant, @conversation, {
+                                     content: item.description.to_s.truncate(220),
+                                     message_type: 'outgoing',
+                                     attachments: [item.image.blob.signed_id]
+                                   }).perform
+      true
+    end
+  end
+
+  def normalize_limit(value)
+    parsed = value.to_i
+    parsed = DEFAULT_LIMIT if parsed <= 0
+    [parsed, MAX_LIMIT].min
+  end
+
+  def normalize_filter(value)
+    value.to_s.strip.presence
+  end
+
+  def resolve_target_inbox_id(actual_params)
+    requested_inbox_id = actual_params[:inbox_id].presence
+    return @conversation.inbox_id if requested_inbox_id.blank?
+
+    Inbox.where(account_id: @conversation.account_id, id: requested_inbox_id).pick(:id) || @conversation.inbox_id
+  end
+
+  def no_images_response(actual_params)
+    category = normalize_filter(actual_params[:suite_category])
+    suite_number = normalize_filter(actual_params[:suite_number])
+
+    detail = []
+    detail << "categoria #{category}" if category.present?
+    detail << "suíte #{suite_number}" if suite_number.present?
+    detail_text = detail.present? ? " para #{detail.join(' e ')}" : ''
+
+    success_response("Não encontrei fotos cadastradas na galeria desta caixa de entrada nem no acervo global#{detail_text}.")
+  end
+
+  def success_payload(selected_items, sent_count, actual_params)
+    scope_used = selected_items.first&.scope || 'inbox'
+    scope_label = scope_used == 'global' ? 'acervo global' : 'caixa de entrada atual'
+
+    success_response(
+      "Enviei #{sent_count} foto(s) da galeria da #{scope_label} para te ajudar a escolher.",
+      scope: scope_used,
+      sent_count: sent_count,
+      suite_category: actual_params[:suite_category],
+      suite_number: actual_params[:suite_number]
+    )
+  end
+
+  def success_response(message, metadata = {})
+    {
+      formatted_message: message,
+      success: true
+    }.merge(metadata)
+  end
+
+  def error_response(message)
+    {
+      formatted_message: message,
+      success: false
+    }
+  end
+
+  def normalize_text(value)
+    value.to_s
+         .dup
+         .force_encoding(Encoding::UTF_8)
+         .encode(Encoding::UTF_8, invalid: :replace, undef: :replace, replace: '')
+  rescue StandardError
+    value.to_s.encode(Encoding::UTF_8, invalid: :replace, undef: :replace, replace: '')
+  end
+end
+# rubocop:enable Metrics/ClassLength
diff --git a/enterprise/app/services/enterprise/message_templates/hook_execution_service.rb b/enterprise/app/services/enterprise/message_templates/hook_execution_service.rb
index 56dbc7245..06b7161bc 100644
--- a/enterprise/app/services/enterprise/message_templates/hook_execution_service.rb
+++ b/enterprise/app/services/enterprise/message_templates/hook_execution_service.rb
@@ -30,12 +30,17 @@ module Enterprise::MessageTemplates::HookExecutionService
   private
 
   def schedule_captain_response
-    job_args = [conversation, conversation.inbox.captain_assistant]
+    job_args = [conversation, conversation.inbox.captain_assistant, message]
+    delay = conversation.inbox.typing_delay.to_i
 
     if message.attachments.blank?
-      Captain::Conversation::ResponseBuilderJob.perform_later(*job_args)
+      if delay.positive?
+        Captain::Conversation::ResponseBuilderJob.set(wait: delay.seconds).perform_later(*job_args)
+      else
+        Captain::Conversation::ResponseBuilderJob.perform_later(*job_args)
+      end
     else
-      wait_time = calculate_attachment_wait_time
+      wait_time = calculate_attachment_wait_time + delay.seconds
       Captain::Conversation::ResponseBuilderJob.set(wait: wait_time).perform_later(*job_args)
     end
   end
diff --git a/enterprise/app/views/api/v1/accounts/captain/inboxes/index.json.jbuilder b/enterprise/app/views/api/v1/accounts/captain/inboxes/index.json.jbuilder
index 72548f53a..5e9c1a018 100644
--- a/enterprise/app/views/api/v1/accounts/captain/inboxes/index.json.jbuilder
+++ b/enterprise/app/views/api/v1/accounts/captain/inboxes/index.json.jbuilder
@@ -1,10 +1,12 @@
 json.payload do
-  json.array! @inboxes do |inbox|
-    json.partial! 'api/v1/models/inbox', formats: [:json], resource: inbox
+  json.array! @captain_inboxes do |captain_inbox|
+    json.partial! 'api/v1/models/inbox', formats: [:json], resource: captain_inbox.inbox
+    json.captain_unit_id captain_inbox.captain_unit_id
+    json.captain_unit_name captain_inbox.captain_unit&.name
   end
 end
 
 json.meta do
-  json.total_count @inboxes.count
+  json.total_count @captain_inboxes.count
   json.page 1
 end
diff --git a/enterprise/app/views/api/v1/accounts/captain/reservations/index.json.jbuilder b/enterprise/app/views/api/v1/accounts/captain/reservations/index.json.jbuilder
new file mode 100644
index 000000000..b31cdd1b9
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/captain/reservations/index.json.jbuilder
@@ -0,0 +1,10 @@
+json.payload do
+  json.array! @reservations do |reservation|
+    json.partial! 'api/v1/models/captain/reservation', formats: [:json], resource: reservation
+  end
+end
+
+json.meta do
+  json.total_count @reservations_count
+  json.page @current_page
+end
diff --git a/enterprise/app/views/api/v1/accounts/captain/reservations/show.json.jbuilder b/enterprise/app/views/api/v1/accounts/captain/reservations/show.json.jbuilder
new file mode 100644
index 000000000..709dc968c
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/captain/reservations/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'api/v1/models/captain/reservation', formats: [:json], resource: @reservation
diff --git a/enterprise/app/views/api/v1/models/captain/_reservation.json.jbuilder b/enterprise/app/views/api/v1/models/captain/_reservation.json.jbuilder
new file mode 100644
index 000000000..44a7ffc6b
--- /dev/null
+++ b/enterprise/app/views/api/v1/models/captain/_reservation.json.jbuilder
@@ -0,0 +1,36 @@
+marker = Captain::Reservations::MarkerBuilder.build_for(resource)
+contact = resource.contact
+unit = resource.unit
+conversation = resource.conversation
+
+json.id resource.id
+json.status resource.status
+json.status_label marker['status_label']
+json.ui_status marker['status']
+json.payment_status resource.payment_status
+json.suite_identifier resource.suite_identifier
+json.check_in_at resource.check_in_at&.iso8601
+json.check_out_at resource.check_out_at&.iso8601
+json.updated_at resource.updated_at&.iso8601
+json.created_at resource.created_at&.iso8601
+
+json.total_amount resource.total_amount.to_f
+json.deposit_amount marker['deposit_amount']&.to_f
+json.amount marker['amount']&.to_f
+json.amount_kind marker['amount_kind']
+
+json.customer_name contact&.name
+json.customer_phone contact&.phone_number
+json.customer_cpf contact&.custom_attributes&.dig('cpf')
+
+json.unit_id unit&.id
+json.unit_name unit&.name
+
+json.conversation_id conversation&.id || resource.conversation_id
+json.conversation_display_id conversation&.display_id
+
+json.pix_copy_paste marker['pix_copy_paste']
+json.pix_reason marker['pix_reason']
+json.pix_status marker['pix_status']
+
+json.reservation_marker marker
diff --git a/enterprise/app/views/enterprise/api/v1/conversations/partials/_conversation.json.jbuilder b/enterprise/app/views/enterprise/api/v1/conversations/partials/_conversation.json.jbuilder
index 5a390a68b..b1d59d780 100644
--- a/enterprise/app/views/enterprise/api/v1/conversations/partials/_conversation.json.jbuilder
+++ b/enterprise/app/views/enterprise/api/v1/conversations/partials/_conversation.json.jbuilder
@@ -8,3 +8,5 @@ if conversation.account.feature_enabled?('sla')
     end
   end
 end
+
+json.reservation_marker conversation.reservation_marker_payload if defined?(Captain::Reservation)
diff --git a/enterprise/lib/captain/conversation/reaction_policy.rb b/enterprise/lib/captain/conversation/reaction_policy.rb
new file mode 100644
index 000000000..08a1b04dc
--- /dev/null
+++ b/enterprise/lib/captain/conversation/reaction_policy.rb
@@ -0,0 +1,52 @@
+module Captain::Conversation::ReactionPolicy
+  REACTION_SAMPLE_RATE = 5
+  GREETING_PATTERNS = [
+    /\boi\b/,
+    /\bola\b/,
+    /\bbom dia\b/,
+    /\bboa tarde\b/,
+    /\bboa noite\b/,
+    /\be ai\b/,
+    /\bhello\b/,
+    /\bhi\b/,
+    /\bhey\b/
+  ].freeze
+  FAREWELL_PATTERNS = [
+    /\btchau\b/,
+    /\bate mais\b/,
+    /\bate logo\b/,
+    /\bfalou\b/,
+    /\bvaleu\b/,
+    /\bbye\b/,
+    /\bgoodbye\b/,
+    /\bsee you\b/
+  ].freeze
+
+  private
+
+  def should_send_reaction_for?(target_message)
+    return false if @response['reaction_emoji'].blank?
+    return false if target_message.blank?
+    return true if greeting_or_farewell?(target_message.content)
+
+    sampled_reaction_slot?(target_message)
+  end
+
+  def sampled_reaction_slot?(target_message)
+    (target_message.id % REACTION_SAMPLE_RATE).zero?
+  end
+
+  def greeting_or_farewell?(text)
+    normalized = normalize_reaction_text(text)
+    GREETING_PATTERNS.any? { |pattern| normalized.match?(pattern) } ||
+      FAREWELL_PATTERNS.any? { |pattern| normalized.match?(pattern) }
+  end
+
+  def normalize_reaction_text(text)
+    I18n.transliterate(text.to_s.downcase)
+  end
+
+  def last_incoming_message
+    @conversation.messages.where(message_type: :incoming).last
+  end
+end
diff --git a/enterprise/lib/captain/prompts/assistant.liquid b/enterprise/lib/captain/prompts/assistant.liquid
index 0dc7d8577..cb06bc8f1 100644
--- a/enterprise/lib/captain/prompts/assistant.liquid
+++ b/enterprise/lib/captain/prompts/assistant.liquid
@@ -41,6 +41,19 @@ Always respect these boundaries:
 {% endfor %}
 {% endif -%}
 
+# Message Reactions (Emoji)
+You have an optional field `reaction_emoji` in your response output.
+CRITICAL: Do NOT react to every single message! This makes the interaction feel artificial.
+- Use emojis naturally and sparingly, just like a human would.
+- Appropriate uses: Greetings (👋), confirming you are looking into something (👀), agreements (👍), or celebrations (🎉).
+- AVOID reacting to serious complaints or basic continuous questions if the tone doesn't fit.
+- If you just sent an emoji in the previous turn, try to hold off on sending another right away. When in doubt, leave `reaction_emoji` empty.
+- Frequency policy:
+  - Prefer reaction on greeting/farewell messages.
+  - For regular conversation, react only occasionally (roughly 20% of turns or less).
+  - If uncertain, keep `reaction_emoji` empty.
+
+
 # Decision Framework
 
 ## 1. Analyze the Request
@@ -49,17 +62,27 @@ First, understand what the user is asking:
 - **Type**: Is it a question, task, complaint, or request?
 - **Complexity**: Can you handle it or does it need specialized expertise?
 
-## 2. Check for Specialized Scenarios First
+## 2. Route by Intent Type
+Decide the route before any handoff:
+- **Factual question** (prices, rules, policies, amenities, schedules, hotel information): treat this as knowledge retrieval.
+- **Execution request** (create reservation, generate Pix, update booking/payment status, operational flow steps): treat this as scenario execution.
 
-Before using any tools, check if the request matches any of these scenarios. If it seems like a particular scenario matches, use the specific handoff tool to transfer the conversation to the specific agent. The following are the scenario agents that are available to you.
+### 2A. For factual questions (FAQ-first, no premature handoff)
+1. Use `captain--tools--faq_lookup` first.
+2. If FAQ returns relevant info, answer directly.
+3. Only handoff to a scenario if the user is explicitly asking to execute a flow after/along with the factual answer.
+4. Never say you don't have access to factual information without trying `faq_lookup` first.
 
+### 2B. For execution requests (scenario-first)
+If the request clearly matches a specialized execution flow, handoff to the right scenario.
+Available scenario agents:
 {% for scenario in scenarios -%}
-- {{ scenario.title }}: {{ scenario.description }}, use the `handoff_to_{{ scenario.key }}` tool to transfer the conversation to the {{ scenario.title }} agent.
+- {{ scenario.title }}: {{ scenario.description }}. Use `handoff_to_{{ scenario.key }}`.
 {% endfor %}
-If unclear, ask clarifying questions to determine if a scenario applies:
+If unclear, ask clarifying questions before choosing.
 
 ## 3. Handle the Request
-If no specialized scenario clearly matches, handle it yourself in the following way
+If no specialized execution scenario clearly matches, handle it yourself.
 
 ### For Questions and Information Requests
 1. **First, check existing knowledge**: Use `captain--tools--faq_lookup` tool to search for relevant information
diff --git a/enterprise/lib/captain/prompts/scenario.liquid b/enterprise/lib/captain/prompts/scenario.liquid
index 1148a7c3a..ec005a2bb 100644
--- a/enterprise/lib/captain/prompts/scenario.liquid
+++ b/enterprise/lib/captain/prompts/scenario.liquid
@@ -45,4 +45,32 @@ You have access to these tools:
 {% for tool in tools -%}
 - {{ tool.id }}: {{ tool.description }}
 {% endfor %}
+
+{% assign has_faq_lookup = false %}
+{% assign has_check_pix_payment = false %}
+{% for tool in tools -%}
+{% if tool.id == 'faq_lookup' -%}
+{% assign has_faq_lookup = true %}
+{% endif -%}
+{% if tool.id == 'check_pix_payment' -%}
+{% assign has_check_pix_payment = true %}
+{% endif -%}
+{% endfor -%}
+
+{% if has_faq_lookup -%}
+# Knowledge Requirement
+Before answering with any factual hotel information (prices, policies, rules, schedules, amenities, passwords), call the `faq_lookup` tool first in the current turn.
+When answering prices or reservation amounts, use only values returned by `faq_lookup` in this turn. Do not infer or reuse old values from conversation memory.
+Only say the information is unavailable if `faq_lookup` does not return relevant results.
+{% endif -%}
+
+{% if has_check_pix_payment -%}
+# Payment Verification Requirement
+If the customer says they already paid the Pix ("já paguei", "paguei o pix", "acabei de pagar", "segue comprovante"), call `check_pix_payment` before saying payment is pending or before handing off.
+Use the tool response as the source of truth for payment status in that turn.
+{% endif -%}
+
+# Orchestrator Boundary
+If the user asks a broad factual question that is not required to execute this scenario's current workflow step, transfer back to the orchestrator using `handoff_to_{{ assistant_name }}`.
+Use this scenario primarily for execution tasks, not as a generic knowledge router.
 {%- endif %}
diff --git a/enterprise/lib/captain/response_schema.rb b/enterprise/lib/captain/response_schema.rb
index 651eb7e23..55f4b9cbb 100644
--- a/enterprise/lib/captain/response_schema.rb
+++ b/enterprise/lib/captain/response_schema.rb
@@ -3,4 +3,8 @@
 class Captain::ResponseSchema < RubyLLM::Schema
   string :response, description: 'The message to send to the user'
   string :reasoning, description: "Agent's thought process"
+  string :reaction_emoji,
+         description: 'Optional. A single emoji to react naturally. Prefer greetings/farewells ' \
+                      'and occasional moments only (~20% of normal turns max). Do NOT react ' \
+                      'to every message. Default to empty string if no specific reaction is needed.'
 end
diff --git a/enterprise/lib/captain/tools/faq_lookup_tool.rb b/enterprise/lib/captain/tools/faq_lookup_tool.rb
index 93dd90259..4db88dc76 100644
--- a/enterprise/lib/captain/tools/faq_lookup_tool.rb
+++ b/enterprise/lib/captain/tools/faq_lookup_tool.rb
@@ -3,15 +3,19 @@ class Captain::Tools::FaqLookupTool < Captain::Tools::BasePublicTool
   param :query, type: 'string', desc: 'The question or topic to search for in the FAQ database'
 
   def perform(_tool_context, query:)
+    Rails.logger.info "[Captain][FaqLookupTool] Starting search with query: '#{query}'"
     log_tool_usage('searching', { query: query })
 
     # Use existing vector search on approved responses
     responses = @assistant.responses.approved.search(query).to_a
+    Rails.logger.info "[Captain][FaqLookupTool] Query returned #{responses.size} results."
 
     if responses.empty?
+      Rails.logger.info "[Captain][FaqLookupTool] No results found for: #{query}"
       log_tool_usage('no_results', { query: query })
       "No relevant FAQs found for: #{query}"
     else
+      Rails.logger.info '[Captain][FaqLookupTool] Found results, formatting...'
       log_tool_usage('found_results', { query: query, count: responses.size })
       format_responses(responses)
     end
diff --git a/get_error.js b/get_error.js
new file mode 100644
index 000000000..b4b1bcbcd
--- /dev/null
+++ b/get_error.js
@@ -0,0 +1,27 @@
+const { chromium } = require('playwright');
+const fs = require('fs');
+
+(async () => {
+  const browser = await chromium.launch({ headless: true });
+  const context = await browser.newContext();
+  const page = await context.newPage();
+  
+  // Listen for console errors
+  page.on('console', msg => {
+    if (msg.type() === 'error') {
+      console.log('Browser Error:', msg.text());
+    }
+  });
+
+  page.on('pageerror', err => {
+    console.log('Page Error:', err.message);
+    console.log('Stack:', err.stack);
+    fs.writeFileSync('error_trace.txt', err.stack);
+  });
+
+  // Since we don't have a live authenticated session here easily, 
+  // maybe the error happens even without auth? Or we can just read the server logs if it's SSR?
+  // Chatwoot is an SPA mostly for dashboard.
+  // Wait, the user already provided the error: "TypeError: Cannot read properties of null (reading 'emitsOptions')"
+  await browser.close();
+})();
diff --git a/informacoes/inter_api b/informacoes/inter_api
new file mode 100644
index 000000000..aaea900de
--- /dev/null
+++ b/informacoes/inter_api
@@ -0,0 +1,95 @@
+# Documentação Técnica: Integração Banco Inter API (Pix V2)
+
+Esta documentação descreve a integração com a API de Parceiros do Banco Inter (CDPJ) para processamento de pagamentos via Pix, implementada no ecossistema Captain/Chatwoot.
+
+## 🔑 Autenticação e Segurança
+
+A API do Banco Inter utiliza um modelo de segurança robusto baseado em **Mutual TLS (mTLS)** e **OAuth2**.
+
+- **Protocolo**: HTTPS com Certificado Digital (Chave Pública e Privada).
+- **OAuth2 Flow**: `client_credentials`.
+- **Scopes Utilizados**: `cob.write`, `cob.read`, `webhook.write`, `webhook.read`, `extrato.read`.
+- **Headers Mandatórios**:
+  - `x-conta-corrente`: Número da conta corrente do parceiro.
+  - `Authorization`: Token Bearer obtido via OAuth2.
+
+### Credenciais
+As credenciais são configuradas por Unidade (`Captain::Unit`) e incluem:
+- `client_id` / `client_secret`
+- `inter_cert_path` e `inter_key_path` (Caminhos para arquivos `.pem`)
+- `inter_pix_key` (Chave Pix CPF/CNPJ/E-mail/EVP)
+
+---
+
+## 🚀 Fluxo de Cobrança Pix (Cobrança Imediata)
+
+O sistema utiliza o endpoint de **Cobrança Imediata (Cob)** para gerar faturas Pix para reservas.
+
+### 1. Geração da Cobrança
+**Endpoint**: `POST https://cdpj.partners.bancointer.com.br/pix/v2/cob`  
+**Serviços Locais**: `Captain::Inter::CobService` e `Captain::InterService`.
+
+**Payload Exemplo**:
+```json
+{
+  "calendario": { "expiracao": 3600 },
+  "devedor": {
+    "cpf": "12345678900",
+    "nome": "Nome do Cliente"
+  },
+  "valor": { "original": "150.00" },
+  "chave": "sua-chave-pix@email.com",
+  "solicitacaoPagador": "Reserva #12345"
+}
+```
+
+### 2. Pix One-Tap (Link Seguro)
+Para melhorar a UX no WhatsApp, foi implementado o fluxo **One-Tap**:
+- Em vez de enviar o código bruto (geralmente muito longo), o bot envia um link curto: `https://seu-dominio/r/:token`.
+- O `:token` é um **SGID (Signed Global ID)** com expiração de 2 horas.
+- Ao abrir o link, o cliente vê uma página otimizada com o botão "Copiar Pix" e feedback visual.
+
+---
+
+## 🔗 Webhooks e Confirmação
+
+O Banco Inter notifica o sistema sobre o pagamento através de webhooks.
+
+- **Endpoint**: `POST /public/api/v1/captain/inter_webhooks`
+- **Controller**: `Public::Api::V1::Captain::InterWebhooksController`
+
+**Processamento**:
+1. Extração do `txid` (Transaction ID) e `endToEndId` (Identificador E2E do Banco Central).
+2. Verificação de idempotência (evita processar o mesmo pagamento duas vezes).
+3. Atualização do status da `Captain::PixCharge` para `paid`.
+4. Disparo do `Captain::Payments::ConfirmationService` para validar a reserva.
+5. Mensagem automática enviada via Chatwoot confirmando o pagamento para o cliente.
+
+---
+
+## 🛠️ Modelos de Dados Principais
+
+### `Captain::PixCharge`
+- Atributos: `txid`, `e2eid`, `status` (active, paid, expired, failed), `pix_copia_e_cola`.
+- Relações: `belongs_to :reservation`, `belongs_to :unit`.
+
+---
+
+## 📂 Localização dos Arquivos
+
+| Componente | Caminho |
+| :--- | :--- |
+| **Service Principal** | `app/services/captain/inter_service.rb` |
+| **Service Enterprise** | `enterprise/app/services/captain/inter/cob_service.rb` |
+| **Controller Webhook** | `app/controllers/public/api/v1/captain/inter_webhooks_controller.rb` |
+| **Model** | `enterprise/app/models/captain/pix_charge.rb` |
+| **Página de Pagamento** | `app/views/public/api/v1/captain/payments/show.html.erb` |
+
+---
+
+## 📝 Notas de Manutenção (Ressalvas)
+- **Encoding**: Foi corrigido um bug crítico onde a API do Inter retornava caracteres em encoding binário que causavam falha no Rails ao renderizar JSON. Sempre use `.force_encoding('UTF-8')` ao lidar com a resposta da API do Inter.
+- **Ambiente de Dev**: No ambiente de desenvolvimento local, o sistema sanitiza URLs de `0.0.0.0` para `127.0.0.1` para garantir que o link One-Tap seja acessível localmente.
+
+---
+*Documentação gerada em 23/02/2026 baseada na análise técnica do repositório local devido à instabilidade do Notion.*
diff --git a/lib/integrations/llm_instrumentation.rb b/lib/integrations/llm_instrumentation.rb
index 326bb901e..483ae5095 100644
--- a/lib/integrations/llm_instrumentation.rb
+++ b/lib/integrations/llm_instrumentation.rb
@@ -10,8 +10,8 @@ module Integrations::LlmInstrumentation
   def instrument_llm_call(params)
     return yield unless ChatwootApp.otel_enabled?
 
-    result = nil
     executed = false
+    result = nil
     tracer.in_span(params[:span_name]) do |span|
       setup_span_attributes(span, params)
       result = yield
@@ -21,14 +21,16 @@ module Integrations::LlmInstrumentation
     end
   rescue StandardError => e
     ChatwootExceptionTracker.new(e, account: resolve_account(params)).capture_exception
-    executed ? result : yield
+    raise e unless executed
+
+    result
   end
 
   def instrument_agent_session(params)
     return yield unless ChatwootApp.otel_enabled?
 
-    result = nil
     executed = false
+    result = nil
     tracer.in_span(params[:span_name]) do |span|
       set_metadata_attributes(span, params)
 
@@ -42,7 +44,9 @@ module Integrations::LlmInstrumentation
     end
   rescue StandardError => e
     ChatwootExceptionTracker.new(e, account: resolve_account(params)).capture_exception
-    executed ? result : yield
+    raise e unless executed
+
+    result
   end
 
   def instrument_tool_call(tool_name, arguments)
diff --git a/package.json b/package.json
index 5663b77a6..13cab01d0 100644
--- a/package.json
+++ b/package.json
@@ -149,8 +149,8 @@
     "vitest": "3.0.5"
   },
   "engines": {
-    "node": "24.x",
-    "pnpm": "10.x"
+    "node": ">=22.x",
+    "pnpm": ">=9.x"
   },
   "husky": {
     "hooks": {
diff --git a/progresso/2026-02-22_migracao_dos_canais_wuzapi_e_evolution.md b/progresso/2026-02-22_migracao_dos_canais_wuzapi_e_evolution.md
new file mode 100644
index 000000000..38e3c3c18
--- /dev/null
+++ b/progresso/2026-02-22_migracao_dos_canais_wuzapi_e_evolution.md
@@ -0,0 +1,59 @@
+# Migração dos Canais Não-Oficiais (Wuzapi e Evolution API)
+
+**Data:** 22/02/2026
+**Autor:** Assistente AI / Arquiteto de Software
+
+## Objetivo
+Transferir toda a implementação de canais de WhatsApp não-oficiais (Wuzapi e Evolution API) do projeto de referência para o novo projeto focado em IA, visando aproveitar as abstrações e integrações previamente construídas de forma segura.
+
+## Contexto
+O projeto referência já continha suporte robusto a provedores como Wuzapi e Evolution API para o canal do WhatsApp. O novo projeto precisa herdar essa capacidade, já que os disparos e interações automatizadas vão continuar usando números do WhatsApp debaixo destes provedores, por uma questão de custo e viabilidade.
+
+## Passos Realizados
+
+1. **Atualização do Banco de Dados (Migrações):**
+   - Foram migradas as dependências para `channel_whatsapp` receber tokens encriptados.
+   - Um conflito de migração duplicada (`AddNameToWebhooks`) foi corrigido, apagando-se o arquivo colidente e executando `bundle exec rails db:migrate`.
+
+2. **Rotas e Controladores:**
+   - Adicionadas as rotas `resource :wuzapi` aninhado dentro dos membros das inboxes.
+   - Adicionada a rota global para receber playloads de eventos em `webhooks/wuzapi/:inbox_id`.
+
+3. **Backend Service & Model (`app/`):**
+   - Transposto o modelo `app/models/channel/whatsapp.rb` para contemplar provisionamento do Wuzapi e Evolution API (`provision_wuzapi_user`, tratamento de `provider_config`).
+   - Copiados os Providers de Serviço em `app/services/whatsapp/providers/wuzapi_service.rb` e `evolution_service.rb`.
+   - Copiados os módulos de Clients HTTP (Acesso Wuzapi/Evolution) alocados em `app/services/wuzapi` e `app/services/evolution_api`.
+
+4. **Frontend Dashboard (`app/javascript/`):**
+   - Transpostos os componentes Vue associados aos canais (`Wuzapi.vue`, `EvolutionGo.vue`, etc.) de `/channels/`.
+   - Modificados os componentes pais (`Settings.vue` e `Whatsapp.vue`) para exibir as seleções Wuzapi e Evolution através da constante global `PROVIDER_TYPES`.
+   - Subscrevida a pasta de locales correspondente (`dashboard/i18n/locale/*/inboxMgmt.json` e `jasmine.json`) contendo as chaves de UX de configuração dos formulários.
+
+## Principais Arquivos Alterados / Criados
+
+- `config/routes.rb`
+- `app/models/channel/whatsapp.rb`
+- `app/services/whatsapp/providers/wuzapi_service.rb`
+- `app/services/whatsapp/providers/evolution_service.rb`
+- `app/services/wuzapi/*` e `app/services/evolution_api/*`
+- `app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Wuzapi.vue` e `EvolutionGo.vue`
+- `app/javascript/dashboard/i18n/locale/...`
+
+## Como Validar
+
+1. **Reiniciar o Servidor Rails e Webpack:**
+   ```bash
+   # Parar o serviço web/worker e webpack-dev-server se rodando manualmente, e inicializá-los
+   bundle exec rails restart
+   ```
+2. **Acessar o Painel Front-end:**
+   Vá em Configurações > Caixas de Entrada > Adicionar Caixa de Entrada > Whatsapp.
+   O usuário deverá ver os cards "Wuzapi" e "Evolution API" entre os provedores selecionáveis.
+3. **Homologar a Conexão Wuzapi/Evolution:**
+   Clicar sobre Wuzapi, fornecer tokens e base URL definidos, e escanear o QR Code gerado. O Status deverá constar como conectado.
+
+## Como Reverter
+- Remover as pastas `app/services/wuzapi` e `app/services/evolution_api`.
+- Retirar os imports e chamadas em `app/models/channel/whatsapp.rb`.
+- Reverter o commit nos componentes `Settings.vue` e `Whatsapp.vue`.
+- Rodar migrações de "down" referentes as colunas inseridas em `channel_whatsapp`.
diff --git a/progresso/2026-02-24_faq_guardrail_e_orquestracao.md b/progresso/2026-02-24_faq_guardrail_e_orquestracao.md
new file mode 100644
index 000000000..44925fbe0
--- /dev/null
+++ b/progresso/2026-02-24_faq_guardrail_e_orquestracao.md
@@ -0,0 +1,74 @@
+# Ajuste de Orquestração + Guardrail de FAQ (Captain/Jasmine)
+
+**Data:** 24/02/2026  
+**Autor:** Codex (AI Developer)
+
+## Objetivo
+Garantir que o agente **não responda “não sei / não tenho acesso” sem antes consultar FAQ**, e evitar que a conversa fique presa em um cenário que ignora FAQ.
+
+## Problema Observado
+- Em algumas conversas, o agente respondia corretamente usando FAQ (ex.: preços), mas em outras respostas dizia que “não tinha acesso” (ex.: senha do Wi-Fi).
+- Isso gerava comportamento inconsistente e perda de confiança.
+
+## Causa-Raiz
+1. **Sticky de cenário no histórico**  
+   O runner podia iniciar o turno no último `agent_name` do histórico (ex.: cenário de disponibilidade), em vez de iniciar no orquestrador principal.
+
+2. **Guardrail com detecção ampla demais de `faq_lookup`**  
+   A checagem considerava `faq_lookup` em `result.messages` inteiro.  
+   Se houve `faq_lookup` em turno anterior, isso podia bloquear o fallback no turno atual.
+
+## O que foi implementado
+
+### 1) Início de turno sempre pelo orquestrador
+- O contexto da execução foi padronizado para iniciar no agente principal (`current_agent` do assistente).
+- O `conversation_history` enviado ao runner zera `agent_name` das mensagens para evitar lock indevido em cenário.
+
+### 2) Guardrail de FAQ para respostas de incerteza
+- Foi criado um guardrail em `AgentRunnerService`:
+  - Detecta respostas de incerteza (`não sei`, `não tenho`, etc.).
+  - Se **não houve `faq_lookup` no turno atual**, dispara fallback de FAQ via busca semântica (`@assistant.responses.approved.search(query)`).
+  - Se encontrar resposta no FAQ, substitui a resposta final.
+  - Se não encontrar, responde explicitamente:
+    - “Consultei o FAQ e não encontrei essa informação cadastrada ainda...”
+    - Evita resposta genérica “não sei” sem contexto.
+
+### 3) Correção de escopo do `faq_lookup`
+- A verificação agora considera apenas mensagens **após a última pergunta do usuário do turno atual**.
+- Isso evita falso positivo de `faq_lookup` antigo.
+
+## Arquivos Alterados
+- `/Users/user/Dev/Produtos/Chatwoot-fazer-ai/fazer-ai-kanban/chatwoot/enterprise/app/services/captain/assistant/agent_runner_service.rb`
+- `/Users/user/Dev/Produtos/Chatwoot-fazer-ai/fazer-ai-kanban/chatwoot/spec/enterprise/services/captain/assistant/agent_runner_service_spec.rb`
+
+## Testes e Validação
+- Executado:
+  - `bundle exec rspec spec/enterprise/services/captain/assistant/agent_runner_service_spec.rb`
+- Resultado:
+  - **29 examples, 0 failures**
+
+Casos cobertos em teste:
+- fallback aplicado quando resposta incerta vem sem `faq_lookup`;
+- não aplica fallback quando `faq_lookup` ocorreu no turno atual;
+- aplica fallback quando `faq_lookup` ocorreu apenas em turno anterior;
+- retorna mensagem explícita de “FAQ não encontrado” quando busca não acha nada.
+
+## Observabilidade (logs)
+Foram mantidos logs para rastrear guardrail:
+- Trigger do guardrail com query;
+- Quantidade de resultados encontrados na busca FAQ;
+- Falha de fallback (se houver exception).
+
+## Impacto Prático
+- O agente deixa de “desistir” sem consultar conhecimento.
+- Reduz respostas incoerentes entre perguntas parecidas.
+- Mantém handoff para humano apenas quando realmente necessário.
+
+## Limitações Atuais
+- Se o FAQ estiver mal cadastrado ou com baixa qualidade semântica, o fallback ainda pode não encontrar resposta.
+- O guardrail atua em respostas de incerteza; não corrige respostas erradas factualmente quando o modelo responde com confiança indevida.
+
+## Próximos Passos Recomendados
+1. Revisar/normalizar entradas de FAQ críticas (Wi-Fi, horários, políticas, preços).
+2. Adicionar métrica de “fallback guardrail acionado” por inbox/assistente.
+3. Opcional: forçar política “FAQ-first” para intents informativas antes de responder livremente.
diff --git a/progresso/como-criar-pagina-settings.md b/progresso/como-criar-pagina-settings.md
new file mode 100644
index 000000000..95cc10727
--- /dev/null
+++ b/progresso/como-criar-pagina-settings.md
@@ -0,0 +1,204 @@
+# Como Criar uma Nova Página de Settings no Chatwoot
+
+**Data:** 2026-02-22
+
+## Objetivo
+
+Criar uma nova tela na área de Configurações do dashboard do Chatwoot (ex: `/settings/captain/units`).
+
+## Contexto
+
+O Chatwoot usa **Vue 3 com Composition API** (`<script setup>`). Telas de settings antigas usavam Options API e `woot-button`, mas o padrão atual usa componentes do `dashboard/components-next`. Usar o padrão antigo causa **tela em branco** (crash silencioso).
+
+---
+
+## Passo a Passo
+
+### 1. Criar o arquivo Vue da página
+
+Local padrão: `app/javascript/dashboard/routes/dashboard/settings/<area>/<NomeDaPagina>.vue`
+
+**Template mínimo funcional:**
+
+```vue
+<script setup>
+import { ref, computed, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
+import { useStore, useMapGetter } from 'dashboard/composables/store';
+import { useAlert } from 'dashboard/composables';
+import { useI18n } from 'vue-i18n';
+import SettingsLayout from '../SettingsLayout.vue';
+import BaseSettingsHeader from '../components/BaseSettingsHeader.vue';
+import Button from 'dashboard/components-next/button/Button.vue';
+import Dialog from 'dashboard/components-next/dialog/Dialog.vue';
+
+const { t } = useI18n();
+const router = useRouter();
+const store = useStore();
+
+// Exemplo: getter de uma store Vuex namespaced
+const records = useMapGetter('minhaStore/getRecords');
+const uiFlags = useMapGetter('minhaStore/getUIFlags');
+
+const deleteDialogRef = ref(null);
+const itemToDelete = ref(null);
+
+onMounted(async () => {
+  await store.dispatch('minhaStore/get');
+});
+</script>
+
+<template>
+  <SettingsLayout
+    :is-loading="uiFlags.isFetching"
+    :loading-message="t('MINHA_SECAO.LOADING')"
+  >
+    <template #header>
+      <BaseSettingsHeader
+        :title="t('MINHA_SECAO.TITLE')"
+        :description="t('MINHA_SECAO.DESC')"
+      >
+        <template #actions>
+          <Button
+            :label="t('MINHA_SECAO.ADD')"
+            icon="i-lucide-plus"
+            @click="goToNew"
+          />
+        </template>
+      </BaseSettingsHeader>
+    </template>
+
+    <template #body>
+      <div class="flex flex-col px-6 pb-8">
+        <!-- conteúdo aqui -->
+
+        <!-- Para modal de confirmação de exclusão -->
+        <Dialog
+          ref="deleteDialogRef"
+          type="alert"
+          :title="t('MINHA_SECAO.DELETE.TITLE')"
+          :description="t('MINHA_SECAO.DELETE.MESSAGE')"
+          :confirm-button-label="t('MINHA_SECAO.DELETE.YES')"
+          @confirm="confirmDelete"
+        />
+      </div>
+    </template>
+  </SettingsLayout>
+</template>
+```
+
+> ⚠️ **CRÍTICO:** O `Dialog` de confirmação deve ficar **dentro** do slot `#body`, nunca fora do `<SettingsLayout>`. Dois root elements causam tela branca no Vue 3.
+
+---
+
+### 2. Registrar a rota
+
+Arquivo: `app/javascript/dashboard/routes/dashboard/settings/<area>/<area>.routes.js`
+
+```js
+import MinhaNovaPage from './MinhaNovaPage.vue';
+
+// Dentro de children:
+{
+  path: 'minha-rota',
+  name: 'minha_rota_name',
+  component: MinhaNovaPage,
+  meta: { permissions: ['administrator'] },
+},
+```
+
+---
+
+### 3. Adicionar item no Sidebar
+
+Arquivo: `app/javascript/dashboard/components-next/sidebar/Sidebar.vue`
+
+Dentro do grupo correto (ex: Captain), adicione:
+
+```js
+{
+  name: 'Minha Página',
+  label: t('SIDEBAR.MINHA_CHAVE'),
+  activeOn: ['minha_rota_name'],
+  to: accountScopedRoute('minha_rota_name'),
+},
+```
+
+---
+
+### 4. Adicionar traduções
+
+**Sidebar key** → `app/javascript/dashboard/i18n/locale/pt_BR/settings.json`:
+```json
+"SIDEBAR": {
+  "MINHA_CHAVE": "Minha Página"
+}
+```
+
+**Textos da página** → Criar ou editar o arquivo específico da feature em `i18n/locale/pt_BR/`:
+```json
+{
+  "MINHA_SECAO": {
+    "TITLE": "...",
+    "DESC": "...",
+    "ADD": "Adicionar",
+    "DELETE": {
+      "TITLE": "Confirmar exclusão",
+      "MESSAGE": "Tem certeza?",
+      "YES": "Excluir"
+    }
+  }
+}
+```
+
+---
+
+### 5. Criar ou registrar a Vuex Store (se necessário)
+
+Arquivo: `app/javascript/dashboard/store/modules/minhaStore.js`
+
+```js
+export const state = {
+  records: [],
+  uiFlags: { isFetching: false, isDeleting: false },
+};
+
+export const getters = {
+  getRecords: $state => $state.records,
+  getUIFlags: $state => $state.uiFlags,
+};
+
+// ... actions e mutations
+
+export default {
+  namespaced: true,
+  state, getters, actions, mutations,
+};
+```
+
+Registrar em `app/javascript/dashboard/store/index.js`:
+```js
+import minhaStore from './modules/minhaStore';
+// dentro de modules:
+minhaStore,
+```
+
+---
+
+## Componentes Disponíveis (components-next)
+
+| Componente | Import |
+|---|---|
+| `Button` | `dashboard/components-next/button/Button.vue` |
+| `Dialog` | `dashboard/components-next/dialog/Dialog.vue` |
+| `Input` | `dashboard/components-next/input/Input.vue` |
+| `TextArea` | `dashboard/components-next/textarea/TextArea.vue` |
+| `Icon` | `dashboard/components-next/icon/Icon.vue` |
+
+Ícones usam o prefixo `i-lucide-*` (ex: `i-lucide-plus`, `i-lucide-trash-2`, `i-lucide-pencil`).
+
+---
+
+## Exemplo real
+
+Ver `app/javascript/dashboard/routes/dashboard/settings/captain/units/Index.vue` — tela de Unidades Pix implementada com sucesso seguindo este padrão.
diff --git a/progresso/leitura-de-imagem-llm-v2.md b/progresso/leitura-de-imagem-llm-v2.md
new file mode 100644
index 000000000..3caad73bd
--- /dev/null
+++ b/progresso/leitura-de-imagem-llm-v2.md
@@ -0,0 +1,21 @@
+# Correção do Motor de Visão Computacional (Leitura de Imagens da IA) - V2
+
+## O Problema
+O AgentRunnerService foi ajustado para permitir envios multimodais à IA (OpenAI), no entanto, o usuário relatou que a IA passou a *alucinar* as imagens (informando ver "horário 00:00" em imagens perfeitamente formatadas).
+
+## Causa Raiz Descoberta
+Através de debugging do payload dentro dos scripts internos, descobrimos sucessivos problemas:
+1. **Bloqueio de Download:** O Ngrok estava barrando o acesso à "image url" pela API da OpenAI. Resolvido enviando em Base64 Data URI nativamente no Payload.
+2. **Coerção de Array em String (O Motivo da Cegueira da IA):** O payload em Base64 era uma `Array`. Contudo, ao passá-lo para a gem que orquestra os agentes (`ruby_llm`), foi descoberto que a biblioteca pegava nossa Array contendo o Base64 e convertia para formato "JSON String" antes de mandar pra OpenAI.
+- Como chegava como Texto e não Objeto para o Servidor GPT, a Inteligência Artificial via um texto gigantesco incompreensível ao invés de uma "Imagem Analisável", levando a alucinações onde tentava apenas tirar conclusões da mensagem do usuário em si.
+
+## Solução Implementada
+Refatoramos o serviço `Captain::OpenAiMessageBuilderService`. Utilizando uma técnica presente no antigo projeto legado (`vision_service.rb`), nós mudamos a estrutura do envio.
+- Antes: `[{type: 'image_url', image_url: {url: "https://ngrok.dev/rails/active_storage/..."}}]`
+- Depois: `[{type: 'image_url', image_url: {url: "data:image/jpeg;base64,...CODIGO GIGANTE..."}}]`
+
+Desta forma, os bytes reais da foto são lidos assincronamente pelo Rails (`file.blob.open`) e trafegados direto no pacote JSON do Payload do Agente.
+- A IA passa a enxergar perfeitamente a imagem ignorando restrições de rede de ActiveStorage `disk` service ou bloqueios temporários de desenvolvimento (ngrok).
+
+## Próximos Passos (Validação)
+Você pode encaminhar a Imagem de Teste localmente lá em `http://localhost:3001` no Chatwoot (Widget Local) ou via Wuzapi para a conta do Bot. Como eu modifiquei algo sensível interno na class do Service, lembre que é essencial certificar-se que os jobs ou instâncias do Sidekiq tenham sofrido reload. (Basta derrubar o server `ctrl+C` e subir novamente com `make force_run`).
diff --git a/progresso/plano-novo-projeto-ia.md b/progresso/plano-novo-projeto-ia.md
new file mode 100644
index 000000000..dfd62c949
--- /dev/null
+++ b/progresso/plano-novo-projeto-ia.md
@@ -0,0 +1,35 @@
+# Plano de Ação: Arquitetura de IA para o Novo Chatwoot
+
+## 1. O Problema Anterior
+No projeto legado (referência: `reference/chatwoot-develop`), os módulos de IA (Jasmine, Captain, CrmInsights) foram injetados em listeners globais e workers que processavam *todas* as mensagens ou rodavam rotinas frequentes. Isso levou a um uso indiscriminado e excessivo de tokens LLM (OpenAI), resultando em custos insustentáveis.
+
+## 2. A Nova Abordagem: Sob Demanda e Controlado
+Neste novo projeto, a arquitetura será desenhada para que a IA seja ativada apenas quando estritamente necessário ou configurado, evitando vazamentos e processamento redundante.
+
+### 2.1 Integrações WhatsApp (Canais)
+As integrações Wuzapi e Evolution API serão importadas do projeto antigo para garantirmos a funcionalidade de base.
+**Ação:** Trazer endpoints, services (providers) e UI de configurações limitados a estas duas integrações de canal. Prioritizar manutenibilidade para facilitar atualizações futuras do Chatwoot core.
+
+### 2.2 Bot de Atendimento e FAQ
+**Ação:**
+- **Utilizar Padrão Nativo (`AgentBot`):** Ao invés de um listener global (`jasmine_listener`), criaremos a IA como um `AgentBot` do Chatwoot.
+- O processamento de RAG (Busca Semântica no Knowledge Base) ocorrerá de forma orgânica e **somente nas conversas atribuídas ao AgentBot (status: pending/bot-assigned)**.
+- O contexto a ser enviado ao LLM será resumido e utilizaremos Cache ou restrição de contexto para as últimas X mensagens para baratear o "Cached Input".
+
+### 2.3 Bot de Reservas e Fluxos Complexos (Especialista/Function Calling)
+**Ação:**
+- Em vez de ter um "Captain" rodando sobre toda mensagem, adotaremos **Roteamento Híbrido**:
+  1. Identificação simples (com modelo barato ou rules-engine/nlu light) se a intenção é "reserva" ou consultar "preço/disponibilidade".
+  2. Uso de function calling estrito apenas quando dentro desse funil específico, minimizando tokens.
+- O histórico não crescerá infinitamente no payload. Quando coletado dado do cliente (ex: quarto, data), será guardado em KV ou banco de dados (contexto da reserva) em vez de precisar que o LLM releia todo o histórico gigante.
+
+### 2.4 Análise / Resumo de CRM (CrmInsights)
+**Ação:**
+- **Remoção de Background Jobs Frequentes:** Não rodar script periódico monitorando conversas para resumos ou sentimento.
+- **Hooks sob Demanda:** A análise visual e a extração estruturada ocorrerá:
+  a) Diretamente num botão manual acionado pelo humano.
+  b) No exato momento de **RESOLVER** (Resolved) a conversa, onde estruturamos o JSON do ticket e salvamos no banco, servindo como relatório pós-venda (uma execução por ticket).
+
+## 3. Próximos Passos Iniciais
+- **Bloqueio do Legado:** Aplicamos um "return" antecipado (`early return`) no projeto legado (`reference/chatwoot-develop`) nos três pontos mapeados: `jasmine_listener.rb`, `processor_service.rb` e `update_job.rb`. Isso foi feito para garantir a paralisação do vazamento financeiro lá, mantendo o sistema em pé, apenas com atendimento humano.
+- **Implementação Nova:** Agora que o custo do outro projeto está congelado, podemos iniciar a implantação das funcionalidades neste novo projeto de forma controlada através da funcionalidade nativa de AgentBots.
diff --git a/proposito/PROPOSITO.md b/proposito/PROPOSITO.md
new file mode 100644
index 000000000..831ab3bea
--- /dev/null
+++ b/proposito/PROPOSITO.md
@@ -0,0 +1,208 @@
+# Propósito do Produto — Fazer AI / Chatwoot Fork
+
+> Documento vivo. Atualizado em: 2026-02-22
+
+---
+
+## 1. Propósito Central
+
+Este repositório é um fork evolutivo do Chatwoot open-source para se tornar a plataforma de atendimento inteligente do ecossistema Fazer AI.
+
+Nosso objetivo é entregar atendimento enterprise com IA nativa, WhatsApp e automações, sem depender de time técnico para ajustes operacionais do dia a dia.
+
+---
+
+## 2. Princípio Inegociável: Abertura Máxima ao Usuário Final
+
+O produto deve sempre priorizar a maior abertura possível para o usuário final.
+
+Em termos práticos:
+
+- Sempre que for viável, a configuração deve existir no front-end/UI.
+- Regras de negócio não devem ficar chumbadas no código quando puderem ser parametrizadas.
+- Prompt, comportamento do agente, handoff, limites operacionais, integrações e fluxos devem ser gerenciáveis no painel.
+- O backend deve atuar como camada de capacidade e segurança, não como gargalo de configuração.
+
+Exceções permitidas:
+
+- Segurança, compliance, integridade de dados e restrições de infraestrutura.
+- Casos de performance crítica comprovada.
+
+Regra de engenharia:
+
+- Se houver dúvida entre hardcode e configuração em UI, escolher configuração em UI.
+- Se um hardcode temporário for necessário, ele deve nascer com plano de migração para UI.
+
+---
+
+## 3. Visão de Produto
+
+> "Toda empresa deve poder ter um atendimento de nível enterprise, com IA, WhatsApp e automações, sem precisar de um time de engenharia dedicado."
+
+Público principal: empresas de médio porte (redes de pousadas, clínicas, academias, hotelaria e operações de serviço com alto volume em WhatsApp).
+
+Problemas que resolvemos:
+
+- Atendimento omnichannel com operação unificada (WhatsApp, email e web).
+- IA capaz de responder, qualificar e executar tarefas reais (reserva, cobrança, consulta).
+- Escalonamento fluido para humano quando necessário.
+- Rastreabilidade total das ações de bot e humano.
+
+---
+
+## 4. Resultados Esperados do Produto
+
+- Reduzir tempo médio de resposta e custo operacional por conversa.
+- Aumentar taxa de resolução com IA sem perder controle humano.
+- Dar autonomia operacional ao cliente final via painel de configuração.
+- Evitar dependência de deploy para alterações de rotina.
+
+---
+
+## 5. Funcionalidades Implementadas (reference/chatwoot-develop)
+
+As funcionalidades abaixo foram desenvolvidas no projeto de referência (`reference/chatwoot-develop`) e precisam ser portadas, adaptadas e melhoradas neste repositório:
+
+### 5.1 🤖 Agentes de IA (Captain AI — v2)
+
+| Feature | Descrição | Status |
+|---------|-----------|--------|
+| **Captain AI (Jasmine)** | Agente LLM principal que responde conversas automaticamente via WhatsApp | ✅ Implementado no reference |
+| **Sistema de Tools** | Agente executando ferramentas: busca de FAQ, verificação de disponibilidade, consulta de preços, status de suítes | ✅ Implementado no reference |
+| **Handoff para Humano** | IA detecta quando não sabe responder e transfere para agente humano, notificando via webhook | ✅ Implementado no reference |
+| **Prompt Studio** | Interface para editar o prompt do agente em blocos modulares (system, persona, tools) diretamente no painel | ✅ Implementado no reference |
+| **Análise de Imagem** | Agente recebe e processa imagens enviadas pelo cliente via WhatsApp | ✅ Implementado no reference |
+| **Transcrição de Áudio** | Mensagens de áudio são transcritas e processadas pelo agente | ✅ Implementado no reference |
+| **Sub-agentes** | Captain pode invocar agentes especializados (ex: agente de preços, agente de reservas) | ✅ Implementado no reference |
+| **FAQ Lookup Tool** | Tool que busca respostas em base de conhecimento via embeddings | ✅ Implementado no reference |
+| **Response Delay** | Simula tempo de digitação para tornar o bot mais humano | ✅ Implementado no reference |
+
+### 5.2 📱 WhatsApp / Wuzapi Integration
+
+| Feature | Descrição | Status |
+|---------|-----------|--------|
+| **Canal Wuzapi** | Integração com Wuzapi (WhatsApp não-oficial para dev/teste) | ✅ Parcialmente portado |
+| **Webhook Wuzapi** | Recebimento de mensagens via webhook do Wuzapi | 🔧 Em ajuste |
+| **Envio de Mensagens** | Envio de texto, imagem, arquivo e reações via Wuzapi | ✅ Implementado no reference |
+| **Sync de mensagens enviadas pelo celular** | Mensagens enviadas pelo app do celular aparecem como "Enviadas" no Chatwoot | ✅ Implementado no reference |
+| **QR Code flow** | Tela de escanear QR code ao criar o canal | ✅ Implementado |
+| **Provisioning automático de usuário** | Ao criar o canal, cria automaticamente um usuário no Wuzapi | ✅ Implementado |
+
+### 5.3 💳 Pagamentos PIX
+
+| Feature | Descrição | Status |
+|---------|-----------|--------|
+| **PIX Stateful** | Fluxo completo de pagamento PIX dentro do chat (geração, polling, confirmação) | ✅ Implementado no reference |
+| **PIX One-tap** | Pagamento PIX com um clique após dados já cadastrados | ✅ Implementado no reference |
+| **PIX Público** | Geração de link de cobrança público sem autenticação | ✅ Implementado no reference |
+
+### 5.4 📅 Reservas
+
+| Feature | Descrição | Status |
+|---------|-----------|--------|
+| **Reserva via Chat** | Agente de IA cria reservas diretamente na conversa perguntando dados ao cliente | ✅ Implementado no reference |
+| **Checagem de disponibilidade** | Tool que verifica disponibilidade de suítes em datas específicas | ✅ Implementado no reference |
+| **Reserva PIX integrada** | Após confirmar reserva, gera cobrança PIX na mesma conversa | ✅ Implementado no reference |
+| **Filtro por duração** | Filtro de reservas por período de estadia | ✅ Implementado no reference |
+
+### 5.5 📊 Campanhas WhatsApp
+
+| Feature | Descrição | Status |
+|---------|-----------|--------|
+| **Campanhas em massa** | Disparo de mensagens em lote via WhatsApp | ✅ Implementado no reference |
+| **Rastreamento de cliques** | Captura UTM, referer, IP e geolocalização de links em campanhas | ✅ Implementado no reference |
+| **Métricas de campanha** | Dashboard de cliques, conversões por campanha | ✅ Implementado no reference |
+
+### 5.6 🏢 Multi-Unidade (Marcas / Brands)
+
+| Feature | Descrição | Status |
+|---------|-----------|--------|
+| **Configuração por Unidade** | Cada inbox/unidade tem seu próprio webhook, prompt, agente e configurações | ✅ Implementado no reference |
+| **Filtro de conversas por Unidade** | Agente/atendente vê apenas as conversas da sua unidade | ✅ Implementado no reference |
+
+### 5.7 💬 UX / Interface
+
+| Feature | Descrição | Status |
+|---------|-----------|--------|
+| **Atalhos de resposta** | Shortcuts customizados de resposta rápida | ✅ Implementado no reference |
+| **Tradução de UI** | Traduções pt-BR para todas as interfaces novas | ✅ Implementado no reference |
+| **Filtros avançados de conversas** | Filtrar por status, unidade, agente, data | ✅ Implementado no reference |
+
+---
+
+## 6. Funcionalidades Prioritárias Para Portar
+
+> Lista priorizada do que ainda precisa ser implementado neste fork:
+
+1. **`IncomingMessageWuzapiService` completo** — Recebimento de mensagens (texto, imagem, áudio, arquivo) corretamente roteado
+2. **Handoff webhook** — Notificação externa quando IA transfere para humano
+3. **Prompt Studio** — Interface de edição de prompts em blocos
+4. **PIX Stateful** — Fluxo de pagamento dentro do chat
+5. **Sub-agentes Captain** — Invoke de agentes especializados
+6. **Campanhas WhatsApp com rastreamento** — Disparo + métricas
+7. **Reservas** — Agente de reservas com disponibilidade e PIX
+
+---
+
+## 7. Arquitetura de IA
+
+```
+Cliente (WhatsApp)
+       │
+       ▼
+  Wuzapi Server ──► Webhook ──► Chatwoot
+                                    │
+                          ┌─────────┴──────────┐
+                          │  Captain AI Agent   │
+                          │  (LLM + Tools)      │
+                          └─────────┬──────────┘
+                                    │
+               ┌────────────────────┼────────────────────┐
+               ▼                    ▼                    ▼
+         FAQ Lookup           Reservas Tool         PIX Tool
+         (Embeddings)         (Disponibilidade)     (Pagamento)
+               │                    │                    │
+               └────────────────────┴────────────────────┘
+                                    │
+                            Handoff se necessário
+                                    │
+                                    ▼
+                            Agente Humano
+```
+
+---
+
+## 8. Stack Tecnológica
+
+| Camada | Tecnologia |
+|--------|-----------|
+| Backend | Ruby on Rails 7.1 |
+| Frontend | Vue 3 + Vite |
+| IA | OpenAI GPT-4.1 / Compatível OpenRouter |
+| WhatsApp | Wuzapi (dev) / Evolution API (prod) |
+| Banco de dados | PostgreSQL |
+| Cache/Jobs | Redis + Sidekiq |
+| Embeddings | pgvector (PostgreSQL) |
+
+---
+
+## 9. Diretrizes de Produto e Implementação
+
+- Toda feature nova deve nascer com o mínimo de parâmetros essenciais expostos no painel.
+- Configurações devem ser legíveis e editáveis por operação, não apenas por engenharia.
+- Defaults podem existir, mas nunca bloquear customização quando ela fizer sentido de negócio.
+- Evitar acoplamento entre comportamento do agente e constantes fixas em arquivo.
+- Antes de fechar uma implementação, responder: "o usuário final consegue ajustar isso pela UI?"
+
+---
+
+## 10. Referências
+
+- Projeto de referência com todas as features implementadas: `reference/chatwoot-develop/`
+- Notas de progresso técnico: `reference/chatwoot-develop/progresso/`
+- Plano de evolução Captain v2: `reference/chatwoot-develop/progresso/plano_evolucao_capitao_v2.md`
+- Arquitetura dos bots: `reference/chatwoot-develop/progresso/arquitetura-bots.md`
+
+---
+
+*Documento mantido pelo time de arquitetura e produto do Fazer AI.*
diff --git a/reference/chatwoot-develop b/reference/chatwoot-develop
new file mode 160000
index 000000000..6c509f0ed
--- /dev/null
+++ b/reference/chatwoot-develop
@@ -0,0 +1 @@
+Subproject commit 6c509f0edb7158cbefd95fc02bbe6efa7f1c50db
diff --git a/scripts/create_fake_pix.rb b/scripts/create_fake_pix.rb
new file mode 100755
index 000000000..0fb93440f
--- /dev/null
+++ b/scripts/create_fake_pix.rb
@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Cria PIX fake para testar webhook
+
+unit = Captain::Unit.find_by(name: 'Samambaia')
+inbox = Inbox.first
+account = inbox.account
+
+# Busca ou cria contato
+contact = inbox.contacts.first
+unless contact
+  contact = Contact.create!(account: account, name: 'Teste Cliente', email: 'teste@example.com')
+  ContactInbox.create!(contact: contact, inbox: inbox)
+end
+
+conversation = Conversation.create!(
+  account: account,
+  inbox: inbox,
+  contact: contact,
+  status: 'open'
+)
+
+reservation = Captain::Reservation.create!(
+  conversation_id: conversation.id,
+  unit: unit,
+  captain_brand_id: unit.captain_brand_id,
+  total_amount: 100.00,
+  status: 'pending_payment'
+)
+
+charge = Captain::PixCharge.create!(
+  reservation: reservation,
+  unit: unit,
+  txid: "TEST#{SecureRandom.hex(8)}",
+  pix_copia_e_cola: '00020101021226930014BR.GOV.BCB.PIX...',
+  status: 'active'
+)
+
+puts '✅ PIX de teste criado!'
+puts "   TxID: #{charge.txid}"
+puts "   Reserva ID: #{reservation.id}"
+puts "   Conversa ID: #{conversation.id}"
+puts "   Valor: R$ #{charge.original_value}"
+puts "\n🚀 Agora execute: bundle exec rails runner scripts/test_inter_webhook.rb"
diff --git a/spec/enterprise/controllers/api/v1/accounts/captain/gallery_items_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/captain/gallery_items_controller_spec.rb
new file mode 100644
index 000000000..1adc04277
--- /dev/null
+++ b/spec/enterprise/controllers/api/v1/accounts/captain/gallery_items_controller_spec.rb
@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Api::V1::Accounts::Captain::GalleryItems', type: :request do
+  let(:account) { create(:account) }
+  let(:admin) { create(:user, account: account, role: :administrator) }
+  let(:inbox) { create(:inbox, account: account) }
+  let(:brand) { create(:captain_brand, account: account) }
+  let(:unit) do
+    Captain::Unit.create!(
+      account: account,
+      brand: brand,
+      inbox: inbox,
+      name: 'Unidade Teste Galeria',
+      inter_pix_key: SecureRandom.uuid,
+      inter_account_number: '12345678'
+    )
+  end
+
+  describe 'POST /api/v1/accounts/:account_id/captain/gallery_items' do
+    it 'creates a gallery item with image and metadata' do
+      post "/api/v1/accounts/#{account.id}/captain/gallery_items",
+           params: {
+             captain_gallery_item: {
+               scope: 'inbox',
+               inbox_id: inbox.id,
+               captain_unit_id: unit.id,
+               suite_category: 'hidromassagem',
+               suite_number: '101',
+               description: 'Foto principal da suíte',
+               image: fixture_file_upload(Rails.root.join('spec/assets/sample.png'), 'image/png')
+             }
+           },
+           headers: admin.create_new_auth_token
+
+      expect(response).to have_http_status(:created)
+      body = response.parsed_body
+      expect(body['scope']).to eq('inbox')
+      expect(body['inbox_id']).to eq(inbox.id)
+      expect(body['captain_unit_id']).to eq(unit.id)
+      expect(body['suite_number']).to eq('101')
+      expect(body['image_url']).to be_present
+    end
+  end
+
+  describe 'GET /api/v1/accounts/:account_id/captain/gallery_items' do
+    it 'filters by inbox and suite metadata' do
+      create(
+        :captain_gallery_item,
+        :inbox_scoped,
+        account: account,
+        captain_unit: unit,
+        inbox: inbox,
+        suite_category: 'hidromassagem',
+        suite_number: '101'
+      )
+      create(
+        :captain_gallery_item,
+        :inbox_scoped,
+        account: account,
+        captain_unit: unit,
+        inbox: inbox,
+        suite_category: 'luxo',
+        suite_number: '202'
+      )
+
+      get "/api/v1/accounts/#{account.id}/captain/gallery_items",
+          params: { scope: 'inbox', inbox_id: inbox.id, suite_category: 'hidromassagem' },
+          headers: admin.create_new_auth_token
+
+      expect(response).to have_http_status(:ok)
+      body = response.parsed_body
+      expect(body.size).to eq(1)
+      expect(body.first['inbox_id']).to eq(inbox.id)
+      expect(body.first['suite_category']).to eq('hidromassagem')
+    end
+  end
+end
diff --git a/spec/enterprise/controllers/api/v1/accounts/captain/inboxes_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/captain/inboxes_controller_spec.rb
index 85d561755..3bec0b8c5 100644
--- a/spec/enterprise/controllers/api/v1/accounts/captain/inboxes_controller_spec.rb
+++ b/spec/enterprise/controllers/api/v1/accounts/captain/inboxes_controller_spec.rb
@@ -3,6 +3,7 @@ require 'rails_helper'
 RSpec.describe 'Api::V1::Accounts::Captain::Inboxes', type: :request do
   let(:account) { create(:account) }
   let(:assistant) { create(:captain_assistant, account: account) }
+  let(:assistant2) { create(:captain_assistant, account: account) }
   let(:inbox) { create(:inbox, account: account) }
   let(:inbox2) { create(:inbox, account: account) }
   let!(:captain_inbox) { create(:captain_inbox, captain_assistant: assistant, inbox: inbox) }
@@ -43,6 +44,7 @@ RSpec.describe 'Api::V1::Accounts::Captain::Inboxes', type: :request do
   end
 
   describe 'POST /api/v1/accounts/:account/captain/assistants/:assistant_id/inboxes' do
+    let(:brand) { Captain::Brand.create!(account: account, name: 'Brand Test') }
     let(:valid_params) do
       {
         inbox: {
@@ -63,6 +65,52 @@ RSpec.describe 'Api::V1::Accounts::Captain::Inboxes', type: :request do
         expect(json_response[:id]).to eq(inbox2.id)
       end
 
+      context 'when inbox is already linked to the same assistant' do
+        it 'is idempotent and returns success' do
+          expect do
+            post "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/inboxes",
+                 params: { inbox: { inbox_id: inbox.id } },
+                 headers: admin.create_new_auth_token
+          end.not_to change(CaptainInbox, :count)
+
+          expect(response).to have_http_status(:success)
+          expect(json_response[:id]).to eq(inbox.id)
+        end
+      end
+
+      context 'when inbox is already linked to another assistant' do
+        it 'returns unprocessable entity' do
+          post "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant2.id}/inboxes",
+               params: { inbox: { inbox_id: inbox.id } },
+               headers: admin.create_new_auth_token
+
+          expect(response).to have_http_status(:unprocessable_entity)
+          expect(json_response[:error]).to eq('Inbox já está conectada a outro assistente.')
+        end
+      end
+
+      context 'when inbox has a linked pix unit in inbox settings' do
+        let!(:linked_unit) do
+          Captain::Unit.create!(
+            account: account,
+            captain_brand_id: brand.id,
+            name: 'Inbox Linked Unit',
+            inbox_id: inbox2.id
+          )
+        end
+
+        it 'syncs captain unit from the inbox configuration' do
+          post "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/inboxes",
+               params: valid_params,
+               headers: admin.create_new_auth_token
+
+          expect(response).to have_http_status(:success)
+
+          created_link = CaptainInbox.find_by!(captain_assistant: assistant, inbox: inbox2)
+          expect(created_link.captain_unit_id).to eq(linked_unit.id)
+        end
+      end
+
       context 'when inbox does not exist' do
         it 'returns not found status' do
           post "/api/v1/accounts/#{account.id}/captain/assistants/#{assistant.id}/inboxes",
diff --git a/spec/enterprise/controllers/api/v1/accounts/captain/reservations_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/captain/reservations_controller_spec.rb
new file mode 100644
index 000000000..ee796847d
--- /dev/null
+++ b/spec/enterprise/controllers/api/v1/accounts/captain/reservations_controller_spec.rb
@@ -0,0 +1,236 @@
+require 'rails_helper'
+
+RSpec.describe 'Api::V1::Accounts::Captain::Reservations', type: :request do
+  around do |example|
+    original = Rails.application.env_config['action_dispatch.show_exceptions']
+    Rails.application.env_config['action_dispatch.show_exceptions'] = :none
+    example.run
+  ensure
+    Rails.application.env_config['action_dispatch.show_exceptions'] = original
+  end
+
+  let(:account) { create(:account) }
+  let(:admin) { create(:user, account: account, role: :administrator) }
+  let(:inbox) { create(:inbox, account: account) }
+  let(:contact) { create(:contact, account: account, name: 'Rodrigo Borba', phone_number: '+5511999990001') }
+  let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: inbox) }
+  let(:conversation) { create(:conversation, account: account, inbox: inbox, contact: contact, contact_inbox: contact_inbox) }
+  let(:brand) { Captain::Brand.create!(account: account, name: 'Brand Test') }
+  let(:unit) { Captain::Unit.create!(account: account, captain_brand_id: brand.id, name: 'Matriz') }
+
+  def json_response
+    JSON.parse(response.body)
+  end
+
+  def create_reservation(attrs = {})
+    Captain::Reservation.create!(
+      {
+        account: account,
+        inbox: inbox,
+        contact: contact,
+        contact_inbox: contact_inbox,
+        conversation: conversation,
+        captain_brand_id: brand.id,
+        captain_unit_id: unit.id,
+        suite_identifier: 'Suite 101',
+        check_in_at: 2.days.from_now.beginning_of_day,
+        check_out_at: 3.days.from_now.beginning_of_day,
+        total_amount: 130,
+        metadata: { deposit_amount: 65 },
+        status: :pending_payment
+      }.merge(attrs)
+    )
+  end
+
+  describe 'GET /api/v1/accounts/:account_id/captain/reservations' do
+    let!(:pending_reservation) do
+      create_reservation(
+        suite_identifier: 'Suite Pendente',
+        check_in_at: Time.zone.parse('2026-02-25 12:00:00'),
+        check_out_at: Time.zone.parse('2026-02-26 12:00:00'),
+        status: :pending_payment
+      )
+    end
+    let!(:confirmed_reservation) do
+      create_reservation(
+        suite_identifier: 'Suite Confirmada',
+        check_in_at: Time.zone.parse('2026-02-28 12:00:00'),
+        check_out_at: Time.zone.parse('2026-03-01 12:00:00'),
+        status: :scheduled,
+        metadata: {},
+        total_amount: 210
+      )
+    end
+
+    it 'returns paginated reservations ordered by operational priority by default' do
+      get "/api/v1/accounts/#{account.id}/captain/reservations",
+          headers: admin.create_new_auth_token
+
+      expect(response).to have_http_status(:ok)
+      expect(json_response['payload'].pluck('id')).to eq([pending_reservation.id, confirmed_reservation.id])
+      expect(json_response.dig('meta', 'total_count')).to eq(2)
+      expect(json_response.dig('payload', 0, 'ui_status')).to eq('pending_payment')
+    end
+
+    it 'filters by confirmed ui status and search query' do
+      contact.update!(custom_attributes: { cpf: '002.519.381-31' })
+
+      get "/api/v1/accounts/#{account.id}/captain/reservations",
+          params: { status: 'confirmed', q: '002.519' },
+          headers: admin.create_new_auth_token
+
+      expect(response).to have_http_status(:ok)
+      expect(json_response['payload'].size).to eq(1)
+      expect(json_response.dig('payload', 0, 'id')).to eq(confirmed_reservation.id)
+    end
+
+    it 'supports combined date range and unit filters' do
+      other_unit = Captain::Unit.create!(
+        account: account,
+        captain_brand_id: brand.id,
+        name: 'Filial'
+      )
+      create_reservation(
+        suite_identifier: 'Outra unidade',
+        captain_unit_id: other_unit.id,
+        check_in_at: Time.zone.parse('2026-02-25 16:00:00'),
+        check_out_at: Time.zone.parse('2026-02-26 10:00:00')
+      )
+
+      get "/api/v1/accounts/#{account.id}/captain/reservations",
+          params: {
+            unit_id: unit.id,
+            date_from: '2026-02-24',
+            date_to: '2026-02-26'
+          },
+          headers: admin.create_new_auth_token
+
+      expect(response).to have_http_status(:ok)
+      expect(json_response['payload'].pluck('id')).to eq([pending_reservation.id])
+    end
+  end
+
+  describe 'GET /api/v1/accounts/:account_id/captain/reservations/revenue' do
+    let!(:unit_two) do
+      Captain::Unit.create!(
+        account: account,
+        captain_brand_id: brand.id,
+        name: 'Filial'
+      )
+    end
+
+    let!(:pending_reservation) do
+      create_reservation(
+        suite_identifier: 'Suite Pendente',
+        status: :pending_payment,
+        total_amount: 400
+      )
+    end
+
+    before do
+      create_reservation(
+        suite_identifier: 'Suite Alfa',
+        status: :scheduled,
+        total_amount: 200,
+        check_in_at: Time.zone.parse('2026-02-25 10:00:00'),
+        check_out_at: Time.zone.parse('2026-02-26 10:00:00')
+      )
+
+      create_reservation(
+        suite_identifier: 'Suite Alfa',
+        status: :active,
+        total_amount: 100,
+        check_in_at: Time.zone.parse('2026-02-25 18:00:00'),
+        check_out_at: Time.zone.parse('2026-02-26 12:00:00')
+      )
+
+      create_reservation(
+        suite_identifier: 'Suite Beta',
+        captain_unit_id: unit_two.id,
+        status: :completed,
+        total_amount: 80,
+        check_in_at: Time.zone.parse('2026-02-27 10:00:00'),
+        check_out_at: Time.zone.parse('2026-02-28 10:00:00')
+      )
+    end
+
+    it 'returns revenue summary considering only confirmed reservations' do
+      get "/api/v1/accounts/#{account.id}/captain/reservations/revenue",
+          headers: admin.create_new_auth_token
+
+      expect(response).to have_http_status(:ok)
+      expect(json_response.dig('summary', 'confirmed_count')).to eq(3)
+      expect(json_response.dig('summary', 'total_revenue')).to eq(380.0)
+      expect(json_response.dig('summary', 'average_ticket')).to be_within(0.001).of(126.666)
+
+      expect(json_response['by_unit'].size).to eq(2)
+
+      suite_alfa = json_response['by_suite'].find { |item| item['suite_identifier'] == 'Suite Alfa' }
+      expect(suite_alfa['reservations_count']).to eq(2)
+      expect(suite_alfa['total_revenue']).to eq(300.0)
+    end
+
+    it 'supports filters by unit, date range and suite identifier' do
+      get "/api/v1/accounts/#{account.id}/captain/reservations/revenue",
+          params: {
+            unit_id: unit.id,
+            suite: 'alfa',
+            date_from: '2026-02-25',
+            date_to: '2026-02-25'
+          },
+          headers: admin.create_new_auth_token
+
+      expect(response).to have_http_status(:ok)
+      expect(json_response.dig('summary', 'confirmed_count')).to eq(2)
+      expect(json_response.dig('summary', 'total_revenue')).to eq(300.0)
+      expect(json_response['by_unit'].size).to eq(1)
+      expect(json_response['by_suite'].size).to eq(1)
+      expect(json_response.dig('by_suite', 0, 'suite_identifier')).to eq('Suite Alfa')
+    end
+
+    it 'does not include pending reservations in revenue totals' do
+      get "/api/v1/accounts/#{account.id}/captain/reservations/revenue",
+          params: { suite: 'pendente' },
+          headers: admin.create_new_auth_token
+
+      expect(response).to have_http_status(:ok)
+      expect(json_response.dig('summary', 'confirmed_count')).to eq(0)
+      expect(json_response.dig('summary', 'total_revenue')).to eq(0.0)
+      expect(json_response['by_unit']).to eq([])
+      expect(json_response['by_suite']).to eq([])
+      expect(pending_reservation.total_amount.to_f).to eq(400.0)
+    end
+  end
+
+  describe 'GET /api/v1/accounts/:account_id/captain/reservations/:id/pix' do
+    it 'returns reason not_generated when there is no active charge' do
+      reservation = create_reservation
+
+      get "/api/v1/accounts/#{account.id}/captain/reservations/#{reservation.id}/pix",
+          headers: admin.create_new_auth_token
+
+      expect(response).to have_http_status(:ok)
+      expect(json_response['pix_copy_paste']).to be_nil
+      expect(json_response['reason']).to eq('not_generated')
+    end
+
+    it 'returns expired when pending payment pix charge is stale' do
+      reservation = create_reservation
+      Captain::PixCharge.create!(
+        reservation: reservation,
+        unit: unit,
+        txid: SecureRandom.hex(8),
+        status: 'active',
+        created_at: 2.hours.ago,
+        updated_at: 2.hours.ago
+      )
+
+      get "/api/v1/accounts/#{account.id}/captain/reservations/#{reservation.id}/pix",
+          headers: admin.create_new_auth_token
+
+      expect(response).to have_http_status(:ok)
+      expect(json_response['pix_copy_paste']).to be_nil
+      expect(json_response['reason']).to eq('expired')
+    end
+  end
+end
diff --git a/spec/enterprise/controllers/api/v1/accounts/captain/units_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/captain/units_controller_spec.rb
new file mode 100644
index 000000000..a99bab78f
--- /dev/null
+++ b/spec/enterprise/controllers/api/v1/accounts/captain/units_controller_spec.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Api::V1::Accounts::Captain::Units', type: :request do
+  let(:account) { create(:account) }
+  let(:admin) { create(:user, account: account, role: :administrator) }
+
+  before do
+    Captain::Brand.create!(account: account, name: 'Brand Test')
+  end
+
+  describe 'POST /api/v1/accounts/:account_id/captain/units' do
+    it 'creates a unit with proactive polling enabled when Inter credentials are complete' do
+      params = {
+        captain_unit: {
+          name: 'Hotel Recanto',
+          inter_client_id: 'cid',
+          inter_client_secret: 'csecret',
+          inter_pix_key: '12345678901',
+          inter_account_number: '210339349',
+          inter_cert_content: 'cert-content',
+          inter_key_content: 'key-content',
+          proactive_pix_polling_enabled: true
+        }
+      }
+
+      post "/api/v1/accounts/#{account.id}/captain/units",
+           params: params,
+           headers: admin.create_new_auth_token
+
+      expect(response).to have_http_status(:created)
+      body = response.parsed_body
+      expect(body['proactive_pix_polling_enabled']).to be(true)
+      expect(body['has_client_secret']).to be(true)
+    end
+
+    it 'rejects enabling proactive polling when Inter credentials are incomplete' do
+      params = {
+        captain_unit: {
+          name: 'Hotel Recanto',
+          inter_client_id: 'cid',
+          inter_pix_key: '12345678901',
+          inter_account_number: '210339349',
+          proactive_pix_polling_enabled: true
+        }
+      }
+
+      post "/api/v1/accounts/#{account.id}/captain/units",
+           params: params,
+           headers: admin.create_new_auth_token
+
+      expect(response).to have_http_status(:unprocessable_entity)
+      expect(response.parsed_body['errors'].join).to match(/só pode ser habilitado/i)
+    end
+  end
+end
diff --git a/spec/enterprise/jobs/captain/conversation/response_builder_job_spec.rb b/spec/enterprise/jobs/captain/conversation/response_builder_job_spec.rb
index 777086613..699bf8149 100644
--- a/spec/enterprise/jobs/captain/conversation/response_builder_job_spec.rb
+++ b/spec/enterprise/jobs/captain/conversation/response_builder_job_spec.rb
@@ -230,6 +230,53 @@ RSpec.describe Captain::Conversation::ResponseBuilderJob, type: :job do
     end
   end
 
+  describe 'reaction throttling' do
+    let(:conversation) { create(:conversation, inbox: inbox, account: account) }
+    let(:job) { described_class.new }
+
+    before do
+      job.instance_variable_set(:@conversation, conversation)
+      job.instance_variable_set(:@response, { 'reaction_emoji' => '👍' })
+    end
+
+    def create_incoming_until_slot(modulo_target:)
+      loop do
+        message = create(
+          :message,
+          conversation: conversation,
+          inbox: inbox,
+          message_type: :incoming,
+          content: 'quero saber disponibilidade'
+        )
+        return message if (message.id % described_class::REACTION_SAMPLE_RATE).zero? == modulo_target
+      end
+    end
+
+    it 'always allows reaction for greetings' do
+      message = create(
+        :message,
+        conversation: conversation,
+        inbox: inbox,
+        message_type: :incoming,
+        content: 'Oi, tudo bem?'
+      )
+
+      expect(job.send(:should_send_reaction_for?, message)).to be(true)
+    end
+
+    it 'blocks reaction for regular messages outside the 20% sample' do
+      message = create_incoming_until_slot(modulo_target: false)
+
+      expect(job.send(:should_send_reaction_for?, message)).to be(false)
+    end
+
+    it 'allows reaction for regular messages inside the 20% sample' do
+      message = create_incoming_until_slot(modulo_target: true)
+
+      expect(job.send(:should_send_reaction_for?, message)).to be(true)
+    end
+  end
+
   describe 'out of office message after handoff' do
     let(:conversation) { create(:conversation, inbox: inbox, account: account, status: :pending) }
     let(:mock_llm_chat_service) { instance_double(Captain::Llm::AssistantChatService) }
diff --git a/spec/enterprise/jobs/captain/payments/poll_pix_charge_status_job_spec.rb b/spec/enterprise/jobs/captain/payments/poll_pix_charge_status_job_spec.rb
new file mode 100644
index 000000000..d719c2975
--- /dev/null
+++ b/spec/enterprise/jobs/captain/payments/poll_pix_charge_status_job_spec.rb
@@ -0,0 +1,126 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Captain::Payments::PollPixChargeStatusJob, type: :job do
+  let(:account) { create(:account) }
+  let(:inbox) { create(:inbox, account: account) }
+  let(:contact) { create(:contact, account: account) }
+  let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: inbox) }
+  let(:conversation) do
+    create(:conversation, account: account, inbox: inbox, contact: contact, contact_inbox: contact_inbox)
+  end
+  let(:brand) { Captain::Brand.create!(account: account, name: 'Brand Test') }
+  let(:unit) do
+    Captain::Unit.create!(
+      account: account,
+      captain_brand_id: brand.id,
+      name: 'Unit Prime',
+      inter_client_id: 'client-id',
+      inter_client_secret: 'client-secret',
+      inter_pix_key: '11999999999',
+      inter_account_number: '210339349',
+      inter_cert_content: 'cert-content',
+      inter_key_content: 'key-content',
+      proactive_pix_polling_enabled: true
+    )
+  end
+  let(:reservation) do
+    Captain::Reservation.create!(
+      account: account,
+      inbox: inbox,
+      contact: contact,
+      contact_inbox: contact_inbox,
+      conversation: conversation,
+      captain_brand_id: brand.id,
+      captain_unit_id: unit.id,
+      suite_identifier: 'Suite 101',
+      check_in_at: 1.day.from_now.beginning_of_hour,
+      check_out_at: 2.days.from_now.beginning_of_hour,
+      status: :pending_payment,
+      payment_status: 'pending',
+      total_amount: 100
+    )
+  end
+  let(:charge) do
+    Captain::PixCharge.create!(
+      reservation: reservation,
+      unit: unit,
+      txid: "txid-#{SecureRandom.hex(8)}",
+      status: 'active'
+    )
+  end
+
+  let(:lock_manager) { instance_double(Redis::LockManager) }
+
+  before do
+    allow(Redis::LockManager).to receive(:new).and_return(lock_manager)
+    allow(lock_manager).to receive(:lock).and_return(true)
+    allow(lock_manager).to receive(:unlock).and_return(true)
+  end
+
+  it 'marks charge as paid and confirms reservation when Inter reports payment' do
+    status_payload = {
+      success: true,
+      paid: true,
+      status: 'CONCLUIDA',
+      end_to_end_id: 'E2E123',
+      raw_payload: { 'status' => 'CONCLUIDA' }
+    }
+    status_service = instance_double(Captain::Inter::CobStatusService, call: status_payload)
+    allow(Captain::Inter::CobStatusService).to receive(:new).with(charge).and_return(status_service)
+
+    confirmation_service = instance_double(Captain::Payments::ConfirmationService, perform: true)
+    allow(Captain::Payments::ConfirmationService).to receive(:new).with(
+      reservation: reservation,
+      source: 'inter_cob_query_polling',
+      payload: status_payload[:raw_payload]
+    ).and_return(confirmation_service)
+
+    described_class.perform_now(charge.id)
+
+    charge.reload
+    expect(charge.status).to eq('paid')
+    expect(charge.e2eid).to eq('E2E123')
+    expect(charge.paid_at).to be_present
+    expect(confirmation_service).to have_received(:perform)
+  end
+
+  it 'keeps charge active when Inter still reports pending payment' do
+    status_service = instance_double(
+      Captain::Inter::CobStatusService,
+      call: { success: true, paid: false, status: 'ATIVA', raw_payload: { 'status' => 'ATIVA' } }
+    )
+    allow(Captain::Inter::CobStatusService).to receive(:new).with(charge).and_return(status_service)
+    allow(Captain::Payments::ConfirmationService).to receive(:new)
+
+    described_class.perform_now(charge.id)
+
+    expect(charge.reload.status).to eq('active')
+    expect(Captain::Payments::ConfirmationService).not_to have_received(:new)
+  end
+
+  it 'expires charge and removes awaiting payment label when txid is expired' do
+    conversation.update_labels(%w[aguardando_pagamento vip])
+    charge.update!(created_at: 2.hours.ago, updated_at: 2.hours.ago)
+
+    allow(Captain::Inter::CobStatusService).to receive(:new)
+
+    described_class.perform_now(charge.id)
+
+    expect(charge.reload.status).to eq('expired')
+    expect(conversation.reload.label_list).to include('vip')
+    expect(conversation.reload.label_list).not_to include('aguardando_pagamento')
+    expect(Captain::Inter::CobStatusService).not_to have_received(:new)
+  end
+
+  it 'skips polling when unit proactive flag is disabled' do
+    unit.update!(proactive_pix_polling_enabled: false)
+    allow(Captain::Inter::CobStatusService).to receive(:new)
+
+    described_class.perform_now(charge.id)
+
+    expect(Captain::Inter::CobStatusService).not_to have_received(:new)
+    expect(charge.reload.status).to eq('active')
+  end
+end
diff --git a/spec/enterprise/jobs/captain/payments/proactive_pix_polling_scheduler_job_spec.rb b/spec/enterprise/jobs/captain/payments/proactive_pix_polling_scheduler_job_spec.rb
new file mode 100644
index 000000000..3fbd09037
--- /dev/null
+++ b/spec/enterprise/jobs/captain/payments/proactive_pix_polling_scheduler_job_spec.rb
@@ -0,0 +1,124 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Captain::Payments::ProactivePixPollingSchedulerJob, type: :job do
+  let(:account) { create(:account) }
+  let(:inbox) { create(:inbox, account: account) }
+  let(:contact) { create(:contact, account: account) }
+  let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: inbox) }
+  let(:conversation) { create(:conversation, account: account, inbox: inbox, contact: contact, contact_inbox: contact_inbox) }
+  let(:brand) { Captain::Brand.create!(account: account, name: 'Brand Test') }
+
+  let(:eligible_unit) do
+    Captain::Unit.create!(
+      account: account,
+      captain_brand_id: brand.id,
+      name: 'Unit Eligible',
+      inter_client_id: 'client-id',
+      inter_client_secret: 'client-secret',
+      inter_pix_key: '11999999999',
+      inter_account_number: '210339349',
+      inter_cert_content: 'cert-content',
+      inter_key_content: 'key-content',
+      proactive_pix_polling_enabled: true
+    )
+  end
+
+  let(:ineligible_unit) do
+    Captain::Unit.create!(
+      account: account,
+      captain_brand_id: brand.id,
+      name: 'Unit Ineligible',
+      inter_client_id: 'client-id',
+      inter_client_secret: 'client-secret',
+      inter_pix_key: '11888888888',
+      inter_account_number: '318244055',
+      inter_cert_content: 'cert-content',
+      inter_key_content: 'key-content',
+      proactive_pix_polling_enabled: false
+    )
+  end
+
+  def create_reservation(unit:, status: :pending_payment, payment_status: 'pending')
+    Captain::Reservation.create!(
+      account: account,
+      inbox: inbox,
+      contact: contact,
+      contact_inbox: contact_inbox,
+      conversation: conversation,
+      captain_brand_id: brand.id,
+      captain_unit_id: unit.id,
+      suite_identifier: "Suite-#{SecureRandom.hex(2)}",
+      check_in_at: 1.day.from_now.beginning_of_hour,
+      check_out_at: 2.days.from_now.beginning_of_hour,
+      status: status,
+      payment_status: payment_status,
+      total_amount: 100
+    )
+  end
+
+  def create_charge(reservation:, unit:, created_at: Time.current)
+    Captain::PixCharge.create!(
+      reservation: reservation,
+      unit: unit,
+      txid: "txid-#{SecureRandom.hex(8)}",
+      status: 'active',
+      created_at: created_at,
+      updated_at: created_at
+    )
+  end
+
+  before do
+    clear_enqueued_jobs
+  end
+
+  it 'enqueues polling only for eligible recent pending charges' do
+    eligible_reservation = create_reservation(unit: eligible_unit)
+    eligible_charge = create_charge(
+      reservation: eligible_reservation,
+      unit: eligible_unit,
+      created_at: 20.minutes.ago
+    )
+
+    old_charge = create_charge(
+      reservation: eligible_reservation,
+      unit: eligible_unit,
+      created_at: 3.hours.ago
+    )
+
+    disabled_unit_reservation = create_reservation(unit: ineligible_unit)
+    disabled_unit_charge = create_charge(
+      reservation: disabled_unit_reservation,
+      unit: ineligible_unit,
+      created_at: 10.minutes.ago
+    )
+
+    scheduled_reservation = create_reservation(unit: eligible_unit, status: :scheduled)
+    scheduled_charge = create_charge(
+      reservation: scheduled_reservation,
+      unit: eligible_unit,
+      created_at: 10.minutes.ago
+    )
+
+    paid_reservation = create_reservation(unit: eligible_unit, payment_status: 'paid')
+    paid_charge = create_charge(
+      reservation: paid_reservation,
+      unit: eligible_unit,
+      created_at: 10.minutes.ago
+    )
+
+    described_class.perform_now
+
+    matching_jobs = enqueued_jobs.select do |job|
+      job[:job] == Captain::Payments::PollPixChargeStatusJob
+    end
+    enqueued_ids = matching_jobs.map { |job| job[:args].first }
+
+    expect(enqueued_ids).to include(eligible_charge.id)
+    expect(enqueued_ids).not_to include(old_charge.id)
+    expect(enqueued_ids).not_to include(disabled_unit_charge.id)
+    expect(enqueued_ids).not_to include(scheduled_charge.id)
+    expect(enqueued_ids).not_to include(paid_charge.id)
+  end
+end
diff --git a/spec/enterprise/models/captain/reservation_spec.rb b/spec/enterprise/models/captain/reservation_spec.rb
new file mode 100644
index 000000000..8f03bda1d
--- /dev/null
+++ b/spec/enterprise/models/captain/reservation_spec.rb
@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Captain::Reservation do
+  describe 'conversation marker sync' do
+    let(:account) { create(:account) }
+    let(:inbox) { create(:inbox, account: account) }
+    let(:contact) { create(:contact, account: account) }
+    let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: inbox) }
+    let(:conversation) { create(:conversation, account: account, inbox: inbox, contact: contact, contact_inbox: contact_inbox) }
+    let(:brand) { Captain::Brand.create!(account: account, name: 'Brand Test') }
+    let(:unit) { Captain::Unit.create!(account: account, captain_brand_id: brand.id, name: 'Matriz') }
+
+    let(:reservation) do
+      described_class.create!(
+        account: account,
+        inbox: inbox,
+        contact: contact,
+        contact_inbox: contact_inbox,
+        conversation: conversation,
+        captain_brand_id: brand.id,
+        captain_unit_id: unit.id,
+        suite_identifier: 'Suite 101',
+        check_in_at: 1.day.from_now.beginning_of_hour,
+        check_out_at: 2.days.from_now.beginning_of_hour,
+        status: :pending_payment,
+        total_amount: 130
+      )
+    end
+
+    it 'stores reservation marker snapshot in conversation additional_attributes' do
+      marker = reservation.reload.conversation.reload.additional_attributes['reservation_marker']
+
+      expect(marker['visible']).to be(true)
+      expect(marker['reservation_id']).to eq(reservation.id)
+      expect(marker['status']).to eq('pending_payment')
+    end
+
+    it 'updates marker snapshot when reservation state changes' do
+      reservation.update!(status: :scheduled)
+
+      marker = conversation.reload.additional_attributes['reservation_marker']
+      expect(marker['status']).to eq('confirmed')
+    end
+  end
+
+  describe 'set_captain_unit_id' do
+    let(:account) { create(:account) }
+    let(:inbox) { create(:inbox, account: account) }
+    let(:contact) { create(:contact, account: account) }
+    let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: inbox) }
+    let(:brand) { Captain::Brand.create!(account: account, name: 'Brand Test') }
+
+    def build_reservation
+      described_class.new(
+        account: account,
+        inbox: inbox,
+        contact: contact,
+        contact_inbox: contact_inbox,
+        suite_identifier: 'Suite 101',
+        check_in_at: 1.day.from_now.beginning_of_hour,
+        check_out_at: 2.days.from_now.beginning_of_hour
+      )
+    end
+
+    it 'uses captain_inbox unit when available' do
+      unit = Captain::Unit.create!(
+        account: account,
+        captain_brand_id: brand.id,
+        name: 'Unit via captain_inbox'
+      )
+      assistant = create(:captain_assistant, account: account)
+      create(
+        :captain_inbox,
+        captain_assistant: assistant,
+        inbox: inbox,
+        captain_unit: unit
+      )
+
+      reservation = build_reservation
+      reservation.validate
+
+      expect(reservation.captain_unit_id).to eq(unit.id)
+    end
+
+    it 'falls back to unit linked directly to inbox' do
+      unit = Captain::Unit.create!(
+        account: account,
+        captain_brand_id: brand.id,
+        name: 'Unit via inbox link',
+        inbox_id: inbox.id
+      )
+      assistant = create(:captain_assistant, account: account)
+      create(
+        :captain_inbox,
+        captain_assistant: assistant,
+        inbox: inbox,
+        captain_unit: nil
+      )
+
+      reservation = build_reservation
+      reservation.validate
+
+      expect(reservation.captain_unit_id).to eq(unit.id)
+    end
+  end
+end
diff --git a/spec/enterprise/models/captain/scenario_spec.rb b/spec/enterprise/models/captain/scenario_spec.rb
index 0a6c13b20..7a962f93e 100644
--- a/spec/enterprise/models/captain/scenario_spec.rb
+++ b/spec/enterprise/models/captain/scenario_spec.rb
@@ -323,6 +323,49 @@ RSpec.describe Captain::Scenario, type: :model do
     end
   end
 
+  describe 'default faq tool behavior' do
+    let(:account) { create(:account) }
+    let(:assistant) { create(:captain_assistant, account: account, config: { 'feature_faq' => true }) }
+
+    it 'includes faq_lookup even when scenario has no explicit tools' do
+      scenario = build(:captain_scenario, assistant: assistant, account: account, tools: [])
+      allow(assistant).to receive(:available_agent_tools).and_return([
+                                                                       { id: 'faq_lookup', title: 'FAQ Lookup', description: 'Search FAQ responses' }
+                                                                     ])
+
+      resolved = scenario.send(:resolved_tools)
+      expect(resolved.map { |tool| tool[:id] }).to contain_exactly('faq_lookup')
+    end
+
+    it 'does not add faq_lookup when faq feature is disabled' do
+      assistant = create(:captain_assistant, account: account, config: { 'feature_faq' => false })
+      scenario = build(:captain_scenario, assistant: assistant, account: account, tools: [])
+      allow(assistant).to receive(:available_agent_tools).and_return([
+                                                                       { id: 'faq_lookup', title: 'FAQ Lookup', description: 'Search FAQ responses' }
+                                                                     ])
+
+      resolved = scenario.send(:resolved_tools)
+      expect(resolved).to be_empty
+    end
+
+    it 'merges faq_lookup with explicit scenario tools without duplicates' do
+      scenario = build(
+        :captain_scenario,
+        assistant: assistant,
+        account: account,
+        tools: %w[add_contact_note faq_lookup]
+      )
+      allow(assistant).to receive(:available_agent_tools).and_return([
+                                                                       { id: 'add_contact_note', title: 'Add Contact Note',
+                                                                         description: 'Add a note' },
+                                                                       { id: 'faq_lookup', title: 'FAQ Lookup', description: 'Search FAQ responses' }
+                                                                     ])
+
+      resolved = scenario.send(:resolved_tools)
+      expect(resolved.map { |tool| tool[:id] }).to contain_exactly('add_contact_note', 'faq_lookup')
+    end
+  end
+
   describe 'factory' do
     it 'creates a valid scenario with associations' do
       account = create(:account)
diff --git a/spec/enterprise/services/captain/assistant/agent_runner_service_spec.rb b/spec/enterprise/services/captain/assistant/agent_runner_service_spec.rb
index bbf712622..10f7a2f85 100644
--- a/spec/enterprise/services/captain/assistant/agent_runner_service_spec.rb
+++ b/spec/enterprise/services/captain/assistant/agent_runner_service_spec.rb
@@ -76,9 +76,10 @@ RSpec.describe Captain::Assistant::AgentRunnerService do
     it 'runs agent with extracted user message and context' do
       expected_context = {
         session_id: "#{account.id}_#{conversation.display_id}",
+        current_agent: assistant.name.to_s.parameterize(separator: '_'),
         conversation_history: [
           { role: :user, content: 'Hello there', agent_name: nil },
-          { role: :assistant, content: 'Hi! How can I help you?', agent_name: 'Assistant' },
+          { role: :assistant, content: 'Hi! How can I help you?', agent_name: nil },
           { role: :user, content: 'I need help with my account', agent_name: nil }
         ],
         state: hash_including(
@@ -119,6 +120,136 @@ RSpec.describe Captain::Assistant::AgentRunnerService do
       end
     end
 
+    context 'when faq guardrail should force a FAQ lookup before uncertainty response' do
+      let(:message_history) do
+        [
+          { role: 'user', content: 'Preciso da senha da internet' }
+        ]
+      end
+      let(:mock_result) do
+        instance_double(
+          Agents::RunResult,
+          output: {
+            'response' => 'Não tenho acesso a essa informação no momento.',
+            'reasoning' => 'Out of scope'
+          },
+          context: nil,
+          messages: [
+            { role: :user, content: 'Preciso da senha da internet' },
+            { role: :assistant, content: 'Não tenho acesso a essa informação no momento.' }
+          ]
+        )
+      end
+
+      before do
+        allow(assistant).to receive(:feature_faq).and_return(true)
+      end
+
+      it 'replaces uncertain response with faq answer when faq tool was not called' do
+        approved_scope = double('approved_scope')
+        faq_response = double('faq_response', answer: 'A senha do Wi-Fi é 1001prime.')
+        allow(assistant).to receive(:responses).and_return(double(approved: approved_scope))
+        allow(approved_scope).to receive(:search).with('Preciso da senha da internet').and_return([faq_response])
+
+        result = service.generate_response(message_history: message_history)
+
+        expect(result['response']).to eq('A senha do Wi-Fi é 1001prime.')
+        expect(result['reasoning']).to eq('FAQ guardrail applied due to uncertain response without faq_lookup call.')
+      end
+
+      it 'returns faq-not-found message when search has no match' do
+        approved_scope = double('approved_scope')
+        allow(assistant).to receive(:responses).and_return(double(approved: approved_scope))
+        allow(approved_scope).to receive(:search).and_return([])
+
+        result = service.generate_response(message_history: message_history)
+
+        expect(result['response']).to eq(
+          'Consultei o FAQ e não encontrei essa informação cadastrada ainda. Posso te ajudar com outro tema ou te transferir para um atendente.'
+        )
+        expect(result['reasoning']).to eq('FAQ guardrail applied; no FAQ entry found for query.')
+      end
+
+      it 'replaces price response with faq answer when faq tool was not called in current turn' do
+        allow(mock_result).to receive(:output).and_return(
+          {
+            'response' => 'Rodrigo, para confirmar a reserva da suíte Aluba, o valor total é R$ 260,00 e o sinal é R$ 130,00.',
+            'reasoning' => 'Valor calculado para reserva'
+          }
+        )
+        allow(mock_result).to receive(:messages).and_return(
+          [
+            { role: :user, content: 'Rodrigo borba machado CPF: 00251938131 para amanhã na pernoite mesmo duração de 2 horas' },
+            {
+              role: :assistant,
+              content: 'Rodrigo, para confirmar a reserva da suíte Aluba, o valor total é R$ 260,00 e o sinal é R$ 130,00.'
+            }
+          ]
+        )
+
+        approved_scope = double('approved_scope')
+        faq_response = double('faq_response', answer: 'O valor da suíte Aluba é R$ 5,00 para qualquer duração.')
+        allow(assistant).to receive(:responses).and_return(double(approved: approved_scope))
+        allow(approved_scope).to receive(:search) do |query|
+          if query.include?('valor da suíte Aluba')
+            [faq_response]
+          else
+            []
+          end
+        end
+
+        result = service.generate_response(message_history: message_history)
+
+        expect(result['response']).to eq('O valor da suíte Aluba é R$ 5,00 para qualquer duração.')
+        expect(result['reasoning']).to eq('FAQ guardrail applied due to price response without faq_lookup call.')
+      end
+
+      it 'does not force fallback when faq_lookup was already called' do
+        allow(mock_result).to receive(:messages).and_return(
+          [
+            { role: :user, content: 'Preciso da senha da internet' },
+            {
+              role: :assistant,
+              content: '',
+              tool_calls: [{ id: 'call_1', name: 'captain--tools--faq_lookup', arguments: { query: 'senha da internet' } }]
+            }
+          ]
+        )
+        approved_scope = double('approved_scope')
+        allow(assistant).to receive(:responses).and_return(double(approved: approved_scope))
+        expect(approved_scope).not_to receive(:search)
+
+        result = service.generate_response(message_history: message_history)
+
+        expect(result['response']).to eq('Não tenho acesso a essa informação no momento.')
+      end
+
+      it 'forces fallback when faq_lookup happened only in a previous turn' do
+        allow(mock_result).to receive(:messages).and_return(
+          [
+            { role: :user, content: 'Qual o horário do café?' },
+            {
+              role: :assistant,
+              content: '',
+              tool_calls: [{ id: 'call_prev', name: 'captain--tools--faq_lookup', arguments: { query: 'horário do café' } }]
+            },
+            { role: :assistant, content: 'O café é servido das 07h às 09h.' },
+            { role: :user, content: 'Preciso da senha da internet' },
+            { role: :assistant, content: 'Não tenho acesso a essa informação no momento.' }
+          ]
+        )
+        approved_scope = double('approved_scope')
+        faq_response = double('faq_response', answer: 'A senha do Wi-Fi é 1001prime.')
+        allow(assistant).to receive(:responses).and_return(double(approved: approved_scope))
+        allow(approved_scope).to receive(:search).with('Preciso da senha da internet').and_return([faq_response])
+
+        result = service.generate_response(message_history: message_history)
+
+        expect(result['response']).to eq('A senha do Wi-Fi é 1001prime.')
+        expect(result['reasoning']).to eq('FAQ guardrail applied due to uncertain response without faq_lookup call.')
+      end
+    end
+
     context 'when agent result is a string' do
       let(:mock_result) { instance_double(Agents::RunResult, output: 'Simple string response', context: nil) }
 
@@ -133,6 +264,30 @@ RSpec.describe Captain::Assistant::AgentRunnerService do
       end
     end
 
+    context 'when agent result is a duplicated JSON string' do
+      let(:mock_result) do
+        instance_double(
+          Agents::RunResult,
+          output: <<~JSON_OUTPUT.strip,
+            {"response":"Rodrigo, valor total R$ 260,00.","reasoning":"Primeira resposta","reaction_emoji":"💰"}
+            {"response":"Rodrigo, para confirmar a reserva, o sinal é R$ 130,00. Posso gerar o Pix?","reasoning":"Resposta final","reaction_emoji":"💰"}
+          JSON_OUTPUT
+          context: nil
+        )
+      end
+
+      it 'parses structured json and returns only the final response text' do
+        result = service.generate_response(message_history: message_history)
+
+        expect(result).to eq({
+                               'response' => 'Rodrigo, para confirmar a reserva, o sinal é R$ 130,00. Posso gerar o Pix?',
+                               'reasoning' => 'Resposta final',
+                               'reaction_emoji' => '💰',
+                               'agent_name' => nil
+                             })
+      end
+    end
+
     context 'when an error occurs' do
       let(:error) { StandardError.new('Test error') }
 
@@ -187,7 +342,7 @@ RSpec.describe Captain::Assistant::AgentRunnerService do
       expect(context).to include(
         conversation_history: array_including(
           { role: :user, content: 'Hello there', agent_name: nil },
-          { role: :assistant, content: 'Hi! How can I help you?', agent_name: 'Assistant' }
+          { role: :assistant, content: 'Hi! How can I help you?', agent_name: nil }
         ),
         state: hash_including(
           account_id: account.id,
diff --git a/spec/enterprise/services/captain/inter/cob_status_service_spec.rb b/spec/enterprise/services/captain/inter/cob_status_service_spec.rb
new file mode 100644
index 000000000..b206d8c23
--- /dev/null
+++ b/spec/enterprise/services/captain/inter/cob_status_service_spec.rb
@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Captain::Inter::CobStatusService do
+  let(:account) { create(:account) }
+  let(:inbox) { create(:inbox, account: account) }
+  let(:contact) { create(:contact, account: account) }
+  let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: inbox) }
+  let(:conversation) { create(:conversation, account: account, inbox: inbox, contact: contact, contact_inbox: contact_inbox) }
+  let(:brand) { Captain::Brand.create!(account: account, name: 'Brand Test') }
+  let(:unit) do
+    Captain::Unit.create!(
+      account: account,
+      captain_brand_id: brand.id,
+      name: 'Matriz',
+      inter_client_id: 'client-id',
+      inter_client_secret: 'client-secret',
+      inter_pix_key: '11999999999',
+      inter_cert_content: 'fake-cert',
+      inter_key_content: 'fake-key'
+    )
+  end
+  let(:reservation) do
+    Captain::Reservation.create!(
+      account: account,
+      inbox: inbox,
+      contact: contact,
+      contact_inbox: contact_inbox,
+      conversation: conversation,
+      captain_brand_id: brand.id,
+      captain_unit_id: unit.id,
+      suite_identifier: 'Suite 101',
+      check_in_at: 1.day.from_now.change(hour: 19, min: 0, sec: 0),
+      check_out_at: 2.days.from_now.change(hour: 12, min: 0, sec: 0),
+      status: :pending_payment,
+      payment_status: 'pending',
+      total_amount: 200
+    )
+  end
+  let(:charge) do
+    Captain::PixCharge.create!(
+      reservation: reservation,
+      unit: unit,
+      txid: "txid-#{SecureRandom.hex(6)}",
+      status: 'active'
+    )
+  end
+  let(:service) { described_class.new(charge) }
+  let(:auth_service) { instance_double(Captain::Inter::AuthService, token: 'inter-token') }
+  let(:connection) { instance_double(Faraday::Connection) }
+
+  before do
+    allow(Captain::Inter::AuthService).to receive(:new).with(unit).and_return(auth_service)
+    allow(service).to receive(:connection).with('inter-token').and_return(connection)
+  end
+
+  it 'returns paid=true when Inter status is CONCLUIDA' do
+    response_body = {
+      txid: charge.txid,
+      status: 'CONCLUIDA',
+      pix: [{ endToEndId: 'E2E123', valor: '2.50' }]
+    }.to_json
+    response = instance_double(Faraday::Response, success?: true, status: 200, body: response_body)
+    allow(connection).to receive(:get).and_return(response)
+
+    result = service.call
+
+    expect(result[:success]).to be(true)
+    expect(result[:paid]).to be(true)
+    expect(result[:status]).to eq('CONCLUIDA')
+    expect(result[:end_to_end_id]).to eq('E2E123')
+  end
+
+  it 'returns paid=false when Inter status is ATIVA and no pix payment entry exists' do
+    response_body = {
+      txid: charge.txid,
+      status: 'ATIVA',
+      pix: []
+    }.to_json
+    response = instance_double(Faraday::Response, success?: true, status: 200, body: response_body)
+    allow(connection).to receive(:get).and_return(response)
+
+    result = service.call
+
+    expect(result[:success]).to be(true)
+    expect(result[:paid]).to be(false)
+    expect(result[:status]).to eq('ATIVA')
+  end
+
+  it 'raises descriptive error when Inter returns non-success response' do
+    response = instance_double(Faraday::Response, success?: false, status: 404, body: '{"title":"not_found"}')
+    allow(connection).to receive(:get).and_return(response)
+
+    expect { service.call }.to raise_error(/Pix Status Check Failed: HTTP 404/)
+  end
+end
diff --git a/spec/enterprise/services/captain/reservations/marker_builder_spec.rb b/spec/enterprise/services/captain/reservations/marker_builder_spec.rb
new file mode 100644
index 000000000..c0d20d03b
--- /dev/null
+++ b/spec/enterprise/services/captain/reservations/marker_builder_spec.rb
@@ -0,0 +1,93 @@
+require 'rails_helper'
+
+RSpec.describe Captain::Reservations::MarkerBuilder do
+  let(:account) { create(:account) }
+  let(:inbox) { create(:inbox, account: account) }
+  let(:contact) { create(:contact, account: account) }
+  let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: inbox) }
+  let(:conversation) { create(:conversation, account: account, inbox: inbox, contact: contact, contact_inbox: contact_inbox) }
+  let(:brand) { Captain::Brand.create!(account: account, name: 'Brand Test') }
+  let(:unit) { Captain::Unit.create!(account: account, captain_brand_id: brand.id, name: 'Matriz') }
+
+  let(:reservation) do
+    Captain::Reservation.create!(
+      account: account,
+      inbox: inbox,
+      contact: contact,
+      contact_inbox: contact_inbox,
+      conversation: conversation,
+      captain_brand_id: brand.id,
+      captain_unit_id: unit.id,
+      suite_identifier: 'Suite 101',
+      check_in_at: 1.day.from_now.beginning_of_hour,
+      check_out_at: 2.days.from_now.beginning_of_hour,
+      status: :pending_payment,
+      total_amount: 130,
+      metadata: { deposit_amount: 65 }
+    )
+  end
+
+  describe '.ui_status' do
+    it 'maps db statuses to ui statuses' do
+      expect(described_class.ui_status(:draft)).to eq('draft')
+      expect(described_class.ui_status(:pending_payment)).to eq('pending_payment')
+      expect(described_class.ui_status(:scheduled)).to eq('confirmed')
+      expect(described_class.ui_status(:active)).to eq('confirmed')
+      expect(described_class.ui_status(:completed)).to eq('confirmed')
+      expect(described_class.ui_status(:cancelled)).to eq('cancelled')
+    end
+  end
+
+  describe '.build_for' do
+    it 'returns hidden payload when reservation is blank' do
+      expect(described_class.build_for(nil)).to eq('visible' => false)
+    end
+
+    it 'returns marker with deposit amount and status mapping' do
+      marker = described_class.build_for(reservation)
+
+      expect(marker['visible']).to be(true)
+      expect(marker['status']).to eq('pending_payment')
+      expect(marker['amount']).to eq(65.0)
+      expect(marker['amount_kind']).to eq('deposit')
+      expect(marker['reservation_id']).to eq(reservation.id)
+    end
+
+    it 'marks pix as not generated when pending payment has no charge' do
+      marker = described_class.build_for(reservation)
+
+      expect(marker['pix_copy_paste']).to be_nil
+      expect(marker['pix_reason']).to eq('not_generated')
+    end
+
+    it 'marks pix as expired when charge is stale for pending payment' do
+      Captain::PixCharge.create!(
+        reservation: reservation,
+        unit: unit,
+        txid: SecureRandom.hex(8),
+        status: 'active',
+        created_at: 2.hours.ago,
+        updated_at: 2.hours.ago
+      )
+
+      marker = described_class.build_for(reservation)
+      expect(marker['pix_reason']).to eq('expired')
+    end
+
+    it 'returns pix payload when active charge has copy-paste value' do
+      Captain::PixCharge.create!(
+        reservation: reservation,
+        unit: unit,
+        txid: SecureRandom.hex(8),
+        status: 'active',
+        pix_copia_e_cola: '000201...',
+        created_at: 10.minutes.ago,
+        updated_at: 10.minutes.ago
+      )
+
+      marker = described_class.build_for(reservation)
+      expect(marker['pix_copy_paste']).to eq('000201...')
+      expect(marker['pix_reason']).to be_nil
+    end
+  end
+end
diff --git a/spec/enterprise/services/captain/tools/check_pix_payment_tool_spec.rb b/spec/enterprise/services/captain/tools/check_pix_payment_tool_spec.rb
new file mode 100644
index 000000000..7017b181d
--- /dev/null
+++ b/spec/enterprise/services/captain/tools/check_pix_payment_tool_spec.rb
@@ -0,0 +1,131 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Captain::Tools::CheckPixPaymentTool, type: :model do
+  let(:account) { create(:account) }
+  let(:assistant) { create(:captain_assistant, account: account) }
+  let(:conversation) { create(:conversation, account: account) }
+  let(:tool) { described_class.new(assistant) }
+  let(:brand) { Captain::Brand.create!(account: account, name: 'Brand Test') }
+  let(:unit) do
+    Captain::Unit.create!(
+      account: account,
+      captain_brand_id: brand.id,
+      name: 'Matriz',
+      inter_client_id: 'client-id',
+      inter_client_secret: 'client-secret',
+      inter_pix_key: '11999999999',
+      inter_cert_content: 'fake-cert',
+      inter_key_content: 'fake-key'
+    )
+  end
+  let(:reservation) do
+    Captain::Reservation.create!(
+      account: account,
+      inbox: conversation.inbox,
+      contact: conversation.contact,
+      contact_inbox: conversation.contact_inbox,
+      conversation: conversation,
+      captain_brand_id: brand.id,
+      captain_unit_id: unit.id,
+      suite_identifier: 'Suite 101',
+      check_in_at: 1.day.from_now.change(hour: 19, min: 0, sec: 0),
+      check_out_at: 2.days.from_now.change(hour: 12, min: 0, sec: 0),
+      status: :pending_payment,
+      payment_status: 'pending',
+      total_amount: 220
+    )
+  end
+  let(:charge) do
+    Captain::PixCharge.create!(
+      reservation: reservation,
+      unit: unit,
+      txid: "txid-#{SecureRandom.hex(8)}",
+      status: 'active'
+    )
+  end
+  let(:tool_context) do
+    Struct.new(:state).new(
+      {
+        account_id: account.id,
+        conversation: { id: conversation.id }
+      }
+    )
+  end
+
+  it 'returns pending message when Inter still reports unpaid charge' do
+    status_service = instance_double(Captain::Inter::CobStatusService, call: { success: true, paid: false, status: 'ATIVA' })
+    allow(Captain::Inter::CobStatusService).to receive(:new).with(charge).and_return(status_service)
+    charge
+
+    result = tool.execute(tool_context)
+
+    expect(result[:success]).to be(true)
+    expect(result[:formatted_message]).to match(/ainda não apareceu como pago/i)
+    expect(charge.reload.status).to eq('active')
+  end
+
+  it 'marks charge as paid and confirms reservation when Inter reports payment' do
+    charge
+    status_service = instance_double(
+      Captain::Inter::CobStatusService,
+      call: {
+        success: true,
+        paid: true,
+        status: 'CONCLUIDA',
+        end_to_end_id: 'E2E123',
+        paid_value: '2.50',
+        raw_payload: { 'txid' => charge.txid, 'status' => 'CONCLUIDA' }
+      }
+    )
+    allow(Captain::Inter::CobStatusService).to receive(:new).with(charge).and_return(status_service)
+
+    confirmation_service = instance_double(Captain::Payments::ConfirmationService, perform: true)
+    allow(Captain::Payments::ConfirmationService).to receive(:new).with(
+      reservation: reservation,
+      source: 'inter_cob_query',
+      payload: { 'txid' => charge.txid, 'status' => 'CONCLUIDA' }
+    ).and_return(confirmation_service)
+
+    result = tool.execute(tool_context, txid: charge.txid)
+
+    expect(result[:success]).to be(true)
+    expect(result[:formatted_message]).to match(/pagamento confirmado no banco inter/i)
+
+    charge.reload
+    expect(charge.status).to eq('paid')
+    expect(charge.e2eid).to eq('E2E123')
+    expect(charge.paid_at).to be_present
+    expect(confirmation_service).to have_received(:perform)
+  end
+
+  it 'does not query Inter again when charge is already paid' do
+    charge.update!(status: 'paid', paid_at: Time.current)
+    expect(Captain::Inter::CobStatusService).not_to receive(:new)
+
+    result = tool.execute(tool_context, txid: charge.txid)
+
+    expect(result[:success]).to be(true)
+    expect(result[:formatted_message]).to match(/pagamento já confirmado/i)
+  end
+
+  it 'returns a friendly message when there is no pix charge in the conversation' do
+    result = tool.execute(tool_context)
+
+    expect(result[:success]).to be(true)
+    expect(result[:formatted_message]).to match(/não encontrei uma cobrança pix/i)
+  end
+
+  it 'returns integration credential guidance on auth failure' do
+    charge
+    status_service = instance_double(Captain::Inter::CobStatusService)
+    allow(Captain::Inter::CobStatusService).to receive(:new).with(charge).and_return(status_service)
+    allow(status_service).to receive(:call).and_raise(StandardError, 'Login/senha invalido')
+
+    result = tool.execute(tool_context)
+
+    expect(result[:success]).to be(true)
+    expect(result[:formatted_message]).to match(/credenciais da integração estão inválidas/i)
+  end
+end
diff --git a/spec/enterprise/services/captain/tools/generate_pix_tool_spec.rb b/spec/enterprise/services/captain/tools/generate_pix_tool_spec.rb
new file mode 100644
index 000000000..19f1d0dfd
--- /dev/null
+++ b/spec/enterprise/services/captain/tools/generate_pix_tool_spec.rb
@@ -0,0 +1,269 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Captain::Tools::GeneratePixTool, type: :model do
+  let(:account) { create(:account) }
+  let(:assistant) { create(:captain_assistant, account: account) }
+  let(:conversation) { create(:conversation, account: account) }
+  let(:tool) { described_class.new(assistant) }
+
+  before do
+    conversation.contact.update!(
+      name: 'Cliente Teste',
+      custom_attributes: conversation.contact.custom_attributes.merge('cpf' => '12345678901')
+    )
+  end
+
+  it 'accepts positional params hash without raising NoMethodError' do
+    reservation = create_draft_reservation
+    allow(tool).to receive(:generate_new_pix).and_return({ success: true })
+    tool.instance_variable_set(:@conversation, conversation)
+
+    expect { tool.execute({ amount: '140,00' }) }.not_to raise_error
+    expect(tool).to have_received(:generate_new_pix).with(have_attributes(id: reservation.id), amount: 140.0)
+  end
+
+  it 'resolves conversation from tool context state' do
+    create_draft_reservation
+    allow(tool).to receive(:generate_new_pix).and_return({ success: true })
+    tool_context = Struct.new(:state).new(
+      {
+        account_id: account.id,
+        conversation: { id: conversation.id }
+      }
+    )
+
+    result = tool.execute(tool_context, amount: '140,00')
+    expect(result).to include(success: true)
+  end
+
+  it 'hydrates cpf and name from recent incoming messages when contact is incomplete' do
+    create_draft_reservation
+    allow(tool).to receive(:generate_new_pix).and_return({ success: true })
+
+    conversation.contact.update!(name: '!@#123', custom_attributes: {})
+    create(
+      :message,
+      account: account,
+      inbox: conversation.inbox,
+      conversation: conversation,
+      sender: conversation.contact,
+      message_type: :incoming,
+      content_type: :text,
+      content: "Nome : rodrigo borba machado\nCPF : 002.519.381-31\n\nUma pernoite"
+    )
+
+    tool.instance_variable_set(:@conversation, conversation)
+    result = tool.execute({ amount: '140,00' })
+
+    expect(result).to include(success: true)
+    expect(tool).to have_received(:generate_new_pix).with(instance_of(Captain::Reservation), amount: 140.0)
+
+    conversation.contact.reload
+    expect(conversation.contact.custom_attributes['cpf']).to eq('00251938131')
+    expect(conversation.contact.name).to eq('Rodrigo Borba Machado')
+  end
+
+  it 'asks for cpf conversationally when cpf is missing' do
+    allow(tool).to receive(:generate_new_pix).and_return({ success: true })
+    conversation.contact.update!(name: 'Cliente Teste', custom_attributes: {})
+    tool.instance_variable_set(:@conversation, conversation)
+
+    result = tool.execute({ amount: '140,00' })
+
+    expect(result[:success]).to be(true)
+    expect(result[:requires_input]).to be(true)
+    expect(result[:missing_field]).to eq('cpf')
+    expect(result[:formatted_message]).to match(/preciso do seu cpf com 11 dígitos/i)
+    expect(tool).not_to have_received(:generate_new_pix)
+  end
+
+  it 'recognizes cpf when customer sends only 11 digits' do
+    create_draft_reservation
+    allow(tool).to receive(:generate_new_pix).and_return({ success: true })
+
+    conversation.contact.update!(name: 'Cliente Teste', custom_attributes: {})
+    create(
+      :message,
+      account: account,
+      inbox: conversation.inbox,
+      conversation: conversation,
+      sender: conversation.contact,
+      message_type: :incoming,
+      content_type: :text,
+      content: '00251938131'
+    )
+
+    tool.instance_variable_set(:@conversation, conversation)
+    result = tool.execute({ amount: '140,00' })
+
+    expect(result).to include(success: true)
+    expect(tool).to have_received(:generate_new_pix).with(instance_of(Captain::Reservation), amount: 140.0)
+    expect(conversation.contact.reload.custom_attributes['cpf']).to eq('00251938131')
+  end
+
+  it 'returns a graceful error when conversation cannot be resolved' do
+    result = tool.execute(amount: '140,00')
+
+    expect(result).to include(success: false)
+    expect(result[:formatted_message]).to match(/não foi possível identificar a conversa/i)
+  end
+
+  it 'creates a draft reservation automatically from conversation history when needed' do
+    allow(tool).to receive(:generate_new_pix).and_return({ success: true })
+    tool.instance_variable_set(:@conversation, conversation)
+
+    create(
+      :message,
+      account: account,
+      inbox: conversation.inbox,
+      conversation: conversation,
+      sender: conversation.contact,
+      message_type: :incoming,
+      content_type: :text,
+      content: 'Quero reservar a suíte stilo para 25/02/2026 por uma pernoite'
+    )
+    create(
+      :message,
+      account: account,
+      inbox: conversation.inbox,
+      conversation: conversation,
+      sender: create(:user, account: account),
+      message_type: :outgoing,
+      content_type: :text,
+      content: 'Perfeito! O valor total é R$ 130,00 e o sinal de 50% é R$ 65,00. Posso gerar o Pix?'
+    )
+
+    result = tool.execute
+
+    expect(result).to include(success: true)
+    expect(tool).to have_received(:generate_new_pix).with(instance_of(Captain::Reservation), amount: 65.0)
+
+    created = Captain::Reservation.where(conversation_id: conversation.id, status: 'draft').order(created_at: :desc).first
+    expect(created).to be_present
+    expect(created.suite_identifier.downcase).to include('stilo')
+    expect(created.total_amount.to_f).to eq(130.0)
+    expect(created.metadata['deposit_amount'].to_f).to eq(65.0)
+  end
+
+  it 'handles ASCII-8BIT message content without crashing during reservation parsing' do
+    allow(tool).to receive(:generate_new_pix).and_return({ success: true })
+    tool.instance_variable_set(:@conversation, conversation)
+
+    incoming_content = 'Quero reservar a suíte Alexa para amanhã em uma pernoite'.dup.force_encoding('ASCII-8BIT')
+    outgoing_content = 'Perfeito! O valor total é R$ 220,00 e o sinal é R$ 110,00.'.dup.force_encoding('ASCII-8BIT')
+
+    create(
+      :message,
+      account: account,
+      inbox: conversation.inbox,
+      conversation: conversation,
+      sender: conversation.contact,
+      message_type: :incoming,
+      content_type: :text,
+      content: incoming_content
+    )
+    create(
+      :message,
+      account: account,
+      inbox: conversation.inbox,
+      conversation: conversation,
+      sender: create(:user, account: account),
+      message_type: :outgoing,
+      content_type: :text,
+      content: outgoing_content
+    )
+
+    result = tool.execute
+
+    expect(result).to include(success: true)
+    expect(tool).to have_received(:generate_new_pix).with(instance_of(Captain::Reservation), amount: 110.0)
+  end
+
+  it 'asks conversationally for missing reservation data when draft cannot be inferred' do
+    allow(tool).to receive(:generate_new_pix).and_return({ success: true })
+    tool.instance_variable_set(:@conversation, conversation)
+
+    result = tool.execute(amount: '140,00')
+
+    expect(result[:success]).to be(true)
+    expect(result[:requires_input]).to be(true)
+    expect(result[:missing_fields]).to include('suite', 'check_in')
+    expect(result[:formatted_message]).to match(/suíte/i)
+    expect(result[:formatted_message]).to match(/check-in/i)
+    expect(tool).not_to have_received(:generate_new_pix)
+  end
+
+  it 'returns cpf follow-up when provider rejects cpf payload' do
+    reservation = create_draft_reservation
+    tool.instance_variable_set(:@conversation, conversation)
+
+    cob_service = instance_double(Captain::Inter::CobService)
+    allow(Captain::Inter::CobService).to receive(:new).with(instance_of(Captain::Reservation), amount: 140.0).and_return(cob_service)
+    allow(cob_service).to receive(:call).and_raise(StandardError, 'CPF do pagador inválido')
+
+    result = tool.execute(amount: '140,00')
+
+    expect(result[:success]).to be(true)
+    expect(result[:requires_input]).to be(true)
+    expect(result[:missing_field]).to eq('cpf')
+    expect(result[:formatted_message]).to match(/cpf com 11 dígitos/i)
+    expect(reservation.reload.status).to eq('draft')
+  end
+
+  it 'handles binary provider error messages without raising encoding exceptions' do
+    binary_error = StandardError.new('Login/senha invalido'.dup.force_encoding('ASCII-8BIT'))
+
+    expect { tool.send(:map_pix_error_message, binary_error) }.not_to raise_error
+    mapped = tool.send(:map_pix_error_message, binary_error)
+    expect(mapped).to match(%r{login/senha inválidos}i)
+  end
+
+  it 'returns conversational message when provider auth fails' do
+    create_draft_reservation
+    tool.instance_variable_set(:@conversation, conversation)
+
+    cob_service = instance_double(Captain::Inter::CobService)
+    allow(Captain::Inter::CobService).to receive(:new).with(instance_of(Captain::Reservation), amount: 140.0).and_return(cob_service)
+    allow(cob_service).to receive(:call).and_raise(StandardError, 'Login/senha invalido'.dup.force_encoding('ASCII-8BIT'))
+
+    result = tool.execute(amount: '140,00')
+
+    expect(result[:success]).to be(true)
+    expect(result[:formatted_message]).to match(%r{login/senha inválidos}i)
+  end
+
+  it 'normalizes ASCII-8BIT pix payload in tool response to UTF-8' do
+    reservation = create_draft_reservation
+    binary_pix_code = "/spi/\xE7abc123".dup.force_encoding('ASCII-8BIT')
+    sgid = instance_double(SignedGlobalID, to_s: 'signed-token')
+    charge = instance_double(Captain::PixCharge, pix_copia_e_cola: binary_pix_code)
+
+    allow(charge).to receive(:to_sgid).with(expires_in: 2.hours, purpose: :pix_payment).and_return(sgid)
+    allow(Rails.application.routes.url_helpers).to receive(:short_payment_link_url).and_return('http://localhost:3000/p/signed-token')
+
+    result = tool.send(:build_pix_response, charge, reservation, amount: 110.0, prefix: 'Pix gerado')
+
+    expect(result[:success]).to be(true)
+    expect(result[:raw_payload].encoding).to eq(Encoding::UTF_8)
+    expect(result[:formatted_message].encoding).to eq(Encoding::UTF_8)
+    expect(result[:raw_payload]).to start_with('00020101021226930014BR.GOV.BCB.PIX2571spi-qrcode.bancointer.com.br/spi/')
+  end
+
+  def create_draft_reservation
+    Captain::Reservation.create!(
+      account: account,
+      inbox: conversation.inbox,
+      contact: conversation.contact,
+      contact_inbox: conversation.contact_inbox,
+      conversation: conversation,
+      suite_identifier: 'Suite 101',
+      check_in_at: 1.day.from_now.change(hour: 19, min: 0, sec: 0),
+      check_out_at: 2.days.from_now.change(hour: 12, min: 0, sec: 0),
+      status: :draft,
+      total_amount: 280.0,
+      metadata: { deposit_amount: 140.0 }
+    )
+  end
+end
diff --git a/spec/enterprise/services/captain/tools/send_suite_images_tool_spec.rb b/spec/enterprise/services/captain/tools/send_suite_images_tool_spec.rb
new file mode 100644
index 000000000..cca8f64d1
--- /dev/null
+++ b/spec/enterprise/services/captain/tools/send_suite_images_tool_spec.rb
@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Captain::Tools::SendSuiteImagesTool, type: :model do
+  let(:account) { create(:account) }
+  let(:assistant) { create(:captain_assistant, account: account) }
+  let(:conversation) { create(:conversation, account: account) }
+  let(:brand) { create(:captain_brand, account: account) }
+  let(:unit) do
+    Captain::Unit.create!(
+      account: account,
+      brand: brand,
+      inbox: conversation.inbox,
+      name: 'Unidade Teste Tool',
+      inter_pix_key: SecureRandom.uuid,
+      inter_account_number: '12345678'
+    )
+  end
+  let(:tool) { described_class.new(assistant) }
+  let(:tool_context) do
+    Struct.new(:state).new(
+      {
+        account_id: account.id,
+        conversation: { id: conversation.id }
+      }
+    )
+  end
+
+  before do
+    create(:captain_inbox, captain_assistant: assistant, inbox: conversation.inbox, captain_unit: unit)
+  end
+
+  it 'sends inbox-scoped gallery images from the current conversation inbox' do
+    create(
+      :captain_gallery_item,
+      :inbox_scoped,
+      account: account,
+      captain_unit: unit,
+      inbox: conversation.inbox,
+      suite_category: 'hidromassagem',
+      suite_number: '101'
+    )
+    create(
+      :captain_gallery_item,
+      :inbox_scoped,
+      account: account,
+      captain_unit: unit,
+      inbox: conversation.inbox,
+      suite_category: 'hidromassagem',
+      suite_number: '101'
+    )
+
+    result = nil
+    expect do
+      result = tool.execute(tool_context, suite_category: 'hidromassagem', suite_number: '101', limit: 2)
+    end.to change { conversation.messages.outgoing.where(sender: assistant).count }.by(2)
+
+    expect(result[:success]).to be(true)
+    expect(result[:sent_count]).to eq(2)
+
+    created_messages = conversation.messages.outgoing.where(sender: assistant).order(created_at: :desc).limit(2)
+    expect(created_messages.all? { |message| message.attachments.any? }).to be(true)
+  end
+
+  it 'falls back to global gallery when there are no photos in the inbox scope' do
+    create(
+      :captain_gallery_item,
+      account: account,
+      scope: 'global',
+      suite_category: 'hidromassagem',
+      suite_number: '101'
+    )
+
+    result = nil
+    expect do
+      result = tool.execute(tool_context, suite_category: 'hidromassagem', suite_number: '101')
+    end.to change { conversation.messages.outgoing.where(sender: assistant).count }.by(1)
+
+    expect(result[:success]).to be(true)
+    expect(result[:scope]).to eq('global')
+  end
+
+  it 'does not use photos from another inbox and returns a conversational message when nothing matches' do
+    other_inbox = create(:inbox, account: account)
+    other_unit = Captain::Unit.create!(
+      account: account,
+      brand: brand,
+      inbox: other_inbox,
+      name: 'Outra Unidade Teste Tool',
+      inter_pix_key: SecureRandom.uuid,
+      inter_account_number: '87654321'
+    )
+    create(
+      :captain_gallery_item,
+      :inbox_scoped,
+      account: account,
+      captain_unit: other_unit,
+      inbox: other_inbox,
+      suite_category: 'hidromassagem',
+      suite_number: '101'
+    )
+
+    result = tool.execute(tool_context, suite_category: 'hidromassagem', suite_number: '101')
+
+    expect(result[:success]).to be(true)
+    expect(result[:formatted_message]).to match(/não encontrei fotos cadastradas/i)
+  end
+end
diff --git a/spec/factories/captain/brand.rb b/spec/factories/captain/brand.rb
new file mode 100644
index 000000000..dbc6f3a77
--- /dev/null
+++ b/spec/factories/captain/brand.rb
@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :captain_brand, class: 'Captain::Brand' do
+    association :account
+    sequence(:name) { |n| "Brand #{n}" }
+  end
+end
diff --git a/spec/factories/captain/gallery_item.rb b/spec/factories/captain/gallery_item.rb
new file mode 100644
index 000000000..90d5d6802
--- /dev/null
+++ b/spec/factories/captain/gallery_item.rb
@@ -0,0 +1,37 @@
+FactoryBot.define do
+  factory :captain_gallery_item, class: 'Captain::GalleryItem' do
+    account
+    captain_unit do
+      brand = create(:captain_brand, account: account)
+      Captain::Unit.create!(
+        account: account,
+        brand: brand,
+        name: "Unidade Factory #{SecureRandom.hex(4)}",
+        inter_pix_key: SecureRandom.uuid,
+        inter_account_number: Faker::Number.number(digits: 8)
+      )
+    end
+    created_by { create(:user, account: account) }
+    scope { 'global' }
+    suite_category { 'hidromassagem' }
+    suite_number { '101' }
+    description { 'Foto da suíte com hidromassagem' }
+    active { true }
+
+    trait :inbox_scoped do
+      scope { 'inbox' }
+    end
+
+    after(:build) do |item|
+      item.inbox = item.captain_unit&.inbox || create(:inbox, account: item.account) if item.scope == 'inbox' && item.inbox.blank?
+
+      next if item.image.attached?
+
+      item.image.attach(
+        io: File.open(Rails.root.join('spec/assets/sample.png')),
+        filename: 'sample.png',
+        content_type: 'image/png'
+      )
+    end
+  end
+end
diff --git a/spec/factories/captain/unit.rb b/spec/factories/captain/unit.rb
new file mode 100644
index 000000000..64f82f710
--- /dev/null
+++ b/spec/factories/captain/unit.rb
@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :captain_unit, class: 'Captain::Unit' do
+    association :account
+    association :brand, factory: :captain_brand, account: account
+    sequence(:name) { |n| "Unidade #{n}" }
+    inter_pix_key { SecureRandom.uuid }
+    inter_account_number { Faker::Number.number(digits: 8) }
+  end
+end