Merge branch 'develop' into fix/missing-postmessage-validation

Fall back to window.location.origin when baseUrl is empty or relative,
supporting same-origin deployments while maintaining origin validation.

.bundler-audit.yml

@@ -2,30 +2,8 @@
 ignore:
   - CVE-2021-41098 # https://github.com/chatwoot/chatwoot/issues/3097 (update once azure blob storage is updated)
   - GHSA-57hq-95w6-v4fc # Devise confirmable race condition — patched locally in User model (remove once on Devise 5+)
-  # Devise 5 is currently blocked by devise-secure_password/devise_token_auth/devise-two-factor.
-  # Chatwoot does not enable Timeoutable, so the timeout redirect path is not reachable.
-  - GHSA-jp94-3292-c3xv
-  # Rails 7.1 has no patched release for the Active Storage proxy range
-  # advisories. Chatwoot limits proxy range requests locally.
+  # Chatwoot defaults to Active Storage redirect-style URLs, and its recommended
+  # storage setup uses local/cloud storage with optional direct uploads to the
+  # storage provider rather than Rails proxy mode. Revisit if we enable
+  # rails_storage_proxy or other app-served Active Storage proxy routes.
   - CVE-2026-33658
-  # Rails 7.1 has no patched release for this Active Storage direct-upload
-  # advisory. Chatwoot filters internal metadata keys locally.
-  - CVE-2026-33173
-  - CVE-2026-33174
-  # Rails 7.1 has no patched release for these Rails advisories. These are not
-  # reachable through Chatwoot's current usage patterns and should be removed
-  # once we upgrade to Rails 7.2.3.1+.
-  - CVE-2026-33168
-  - CVE-2026-33169
-  - CVE-2026-33170
-  - CVE-2026-33176
-  - CVE-2026-33195
-  - CVE-2026-33202
-  # No Rails 7.1 patch for this Active Storage advisory; mitigated locally.
-  # Remove once on Rails 7.2.3.1+.
-  - CVE-2026-66066
-  # RubyLLM's name-normalization ReDoS is reported on Ruby 3.1; we require Ruby 3.4.4.
-  # Built-in tool names are fixed; custom tools use bounded slugs and override normalization.
-  # Patched 2.0 releases need an ai-agents migration (currently constrained to RubyLLM 1.x).
-  # Remove when a supported patched RubyLLM/ai-agents combination is adopted.
-  - CVE-2026-67991

.circleci/config.yml

@@ -77,8 +77,7 @@ jobs:
 
       - node/install:
           node-version: '24.13'
-      - node/install-pnpm:
-          version: '10.2.0'
+      - node/install-pnpm
       - node/install-packages:
           pkg-manager: pnpm
           override-ci-command: pnpm i
@@ -119,8 +118,7 @@ jobs:
       - checkout
       - node/install:
           node-version: '24.13'
-      - node/install-pnpm:
-          version: '10.2.0'
+      - node/install-pnpm
       - node/install-packages:
           pkg-manager: pnpm
           override-ci-command: pnpm i
@@ -151,8 +149,7 @@ jobs:
       - checkout
       - node/install:
           node-version: '24.13'
-      - node/install-pnpm:
-          version: '10.2.0'
+      - node/install-pnpm
       - node/install-packages:
           pkg-manager: pnpm
           override-ci-command: pnpm i

.env.example

@@ -15,15 +15,6 @@ SECRET_KEY_BASE=replace_with_lengthy_secure_hex
 
 # Replace with the URL you are planning to use for your app
 FRONTEND_URL=http://0.0.0.0:3000
-
-# Enterprise conversation monitors (enable the conversation_monitors account feature separately)
-# Set CAPTAIN_OPENROUTER_API_KEY and optional CAPTAIN_OPENROUTER_DECISION_MODEL_ENDPOINT
-# in Super Admin -> Settings -> Captain (shared installation settings). The endpoint is the API base URL.
-# CONVERSATION_MONITORS_MODEL=typesafe/jev-1.13
-# CONVERSATION_MONITORS_LIMIT=20
-# Allowlisted contact/conversation custom attribute keys to send as customer context
-# CONVERSATION_MONITORS_ATTRIBUTES=deployment_type
-# CONVERSATION_MONITORS_DAILY_TOKEN_LIMIT=20000000
 # To use a dedicated URL for help center pages
 # HELPCENTER_URL=http://0.0.0.0:3000
 
@@ -68,16 +59,6 @@ REDIS_SENTINEL_MASTER_NAME=
 # ref: https://github.com/chatwoot/chatwoot/issues/2420
 # REDIS_OPENSSL_VERIFY_MODE=none
 
-# OpenSearch / Elasticsearch-compatible search config
-# Set OPENSEARCH_URL to enable advanced search. Elastic Cloud API keys can be configured with either key name below.
-# API key values must be provided without the ApiKey authorization scheme prefix.
-# OPENSEARCH_URL=
-# OPENSEARCH_API_KEY=
-# ELASTICSEARCH_API_KEY=
-# OPENSEARCH_AWS_ACCESS_KEY_ID=
-# OPENSEARCH_AWS_SECRET_ACCESS_KEY=
-# OPENSEARCH_AWS_REGION=us-east-1
-
 # Postgres Database config variables
 # You can leave POSTGRES_DATABASE blank. The default name of
 # the database in the production environment is chatwoot_production
@@ -89,13 +70,6 @@ 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
-# Number of Puma worker processes (clustered mode). Defaults to 0 (single
-# process) when unset. On a multi-core production server, set this to run Puma
-# in clustered mode so CPU-bound requests don't serialize behind Ruby's GVL.
-# A common starting point is the number of available CPU cores; total
-# concurrency is roughly WEB_CONCURRENCY * RAILS_MAX_THREADS, so size it
-# against available RAM. See config/puma.rb.
-# WEB_CONCURRENCY=2
 
 # The email from which all outgoing emails are sent
 # could user either  `email@yourdomain.com` or `BrandName <email@yourdomain.com>`
@@ -124,8 +98,6 @@ SMTP_OPENSSL_VERIFY_MODE=peer
 # Mail Incoming
 # This is the domain set for the reply emails when conversation continuity is enabled
 MAILER_INBOUND_EMAIL_DOMAIN=
-# Maximum time in seconds to process a single IMAP email
-# EMAIL_PROCESSING_TIMEOUT_SECONDS=60
 # Set this to the appropriate ingress channel with regards to incoming emails
 # Possible values are :
 # relay for Exim, Postfix, Qmail
@@ -158,11 +130,6 @@ ACTION_MAILBOX_SES_SNS_TOPIC=
 # Storage
 ACTIVE_STORAGE_SERVICE=local
 
-# Restrict libvips to its trusted, well-tested image loaders when Active Storage
-# generates variants. Hardens image processing against untrusted uploads.
-# Requires libvips >= 8.13 (ignored on older versions).
-VIPS_BLOCK_UNTRUSTED=1
-
 # Amazon S3
 # documentation: https://www.chatwoot.com/docs/configuring-s3-bucket-as-cloud-storage
 S3_BUCKET_NAME=
@@ -182,8 +149,6 @@ LOG_SIZE=500
 
 # Facebook
 # documentation: https://www.chatwoot.com/docs/facebook-setup
-# Connected Facebook pages are subscribed by Chatwoot to Messenger webhook
-# fields, including postbacks used by Get Started and button flows.
 FB_VERIFY_TOKEN=
 FB_APP_SECRET=
 FB_APP_ID=
@@ -201,7 +166,6 @@ TWITTER_ENVIRONMENT=
 #slack integration
 SLACK_CLIENT_ID=
 SLACK_CLIENT_SECRET=
-SLACK_SIGNING_SECRET=
 
 # Google OAuth
 GOOGLE_OAUTH_CLIENT_ID=
@@ -264,30 +228,10 @@ ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:
 ## To prevent and throttle abusive requests
 # ENABLE_RACK_ATTACK=true
 # RACK_ATTACK_LIMIT=300
-## Parent switch for all widget throttles; per-endpoint switches below only apply when this is on
 # ENABLE_RACK_ATTACK_WIDGET_API=true
-## Widget conversation creates, per minute, keyed on (IP, website_token)
-# ENABLE_RACK_ATTACK_WIDGET_CONVERSATIONS=true
-# RATE_LIMIT_WIDGET_CONVERSATIONS=30
-## Widget message creates, per minute, keyed on (IP, website_token)
-# ENABLE_RACK_ATTACK_WIDGET_MESSAGES=true
-# RATE_LIMIT_WIDGET_MESSAGES=60
-## Widget contact updates, per hour, per IP
-# ENABLE_RACK_ATTACK_WIDGET_CONTACTS=true
-# RATE_LIMIT_WIDGET_CONTACTS=60
-## Widget page loads (new session), per hour, per IP
-# ENABLE_RACK_ATTACK_WIDGET_LOAD=true
-# RATE_LIMIT_WIDGET_LOAD=200
-## Widget transcript requests, per hour, per IP
-# ENABLE_RACK_ATTACK_WIDGET_TRANSCRIPT=true
-# RATE_LIMIT_WIDGET_TRANSCRIPT=5
 # 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
 
-## SafeFetch private network access
-## Keep disabled by default. Self-hosted installations can enable this to allow SafeFetch requests to private network URLs.
-# SAFE_FETCH_ALLOW_PRIVATE_NETWORK=false
-
 ## Running chatwoot as an API only server
 ## setting this value to true will disable the frontend dashboard endpoints
 # CW_API_ONLY_SERVER=false
@@ -321,14 +265,10 @@ AZURE_APP_SECRET=
 # Enable verbose logging each time a job is dequeued in Sidekiq
 # ENABLE_SIDEKIQ_DEQUEUE_LOGGER=false
 
-# Sidekiq health check server (defaults to 0.0.0.0:7433).
-# Uncomment SIDEKIQ_ALIVE_HOST to restrict the health check to localhost.
-# SIDEKIQ_ALIVE_HOST=127.0.0.1
-# SIDEKIQ_ALIVE_PORT=7433
 
-# AI powered features (Captain)
-# The OpenAI API key and endpoint for Captain are not configured via .env.
-# Set them at Super Admin > App Configs > Captain (CAPTAIN_OPEN_AI_API_KEY, CAPTAIN_OPEN_AI_ENDPOINT).
+# AI powered features
+## OpenAI key
+# OPENAI_API_KEY=
 
 # Housekeeping/Performance related configurations
 # Set to true if you want to remove stale contact inboxes
@@ -337,15 +277,3 @@ AZURE_APP_SECRET=
 
 # REDIS_ALFRED_SIZE=10
 # REDIS_VELMA_SIZE=10
-
-# Publish Sidekiq queue metrics to AWS CloudWatch for autoscaling. Off by default.
-# By default uses the instance role, which must allow cloudwatch:PutMetricData.
-# ENABLE_SIDEKIQ_CLOUDWATCH=true
-# SIDEKIQ_CLOUDWATCH_NAMESPACE=Chatwoot/Sidekiq
-# Publish interval in seconds (default 60; values below 60 work but bill as high-resolution CloudWatch metrics)
-# SIDEKIQ_CLOUDWATCH_INTERVAL=60
-# Optional: dedicated credentials for CloudWatch only, separate from the S3 (storage) keys.
-# Set these to override the instance role when a role is not available.
-# SIDEKIQ_CLOUDWATCH_AWS_ACCESS_KEY_ID=
-# SIDEKIQ_CLOUDWATCH_AWS_SECRET_ACCESS_KEY=
-# SIDEKIQ_CLOUDWATCH_AWS_REGION=us-east-1

.eslintrc.js

@@ -247,7 +247,6 @@ module.exports = {
   },
   env: {
     browser: true,
-    es2020: true,
     node: true,
   },
   globals: {

.github/scripts/ghsa_linear_sync.py

@@ -1,211 +0,0 @@
-#!/usr/bin/env python3
-"""Sync triage GitHub security advisories to Linear issues."""
-
-from __future__ import annotations
-
-import os
-import sys
-from typing import Any
-
-import requests
-
-GITHUB_API = "https://api.github.com"
-LINEAR_API = "https://api.linear.app/graphql"
-
-SEVERITY_PRIORITY = {"critical": 1, "high": 2, "medium": 3, "low": 4}
-SEVERITY_COLOR = {
-    "critical": 15548997,
-    "high": 15105570,
-    "medium": 15844367,
-    "low": 3066993,
-}
-DEFAULT_COLOR = 9807270
-
-
-def required_env(name: str) -> str:
-    value = os.environ.get(name)
-    if not value:
-        sys.exit(f"Missing required env var: {name}")
-    return value
-
-
-def fetch_triage_advisories(repo: str, token: str) -> list[dict[str, Any]]:
-    url: str | None = f"{GITHUB_API}/repos/{repo}/security-advisories"
-    params: dict[str, Any] | None = {"state": "triage", "per_page": 100}
-    headers = {
-        "Accept": "application/vnd.github+json",
-        "Authorization": f"Bearer {token}",
-        "X-GitHub-Api-Version": "2022-11-28",
-    }
-    advisories: list[dict[str, Any]] = []
-    while url:
-        r = requests.get(url, headers=headers, params=params, timeout=30)
-        r.raise_for_status()
-        advisories.extend(r.json())
-        next_link = r.links.get("next")
-        url = next_link["url"] if next_link else None
-        params = None
-    return advisories
-
-
-def linear_call(query: str, variables: dict[str, Any], api_key: str) -> dict[str, Any]:
-    r = requests.post(
-        LINEAR_API,
-        headers={"Authorization": api_key},
-        json={"query": query, "variables": variables},
-        timeout=30,
-    )
-    r.raise_for_status()
-    return r.json()
-
-
-def linear_issue_exists(ghsa_id: str, api_key: str) -> bool:
-    query = (
-        "query($q: String!) { issues(filter: {title: {contains: $q}}, first: 1) "
-        "{ nodes { id } } }"
-    )
-    resp = linear_call(query, {"q": ghsa_id}, api_key)
-    return len(resp.get("data", {}).get("issues", {}).get("nodes", [])) > 0
-
-
-def linear_create_issue(input_data: dict[str, Any], api_key: str) -> dict[str, str] | None:
-    query = (
-        "mutation($input: IssueCreateInput!) { issueCreate(input: $input) "
-        "{ success issue { identifier url } } }"
-    )
-    resp = linear_call(query, {"input": input_data}, api_key)
-    create = resp.get("data", {}).get("issueCreate") or {}
-    if not create.get("success"):
-        return None
-    return create.get("issue")
-
-
-def reporter_login(advisory: dict[str, Any]) -> str:
-    for credit in advisory.get("credits") or []:
-        user = (credit or {}).get("user") or {}
-        if user.get("login"):
-            return user["login"]
-    return "unknown"
-
-
-def cvss_score(advisory: dict[str, Any]) -> str:
-    score = (advisory.get("cvss") or {}).get("score")
-    return str(score) if score is not None else "n/a"
-
-
-def build_description(adv: dict[str, Any]) -> str:
-    return (
-        f"**GHSA:** {adv['ghsa_id']}\n"
-        f"**CVE:** {adv.get('cve_id') or 'n/a'}\n"
-        f"**Severity:** {adv.get('severity') or 'unknown'} (CVSS {cvss_score(adv)})\n"
-        f"**Reporter:** {reporter_login(adv)}\n"
-        f"**Reported:** {(adv.get('created_at') or '').split('T')[0]}\n"
-        f"**Advisory:** {adv['html_url']}\n\n"
-        f"---\n\n"
-        f"{adv.get('description') or 'No description provided.'}"
-    )
-
-
-def post_slack(adv: dict[str, Any], issue: dict[str, str], webhook_url: str) -> None:
-    severity = adv.get("severity") or "unknown"
-    title = f"[{adv['ghsa_id']}] {adv['summary']}"[:200]
-    text = (
-        f"*<{issue['url']}|{title}>*\n"
-        f"Linear: {issue['identifier']} · Severity: {severity} (CVSS {cvss_score(adv)}) · <{adv['html_url']}|advisory>"
-    )
-    try:
-        requests.post(webhook_url, json={"text": text}, timeout=10)
-    except requests.RequestException:
-        pass
-
-
-def post_discord(adv: dict[str, Any], issue: dict[str, str], webhook_url: str) -> None:
-    severity = adv.get("severity") or "unknown"
-    title = f"[{adv['ghsa_id']}] {adv['summary']}"[:250]
-    payload = {
-        "username": "GHSA Sync",
-        "embeds": [
-            {
-                "title": title,
-                "url": issue["url"],
-                "color": SEVERITY_COLOR.get(severity, DEFAULT_COLOR),
-                "fields": [
-                    {"name": "Linear", "value": issue["identifier"], "inline": True},
-                    {
-                        "name": "Severity",
-                        "value": f"{severity} (CVSS {cvss_score(adv)})",
-                        "inline": True,
-                    },
-                    {
-                        "name": "Advisory",
-                        "value": f"[GitHub]({adv['html_url']})",
-                        "inline": True,
-                    },
-                ],
-            }
-        ],
-    }
-    try:
-        requests.post(webhook_url, json=payload, timeout=10)
-    except requests.RequestException:
-        pass
-
-
-def main() -> int:
-    repo = required_env("GITHUB_REPOSITORY")
-    gh_token = required_env("GHSA_READ_TOKEN")
-    linear_api_key = required_env("LINEAR_API_KEY")
-    team_id = required_env("LINEAR_TEAM_ID")
-    project_id = required_env("LINEAR_PROJECT_ID")
-    label_id = required_env("LINEAR_LABEL_ID")
-    discord_webhook = os.environ.get("DISCORD_WEBHOOK_URL") or None
-    slack_webhook = os.environ.get("SLACK_WEBHOOK_URL") or None
-
-    advisories = fetch_triage_advisories(repo, gh_token)
-    print(f"Fetched {len(advisories)} triage advisories")
-
-    created = skipped = failed = 0
-
-    for adv in advisories:
-        ghsa_id = adv.get("ghsa_id")
-        if not ghsa_id:
-            failed += 1
-            continue
-
-        try:
-            if linear_issue_exists(ghsa_id, linear_api_key):
-                skipped += 1
-                continue
-
-            severity = adv.get("severity") or "unknown"
-            issue = linear_create_issue(
-                {
-                    "title": f"[{ghsa_id}] {adv.get('summary', '')}",
-                    "description": build_description(adv),
-                    "teamId": team_id,
-                    "projectId": project_id,
-                    "labelIds": [label_id],
-                    "priority": SEVERITY_PRIORITY.get(severity, 3),
-                },
-                linear_api_key,
-            )
-        except requests.RequestException:
-            failed += 1
-            continue
-
-        if not issue:
-            failed += 1
-            continue
-
-        created += 1
-        if discord_webhook:
-            post_discord(adv, issue, discord_webhook)
-        if slack_webhook:
-            post_slack(adv, issue, slack_webhook)
-
-    print(f"Created {created}, skipped {skipped}, failed {failed}")
-    return 1 if failed > 0 else 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())

.github/workflows/deploy_check.yml

@@ -11,9 +11,6 @@ concurrency:
   group: pr-${{ github.workflow }}-${{ github.head_ref }}
   cancel-in-progress: true
 
-permissions:
-  contents: read
-
 jobs:
   deployment_check:
     name: Check Deployment

.github/workflows/frontend-fe.yml

@@ -8,9 +8,6 @@ on:
     branches:
       - develop
 
-permissions:
-  contents: read
-
 jobs:
   test:
     runs-on: ubuntu-22.04

.github/workflows/ghsa-linear-sync.yml

@@ -1,30 +0,0 @@
-name: Sync GHSA advisories to Linear
-
-on:
-  schedule:
-    - cron: '0 4 * * *'  # daily at 09:30 IST
-  workflow_dispatch: {}
-
-permissions:
-  contents: read
-
-jobs:
-  sync:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.11'
-      - name: Install dependencies
-        run: pip install requests==2.32.3
-      - name: Sync advisories
-        env:
-          GHSA_READ_TOKEN: ${{ secrets.GHSA_READ_TOKEN }}
-          LINEAR_API_KEY: ${{ secrets.LINEAR_API_KEY }}
-          LINEAR_TEAM_ID: ${{ secrets.LINEAR_TEAM_ID }}
-          LINEAR_PROJECT_ID: ${{ secrets.LINEAR_PROJECT_ID }}
-          LINEAR_LABEL_ID: ${{ secrets.LINEAR_LABEL_ID }}
-          DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-        run: python3 .github/scripts/ghsa_linear_sync.py

.github/workflows/logging_percentage_check.yml

@@ -10,9 +10,6 @@ concurrency:
   group: pr-${{ github.workflow }}-${{ github.head_ref }}
   cancel-in-progress: true
 
-permissions:
-  contents: read
-
 jobs:
   log_lines_check:
     runs-on: ubuntu-latest

.github/workflows/nightly_installer.yml

@@ -14,9 +14,6 @@ on:
     - cron: "0 0 * * *"
   workflow_dispatch:
 
-permissions:
-  contents: read
-
 jobs:
   nightly:
     runs-on: ubuntu-24.04

.github/workflows/publish_codespace_image.yml

@@ -3,10 +3,6 @@ name: Publish Codespace Base Image
 on:
   workflow_dispatch:
 
-permissions:
-  contents: read
-  packages: write
-
 jobs:
   publish-code-space-image:
     runs-on: ubuntu-latest

.github/workflows/publish_ee_docker.yml

@@ -18,9 +18,6 @@ on:
 env:
   DOCKER_REPO: chatwoot/chatwoot
 
-permissions:
-  contents: read
-
 jobs:
   build:
     strategy:

.github/workflows/publish_foss_docker.yml

@@ -18,9 +18,6 @@ on:
 env:
   DOCKER_REPO: chatwoot/chatwoot
 
-permissions:
-  contents: read
-
 jobs:
   build:
     strategy:

.github/workflows/run_foss_spec.yml

@@ -21,24 +21,6 @@ jobs:
       - name: Run Rubocop
         run: bundle exec rubocop --parallel
 
-  security-scan:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-      - name: Run Brakeman
-        # Non-blocking for now: Brakeman surfaces 35 pre-existing findings
-        # (13 High confidence) that need security-team triage before this
-        # can be turned into a hard gate.
-        continue-on-error: true
-        run: bundle exec brakeman -q --no-pager
-      - name: Run bundle-audit
-        run: |
-          bundle exec bundle-audit update
-          bundle exec bundle-audit check
-
   lint-frontend:
     runs-on: ubuntu-latest
     steps:

.github/workflows/run_mfa_spec.yml

@@ -67,20 +67,9 @@ jobs:
         run: |
           bundle exec rspec \
             spec/services/mfa/token_service_spec.rb \
-            spec/services/mfa/setup_token_service_spec.rb \
             spec/services/mfa/authentication_service_spec.rb \
             spec/requests/api/v1/profile/mfa_controller_spec.rb \
-            spec/controllers/api/v1/profiles_controller_spec.rb \
-            spec/controllers/api/v1/notification_subscriptions_controller_spec.rb \
-            spec/requests/api/v1/profile/sessions_controller_spec.rb \
             spec/controllers/devise_overrides/sessions_controller_spec.rb \
-            spec/requests/devise_overrides/passwords_controller_spec.rb \
-            spec/requests/devise_overrides/confirmations_controller_spec.rb \
-            spec/controllers/api/v1/accounts_controller_spec.rb \
-            spec/controllers/api/v2/accounts_controller_spec.rb \
-            spec/requests/api/v1/accounts/base_controller_spec.rb \
-            spec/enterprise/controllers/enterprise/api/v1/accounts_controller_spec.rb \
-            spec/enterprise/controllers/enterprise/devise_overrides/device_verification_spec.rb \
             spec/models/application_record_external_credentials_encryption_spec.rb \
             --profile=10 \
             --format documentation
@@ -98,13 +87,6 @@ jobs:
             -e "backup code" \
             --profile=10 \
             --format documentation
-
-      - name: Run MFA-related tests in account_spec
-        run: |
-          bundle exec rspec spec/models/account_spec.rb \
-            -e "enforce_mfa" \
-            --profile=10 \
-            --format documentation
         env:
           NODE_OPTIONS: --openssl-legacy-provider
 

.github/workflows/size-limit.yml

@@ -10,9 +10,6 @@ concurrency:
   group: pr-${{ github.workflow }}-${{ github.head_ref }}
   cancel-in-progress: true
 
-permissions:
-  contents: read
-
 jobs:
   test:
     runs-on: ubuntu-22.04

.github/workflows/test_docker_build.yml

@@ -7,9 +7,6 @@ on:
       - master
   workflow_dispatch:
 
-permissions:
-  contents: read
-
 jobs:
   test-build:
     strategy:

.gitignore

@@ -104,4 +104,3 @@ CLAUDE.local.md
 .pnpm-store/*
 local/
 Procfile.worktree
-.nodeterm/project.json

.rubocop.yml

@@ -16,10 +16,8 @@ Layout/LineLength:
 Metrics/ClassLength:
   Max: 175
   Exclude:
-    - 'app/builders/messages/message_builder.rb'
     - 'app/models/message.rb'
     - 'app/models/conversation.rb'
-    - 'config/initializers/rack_attack.rb'
 
 Metrics/MethodLength:
   Max: 19

AGENTS.md

@@ -43,22 +43,13 @@
 
 ## General Guidelines
 
-- **Database foreign keys**: Prefer Rails associations and callbacks over database foreign-key constraints. Add a database foreign key only when there is a clear need and after checking deletion behavior and production migration/locking risks. Existing foreign keys alone are not a reason to add new ones.
-- Prefer the smallest production-ready change that solves the current problem.
-- Build for the expected production path first. Do not add speculative guards, fallbacks, retries, or edge-case handling unless the caller can actually hit that case or production has proven it necessary.
-- Enforce eligibility and exclusivity rules at the earliest shared entry point. Do not repeat backup guards across downstream jobs, callbacks, services, or writes unless a proven independent path bypasses that point.
-- Validate request parameters at the controller or request boundary, reusing existing errors so invalid input returns `422 Unprocessable Entity` instead of reaching models or Sentry.
-- Accept only the documented type, shape, and value. Do not add compatibility coercions for malformed client values; fix official clients instead.
-- When an impossible or misconfigured state would indicate a setup/deployment bug, let it fail loudly instead of silently skipping behavior.
-- For locked/internal configs that must exist in production, prefer direct reads (`find`, `find_by!`, required hash keys) over silent fallbacks.
-- Do not add validation or response checks unless the code uses the result or the check changes behavior meaningfully.
-- Prefer existing repo dependencies/client libraries over hand-rolled protocol code for auth, signing, parsing, or API plumbing.
-- Avoid one-use private helpers unless they hide real complexity or make the main flow meaningfully easier to read.
+- 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
-- In specs, avoid custom helper methods for setup/data. Prefer `let` values and direct per-example setup; only add a helper when it removes meaningful repeated complexity.
 - 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
@@ -89,10 +80,8 @@
 ## Project-Specific
 
 - **Translations**:
-  - For product and source-string changes, only update `en.yml` and `en.json`; other languages are handled through Crowdin and the community
-  - Crowdin-generated translation sync PRs may update non-English locale files; do not flag those changes solely for modifying translated locale files
-  - Preserve product and brand names, OAuth scopes, API values, and other machine-readable identifiers unless an official localized form exists
-  - When reviewing Crowdin syncs, verify protected terms remain unchanged. Add newly introduced product names, brand names, and machine-readable identifiers to the Crowdin glossary as non-translatable, and keep the glossary current
+  - 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)
@@ -101,15 +90,6 @@
 
 - Use compact `module/class` definitions; avoid nested styles
 
-## Frontend Conventions
-
-- Prefer existing design-system utilities and shared composables.
-- Use typography utilities instead of manually recreating font styles.
-- Use logical Tailwind utilities (`ms`, `me`, `start`, `end`) for direction-aware layouts.
-- Use `rem` for arbitrary CSS dimensions; preserve native numeric values required by chart/SVG APIs.
-- Extract repeated or domain-specific strings, thresholds, colors, and durations into named constants.
-- Use shared request-cancellation utilities instead of local `AbortController` logic.
-
 ## Enterprise Edition Notes
 
 - Chatwoot has an Enterprise overlay under `enterprise/` that extends/overrides OSS code.

Gemfile

@@ -3,10 +3,8 @@ source 'https://rubygems.org'
 ruby '3.4.4'
 
 ##-- base gems for rails --##
-
 gem 'rack-cors', '2.0.0', require: 'rack/cors'
-gem 'rails', '7.2.3.1'
-
+gem 'rails', '~> 7.1'
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', require: false
 
@@ -24,7 +22,6 @@ gem 'time_diff'
 gem 'tzinfo-data'
 gem 'valid_email2'
 gem 'email-provider-info'
-gem 'gemoji'
 # compress javascript config.assets.js_compressor
 gem 'uglifier'
 ##-- used for single column multiple binary flags in notification settings/feature flagging --##
@@ -54,8 +51,9 @@ gem 'csv-safe'
 
 ##-- for active storage --##
 gem 'aws-sdk-s3', require: false
-gem 'aws-sdk-sesv2', require: false
-gem 'azure-blob', require: false
+# original gem isn't maintained actively
+# we wanted updated version of faraday which is a dependency for slack-ruby-client
+gem 'azure-storage-blob', git: 'https://github.com/chatwoot/azure-storage-ruby', branch: 'chatwoot', require: false
 gem 'google-cloud-storage', '>= 1.48.0', require: false
 gem 'image_processing'
 
@@ -77,27 +75,26 @@ gem 'faraday_middleware-aws-sigv4'
 ##--- gems for server & infra configuration ---##
 gem 'dotenv-rails', '>= 3.0.0'
 gem 'foreman'
-gem 'puma', '~> 7.2', '>= 7.2.1'
+gem 'puma'
 gem 'vite_rails'
 # metrics on heroku
 gem 'barnes'
 
 ##--- gems for authentication & authorization ---##
 gem 'devise', '>= 4.9.4'
-# 2.2.3 requires Devise 5; Chatwoot remains on Devise 4 for this upgrade stack.
-gem 'devise-secure_password', '2.2.1'
+gem 'devise-secure_password', git: 'https://github.com/chatwoot/devise-secure_password', branch: 'chatwoot'
 gem 'devise_token_auth', '>= 1.2.3'
 gem 'rails-i18n', '~> 7.0'
 # two-factor authentication
 gem 'devise-two-factor', '>= 5.0.0'
 # authorization
-gem 'jwt', '~> 2.10', '>= 2.10.3'
+gem 'jwt'
 gem 'pundit'
 
 # super admin
 gem 'administrate', '>= 0.20.1'
 gem 'administrate-field-active_storage', '>= 1.0.3'
-gem 'administrate-field-belongs_to_search', '>= 0.10.0'
+gem 'administrate-field-belongs_to_search', '>= 0.9.0'
 
 ##--- gems for pubsub service ---##
 # https://karolgalanciak.com/blog/2019/11/30/from-activerecord-callbacks-to-publish-slash-subscribe-pattern-and-event-driven-design/
@@ -135,13 +132,11 @@ gem 'sentry-ruby', require: false
 gem 'sentry-sidekiq', '>= 5.19.0', require: false
 
 ##-- background job processing --##
-gem 'sidekiq', '~> 7.3.10'
+gem 'sidekiq', '>= 7.3.1'
 # We want cron jobs
-gem 'sidekiq-cron', '>= 2.4.0'
+gem 'sidekiq-cron', '>= 1.12.0'
 # for sidekiq healthcheck
 gem 'sidekiq_alive'
-# publishes Sidekiq queue metrics to CloudWatch for autoscaling (opt-in via ENABLE_SIDEKIQ_CLOUDWATCH)
-gem 'speedshop-cloudwatch', '~> 0.2.1', require: false
 
 ##-- Push notification service --##
 gem 'fcm'
@@ -199,10 +194,10 @@ gem 'reverse_markdown'
 
 gem 'iso-639'
 gem 'ruby-openai'
-gem 'ai-agents', '>= 0.12.0'
+gem 'ai-agents', '>= 0.9.1'
 
 # TODO: Move this gem as a dependency of ai-agents
-gem 'ruby_llm', '>= 1.14.1'
+gem 'ruby_llm', '>= 1.8.2'
 gem 'ruby_llm-schema'
 
 gem 'cld3', '~> 3.7'
@@ -213,8 +208,6 @@ gem 'opentelemetry-exporter-otlp'
 
 gem 'shopify_api'
 
-gem 'firecrawl-sdk', '~> 1.0', require: 'firecrawl'
-
 ### Gems required only in specific deployment environments ###
 ##############################################################
 

Gemfile.lock

@@ -1,87 +1,115 @@
+GIT
+  remote: https://github.com/chatwoot/azure-storage-ruby
+  revision: 9957cf899d33a285b5dfe15bdb875292398e392b
+  branch: chatwoot
+  specs:
+    azure-storage-blob (2.0.3)
+      azure-storage-common (~> 2.0)
+      nokogiri (~> 1, >= 1.10.8)
+    azure-storage-common (2.0.4)
+      faraday (~> 2.0)
+      faraday-follow_redirects (~> 0.3.0)
+      faraday-net_http_persistent (~> 2.0)
+      net-http-persistent (~> 4.0)
+      nokogiri (~> 1, >= 1.10.8)
+
+GIT
+  remote: https://github.com/chatwoot/devise-secure_password
+  revision: adcc85fe1babfe40feae73dbcae64d14fff86e69
+  branch: chatwoot
+  specs:
+    devise-secure_password (2.0.1)
+      devise (>= 4.0.0, < 5.0.0)
+      railties (>= 5.0.0, < 8.0.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    actioncable (7.1.5.2)
+      actionpack (= 7.1.5.2)
+      activesupport (= 7.1.5.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      activejob (= 7.2.3.1)
-      activerecord (= 7.2.3.1)
-      activestorage (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
-      mail (>= 2.8.0)
-    actionmailer (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      actionview (= 7.2.3.1)
-      activejob (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
-      mail (>= 2.8.0)
+    actionmailbox (7.1.5.2)
+      actionpack (= 7.1.5.2)
+      activejob (= 7.1.5.2)
+      activerecord (= 7.1.5.2)
+      activestorage (= 7.1.5.2)
+      activesupport (= 7.1.5.2)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.1.5.2)
+      actionpack (= 7.1.5.2)
+      actionview (= 7.1.5.2)
+      activejob (= 7.1.5.2)
+      activesupport (= 7.1.5.2)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.3.1)
-      actionview (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
-      cgi
+    actionpack (7.1.5.2)
+      actionview (= 7.1.5.2)
+      activesupport (= 7.1.5.2)
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4, < 3.3)
+      rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-      useragent (~> 0.16)
-    actiontext (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      activerecord (= 7.2.3.1)
-      activestorage (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    actiontext (7.1.5.2)
+      actionpack (= 7.1.5.2)
+      activerecord (= 7.1.5.2)
+      activestorage (= 7.1.5.2)
+      activesupport (= 7.1.5.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.3.1)
-      activesupport (= 7.2.3.1)
+    actionview (7.1.5.2)
+      activesupport (= 7.1.5.2)
       builder (~> 3.1)
-      cgi
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
     active_record_query_trace (1.8)
-    activejob (7.2.3.1)
-      activesupport (= 7.2.3.1)
+    activejob (7.1.5.2)
+      activesupport (= 7.1.5.2)
       globalid (>= 0.3.6)
-    activemodel (7.2.3.1)
-      activesupport (= 7.2.3.1)
-    activerecord (7.2.3.1)
-      activemodel (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    activemodel (7.1.5.2)
+      activesupport (= 7.1.5.2)
+    activerecord (7.1.5.2)
+      activemodel (= 7.1.5.2)
+      activesupport (= 7.1.5.2)
       timeout (>= 0.4.0)
     activerecord-import (2.1.0)
       activerecord (>= 4.2)
-    activestorage (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      activejob (= 7.2.3.1)
-      activerecord (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    activestorage (7.1.5.2)
+      actionpack (= 7.1.5.2)
+      activejob (= 7.1.5.2)
+      activerecord (= 7.1.5.2)
+      activesupport (= 7.1.5.2)
       marcel (~> 1.0)
-    activesupport (7.2.3.1)
+    activesupport (7.1.5.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
       logger (>= 1.4.2)
-      minitest (>= 5.1, < 6)
+      minitest (>= 5.1)
+      mutex_m
       securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
+      tzinfo (~> 2.0)
     acts-as-taggable-on (12.0.0)
       activerecord (>= 7.1, < 8.1)
       zeitwerk (>= 2.4, < 3.0)
-    addressable (2.9.0)
-      public_suffix (>= 2.0.2, < 8.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     administrate (0.20.1)
       actionpack (>= 6.0, < 8.0)
       actionview (>= 6.0, < 8.0)
@@ -93,13 +121,13 @@ GEM
     administrate-field-active_storage (1.0.3)
       administrate (>= 0.2.2)
       rails (>= 7.0)
-    administrate-field-belongs_to_search (0.10.0)
+    administrate-field-belongs_to_search (0.9.0)
       administrate (>= 0.3, < 1.0)
       jbuilder (~> 2)
-      rails (>= 4.2, < 8.0)
+      rails (>= 4.2, < 7.2)
       selectize-rails (~> 0.6)
-    ai-agents (0.12.0)
-      ruby_llm (~> 1.14)
+    ai-agents (0.9.1)
+      ruby_llm (~> 1.9.1)
     annotaterb (4.20.0)
       activerecord (>= 6.0.0)
       activesupport (>= 6.0.0)
@@ -108,17 +136,12 @@ GEM
     audited (5.4.1)
       activerecord (>= 5.0, < 7.7)
       activesupport (>= 5.0, < 7.7)
-    auth-sanitizer (0.2.1)
-      version_gem (~> 1.1, >= 1.1.10)
     aws-actionmailbox-ses (0.1.0)
       actionmailbox (>= 7.1.0)
       aws-sdk-s3 (~> 1, >= 1.123.0)
       aws-sdk-sns (~> 1, >= 1.61.0)
     aws-eventstream (1.4.0)
     aws-partitions (1.1198.0)
-    aws-sdk-cloudwatch (1.126.0)
-      aws-sdk-core (~> 3, >= 3.239.1)
-      aws-sigv4 (~> 1.5)
     aws-sdk-core (3.240.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
@@ -134,29 +157,22 @@ GEM
       aws-sdk-core (~> 3, >= 3.234.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-sesv2 (1.92.0)
-      aws-sdk-core (~> 3, >= 3.239.1)
-      aws-sigv4 (~> 1.5)
     aws-sdk-sns (1.70.0)
       aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
-    azure-blob (0.8.0)
-      cgi
-      rexml
     barnes (0.0.9)
       multi_json (~> 1)
       statsd-ruby (~> 1.1)
     base64 (0.3.0)
     bcrypt (3.1.22)
-    benchmark (0.5.0)
-    bigdecimal (4.1.2)
+    benchmark (0.4.1)
+    bigdecimal (3.2.2)
     bindex (0.8.1)
     bootsnap (1.16.0)
       msgpack (~> 1.2)
-    brakeman (8.0.5)
-      racc
+    brakeman (5.4.1)
     browser (5.3.1)
     builder (3.3.0)
     bullet (8.0.7)
@@ -168,22 +184,18 @@ GEM
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     byebug (11.1.3)
-    cgi (0.5.2)
     childprocess (5.1.0)
       logger (~> 1.5)
     cld3 (3.7.0)
     climate_control (1.2.0)
     coderay (1.1.3)
-    commonmarker (0.23.12)
-    concurrent-ruby (1.3.8)
+    commonmarker (0.23.10)
+    concurrent-ruby (1.3.5)
     connection_pool (2.5.5)
     crack (1.0.0)
       bigdecimal
       rexml
-    crass (1.0.7)
-    cronex (0.15.0)
-      tzinfo
-      unicode (>= 0.4.4.5)
+    crass (1.0.6)
     csv (3.3.0)
     csv-safe (3.3.1)
       csv (~> 3.0)
@@ -193,18 +205,17 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    datadog (2.38.0)
-      cgi
-      datadog-ruby_core_source (~> 3.5, >= 3.5.3)
-      libdatadog (~> 36.0.0.1.0)
-      libddwaf (~> 1.30.0.0.0)
+    datadog (2.19.0)
+      datadog-ruby_core_source (~> 3.4, >= 3.4.1)
+      libdatadog (~> 18.1.0.1.0)
+      libddwaf (~> 1.24.1.0.3)
       logger
       msgpack
-    datadog-ruby_core_source (3.5.3)
-    date (3.5.1)
-    debug (1.11.1)
-      irb (~> 1.10)
-      reline (>= 0.3.8)
+    datadog-ruby_core_source (3.4.1)
+    date (3.4.1)
+    debug (1.8.0)
+      irb (>= 1.5.0)
+      reline (>= 0.3.1)
     declarative (0.0.20)
     devise (4.9.4)
       bcrypt (~> 3.0)
@@ -212,9 +223,6 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise-secure_password (2.2.1)
-      devise (>= 4.0.0, < 5.0.0)
-      railties (>= 5.0.0, < 9.0.0)
     devise-two-factor (6.1.0)
       activesupport (>= 7.0, < 8.1)
       devise (~> 4.0)
@@ -260,8 +268,8 @@ GEM
       dry-logic (~> 1.5)
       dry-types (~> 1.8)
       zeitwerk (~> 2.6)
-    dry-types (1.9.1)
-      bigdecimal (>= 3.0)
+    dry-types (1.8.3)
+      bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)
       dry-inflector (~> 1.0)
@@ -275,8 +283,7 @@ GEM
       ruby2_keywords
     email-provider-info (0.0.1)
     email_reply_trimmer (0.1.13)
-    erb (6.0.6)
-    erubi (1.13.1)
+    erubi (1.13.0)
     et-orbi (1.2.11)
       tzinfo
     event_stream_parser (1.0.0)
@@ -291,17 +298,22 @@ GEM
       railties (>= 5.0.0)
     faker (3.2.0)
       i18n (>= 1.8.11, < 2)
-    faraday (2.14.3)
+    faraday (2.14.1)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
+    faraday-follow_redirects (0.3.0)
+      faraday (>= 1, < 3)
     faraday-mashify (1.0.0)
       faraday (~> 2.0)
       hashie
-    faraday-multipart (1.2.0)
-      multipart-post (~> 2.0)
-    faraday-net_http (3.4.4)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (3.4.2)
       net-http (~> 0.5)
+    faraday-net_http_persistent (2.1.0)
+      faraday (~> 2.5)
+      net-http-persistent (~> 4.0)
     faraday-retry (2.4.0)
       faraday (~> 2.0)
     faraday_middleware-aws-sigv4 (1.0.1)
@@ -324,7 +336,6 @@ GEM
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    firecrawl-sdk (1.4.1)
     flag_shih_tzu (0.3.23)
     foreman (0.87.2)
     fugit (1.11.1)
@@ -338,7 +349,6 @@ GEM
       googleapis-common-protos-types (>= 1.3.1, < 2.a)
       googleauth (~> 1.0)
       grpc (~> 1.36)
-    gemoji (4.1.0)
     geocoder (1.8.1)
     gli (2.22.2)
       ostruct
@@ -413,15 +423,14 @@ GEM
       googleapis-common-protos-types (~> 1.0)
     gserver (0.0.1)
     haikunator (1.1.1)
-    hairtrigger (1.3.1)
-      activerecord (>= 6.0, < 9)
+    hairtrigger (1.0.0)
+      activerecord (>= 6.0, < 8)
       ruby2ruby (~> 2.4)
       ruby_parser (~> 3.10)
     hana (1.3.7)
     hash_diff (1.1.1)
     hashdiff (1.1.0)
-    hashie (5.1.0)
-      logger
+    hashie (5.0.0)
     html2text (0.4.0)
       nokogiri (>= 1.0, < 2.0)
     http (5.1.1)
@@ -438,28 +447,25 @@ GEM
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.15.2)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    io-console (0.8.2)
-    irb (1.18.0)
-      pp (>= 0.6.0)
-      prism (>= 1.3.0)
-      rdoc (>= 4.0.0)
-      reline (>= 0.4.2)
+    io-console (0.6.0)
+    irb (1.7.2)
+      reline (>= 0.3.6)
     iso-639 (0.3.8)
       csv
-    jbuilder (2.15.1)
-      actionview (>= 7.0.0)
-      activesupport (>= 7.0.0)
+    jbuilder (2.11.5)
+      actionview (>= 5.0.0)
+      activesupport (>= 5.0.0)
     jmespath (1.6.2)
     jquery-rails (4.6.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.19.9)
+    json (2.19.2)
     json_refs (0.1.8)
       hana
     json_schemer (0.2.24)
@@ -480,7 +486,7 @@ GEM
     judoscale-sidekiq (1.8.2)
       judoscale-ruby (= 1.8.2)
       sidekiq (>= 5.0)
-    jwt (2.10.3)
+    jwt (2.10.1)
       base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -507,16 +513,15 @@ GEM
       logger (~> 1.6)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
-    libdatadog (36.0.0.1.0)
-    libdatadog (36.0.0.1.0-arm64-darwin)
-    libdatadog (36.0.0.1.0-x86_64-linux)
-    libddwaf (1.30.0.0.2)
+    libdatadog (18.1.0.1.0)
+    libdatadog (18.1.0.1.0-x86_64-linux)
+    libddwaf (1.24.1.0.3)
       ffi (~> 1.0)
-    libddwaf (1.30.0.0.2-arm64-darwin)
+    libddwaf (1.24.1.0.3-arm64-darwin)
       ffi (~> 1.0)
-    libddwaf (1.30.0.0.2-x86_64-darwin)
+    libddwaf (1.24.1.0.3-x86_64-darwin)
       ffi (~> 1.0)
-    libddwaf (1.30.0.0.2-x86_64-linux)
+    libddwaf (1.24.1.0.3-x86_64-linux)
       ffi (~> 1.0)
     line-bot-api (1.28.0)
     lint_roller (1.1.0)
@@ -533,11 +538,10 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.25.2)
+    loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    mail (2.9.1)
-      logger
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
@@ -554,12 +558,12 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    minitest (5.27.0)
+    minitest (5.25.5)
     mock_redis (0.36.0)
       ruby2_keywords
-    msgpack (1.8.3)
+    msgpack (1.8.0)
     multi_json (1.15.0)
-    multi_xml (0.9.1)
+    multi_xml (0.8.0)
       bigdecimal (>= 3.1, < 5)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
@@ -567,7 +571,9 @@ GEM
       activerecord (>= 5.2)
     net-http (0.9.1)
       uri (>= 0.11.1)
-    net-imap (0.6.4.1)
+    net-http-persistent (4.0.2)
+      connection_pool (~> 2.2)
+    net-imap (0.4.20)
       date
       net-protocol
     net-pop (0.1.2)
@@ -582,37 +588,30 @@ GEM
       sidekiq
     newrelic_rpm (9.6.0)
       base64
-    nio4r (2.7.5)
-    nokogiri (1.19.4)
+    nio4r (2.7.3)
+    nokogiri (1.19.1)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.19.4-arm64-darwin)
+    nokogiri (1.19.1-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.4-x86_64-darwin)
+    nokogiri (1.19.1-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.4-x86_64-linux-gnu)
+    nokogiri (1.19.1-x86_64-linux-gnu)
       racc (~> 1.4)
-    oauth (1.1.6)
-      auth-sanitizer (~> 0.2, >= 0.2.1)
-      base64 (~> 0.1)
-      cgi
-      oauth-tty (~> 1.0, >= 1.0.8)
-      snaky_hash (~> 2.0, >= 2.0.5)
-      version_gem (~> 1.1, >= 1.1.11)
-    oauth-tty (1.0.8)
-      auth-sanitizer (~> 0.1, >= 0.1.3)
-      cgi
-      version_gem (~> 1.1, >= 1.1.9)
-    oauth2 (2.0.22)
-      auth-sanitizer (~> 0.2, >= 0.2.1)
-      faraday (>= 0.17.3, < 4.0)
-      jwt (>= 1.0, < 4.0)
-      logger (~> 1.2)
+    oauth (1.1.0)
+      oauth-tty (~> 1.0, >= 1.0.1)
+      snaky_hash (~> 2.0)
+      version_gem (~> 1.1)
+    oauth-tty (1.0.5)
+      version_gem (~> 1.1, >= 1.1.1)
+    oauth2 (2.0.9)
+      faraday (>= 0.17.3, < 3.0)
+      jwt (>= 1.0, < 3.0)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 4)
-      snaky_hash (~> 2.0, >= 2.0.5)
-      version_gem (~> 1.1, >= 1.1.11)
-    oj (3.17.3)
+      snaky_hash (~> 2.0)
+      version_gem (~> 1.1)
+    oj (3.16.10)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omniauth (2.1.4)
@@ -659,7 +658,7 @@ GEM
       opentelemetry-api (~> 1.0)
     orm_adapter (0.5.0)
     os (1.1.4)
-    ostruct (0.6.3)
+    ostruct (0.6.1)
     parallel (1.27.0)
     parser (3.3.8.0)
       ast (~> 2.4.1)
@@ -669,10 +668,7 @@ GEM
       activerecord (>= 5.2)
       activesupport (>= 5.2)
     pgvector (0.1.1)
-    pp (0.6.4)
-      prettyprint
-    prettyprint (0.2.0)
-    prism (1.9.0)
+    prism (1.4.0)
     procore-sift (1.0.0)
       activerecord (>= 6.1)
     pry (0.14.2)
@@ -680,29 +676,29 @@ GEM
       method_source (~> 1.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    public_suffix (7.0.5)
-    puma (7.2.1)
+    public_suffix (6.0.2)
+    puma (6.4.3)
       nio4r (~> 2.0)
     pundit (2.3.0)
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (3.2.6)
+    rack (3.2.5)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-contrib (2.5.0)
       rack (< 4)
     rack-cors (2.0.0)
       rack (>= 2.0.0)
-    rack-mini-profiler (4.0.1)
+    rack-mini-profiler (3.2.0)
       rack (>= 1.2.0)
     rack-protection (4.2.1)
       base64 (>= 0.1.0)
       logger (>= 1.6.0)
       rack (>= 3.0.0, < 4)
-    rack-proxy (1.0.3)
-      rack (>= 2.0, < 4)
-    rack-session (2.1.2)
+    rack-proxy (0.7.7)
+      rack
+    rack-session (2.1.1)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -710,54 +706,43 @@ GEM
     rack-timeout (0.6.3)
     rackup (2.2.1)
       rack (>= 3)
-    rails (7.2.3.1)
-      actioncable (= 7.2.3.1)
-      actionmailbox (= 7.2.3.1)
-      actionmailer (= 7.2.3.1)
-      actionpack (= 7.2.3.1)
-      actiontext (= 7.2.3.1)
-      actionview (= 7.2.3.1)
-      activejob (= 7.2.3.1)
-      activemodel (= 7.2.3.1)
-      activerecord (= 7.2.3.1)
-      activestorage (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    rails (7.1.5.2)
+      actioncable (= 7.1.5.2)
+      actionmailbox (= 7.1.5.2)
+      actionmailer (= 7.1.5.2)
+      actionpack (= 7.1.5.2)
+      actiontext (= 7.1.5.2)
+      actionview (= 7.1.5.2)
+      activejob (= 7.1.5.2)
+      activemodel (= 7.1.5.2)
+      activerecord (= 7.1.5.2)
+      activestorage (= 7.1.5.2)
+      activesupport (= 7.1.5.2)
       bundler (>= 1.15.0)
-      railties (= 7.2.3.1)
-    rails-dom-testing (2.3.0)
+      railties (= 7.1.5.2)
+    rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.7.1)
-      loofah (~> 2.25, >= 2.25.2)
+    rails-html-sanitizer (1.6.1)
+      loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rails-i18n (7.0.10)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
-      cgi
-      irb (~> 1.13)
+    railties (7.1.5.2)
+      actionpack (= 7.1.5.2)
+      activesupport (= 7.1.5.2)
+      irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
-      tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (4.0.3)
-      logger
-      prism (>= 1.6.0)
-      tsort
-    rdoc (8.0.0)
-      erb
-      prism (>= 1.6.0)
-      rbs (>= 4.0.0)
-      tsort
     redis (5.0.6)
       redis-client (>= 0.9.0)
     redis-client (0.26.4)
@@ -765,7 +750,7 @@ GEM
     redis-namespace (1.10.0)
       redis (>= 4)
     regexp_parser (2.10.0)
-    reline (0.6.3)
+    reline (0.3.6)
       io-console (~> 0.5)
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -849,19 +834,18 @@ GEM
     ruby2ruby (2.5.0)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.6)
-    ruby_llm (1.15.0)
+    ruby_llm (1.9.2)
       base64
       event_stream_parser (~> 1)
       faraday (>= 1.10.0)
       faraday-multipart (>= 1)
       faraday-net_http (>= 1)
       faraday-retry (>= 1)
-      marcel (~> 1)
-      ruby_llm-schema (~> 0)
+      marcel (~> 1.0)
+      ruby_llm-schema (~> 0.2.1)
       zeitwerk (~> 2)
-    ruby_llm-schema (0.3.0)
-    ruby_parser (3.22.0)
-      racc (~> 1.5)
+    ruby_llm-schema (0.2.5)
+    ruby_parser (3.20.0)
       sexp_processor (~> 4.16)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
@@ -911,17 +895,16 @@ GEM
       zeitwerk (~> 2.5)
     shoulda-matchers (5.3.0)
       activesupport (>= 5.2.0)
-    sidekiq (7.3.10)
-      base64
-      connection_pool (>= 2.3.0, < 3)
+    sidekiq (7.3.1)
+      concurrent-ruby (< 2)
+      connection_pool (>= 2.3.0)
       logger
-      rack (>= 2.2.4, < 3.3)
-      redis-client (>= 0.23.0, < 1)
-    sidekiq-cron (2.4.0)
-      cronex (>= 0.13.0)
-      fugit (~> 1.8, >= 1.11.1)
+      rack (>= 2.2.4)
+      redis-client (>= 0.22.2)
+    sidekiq-cron (1.12.0)
+      fugit (~> 1.8)
       globalid (>= 1.0.1)
-      sidekiq (>= 6.5.0)
+      sidekiq (>= 6)
     sidekiq_alive (2.5.0)
       gserver (~> 0.0.1)
       sidekiq (>= 5, < 9)
@@ -946,12 +929,10 @@ GEM
       gli
       hashie
       logger
-    snaky_hash (2.0.5)
-      hashie (>= 0.1.0, < 6)
-      version_gem (>= 1.1.8, < 3)
+    snaky_hash (2.0.1)
+      hashie
+      version_gem (~> 1.1, >= 1.1.1)
     sorbet-runtime (0.5.11934)
-    speedshop-cloudwatch (0.2.1)
-      aws-sdk-cloudwatch (>= 1.81.0)
     spring (4.1.1)
     spring-watcher-listen (2.1.0)
       listen (>= 2.7, < 4.0)
@@ -969,8 +950,7 @@ GEM
     statsd-ruby (1.5.0)
     stripe (18.0.1)
     telephone_number (1.4.20)
-    test-prof (1.6.3)
-      logger
+    test-prof (1.2.1)
     thor (1.4.0)
     tidewave (0.2.0)
       fast-mcp (~> 1.5.0)
@@ -980,9 +960,8 @@ GEM
     time_diff (0.3.0)
       activesupport
       i18n
-    timeout (0.6.1)
+    timeout (0.4.3)
     trailblazer-option (0.1.2)
-    tsort (0.2.0)
     twilio-ruby (7.6.0)
       faraday (>= 0.9, < 3.0)
       jwt (>= 1.5, < 3.0)
@@ -991,7 +970,7 @@ GEM
       oauth
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2026.4)
+    tzinfo-data (1.2023.3)
       tzinfo (>= 1.0.0)
     uber (0.1.0)
     uglifier (4.2.0)
@@ -999,7 +978,6 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    unicode (0.4.4.5)
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
@@ -1007,19 +985,16 @@ GEM
     uri (1.1.1)
     uri-idna (0.3.1)
     uri_template (0.7.0)
-    useragent (0.16.11)
     valid_email2 (5.2.6)
       activemodel (>= 3.2)
       mail (~> 2.5)
-    version_gem (1.1.11)
-    vite_rails (3.10.0)
-      railties (>= 5.1, < 9)
+    version_gem (1.1.4)
+    vite_rails (3.0.17)
+      railties (>= 5.1, < 8)
       vite_ruby (~> 3.0, >= 3.2.2)
-    vite_ruby (3.10.6)
+    vite_ruby (3.8.0)
       dry-cli (>= 0.7, < 2)
-      logger (~> 1.6)
-      mutex_m
-      rack-proxy (>= 0.6.1)
+      rack-proxy (~> 0.6, >= 0.6.1)
       zeitwerk (~> 2.2)
     warden (1.2.9)
       rack (>= 2.0.9)
@@ -1035,7 +1010,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.8.2)
+    websocket-driver (0.7.7)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -1043,7 +1018,7 @@ GEM
     working_hours (1.4.1)
       activesupport (>= 3.2)
       tzinfo
-    zeitwerk (2.7.5)
+    zeitwerk (2.7.4)
 
 PLATFORMS
   arm64-darwin-20
@@ -1062,15 +1037,14 @@ DEPENDENCIES
   acts-as-taggable-on
   administrate (>= 0.20.1)
   administrate-field-active_storage (>= 1.0.3)
-  administrate-field-belongs_to_search (>= 0.10.0)
-  ai-agents (>= 0.12.0)
+  administrate-field-belongs_to_search (>= 0.9.0)
+  ai-agents (>= 0.9.1)
   annotaterb
   attr_extras
   audited (~> 5.4, >= 5.4.1)
   aws-actionmailbox-ses (~> 0)
   aws-sdk-s3
-  aws-sdk-sesv2
-  azure-blob
+  azure-storage-blob!
   barnes
   bootsnap
   brakeman
@@ -1086,7 +1060,7 @@ DEPENDENCIES
   datadog (~> 2.0)
   debug (~> 1.8)
   devise (>= 4.9.4)
-  devise-secure_password (= 2.2.1)
+  devise-secure_password!
   devise-two-factor (>= 5.0.0)
   devise_token_auth (>= 1.2.3)
   dotenv-rails (>= 3.0.0)
@@ -1099,10 +1073,8 @@ DEPENDENCIES
   faker
   faraday_middleware-aws-sigv4
   fcm
-  firecrawl-sdk (~> 1.0)
   flag_shih_tzu
   foreman
-  gemoji
   geocoder
   gmail_xoauth
   google-cloud-dialogflow-v2 (>= 0.24.0)
@@ -1121,7 +1093,7 @@ DEPENDENCIES
   json_schemer
   judoscale-rails
   judoscale-sidekiq
-  jwt (~> 2.10, >= 2.10.3)
+  jwt
   kaminari
   koala
   letter_opener
@@ -1149,13 +1121,13 @@ DEPENDENCIES
   pgvector
   procore-sift
   pry-rails
-  puma (~> 7.2, >= 7.2.1)
+  puma
   pundit
   rack-attack (>= 6.7.0)
   rack-cors (= 2.0.0)
   rack-mini-profiler (>= 3.2.0)
   rack-timeout
-  rails (= 7.2.3.1)
+  rails (~> 7.1)
   rails-i18n (~> 7.0)
   redis
   redis-namespace
@@ -1170,7 +1142,7 @@ DEPENDENCIES
   rubocop-rails
   rubocop-rspec
   ruby-openai
-  ruby_llm (>= 1.14.1)
+  ruby_llm (>= 1.8.2)
   ruby_llm-schema
   scout_apm
   scss_lint
@@ -1181,14 +1153,13 @@ DEPENDENCIES
   sentry-sidekiq (>= 5.19.0)
   shopify_api
   shoulda-matchers
-  sidekiq (~> 7.3.10)
-  sidekiq-cron (>= 2.4.0)
+  sidekiq (>= 7.3.1)
+  sidekiq-cron (>= 1.12.0)
   sidekiq_alive
   simplecov (>= 0.21)
   simplecov_json_formatter
   skooma
   slack-ruby-client (~> 2.7.0)
-  speedshop-cloudwatch (~> 0.2.1)
   spring
   spring-watcher-listen
   squasher

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2017-2026 Chatwoot Inc.
+Copyright (c) 2017-2024 Chatwoot Inc.
 
 Portions of this software are licensed as follows:
 

Procfile.tunnel

@@ -1,4 +1,4 @@
 backend: DISABLE_MINI_PROFILER=true bin/rails s -p 3000
 # https://github.com/mperham/sidekiq/issues/3090#issuecomment-389748695
 worker: dotenv bundle exec sidekiq -C config/sidekiq.yml
-vite: bin/vite build --watch --force
+vite: bin/vite build --watch

VERSION_CW

@@ -1 +1 @@
-4.18.0
+4.13.0

app/actions/contact_merge_action.rb

@@ -13,7 +13,6 @@ class ContactMergeAction
       merge_messages
       merge_contact_inboxes
       merge_contact_notes
-      merge_calls
       merge_and_remove_mergee_contact
     end
     @base_contact
@@ -47,10 +46,6 @@ class ContactMergeAction
     ContactInbox.where(contact_id: @mergee_contact.id).update(contact_id: @base_contact.id)
   end
 
-  def merge_calls
-    # overridden in enterprise/app/actions/enterprise/contact_merge_action.rb
-  end
-
   def merge_and_remove_mergee_contact
     mergable_attribute_keys = %w[identifier name email phone_number additional_attributes custom_attributes]
     base_contact_attributes = base_contact.attributes.slice(*mergable_attribute_keys).compact_blank
@@ -58,17 +53,10 @@ class ContactMergeAction
 
     # attributes in base contact are given preference
     merged_attributes = mergee_contact_attributes.deep_merge(base_contact_attributes)
-    merged_attributes['contact_type'] = higher_contact_type
 
     @mergee_contact.reload.destroy!
     Rails.configuration.dispatcher.dispatch(CONTACT_MERGED, Time.zone.now, contact: @base_contact,
                                                                            tokens: [@base_contact.contact_inboxes.filter_map(&:pubsub_token)])
     @base_contact.update!(merged_attributes)
   end
-
-  def higher_contact_type
-    [base_contact, mergee_contact].map(&:contact_type).max_by { |type| Contact.contact_types[type] }
-  end
 end
-
-ContactMergeAction.prepend_mod_with('ContactMergeAction')

app/builders/agent_builder.rb

@@ -2,14 +2,6 @@
 # It initializes with necessary attributes and provides a perform method
 # to create a user and account user in a transaction.
 class AgentBuilder
-  LIMIT_EXCEEDED_MESSAGE = 'Account limit exceeded. Please purchase more licenses'.freeze
-
-  class LimitExceededError < StandardError
-    def initialize
-      super(AgentBuilder::LIMIT_EXCEEDED_MESSAGE)
-    end
-  end
-
   # Initializes an AgentBuilder with necessary attributes.
   # @param email [String] the email of the user.
   # @param name [String] the name of the user.
@@ -22,51 +14,30 @@ class AgentBuilder
   # Creates a user and account user in a transaction.
   # @return [User] the created user.
   def perform
-    account.with_lock do
-      raise LimitExceededError unless can_add_agent?
-
-      ActiveRecord::Base.transaction(requires_new: true) do
-        @user = find_or_create_user
-        create_account_user
-        reserve_invitation_email_capacity if user_needs_confirmation?
-      end
+    ActiveRecord::Base.transaction do
+      @user = find_or_create_user
+      create_account_user
     end
-    @user.send_confirmation_instructions if user_needs_confirmation?
     @user
   end
 
   private
 
-  def can_add_agent?
-    account.usage_limits[:agents] > account.account_users.count
-  end
-
   # Finds a user by email or creates a new one with a temporary password.
   # @return [User] the found or created user.
   def find_or_create_user
-    @new_user = false
     user = User.from_email(email)
     return user if user
 
     @name = email.split('@').first if @name.blank?
     temp_password = "1!aA#{SecureRandom.alphanumeric(12)}"
-    User.new(email: email, name: @name, password: temp_password, password_confirmation: temp_password).tap do |new_user|
-      new_user.skip_confirmation_notification!
-      new_user.save!
-      @new_user = true
-    end
+    User.create!(email: email, name: @name, password: temp_password, password_confirmation: temp_password)
   end
 
   # Checks if the user needs confirmation.
   # @return [Boolean] true if the user is persisted and not confirmed, false otherwise.
   def user_needs_confirmation?
-    @new_user && @user.persisted? && !@user.confirmed?
-  end
-
-  def reserve_invitation_email_capacity
-    return if account.reserve_email_send_capacity
-
-    raise CustomExceptions::Account::EmailLimitExceeded.new({})
+    @user.persisted? && !@user.confirmed?
   end
 
   # Creates an account user linking the user to the current account.

app/builders/contact_inbox_with_contact_builder.rb

@@ -50,7 +50,7 @@ class ContactInboxWithContactBuilder
 
   def create_contact
     account.contacts.create!(
-      name: contact_name,
+      name: contact_attributes[:name] || ::Haikunator.haikunate(1000),
       phone_number: contact_attributes[:phone_number],
       email: contact_attributes[:email],
       identifier: contact_attributes[:identifier],
@@ -59,15 +59,10 @@ class ContactInboxWithContactBuilder
     )
   end
 
-  def contact_name
-    name = contact_attributes[:name] || ::Haikunator.haikunate(1000)
-    name.truncate(ApplicationRecord::MAX_STRING_COLUMN_LENGTH, omission: '')
-  end
-
   def find_contact
     contact = find_contact_by_identifier(contact_attributes[:identifier])
     contact ||= find_contact_by_email(contact_attributes[:email])
-    contact ||= find_contact_by_phone_numbers
+    contact ||= find_contact_by_phone_number(contact_attributes[:phone_number])
     contact ||= find_contact_by_instagram_source_id(source_id) if instagram_channel?
 
     contact
@@ -107,14 +102,9 @@ class ContactInboxWithContactBuilder
     account.contacts.from_email(email)
   end
 
-  def find_contact_by_phone_numbers
-    phone_numbers = [contact_attributes[:phone_number], *Array(contact_attributes[:phone_number_candidates])].compact_blank.uniq
+  def find_contact_by_phone_number(phone_number)
+    return if phone_number.blank?
 
-    phone_numbers.each do |phone_number|
-      contact = account.contacts.find_by(phone_number: phone_number)
-      return contact if contact
-    end
-
-    nil
+    account.contacts.find_by(phone_number: phone_number)
   end
 end

app/builders/email/base_builder.rb

@@ -25,13 +25,12 @@ class Email::BaseBuilder
     # Friendly: <agent_name> from <business_name>
     # Professional: <business_name>
     if inbox.friendly?
-      Email::SenderNameBuilder.new(
-        account: account,
-        sender: message&.sender,
-        sender_email: sender_email,
+      I18n.t(
+        'conversations.reply.email.header.friendly_name',
         sender_name: custom_sender_name,
-        business_name: business_name
-      ).build
+        business_name: business_name,
+        from_email: sender_email
+      )
     else
       I18n.t(
         'conversations.reply.email.header.professional_name',

app/builders/email/sender_name_builder.rb

@@ -1,46 +0,0 @@
-class Email::SenderNameBuilder
-  TRANSLATION_KEY = 'conversations.reply.email.header.friendly_name'.freeze
-
-  pattr_initialize [:account!, :sender!, :sender_email!, :sender_name!, :business_name!]
-
-  def build
-    address = Mail::Address.new(sender_email)
-    address.display_name = localized_display_name(address.address)
-    address.format
-  rescue Mail::Field::ParseError, Mail::Field::IncompleteParseError
-    localized_header(sender_email)
-  end
-
-  private
-
-  def localized_display_name(email_address)
-    localized_header(email_address).sub(mailbox_pattern(email_address), '').strip
-  end
-
-  def localized_header(email_address)
-    I18n.t(
-      TRANSLATION_KEY,
-      sender_name: sender_name,
-      business_name: business_name,
-      from_email: email_address,
-      locale: sender_locale
-    )
-  end
-
-  def mailbox_pattern(email_address)
-    /\s*[<«]\s*(?:reply\+)?#{Regexp.escape(email_address)}\s*[>»]\s*/
-  end
-
-  def sender_locale
-    locale_candidates.find { |locale| valid_locale?(locale) && I18n.exists?(TRANSLATION_KEY, locale, fallback: false) } || I18n.default_locale
-  end
-
-  def locale_candidates
-    sender_locale = sender.ui_settings&.dig('locale') if sender.is_a?(User)
-    [sender_locale, account.locale, I18n.default_locale].compact.map(&:to_s).uniq
-  end
-
-  def valid_locale?(locale)
-    I18n.available_locales.map(&:to_s).include?(locale)
-  end
-end

app/builders/messages/facebook/message_builder.rb

@@ -91,21 +91,11 @@ class Messages::Facebook::MessageBuilder < Messages::Messenger::MessageBuilder
 
   def fallback_params(attachment)
     {
-      fallback_title: attachment['title'] || attachment.dig('payload', 'title'),
-      external_url: attachment['url'] || attachment.dig('payload', 'url')
+      fallback_title: attachment['title'],
+      external_url: attachment['url']
     }
   end
 
-  # Facebook shared posts point to page URLs, not downloadable media URLs.
-  # Both `share` and `post` attachment types carry a page URL rather than a media file,
-  # so map them to `fallback` (which keeps the title/link without attempting a download).
-  # Keep this Facebook-only so Messenger/Instagram share attachments still use the parent media handling.
-  def normalize_file_type(type)
-    return :fallback if [:share, :post].include?(type.to_sym)
-
-    super
-  end
-
   def conversation_params
     {
       account_id: @inbox.account_id,
@@ -133,10 +123,8 @@ class Messages::Facebook::MessageBuilder < Messages::Messenger::MessageBuilder
   end
 
   def process_contact_params_result(result)
-    name = result['name'].presence || [result['first_name'], result['last_name']].compact_blank.join(' ').presence || 'John Doe'
-
     {
-      name: name,
+      name: "#{result['first_name'] || 'John'} #{result['last_name'] || 'Doe'}",
       account_id: @inbox.account_id,
       avatar_url: result['profile_pic']
     }

app/builders/messages/message_builder.rb

@@ -7,13 +7,12 @@ class Messages::MessageBuilder
 
   def initialize(user, conversation, params)
     @params = params
-    @private = ActiveModel::Type::Boolean.new.cast(params[:private]) || false
+    @private = params[:private] || false
     @conversation = conversation
     @user = user
     @account = conversation.account
     @message_type = params[:message_type] || 'outgoing'
     @attachments = params[:attachments]
-    @is_voice_message = ActiveModel::Type::Boolean.new.cast(params[:is_voice_message])
     @automation_rule = content_attributes&.dig(:automation_rule_id)
     return unless params.instance_of?(ActionController::Parameters)
 
@@ -49,52 +48,25 @@ class Messages::MessageBuilder
   end
 
   def process_attachments
-    (Array(@attachments) + forwarded_attachments).each do |uploaded_attachment|
+    return if @attachments.blank?
+
+    @attachments.each do |uploaded_attachment|
       attachment = @message.attachments.build(
         account_id: @message.account_id,
         file: uploaded_attachment
       )
 
-      attachment.file_type = attachment_file_type(uploaded_attachment)
-      tag_voice_message(attachment)
+      attachment.file_type = if uploaded_attachment.is_a?(String)
+                               file_type_by_signed_id(
+                                 uploaded_attachment
+                               )
+                             else
+                               file_type(uploaded_attachment&.content_type)
+                             end
     end
   end
 
-  def attachment_file_type(uploaded_attachment)
-    if uploaded_attachment.is_a?(String)
-      file_type_by_signed_id(uploaded_attachment)
-    else
-      file_type(uploaded_attachment&.content_type)
-    end
-  end
-
-  def tag_voice_message(attachment)
-    return unless @is_voice_message && attachment.file_type == 'audio'
-
-    attachment.meta = (attachment.meta || {}).merge('is_voice_message' => true)
-  end
-
-  def forwarded_message_id
-    content_attributes[:forwarded_message_id]
-  end
-
-  def forwarded_attachments
-    return [] if forwarded_message_id.blank?
-
-    forwarded_message = @conversation.messages.find(forwarded_message_id)
-    forwarded_message.attachments.where(id: @params[:forwarded_attachment_ids]).map { |attachment| attachment.file.blob }
-  end
-
-  def validate_forward
-    return if forwarded_message_id.blank?
-
-    raise StandardError, 'Forwarded emails need an email inbox' unless @conversation.inbox.email?
-    raise StandardError, 'Forwarded emails cannot be private' if @private
-    raise StandardError, 'Forwarded emails need a recipient' if process_email_string(@params[:to_emails]).empty?
-  end
-
   def process_emails
-    validate_forward
     return unless @conversation.inbox&.inbox_type == 'Email'
 
     cc_emails = process_email_string(@params[:cc_emails])

app/builders/messages/messenger/message_builder.rb

@@ -6,11 +6,6 @@ class Messages::Messenger::MessageBuilder
     return if unsupported_file_type?(attachment['type'])
 
     params = attachment_params(attachment)
-    # During Meta's sticker webhook transition, a sticker message carries both an `image`
-    # and a `sticker` attachment pointing to the same URL. Skip the redundant sticker so it
-    # isn't attached twice, while still storing legitimate duplicate attachments of other types.
-    return if duplicate_sticker?(attachment, params[:external_url])
-
     attachment_obj = @message.attachments.new(params.except(:remote_file_url))
     attachment_obj.save!
     if facebook_reel?(attachment)
@@ -18,14 +13,10 @@ class Messages::Messenger::MessageBuilder
     elsif params[:remote_file_url]
       attach_file(attachment_obj, params[:remote_file_url])
     end
-    fetch_attachment_links(attachment_obj)
-    update_attachment_file_type(attachment_obj)
-  end
-
-  def fetch_attachment_links(attachment_obj)
     fetch_story_link(attachment_obj) if attachment_obj.file_type == 'story_mention'
     fetch_ig_story_link(attachment_obj) if attachment_obj.file_type == 'ig_story'
     fetch_ig_post_link(attachment_obj) if attachment_obj.file_type == 'ig_post'
+    update_attachment_file_type(attachment_obj)
   end
 
   def attach_file(attachment, file_url)
@@ -37,10 +28,6 @@ class Messages::Messenger::MessageBuilder
       filename: attachment_file.original_filename,
       content_type: attachment_file.content_type
     )
-    # The Attachment row is saved before the blob is attached, so the
-    # after_create_commit broadcast bails on `file.attached?`. Re-fire here
-    # for audio so the bubble updates without waiting on transcription.
-    attachment.message&.reload&.send_update_event if attachment.file_type.to_sym == :audio
   end
 
   def attachment_params(attachment)
@@ -120,20 +107,13 @@ class Messages::Messenger::MessageBuilder
 
   # Facebook may send attachment types that don't directly match our file_type enum.
   # Map known aliases to their canonical enum values.
-  FACEBOOK_FILE_TYPE_MAP = { reel: :ig_reel, sticker: :image }.freeze
+  FACEBOOK_FILE_TYPE_MAP = { reel: :ig_reel }.freeze
 
   def normalize_file_type(type)
     sym = type.to_sym
     FACEBOOK_FILE_TYPE_MAP.fetch(sym, sym)
   end
 
-  def duplicate_sticker?(attachment, url)
-    return false unless attachment['type'].to_sym == :sticker
-    return false if url.blank?
-
-    @message.attachments.any? { |existing| existing.external_url == url }
-  end
-
   # Facebook sends reel URLs as webpage links (facebook.com/reel/...) rather than
   # direct video URLs. Downloading these yields HTML, not video content.
   def facebook_reel?(attachment)

app/builders/notification_builder.rb

@@ -27,8 +27,6 @@ class NotificationBuilder
     return if notification_type == 'conversation_creation' && !user_subscribed_to_notification?
     # skip notifications for blocked conversations except for user mentions
     return if primary_actor.contact.blocked? && notification_type != 'conversation_mention'
-    # respect conversation access (inbox/team membership and custom-role permissions)
-    return unless user_can_access_conversation?
 
     user.notifications.create!(
       notification_type: notification_type,
@@ -38,17 +36,4 @@ class NotificationBuilder
       secondary_actor: secondary_actor || current_user
     )
   end
-
-  def user_can_access_conversation?
-    conversation = primary_actor.is_a?(Conversation) ? primary_actor : primary_actor.try(:conversation)
-    return true if conversation.blank?
-
-    account_user = AccountUser.find_by(account_id: account.id, user_id: user.id)
-    return false if account_user.blank?
-
-    ConversationPolicy.new(
-      { user: user, account: account, account_user: account_user },
-      conversation
-    ).show?
-  end
 end

app/builders/v2/reports/bot_metrics_builder.rb

@@ -31,24 +31,13 @@ class V2::Reports::BotMetricsBuilder
   end
 
   def bot_resolutions_count
-    # Exclude conversations that also had a handoff in the same range — handoff wins
-    account.reporting_events.joins(:conversation).select(:conversation_id)
-           .where(account_id: account.id, name: :conversation_bot_resolved, created_at: range)
-           .where.not(conversation_id: bot_handoff_conversation_ids_subquery)
-           .distinct.count
+    account.reporting_events.joins(:conversation).select(:conversation_id).where(account_id: account.id, name: :conversation_bot_resolved,
+                                                                                 created_at: range).distinct.count
   end
 
   def bot_handoffs_count
-    account.reporting_events.joins(:conversation).select(:conversation_id)
-           .where(account_id: account.id, name: :conversation_bot_handoff, created_at: range)
-           .distinct.count
-  end
-
-  def bot_handoff_conversation_ids_subquery
-    account.reporting_events
-           .where(name: :conversation_bot_handoff, created_at: range)
-           .where.not(conversation_id: nil)
-           .select(:conversation_id)
+    account.reporting_events.joins(:conversation).select(:conversation_id).where(account_id: account.id, name: :conversation_bot_handoff,
+                                                                                 created_at: range).distinct.count
   end
 
   def bot_resolution_rate

app/builders/v2/reports/drilldown_builder.rb

@@ -1,213 +0,0 @@
-class V2::Reports::DrilldownBuilder
-  include DateRangeHelper
-  include TimezoneHelper
-
-  DEFAULT_GROUP_BY = 'day'.freeze
-  DEFAULT_PAGE = 1
-  DEFAULT_PER_PAGE = 25
-  MAX_PER_PAGE = 100
-  SUPPORTED_GROUP_BY = %w[hour day week month year].freeze
-  SUPPORTED_DIMENSION_TYPES = %w[account inbox agent label team].freeze
-  MESSAGE_METRICS = {
-    'incoming_messages_count' => :incoming,
-    'outgoing_messages_count' => :outgoing
-  }.freeze
-  MESSAGE_EVENT_METRICS = %w[avg_first_response_time reply_time].freeze
-
-  pattr_initialize :account, :params
-
-  def self.supported_dimension_type?(type) = SUPPORTED_DIMENSION_TYPES.include?((type.presence || 'account').to_s)
-
-  def build
-    records = paginated_records.to_a
-    { meta: meta, payload: records.map { |record| record_serializer(records).serialize(record) } }
-  end
-
-  private
-
-  def meta
-    {
-      metric: metric,
-      record_type: record_type,
-      bucket: {
-        since: bucket_range.begin.to_i,
-        until: bucket_range.end.to_i
-      },
-      current_page: current_page,
-      per_page: per_page,
-      total_count: paginated_records.total_count,
-      conversation_count: conversation_count
-    }
-  end
-
-  def conversation_count
-    return paginated_records.total_count if conversation_metric?
-
-    drilldown_scope.except(:includes).reorder(nil).distinct.count(:conversation_id)
-  end
-
-  def paginated_records
-    @paginated_records ||= drilldown_scope.page(current_page).per(per_page)
-  end
-
-  def drilldown_scope
-    if message_metric?
-      message_scope
-    elsif conversation_metric?
-      conversation_scope
-    else
-      reporting_event_scope
-    end
-  end
-
-  def message_scope
-    scope.messages
-         .where(account_id: account.id, created_at: bucket_range)
-         .public_send(MESSAGE_METRICS.fetch(metric))
-         .includes(:sender, conversation: [:assignee, :contact, :inbox])
-         .reorder(created_at: :desc)
-  end
-
-  def conversation_scope
-    scope.conversations
-         .where(account_id: account.id, created_at: bucket_range)
-         .includes(:assignee, :contact, :inbox)
-         .order(created_at: :desc)
-  end
-
-  def reporting_event_scope
-    events = scope.reporting_events
-                  .where(account_id: account.id, name: raw_event_name, created_at: bucket_range)
-                  .includes(:user, :inbox, conversation: [:assignee, :contact, :inbox])
-                  .order(created_at: :desc)
-
-    if raw_count_strategy == :exclude_bot_handoffs
-      events = events.where.not(conversation_id: bot_handoff_conversation_ids_subquery)
-    elsif raw_count_strategy == :distinct_conversation
-      events = events.where(id: distinct_conversation_event_ids(events))
-    end
-
-    events
-  end
-
-  def bot_handoff_conversation_ids_subquery
-    scope.reporting_events
-         .where(account_id: account.id, name: :conversation_bot_handoff, created_at: range)
-         .where.not(conversation_id: nil)
-         .select(:conversation_id)
-  end
-
-  def distinct_conversation_event_ids(events)
-    events.reorder(nil)
-          .where.not(conversation_id: nil)
-          .select('MAX(reporting_events.id)')
-          .group(:conversation_id)
-  end
-
-  def record_serializer(records)
-    @record_serializer ||= V2::Reports::DrilldownRecordSerializer.new(
-      account,
-      metric,
-      use_business_hours?,
-      records
-    )
-  end
-
-  def bucket_range
-    @bucket_range ||= begin
-      bucket_start = Time.zone.at(params[:bucket_timestamp].to_i).in_time_zone(timezone)
-      bucket_end = bucket_end_for(bucket_start)
-      requested_start = Time.zone.at(params[:since].to_i)
-      requested_end = Time.zone.at(params[:until].to_i)
-
-      [bucket_start, requested_start].max...[bucket_end, requested_end].min
-    end
-  end
-
-  def bucket_end_for(bucket_start)
-    {
-      'hour' => bucket_start + 1.hour,
-      'day' => bucket_start + 1.day,
-      'week' => bucket_start + 1.week,
-      'month' => bucket_start + 1.month,
-      'year' => bucket_start + 1.year
-    }.fetch(group_by)
-  end
-
-  def scope
-    case dimension_type
-    when 'account' then account
-    when 'inbox' then inbox
-    when 'agent' then user
-    when 'label' then label
-    when 'team' then team
-    else
-      raise ArgumentError, "Unsupported drilldown dimension type: #{dimension_type}"
-    end
-  end
-
-  def inbox = @inbox ||= account.inboxes.find(params[:id])
-
-  def user = @user ||= account.users.find(params[:id])
-
-  def label = @label ||= account.labels.find(params[:id])
-
-  def team = @team ||= account.teams.find(params[:id])
-
-  def metric
-    params[:metric].to_s
-  end
-
-  def report_metric
-    @report_metric ||= Reports::ReportMetricRegistry.fetch(metric)
-  end
-
-  def raw_event_name
-    report_metric&.raw_event_name
-  end
-
-  def raw_count_strategy
-    report_metric&.raw_count_strategy
-  end
-
-  def record_type
-    return 'message' if message_metric? || MESSAGE_EVENT_METRICS.include?(metric)
-
-    'conversation'
-  end
-
-  def message_metric?
-    MESSAGE_METRICS.key?(metric)
-  end
-
-  def conversation_metric?
-    metric == 'conversations_count'
-  end
-
-  def dimension_type
-    (params[:type].presence || 'account').to_s
-  end
-
-  def group_by
-    @group_by ||= SUPPORTED_GROUP_BY.include?(params[:group_by].to_s) ? params[:group_by].to_s : DEFAULT_GROUP_BY
-  end
-
-  def timezone
-    @timezone ||= timezone_name_from_offset(params[:timezone_offset])
-  end
-
-  def current_page
-    [params[:page].to_i, DEFAULT_PAGE].max
-  end
-
-  def per_page
-    requested_per_page = params[:per_page].to_i
-    requested_per_page = DEFAULT_PER_PAGE if requested_per_page <= 0
-
-    [requested_per_page, MAX_PER_PAGE].min
-  end
-
-  def use_business_hours?
-    ActiveModel::Type::Boolean.new.cast(params[:business_hours])
-  end
-end

app/builders/v2/reports/drilldown_record_serializer.rb

@@ -1,199 +0,0 @@
-class V2::Reports::DrilldownRecordSerializer
-  MESSAGE_EVENT_METRICS = %w[avg_first_response_time reply_time].freeze
-
-  attr_reader :account, :metric, :use_business_hours, :records
-
-  def initialize(account, metric, use_business_hours, records = [])
-    @account = account
-    @metric = metric
-    @use_business_hours = use_business_hours
-    @records = records
-  end
-
-  def serialize(record)
-    return serialize_message(record) if record.is_a?(Message)
-    return serialize_conversation_event(record) if record.is_a?(ReportingEvent)
-
-    serialize_conversation(record)
-  end
-
-  private
-
-  def serialize_message(message, metric_value: nil, occurred_at: nil)
-    {
-      record_type: 'message',
-      conversation: conversation_attributes(message.conversation),
-      message: message_attributes(message),
-      metric_value: metric_value,
-      occurred_at: (occurred_at || message.created_at).to_i
-    }
-  end
-
-  def serialize_conversation_event(event)
-    inferred_message = inferred_message_for(event)
-    if inferred_message.present?
-      return serialize_message(
-        inferred_message,
-        metric_value: event_metric_value(event),
-        occurred_at: event_timestamp(event)
-      )
-    end
-
-    serialize_conversation(
-      event.conversation,
-      metric_value: event_metric_value(event),
-      occurred_at: event_timestamp(event),
-      event_name: event.name
-    )
-  end
-
-  def serialize_conversation(conversation, metric_value: nil, occurred_at: nil, event_name: nil)
-    serialized_record = {
-      record_type: 'conversation',
-      conversation: conversation_attributes(conversation),
-      message: nil,
-      metric_value: metric_value,
-      occurred_at: (occurred_at || conversation&.created_at)&.to_i
-    }
-    serialized_record[:event_name] = event_name if event_name.present?
-    serialized_record
-  end
-
-  def conversation_attributes(conversation)
-    return {} if conversation.blank?
-
-    {
-      id: conversation.id,
-      display_id: conversation.display_id,
-      contact_id: conversation.contact_id,
-      contact_name: conversation.contact&.name,
-      inbox_id: conversation.inbox_id,
-      inbox_name: conversation.inbox&.name,
-      assignee_id: conversation.assignee_id,
-      assignee_name: conversation.assignee&.name,
-      status: conversation.status,
-      created_at: conversation.created_at.to_i,
-      last_activity_at: conversation.last_activity_at.to_i,
-      last_message: last_message_attributes(conversation)
-    }
-  end
-
-  def message_attributes(message)
-    {
-      id: message.id,
-      content: message.content,
-      message_type: message.message_type,
-      sender_name: message.sender&.try(:name),
-      created_at: message.created_at.to_i
-    }
-  end
-
-  def last_message_attributes(conversation)
-    message = latest_messages_by_conversation_id[conversation.id]
-    return if message.blank?
-
-    message_attributes(message)
-  end
-
-  def inferred_message_for(event)
-    return unless MESSAGE_EVENT_METRICS.include?(metric)
-    return if event.conversation.blank? || event.event_end_time.blank?
-
-    inferred_messages_by_event_id[event.id]
-  end
-
-  def first_response_event_with_user?(event)
-    metric == 'avg_first_response_time' && event.user_id.present?
-  end
-
-  def message_inference_range(event)
-    (event.event_end_time - 1.second)..(event.event_end_time + 1.second)
-  end
-
-  def event_metric_value(event)
-    use_business_hours ? event.value_in_business_hours : event.value
-  end
-
-  def event_timestamp(event)
-    event.event_end_time || event.created_at
-  end
-
-  def latest_messages_by_conversation_id
-    @latest_messages_by_conversation_id ||= if conversation_ids.blank?
-                                              {}
-                                            else
-                                              latest_messages.index_by(&:conversation_id)
-                                            end
-  end
-
-  def latest_messages
-    Message
-      .where(account_id: account.id, conversation_id: conversation_ids)
-      .where.not(message_type: :activity)
-      .select('DISTINCT ON (messages.conversation_id) messages.*')
-      .reorder(Arel.sql('messages.conversation_id, messages.created_at DESC, messages.id DESC'))
-      .includes(:sender)
-  end
-
-  def inferred_messages_by_event_id
-    @inferred_messages_by_event_id ||= inference_events.each_with_object({}) do |event, messages_by_event_id|
-      messages_by_event_id[event.id] = inferred_message_candidates.find do |message|
-        message_matches_event?(message, event)
-      end
-    end
-  end
-
-  def inferred_message_candidates
-    @inferred_message_candidates ||= if inference_events.blank?
-                                       []
-                                     else
-                                       inferred_messages.to_a
-                                     end
-  end
-
-  def inferred_messages
-    Message
-      .where(account_id: account.id, conversation_id: inference_events.map(&:conversation_id).uniq)
-      .where(created_at: inference_time_range)
-      .where(message_type: %i[outgoing template])
-      .includes(:sender)
-      .reorder(created_at: :desc, id: :desc)
-  end
-
-  def message_matches_event?(message, event)
-    message.conversation_id == event.conversation_id &&
-      message.created_at.between?(
-        message_inference_range(event).begin,
-        message_inference_range(event).end
-      ) &&
-      message_sender_matches_event?(message, event)
-  end
-
-  def message_sender_matches_event?(message, event)
-    return true unless first_response_event_with_user?(event)
-
-    message.sender_id == event.user_id && message.sender_type == 'User'
-  end
-
-  def inference_time_range
-    event_end_times = inference_events.map(&:event_end_time)
-
-    (event_end_times.min - 1.second)..(event_end_times.max + 1.second)
-  end
-
-  def inference_events
-    @inference_events ||= records.select do |record|
-      record.is_a?(ReportingEvent) && record.conversation_id.present? && record.event_end_time.present?
-    end
-  end
-
-  def conversation_ids
-    @conversation_ids ||= records.filter_map { |record| conversation_id_for(record) }.uniq
-  end
-
-  def conversation_id_for(record)
-    return record.conversation_id if record.is_a?(Message) || record.is_a?(ReportingEvent)
-
-    record.id
-  end
-end

app/controllers/api/base_controller.rb

@@ -1,7 +1,5 @@
 class Api::BaseController < ApplicationController
   include AccessTokenAuthHelper
-  # Raw API tokens must bypass DeviseTokenAuth's encoded dashboard bearer parsing.
-  skip_before_action :set_current_user, if: :authenticate_by_access_token?
   respond_to :json
   before_action :authenticate_access_token!, if: :authenticate_by_access_token?
   before_action :validate_bot_access_token!, if: :authenticate_by_access_token?
@@ -9,6 +7,10 @@ class Api::BaseController < ApplicationController
 
   private
 
+  def authenticate_by_access_token?
+    request.headers[:api_access_token].present? || request.headers[:HTTP_API_ACCESS_TOKEN].present?
+  end
+
   def check_authorization(model = nil)
     model ||= controller_name.classify.constantize
 

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

@@ -1,4 +1,5 @@
 class Api::V1::Accounts::AgentBotsController < Api::V1::Accounts::BaseController
+  before_action :current_account
   before_action :check_authorization
   before_action :agent_bot, except: [:index, :create]
 

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

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

app/controllers/api/v1/accounts/articles/bulk_actions_controller.rb

@@ -1,7 +1,7 @@
 class Api::V1::Accounts::Articles::BulkActionsController < Api::V1::Accounts::BaseController
   before_action :portal
   before_action :check_authorization
-  before_action :set_articles, only: [:update_status, :update_category, :delete_articles]
+  before_action :set_articles, only: [:update_status, :delete_articles]
 
   def translate
     head :not_implemented
@@ -19,18 +19,6 @@ class Api::V1::Accounts::Articles::BulkActionsController < Api::V1::Accounts::Ba
     render_could_not_create_error(e.message)
   end
 
-  def update_category
-    return render_could_not_create_error(I18n.t('portals.articles.no_articles_found')) if @articles.none?
-    return render_could_not_create_error(I18n.t('portals.articles.category_not_found')) unless category_valid?
-
-    ActiveRecord::Base.transaction do
-      @articles.find_each { |article| article.update!(category_id: params[:category_id]) }
-    end
-    head :ok
-  rescue ActiveRecord::RecordInvalid => e
-    render_could_not_create_error(e.message)
-  end
-
   def delete_articles
     return render_could_not_create_error(I18n.t('portals.articles.no_articles_found')) if @articles.none?
 
@@ -51,9 +39,5 @@ class Api::V1::Accounts::Articles::BulkActionsController < Api::V1::Accounts::Ba
   def set_articles
     @articles = @portal.articles.where(id: params[:ids])
   end
-
-  def category_valid?
-    @portal.categories.exists?(id: params[:category_id])
-  end
 end
 Api::V1::Accounts::Articles::BulkActionsController.prepend_mod_with('Api::V1::Accounts::Articles::BulkActionsController')

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

@@ -3,8 +3,6 @@ class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
   before_action :check_authorization
   before_action :fetch_article, except: [:index, :create, :reorder]
   before_action :set_current_page, only: [:index]
-  before_action :validate_author, only: [:create]
-  before_action :discard_invalid_author, only: [:update]
 
   def index
     @portal_articles = @portal.articles
@@ -32,8 +30,8 @@ class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
   end
 
   def update
-    persist_article_changes if params[:article].present?
-    render json: { message: @article.errors.full_messages.to_sentence }, status: :unprocessable_entity and return unless @article.valid?
+    @article.update!(article_params) if params[:article].present?
+    render json: { error: @article.errors.messages }, status: :unprocessable_entity and return unless @article.valid?
   end
 
   def destroy
@@ -42,8 +40,8 @@ class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
   end
 
   def reorder
-    positions = Article.update_positions(portal: @portal, positions_hash: params[:positions_hash])
-    render json: { positions: positions }
+    Article.update_positions(portal: @portal, positions_hash: params[:positions_hash])
+    head :ok
   end
 
   private
@@ -65,52 +63,16 @@ class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
     @article = @portal.articles.find(params[:id])
   end
 
-  def validate_author
-    author_id = params.dig(:article, :author_id)
-    return if author_id.blank?
-    return if author_belongs_to_account?(author_id)
-
-    render json: { error: 'Invalid author ID' }, status: :unprocessable_entity
-  end
-
-  def discard_invalid_author
-    submitted_article_params = params[:article]
-    return unless submitted_article_params&.key?(:author_id)
-
-    author_id = submitted_article_params[:author_id]
-    return if author_belongs_to_account?(author_id)
-
-    submitted_article_params.delete(:author_id)
-  end
-
-  def author_belongs_to_account?(author_id)
-    author_id.to_s.match?(/\A\d+\z/) && Current.account.users.exists?(id: author_id.to_i)
-  end
-
   def portal
     @portal ||= Current.account.portals.find_by!(slug: params[:portal_id])
   end
 
-  # Draft-only autosaves must not bump the public-facing updated_at, so write
-  # them with update_columns (which skips the timestamp). update_columns also
-  # skips validations, so assign and validate first to avoid persisting content
-  # that exceeds the column length limit.
-  def persist_article_changes
-    keys = article_params.to_h.keys
-    if keys.any? && (keys - %w[draft_title draft_content]).empty?
-      @article.assign_attributes(article_params)
-      @article.update_columns(article_params.to_h) if @article.valid? # rubocop:disable Rails/SkipsModelValidations
-    else
-      @article.update!(article_params)
-    end
-  end
-
   def article_params
     params.require(:article).permit(
       :title, :slug, :position, :content, :description, :category_id, :author_id, :associated_article_id, :status,
-      :locale, :draft_title, :draft_content, meta: [:title,
-                                                    :description,
-                                                    { tags: [] }]
+      :locale, meta: [:title,
+                      :description,
+                      { tags: [] }]
     )
   end
 

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

@@ -2,8 +2,6 @@ class Api::V1::Accounts::AssignableAgentsController < Api::V1::Accounts::BaseCon
   before_action :fetch_inboxes
 
   def index
-    # TODO: Remove this opt-in once mobile clients support AI assignees in this payload.
-    @include_ai_assignees = params[:include_ai_assignees].present?
     agent_ids = @inboxes.map do |inbox|
       authorize inbox, :show?
       member_ids = inbox.members.pluck(:user_id)
@@ -12,7 +10,6 @@ class Api::V1::Accounts::AssignableAgentsController < Api::V1::Accounts::BaseCon
     agent_ids = agent_ids.inject(:&)
     agents = Current.account.users.where(id: agent_ids)
     @assignable_agents = (agents + Current.account.administrators).uniq
-    @agent_bots = @include_ai_assignees ? AgentBot.accessible_to(Current.account) : []
   end
 
   private
@@ -25,5 +22,3 @@ class Api::V1::Accounts::AssignableAgentsController < Api::V1::Accounts::BaseCon
     params.permit(inbox_ids: [])
   end
 end
-
-Api::V1::Accounts::AssignableAgentsController.prepend_mod_with('Api::V1::Accounts::AssignableAgentsController')

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

@@ -30,8 +30,7 @@ class Api::V1::Accounts::AssignmentPoliciesController < Api::V1::Accounts::BaseC
   def assignment_policy_params
     params.require(:assignment_policy).permit(
       :name, :description, :assignment_order, :conversation_priority,
-      :fair_distribution_limit, :fair_distribution_window, :enabled,
-      :exclude_older_than_hours
+      :fair_distribution_limit, :fair_distribution_window, :enabled
     )
   end
 end

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

@@ -3,7 +3,6 @@ class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseCont
 
   before_action :check_authorization
   before_action :fetch_automation_rule, only: [:show, :update, :destroy, :clone]
-  before_action :ensure_execution_delay_allowed, only: [:create, :update]
 
   def index
     @automation_rules = Current.account.automation_rules
@@ -48,45 +47,22 @@ class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseCont
 
   def clone
     automation_rule = Current.account.automation_rules.find_by(id: params[:automation_rule_id])
-    # Dropping the delay here would clone a paused wait into a rule that fires instantly on the
-    # next matching event, so refuse rather than rewrite what the rule means.
-    return render_delayed_automations_error if automation_rule.execution_delay.present? && !delayed_automations_enabled?
-
-    @automation_rule = automation_rule.dup
-    @automation_rule.save!
+    new_rule = automation_rule.dup
+    new_rule.save!
+    @automation_rule = new_rule
   end
 
   private
 
   def automation_rules_permit
-    permitted_attributes = [:name, :description, :event_name, :active]
-    permitted_attributes << :execution_delay if delayed_automations_enabled?
-
     params.permit(
-      *permitted_attributes,
+      :name, :description, :event_name, :active,
       conditions: [:attribute_key, :filter_operator, :query_operator, :custom_attribute_type, { values: [] }],
       actions: [:action_name, { action_params: [] }]
     )
   end
 
-  def ensure_execution_delay_allowed
-    return if delayed_automations_enabled?
-    return if params[:execution_delay].blank?
-
-    render_delayed_automations_error
-  end
-
-  def render_delayed_automations_error
-    render json: { error: 'Delayed automations are not enabled for this account.' }, status: :unprocessable_entity
-  end
-
-  def delayed_automations_enabled?
-    Current.account.feature_enabled?('delayed_automations')
-  end
-
   def fetch_automation_rule
     @automation_rule = Current.account.automation_rules.find_by(id: params[:id])
   end
 end
-
-Api::V1::Accounts::AutomationRulesController.prepend_mod_with('Api::V1::Accounts::AutomationRulesController')

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

@@ -1,17 +1,6 @@
 class Api::V1::Accounts::BaseController < Api::BaseController
   include SwitchLocale
   include EnsureCurrentAccountHelper
-  include MfaEnforcementGuard
   before_action :current_account
-  before_action :validate_token_api_access, if: :authenticate_by_access_token?
-  before_action :check_account_mfa_enforcement, if: :authenticate_by_access_token?
   around_action :switch_locale_using_account_locale
-
-  private
-
-  def validate_token_api_access
-    return if Current.account.api_and_webhooks_enabled?
-
-    render json: { error: 'API access is not enabled for this account' }, status: :forbidden
-  end
 end

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

@@ -1,28 +0,0 @@
-class Api::V1::Accounts::BrandedEmailLayoutsController < Api::V1::Accounts::BaseController
-  before_action :check_admin_authorization?
-
-  def show
-    set_branded_email_layout
-  end
-
-  def update
-    unless Current.account.feature_enabled?(:branded_email_templates)
-      render_could_not_create_error('Branded email templates feature is not enabled')
-      return
-    end
-
-    branded_email_layout = params[:branded_email_layout] == 'null' ? nil : params[:branded_email_layout]
-    EmailTemplate.update_account_branded_layout!(account: Current.account, body: branded_email_layout) if params.key?(:branded_email_layout)
-    set_branded_email_layout
-  rescue ActiveRecord::RecordInvalid => e
-    render_could_not_create_error(e.record.errors.full_messages.join(', '))
-  end
-
-  private
-
-  def set_branded_email_layout
-    @branded_email_layout = EmailTemplate.account_branded_layout_template_for(Current.account)&.body
-  end
-end
-
-Api::V1::Accounts::BrandedEmailLayoutsController.prepend_mod_with('Api::V1::Accounts::BrandedEmailLayoutsController')

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

@@ -1,6 +1,4 @@
 class Api::V1::Accounts::BulkActionsController < Api::V1::Accounts::BaseController
-  before_action :validate_assignment_targets, only: :create, if: -> { normalized_type == 'Conversation' }
-
   def create
     case normalized_type
     when 'Conversation'
@@ -21,19 +19,6 @@ class Api::V1::Accounts::BulkActionsController < Api::V1::Accounts::BaseControll
     params[:type].to_s.camelize
   end
 
-  def validate_assignment_targets
-    fields = conversation_params[:fields] || {}
-
-    assignee_id = fields[:assignee_id]
-    return render_could_not_create_error('Invalid assignee_id') if !assignee_id.nil? && !@current_account.users.exists?(id: assignee_id)
-
-    team_id = fields[:team_id]
-    # The dashboard sends 0 to remove the team assignment; accept '0' from form-encoded requests too.
-    return if [nil, 0, '0'].include?(team_id) || @current_account.teams.exists?(id: team_id)
-
-    render_could_not_create_error('Invalid team_id')
-  end
-
   def enqueue_conversation_job
     ::BulkActionsJob.perform_later(
       account: @current_account,

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

@@ -6,21 +6,27 @@ class Api::V1::Accounts::CallbacksController < Api::V1::Accounts::BaseController
     page_access_token = params[:page_access_token]
     page_id = params[:page_id]
     inbox_name = params[:inbox_name]
-
     ActiveRecord::Base.transaction do
       facebook_channel = Current.account.facebook_pages.create!(
         page_id: page_id, user_access_token: user_access_token,
         page_access_token: page_access_token
       )
       @facebook_inbox = Current.account.inboxes.create!(name: inbox_name, channel: facebook_channel)
-      sync_page_details(page_access_token, facebook_channel)
+      set_instagram_id(page_access_token, facebook_channel)
       set_avatar(@facebook_inbox, page_id)
     end
-  rescue CustomExceptions::Inbox::LimitExceeded => e
-    render_error_response(e)
   rescue StandardError => e
     ChatwootExceptionTracker.new(e).capture_exception
     Rails.logger.error "Error in register_facebook_page: #{e.message}"
+    # Additional log statements
+    log_additional_info
+  end
+
+  def log_additional_info
+    Rails.logger.debug do
+      "user_access_token: #{params[:user_access_token]} , page_access_token: #{params[:page_access_token]} ,
+      page_id: #{params[:page_id]}, inbox_name: #{params[:inbox_name]}"
+    end
   end
 
   def facebook_pages
@@ -34,11 +40,15 @@ class Api::V1::Accounts::CallbacksController < Api::V1::Accounts::BaseController
     @page_details = mark_already_existing_facebook_pages(pages)
   end
 
-  def sync_page_details(page_access_token, facebook_channel)
-    page_details = Facebook::PageDetailsService.new(access_token: page_access_token).perform
-    facebook_channel.update(page_details.compact)
+  def set_instagram_id(page_access_token, facebook_channel)
+    fb_object = Koala::Facebook::API.new(page_access_token)
+    response = fb_object.get_connections('me', '', { fields: 'instagram_business_account' })
+    return if response['instagram_business_account'].blank?
+
+    instagram_id = response['instagram_business_account']['id']
+    facebook_channel.update(instagram_id: instagram_id)
   rescue StandardError => e
-    Rails.logger.error "Error in sync_page_details: #{e.message}"
+    Rails.logger.error "Error in set_instagram_id: #{e.message}"
   end
 
   # get params[:inbox_id], current_account. params[:omniauth_token]
@@ -66,7 +76,7 @@ class Api::V1::Accounts::CallbacksController < Api::V1::Accounts::BaseController
     fb_page = get_fb_page(fb_page_id)
     ActiveRecord::Base.transaction do
       fb_page&.update!(user_access_token: @user_access_token, page_access_token: access_token)
-      sync_page_details(access_token, fb_page)
+      set_instagram_id(access_token, fb_page)
       fb_page&.reauthorized!
     rescue StandardError => e
       ChatwootExceptionTracker.new(e).capture_exception

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

@@ -13,13 +13,7 @@ class Api::V1::Accounts::CampaignsController < Api::V1::Accounts::BaseController
   end
 
   def update
-    @campaign.with_lock do
-      if @campaign.one_off? && !@campaign.active?
-        render json: { error: 'The campaign has already started' }, status: :unprocessable_entity
-      else
-        @campaign.update!(campaign_params)
-      end
-    end
+    @campaign.update!(campaign_params)
   end
 
   def destroy
@@ -30,7 +24,7 @@ class Api::V1::Accounts::CampaignsController < Api::V1::Accounts::BaseController
   private
 
   def campaign
-    @campaign ||= Current.account.campaigns.find_by!(display_id: params[:id])
+    @campaign ||= Current.account.campaigns.find_by(display_id: params[:id])
   end
 
   def campaign_params

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

@@ -33,10 +33,9 @@ class Api::V1::Accounts::CannedResponsesController < Api::V1::Accounts::BaseCont
 
   def canned_responses
     if params[:search]
-      search = params[:search].delete("\0")
       Current.account.canned_responses
-             .where('short_code ILIKE :search OR content ILIKE :search', search: "%#{search}%")
-             .order_by_search(search)
+             .where('short_code ILIKE :search OR content ILIKE :search', search: "%#{params[:search]}%")
+             .order_by_search(params[:search])
 
     else
       Current.account.canned_responses

app/controllers/api/v1/accounts/captain/preferences_controller.rb

@@ -1,4 +1,5 @@
 class Api::V1::Accounts::Captain::PreferencesController < Api::V1::Accounts::BaseController
+  before_action :current_account
   before_action :authorize_account_update, only: [:update]
 
   def show
@@ -7,8 +8,8 @@ class Api::V1::Accounts::Captain::PreferencesController < Api::V1::Accounts::Bas
 
   def update
     params_to_update = captain_params
-    @current_account.captain_models = params_to_update[:captain_models] if params_to_update.key?(:captain_models)
-    @current_account.captain_features = params_to_update[:captain_features] if params_to_update.key?(:captain_features)
+    @current_account.captain_models = params_to_update[:captain_models] if params_to_update[:captain_models]
+    @current_account.captain_features = params_to_update[:captain_features] if params_to_update[:captain_features]
     @current_account.save!
 
     render json: preferences_payload
@@ -37,7 +38,7 @@ class Api::V1::Accounts::Captain::PreferencesController < Api::V1::Accounts::Bas
 
   def merged_captain_models
     existing_models = @current_account.captain_models || {}
-    existing_models.merge(permitted_captain_models).compact_blank.presence
+    existing_models.merge(permitted_captain_models)
   end
 
   def merged_captain_features
@@ -46,38 +47,30 @@ class Api::V1::Accounts::Captain::PreferencesController < Api::V1::Accounts::Bas
   end
 
   def permitted_captain_models
-    params.require(:captain_models).permit(*captain_feature_keys).to_h.stringify_keys
+    params.require(:captain_models).permit(
+      :editor, :assistant, :copilot, :label_suggestion,
+      :audio_transcription, :help_center_search
+    ).to_h.stringify_keys
   end
 
   def permitted_captain_features
-    params.require(:captain_features).permit(*captain_feature_keys).to_h.stringify_keys
-  end
-
-  def captain_feature_keys
-    Llm::Models.feature_keys.map(&:to_sym)
+    params.require(:captain_features).permit(
+      :editor, :assistant, :copilot, :label_suggestion,
+      :audio_transcription, :help_center_search
+    ).to_h.stringify_keys
   end
 
   def features_with_account_preferences
     preferences = Current.account.captain_preferences
     account_features = preferences[:features] || {}
+    account_models = preferences[:models] || {}
 
     Llm::Models.feature_keys.index_with do |feature_key|
       config = Llm::Models.feature_config(feature_key)
-      route = Llm::FeatureRouter.resolve(feature: feature_key, account: Current.account)
       config.merge(
-        default: default_model_for(feature_key),
         enabled: account_features[feature_key] == true,
-        model: route[:model],
-        selected: route[:model],
-        provider: route[:provider],
-        source: route[:source]
+        selected: account_models[feature_key] || config[:default]
       )
     end
   end
-
-  def default_model_for(feature_key)
-    return Llm::FeatureRouter::CAPTAIN_V2_ASSISTANT_MODEL if feature_key == 'assistant' && Current.account.feature_enabled?('captain_integration')
-
-    Llm::Models.default_model_for(feature_key)
-  end
 end

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

@@ -53,7 +53,7 @@ class Api::V1::Accounts::CategoriesController < Api::V1::Accounts::BaseControlle
 
   def category_params
     params.require(:category).permit(
-      :name, :description, :position, :slug, :locale, :icon, :icon_color, :parent_category_id, :associated_category_id
+      :name, :description, :position, :slug, :locale, :icon, :parent_category_id, :associated_category_id
     )
   end
 

app/controllers/api/v1/accounts/channels/twilio_channels_controller.rb

@@ -6,8 +6,6 @@ class Api::V1::Accounts::Channels::TwilioChannelsController < Api::V1::Accounts:
 
   def create
     process_create
-  rescue CustomExceptions::Inbox::LimitExceeded => e
-    render_error_response(e)
   rescue StandardError => e
     render_could_not_create_error(e.message)
   end
@@ -22,7 +20,7 @@ class Api::V1::Accounts::Channels::TwilioChannelsController < Api::V1::Accounts:
     ActiveRecord::Base.transaction do
       authenticate_twilio
       build_inbox
-      setup_webhooks
+      setup_webhooks if @twilio_channel.sms?
     end
   end
 
@@ -36,7 +34,7 @@ class Api::V1::Accounts::Channels::TwilioChannelsController < Api::V1::Accounts:
   end
 
   def setup_webhooks
-    ::Twilio::WebhookSetupService.new(channel: @twilio_channel).perform
+    ::Twilio::WebhookSetupService.new(inbox: @inbox).perform
   end
 
   def phone_number

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

@@ -1,24 +0,0 @@
-class Api::V1::Accounts::Companies::BaseController < Api::V1::Accounts::BaseController
-  before_action :ensure_companies_enabled!
-  before_action :fetch_company
-
-  private
-
-  def ensure_companies_enabled!
-    return if Current.account.feature_enabled?('companies')
-
-    render json: { error: 'Companies are not enabled for this account' }, status: :forbidden
-  end
-
-  def fetch_company
-    @company = Current.account.companies.find(params[:company_id])
-  end
-
-  def authorize_company_read!
-    authorize(@company, :show?)
-  end
-
-  def authorize_company_update!
-    authorize(@company, :update?)
-  end
-end

app/controllers/api/v1/accounts/companies/contacts_controller.rb

@@ -1,67 +0,0 @@
-class Api::V1::Accounts::Companies::ContactsController < Api::V1::Accounts::Companies::BaseController
-  RESULTS_PER_PAGE = 15
-  CONTACT_SEARCH_QUERY = [
-    'contacts.name ILIKE :search',
-    'contacts.email ILIKE :search',
-    'contacts.phone_number ILIKE :search',
-    'contacts.identifier ILIKE :search'
-  ].join(' OR ')
-
-  before_action :authorize_company_read!, only: [:index, :search]
-  before_action :authorize_company_update!, only: [:create, :destroy]
-  before_action :set_current_page, only: [:index, :search]
-  before_action :fetch_contact, only: [:destroy]
-
-  def index
-    @contacts = fetch_contacts(@company.contacts.order(:name, :id))
-    @contacts_count = @contacts.total_count
-  end
-
-  def search
-    if params[:q].blank?
-      return render json: { error: 'Specify search string with parameter q' },
-                    status: :unprocessable_entity
-    end
-
-    @contacts = fetch_contacts(contact_search_scope)
-    @contacts_count = @contacts.total_count
-  end
-
-  def create
-    @contact = Current.account.contacts.find(params[:contact_id])
-    membership_service.assign(contact: @contact)
-  end
-
-  def destroy
-    membership_service.remove(contact: @contact)
-    head :ok
-  end
-
-  private
-
-  def set_current_page
-    @current_page = params[:page] || 1
-  end
-
-  def fetch_contact
-    @contact = @company.contacts.find(params[:id])
-  end
-
-  def fetch_contacts(contacts)
-    contacts
-      .includes({ avatar_attachment: [:blob] }, :company)
-      .page(@current_page)
-      .per(RESULTS_PER_PAGE)
-  end
-
-  def contact_search_scope
-    Current.account.contacts
-           .where('contacts.company_id IS NULL OR contacts.company_id != ?', @company.id)
-           .where(CONTACT_SEARCH_QUERY, search: "%#{params[:q].strip}%")
-           .order(:name, :id)
-  end
-
-  def membership_service
-    @membership_service ||= Companies::ContactMembershipService.new(company: @company)
-  end
-end

app/controllers/api/v1/accounts/companies/conversations_controller.rb

@@ -1,15 +0,0 @@
-class Api::V1::Accounts::Companies::ConversationsController < Api::V1::Accounts::Companies::BaseController
-  before_action :authorize_company_read!
-
-  def index
-    conversations = Current.account.conversations.includes(
-      :assignee, :contact, :inbox, :taggings
-    ).preload(ai_assignee: { avatar_attachment: [:blob] }).where(contact_id: @company.contacts.select(:id))
-
-    @conversations = Conversations::PermissionFilterService.new(
-      conversations,
-      Current.user,
-      Current.account
-    ).perform.order(last_activity_at: :desc).limit(20)
-  end
-end

app/controllers/api/v1/accounts/companies/notes_controller.rb

@@ -1,11 +0,0 @@
-class Api::V1::Accounts::Companies::NotesController < Api::V1::Accounts::Companies::BaseController
-  before_action :authorize_company_read!
-
-  def index
-    @notes = Current.account.notes
-                    .where(contact_id: @company.contacts.select(:id))
-                    .latest
-                    .includes(:contact, :user)
-                    .limit(20)
-  end
-end

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

@@ -1,114 +0,0 @@
-class Api::V1::Accounts::CompaniesController < Api::V1::Accounts::BaseController
-  include Sift
-  sort_on :name, type: :string
-  sort_on :domain, type: :string
-  sort_on :created_at, type: :datetime
-  sort_on :last_activity_at, internal_name: :order_on_last_activity_at, type: :scope, scope_params: [:direction]
-  sort_on :contacts_count, internal_name: :order_on_contacts_count, type: :scope, scope_params: [:direction]
-
-  RESULTS_PER_PAGE = 25
-
-  before_action :ensure_companies_enabled!
-  before_action :check_authorization
-  before_action :set_current_page, only: [:index, :search]
-  before_action :fetch_company, only: [:show, :update, :destroy, :avatar, :destroy_custom_attributes]
-
-  def index
-    @companies = fetch_companies(resolved_companies)
-    @companies_count = @companies.total_count
-  end
-
-  def search
-    if params[:q].blank?
-      return render json: { error: I18n.t('errors.companies.search.query_missing') },
-                    status: :unprocessable_entity
-    end
-
-    companies = resolved_companies.search_by_name_or_domain(params[:q])
-    @companies = fetch_companies(companies)
-    @companies_count = @companies.total_count
-  end
-
-  def show; end
-
-  def create
-    @company = Current.account.companies.build(company_params)
-    @company.save!
-  end
-
-  def update
-    @company.update!(company_update_params)
-  end
-
-  def destroy_custom_attributes
-    custom_attributes = custom_attributes_to_destroy
-    return if performed?
-
-    @company.custom_attributes = @company.custom_attributes.excluding(*custom_attributes)
-    @company.save!
-  end
-
-  def destroy
-    Companies::DeleteJob.perform_later(company_id: @company.id)
-    head :ok
-  end
-
-  def avatar
-    @company.avatar.purge if @company.avatar.attached?
-  end
-
-  private
-
-  def resolved_companies
-    @resolved_companies ||= Current.account.companies
-  end
-
-  def set_current_page
-    @current_page = params[:page] || 1
-  end
-
-  def fetch_companies(companies)
-    filtrate(companies)
-      .page(@current_page)
-      .per(RESULTS_PER_PAGE)
-  end
-
-  def ensure_companies_enabled!
-    return if Current.account.feature_enabled?('companies')
-
-    render json: { error: 'Companies are not enabled for this account' }, status: :forbidden
-  end
-
-  def fetch_company
-    @company = Current.account.companies.find(params[:id])
-  end
-
-  def company_params
-    params.require(:company).permit(
-      :name,
-      :domain,
-      :description,
-      :avatar,
-      additional_attributes: {},
-      custom_attributes: {}
-    )
-  end
-
-  def company_custom_attributes
-    custom_attributes = company_params[:custom_attributes]
-    return @company.custom_attributes.merge(custom_attributes.to_h) if custom_attributes.present?
-
-    @company.custom_attributes
-  end
-
-  def company_update_params
-    company_params.except(:custom_attributes).merge(custom_attributes: company_custom_attributes)
-  end
-
-  def custom_attributes_to_destroy
-    custom_attributes = params.permit(custom_attributes: [])[:custom_attributes]
-    return custom_attributes if custom_attributes.present? || params[:custom_attributes].is_a?(Array)
-
-    render json: { error: 'custom_attributes must be an array' }, status: :unprocessable_entity
-  end
-end

app/controllers/api/v1/accounts/concerns/inbox_health_management.rb

@@ -1,122 +0,0 @@
-module Api::V1::Accounts::Concerns::InboxHealthManagement
-  extend ActiveSupport::Concern
-
-  included do
-    skip_before_action :check_authorization, only: [:health, :register_webhook]
-    before_action :check_admin_authorization?, only: [:register_webhook]
-    before_action :validate_health_supported_channel, only: [:health, :register_webhook]
-  end
-
-  def sync_templates
-    return render status: :unprocessable_entity, json: { error: 'Template sync is only available for WhatsApp channels' } unless whatsapp_channel?
-
-    trigger_template_sync
-    render status: :ok, json: { message: 'Template sync initiated successfully' }
-  rescue StandardError => e
-    render status: :internal_server_error, json: { error: e.message }
-  end
-
-  def message_templates
-    unless whatsapp_channel?
-      return render status: :unprocessable_entity, json: { error: 'Message templates are only available for WhatsApp channels' }
-    end
-
-    templates, last_sync_attempt_at, name_key = message_template_data
-    templates = templates.select { |template| template[name_key] == params[:name] } if params[:name].present?
-
-    render json: {
-      payload: templates,
-      meta: { last_sync_attempt_at: last_sync_attempt_at }
-    }
-  end
-
-  def health
-    render json: fetch_health_data
-  rescue Whatsapp::HealthService::ApiError => e
-    Rails.logger.error "[INBOX HEALTH] Error fetching health data: #{e.message}"
-    render json: {
-      error: {
-        type: e.authorization_error? ? 'authorization' : 'api',
-        message: e.message,
-        http_status: e.http_status,
-        code: e.code,
-        subcode: e.subcode
-      }.compact
-    }, status: :unprocessable_entity
-  rescue StandardError => e
-    Rails.logger.error "[INBOX HEALTH] Error fetching health data: #{e.message}"
-    render json: { error: e.message }, status: :unprocessable_entity
-  end
-
-  def register_webhook
-    register_channel_webhook
-
-    render json: { message: 'Webhook registered successfully' }, status: :ok
-  rescue StandardError => e
-    Rails.logger.error "[INBOX WEBHOOK] Webhook registration failed: #{e.message}"
-    render json: { error: e.message }, status: :unprocessable_entity
-  end
-
-  def whatsapp_business_management_token
-    Whatsapp::BusinessManagementTokenService.new(whatsapp_channel).update!(params.require(:business_management_token))
-
-    head :no_content
-  rescue ArgumentError, ActiveRecord::RecordInvalid => e
-    render json: { error: e.message, message: e.message }, status: :unprocessable_entity
-  end
-
-  private
-
-  def fetch_health_data
-    return Whatsapp::HealthService.new(@inbox.channel).sync_health_status!(include_business_profile: true) if whatsapp_cloud_channel?
-
-    Twilio::HealthService.new(channel: @inbox.channel).perform
-  end
-
-  def register_channel_webhook
-    return Whatsapp::WebhookSetupService.new(@inbox.channel).register_callback if whatsapp_cloud_channel?
-
-    Twilio::WebhookSetupService.new(channel: @inbox.channel).perform
-    # No-op unless voice is enabled; keeps the number's voice webhooks in sync alongside messaging.
-    @inbox.channel.try(:reprovision_voice_webhooks!)
-  end
-
-  def validate_health_supported_channel
-    return if whatsapp_cloud_channel? || twilio_sms_channel?
-
-    render json: { error: 'Health data only available for WhatsApp Cloud API and Twilio SMS channels' }, status: :bad_request
-  end
-
-  def whatsapp_channel
-    channel = @inbox.channel
-    raise ActiveRecord::RecordNotFound unless channel.is_a?(Channel::Whatsapp)
-
-    channel
-  end
-
-  def whatsapp_cloud_channel?
-    @inbox.channel.is_a?(Channel::Whatsapp) && @inbox.channel.provider == 'whatsapp_cloud'
-  end
-
-  def twilio_sms_channel?
-    @inbox.channel.is_a?(Channel::TwilioSms) && @inbox.channel.sms?
-  end
-
-  def whatsapp_channel?
-    @inbox.whatsapp? || (@inbox.twilio? && @inbox.channel.whatsapp?)
-  end
-
-  def message_template_data
-    return [@inbox.channel.message_templates.presence || [], @inbox.channel.message_templates_last_updated, 'name'] unless @inbox.twilio_whatsapp?
-
-    [@inbox.channel.content_templates&.dig('templates') || [], @inbox.channel.content_templates_last_updated, 'friendly_name']
-  end
-
-  def trigger_template_sync
-    if @inbox.whatsapp?
-      Channels::Whatsapp::TemplatesSyncJob.perform_later(@inbox.channel)
-    elsif @inbox.twilio? && @inbox.channel.whatsapp?
-      Channels::Twilio::TemplatesSyncJob.perform_later(@inbox.channel)
-    end
-  end
-end

app/controllers/api/v1/accounts/concerns/inbox_secret_management.rb

@@ -1,16 +0,0 @@
-module Api::V1::Accounts::Concerns::InboxSecretManagement
-  extend ActiveSupport::Concern
-
-  def reset_secret
-    return head :not_found unless @inbox.api?
-
-    @inbox.channel.reset_secret!
-  end
-
-  def rotate_hmac_token
-    return head :not_found unless @inbox.web_widget? || @inbox.api?
-
-    @inbox.channel.regenerate_hmac_token
-    render :show
-  end
-end

app/controllers/api/v1/accounts/concerns/whatsapp_health_management.rb

@@ -0,0 +1,55 @@
+module Api::V1::Accounts::Concerns::WhatsappHealthManagement
+  extend ActiveSupport::Concern
+
+  included do
+    skip_before_action :check_authorization, only: [:health, :register_webhook]
+    before_action :check_admin_authorization?, only: [:register_webhook]
+    before_action :validate_whatsapp_cloud_channel, only: [:health, :register_webhook]
+  end
+
+  def sync_templates
+    return render status: :unprocessable_entity, json: { error: 'Template sync is only available for WhatsApp channels' } unless whatsapp_channel?
+
+    trigger_template_sync
+    render status: :ok, json: { message: 'Template sync initiated successfully' }
+  rescue StandardError => e
+    render status: :internal_server_error, json: { error: e.message }
+  end
+
+  def health
+    health_data = Whatsapp::HealthService.new(@inbox.channel).fetch_health_status
+    render json: health_data
+  rescue StandardError => e
+    Rails.logger.error "[INBOX HEALTH] Error fetching health data: #{e.message}"
+    render json: { error: e.message }, status: :unprocessable_entity
+  end
+
+  def register_webhook
+    Whatsapp::WebhookSetupService.new(@inbox.channel).register_callback
+
+    render json: { message: 'Webhook registered successfully' }, status: :ok
+  rescue StandardError => e
+    Rails.logger.error "[INBOX WEBHOOK] Webhook registration failed: #{e.message}"
+    render json: { error: e.message }, status: :unprocessable_entity
+  end
+
+  private
+
+  def validate_whatsapp_cloud_channel
+    return if @inbox.channel.is_a?(Channel::Whatsapp) && @inbox.channel.provider == 'whatsapp_cloud'
+
+    render json: { error: 'Health data only available for WhatsApp Cloud API channels' }, status: :bad_request
+  end
+
+  def whatsapp_channel?
+    @inbox.whatsapp? || (@inbox.twilio? && @inbox.channel.whatsapp?)
+  end
+
+  def trigger_template_sync
+    if @inbox.whatsapp?
+      Channels::Whatsapp::TemplatesSyncJob.perform_later(@inbox.channel)
+    elsif @inbox.twilio? && @inbox.channel.whatsapp?
+      Channels::Twilio::TemplatesSyncJob.perform_later(@inbox.channel)
+    end
+  end
+end

app/controllers/api/v1/accounts/contacts/attachments_controller.rb

@@ -1,18 +0,0 @@
-class Api::V1::Accounts::Contacts::AttachmentsController < Api::V1::Accounts::Contacts::BaseController
-  RESULTS_PER_PAGE = 100
-
-  def index
-    conversations = Conversations::PermissionFilterService.new(
-      Current.account.conversations.where(contact_id: @contact.id),
-      Current.user,
-      Current.account
-    ).perform
-
-    @attachments = Attachment.where(message_id: Message.where(conversation_id: conversations).select(:id))
-                             .includes({ file_attachment: :blob }, message: [:conversation, :inbox, { sender: { avatar_attachment: :blob } }])
-                             .order(created_at: :desc)
-                             .page(params[:page])
-                             .per(RESULTS_PER_PAGE)
-    @attachments_count = @attachments.total_count
-  end
-end

app/controllers/api/v1/accounts/contacts/conversations_controller.rb

@@ -1,46 +1,17 @@
 class Api::V1::Accounts::Contacts::ConversationsController < Api::V1::Accounts::Contacts::BaseController
-  RESULTS_PER_PAGE = 25
-
-  # Scoped to a conversation, this returns it with the ones created around it: the in-thread
-  # navigation walks the whole history and never needs more than that.
   def index
-    @conversations = if params[:conversation_id].present?
-                       conversation_with_neighbours(params[:conversation_id])
-                     else
-                       permitted_conversations.order(last_activity_at: :desc, id: :desc).limit(RESULTS_PER_PAGE)
-                     end
-  end
-
-  private
-
-  def permitted_conversations
+    # Start with all conversations for this contact
     conversations = Current.account.conversations.includes(
-      :assignee, :contact, :taggings, :contact_inbox
-    ).preload(
-      inbox: :channel,
-      ai_assignee: { avatar_attachment: [:blob] }
+      :assignee, :contact, :inbox, :taggings
     ).where(contact_id: @contact.id)
 
-    Conversations::PermissionFilterService.new(
+    # Apply permission-based filtering using the existing service
+    conversations = Conversations::PermissionFilterService.new(
       conversations,
       Current.user,
       Current.account
     ).perform
-  end
 
-  def conversation_with_neighbours(display_id)
-    conversation = permitted_conversations.find_by!(display_id: display_id)
-
-    [neighbour(conversation, :older), conversation, neighbour(conversation, :newer)].compact
-  end
-
-  def neighbour(conversation, direction)
-    comparison = direction == :older ? '<' : '>'
-    order = direction == :older ? :desc : :asc
-
-    permitted_conversations
-      .where("(conversations.created_at, conversations.id) #{comparison} (?, ?)", conversation.created_at, conversation.id)
-      .order(created_at: order, id: order)
-      .first
+    @conversations = conversations.order(last_activity_at: :desc).limit(20)
   end
 end

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

@@ -84,7 +84,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
 
   def create
     ActiveRecord::Base.transaction do
-      @contact = Current.account.contacts.new(permitted_params.except(:avatar_url).merge(contact_type: :lead))
+      @contact = Current.account.contacts.new(permitted_params.except(:avatar_url))
       @contact.save!
       @contact_inbox = build_contact_inbox
       process_avatar_from_url
@@ -171,12 +171,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
   end
 
   def permitted_params
-    permitted_params = params.permit(:name, :identifier, :email, :phone_number, :avatar, :avatar_url, :blocked,
-                                     additional_attributes: {}, custom_attributes: {})
-    return permitted_params unless Current.account.feature_enabled?('companies') && params.key?(:company_id)
-
-    company_id = params[:company_id]
-    permitted_params.merge(company_id: company_id.present? ? Current.account.companies.find(company_id).id : nil)
+    params.permit(:name, :identifier, :email, :phone_number, :avatar, :blocked, :avatar_url, additional_attributes: {}, custom_attributes: {})
   end
 
   def contact_custom_attributes
@@ -219,5 +214,3 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
     render json: error, status: error_status
   end
 end
-
-Api::V1::Accounts::ContactsController.prepend_mod_with('Api::V1::Accounts::ContactsController')

app/controllers/api/v1/accounts/conversations/assignments_controller.rb

@@ -34,11 +34,8 @@ class Api::V1::Accounts::Conversations::AssignmentsController < Api::V1::Account
   end
 
   def set_team
-    team_id = params[:team_id].to_i
-    @team = team_id.positive? ? Current.account.teams.find(team_id) : nil
-    @conversation.with_lock do
-      @conversation.update!(team: @team)
-    end
+    @team = Current.account.teams.find_by(id: params[:team_id])
+    @conversation.update!(team: @team)
     render json: @team
   end
 
@@ -46,7 +43,3 @@ class Api::V1::Accounts::Conversations::AssignmentsController < Api::V1::Account
     params[:assignee_type].to_s == 'AgentBot'
   end
 end
-
-Api::V1::Accounts::Conversations::AssignmentsController.prepend_mod_with(
-  'Api::V1::Accounts::Conversations::AssignmentsController'
-)

app/controllers/api/v1/accounts/conversations/contact_info_requests_controller.rb

@@ -1,14 +0,0 @@
-class Api::V1::Accounts::Conversations::ContactInfoRequestsController < Api::V1::Accounts::Conversations::BaseController
-  rescue_from CustomExceptions::WhatsappContactInfoRequestError do |error|
-    render json: { error: error.message }, status: error.http_status
-  end
-
-  def show
-    render json: Whatsapp::ContactInfoRequestEligibilityService.new(conversation: @conversation).availability
-  end
-
-  def create
-    @message = Whatsapp::ContactInfoRequestService.new(conversation: @conversation, sender: Current.user).perform
-    render 'api/v1/accounts/conversations/messages/create'
-  end
-end

app/controllers/api/v1/accounts/conversations/direct_uploads_controller.rb

@@ -1,19 +1,6 @@
 class Api::V1::Accounts::Conversations::DirectUploadsController < ActiveStorage::DirectUploadsController
-  include DeviseTokenAuth::Concerns::SetUserByToken
-  include RequestExceptionHandler
-  include AccessTokenAuthHelper
   include EnsureCurrentAccountHelper
-  include MfaEnforcementGuard
-
-  skip_before_action :verify_authenticity_token, if: :authenticate_by_access_token?
-
-  around_action :handle_with_exception
-  before_action :authenticate_access_token!, if: :authenticate_by_access_token?
-  before_action :validate_bot_access_token!, if: :authenticate_by_access_token?
-  before_action :authenticate_user!, unless: :authenticate_by_access_token?
   before_action :current_account
-  before_action :validate_token_api_access, if: :authenticate_by_access_token?
-  before_action :check_account_mfa_enforcement, if: :authenticate_by_access_token?
   before_action :conversation
 
   def create
@@ -24,12 +11,6 @@ class Api::V1::Accounts::Conversations::DirectUploadsController < ActiveStorage:
 
   private
 
-  def validate_token_api_access
-    return if Current.account.api_and_webhooks_enabled?
-
-    render json: { error: 'API access is not enabled for this account' }, status: :forbidden
-  end
-
   def conversation
     @conversation ||= Current.account.conversations.find_by(display_id: params[:conversation_id])
   end

app/controllers/api/v1/accounts/conversations/messages_controller.rb

@@ -20,9 +20,7 @@ class Api::V1::Accounts::Conversations::MessagesController < Api::V1::Accounts::
 
   def destroy
     ActiveRecord::Base.transaction do
-      # keeps the forward marker so replies to a deleted forward stay out of this conversation
-      message.update!(content: I18n.t('conversations.messages.deleted'), content_type: :text,
-                      content_attributes: message.content_attributes.slice('forwarded_message_id').merge(deleted: true))
+      message.update!(content: I18n.t('conversations.messages.deleted'), content_type: :text, content_attributes: { deleted: true })
       message.attachments.destroy_all
     end
   end
@@ -30,7 +28,10 @@ class Api::V1::Accounts::Conversations::MessagesController < Api::V1::Accounts::
   def retry
     return if message.blank?
 
-    ::SendReplyJob.perform_later(message.id) if claim_message_retry
+    service = Messages::StatusUpdateService.new(message, 'sent')
+    service.perform
+    message.update!(content_attributes: {})
+    ::SendReplyJob.perform_later(message.id)
   rescue StandardError => e
     render_could_not_create_error(e.message)
   end
@@ -51,9 +52,6 @@ class Api::V1::Accounts::Conversations::MessagesController < Api::V1::Accounts::
     end
 
     render json: { content: translated_content }
-  rescue Google::Cloud::Error => e
-    # `details` carries the clean human message; `message` includes gRPC debug noise
-    render_could_not_create_error(e.details.presence || e.message)
   end
 
   private
@@ -66,21 +64,6 @@ class Api::V1::Accounts::Conversations::MessagesController < Api::V1::Accounts::
     @message_finder ||= MessageFinder.new(@conversation, params)
   end
 
-  def claim_message_retry
-    message.with_lock do
-      next false unless message.failed?
-
-      Messages::StatusUpdateService.new(message, 'sent').perform
-      clear_source_id unless @conversation.inbox.api? || @conversation.inbox.web_widget?
-      true
-    end
-  end
-
-  def clear_source_id
-    Rails.logger.info "Cleared older source ID #{message.source_id} for message #{message.id}" if message.source_id.present?
-    message.update!(source_id: nil)
-  end
-
   def permitted_params
     params.permit(:id, :target_language, :status, :external_error)
   end
@@ -95,5 +78,3 @@ class Api::V1::Accounts::Conversations::MessagesController < Api::V1::Accounts::
     render json: { error: 'Message status update is only allowed for API inboxes' }, status: :forbidden unless @conversation.inbox.api?
   end
 end
-
-Api::V1::Accounts::Conversations::MessagesController.prepend_mod_with('Api::V1::Accounts::Conversations::MessagesController')

app/controllers/api/v1/accounts/conversations/participants_controller.rb

@@ -1,74 +1,41 @@
 class Api::V1::Accounts::Conversations::ParticipantsController < Api::V1::Accounts::Conversations::BaseController
-  include Events::Types
-
-  before_action :validate_participant_ids, only: [:create, :update]
-
   def show
     @participants = @conversation.conversation_participants
   end
 
   def create
-    participant_ids_to_add = participants_to_be_added_ids
-
     ActiveRecord::Base.transaction do
-      @participants = participant_ids_to_add.map { |user_id| @conversation.conversation_participants.find_or_create_by!(user_id: user_id) }
+      @participants = participants_to_be_added_ids.map { |user_id| @conversation.conversation_participants.find_or_create_by(user_id: user_id) }
     end
-    notify_unread_count_change if participant_ids_to_add.any?
   end
 
   def update
-    participant_ids_to_add = participants_to_be_added_ids
-    participant_ids_to_remove = participants_to_be_removed_ids
-    changed_participant_ids = participant_ids_to_add + participant_ids_to_remove
-
     ActiveRecord::Base.transaction do
-      participant_ids_to_add.each { |user_id| @conversation.conversation_participants.find_or_create_by!(user_id: user_id) }
-      participant_ids_to_remove.each { |user_id| @conversation.conversation_participants.find_by(user_id: user_id)&.destroy }
+      participants_to_be_added_ids.each { |user_id| @conversation.conversation_participants.find_or_create_by(user_id: user_id) }
+      participants_to_be_removed_ids.each { |user_id| @conversation.conversation_participants.find_by(user_id: user_id)&.destroy }
     end
-    notify_unread_count_change if changed_participant_ids.any?
-    @participants = @conversation.conversation_participants.reload
+    @participants = @conversation.conversation_participants
     render action: 'show'
   end
 
   def destroy
-    participant_ids_to_remove = current_participant_ids & params[:user_ids]
-
     ActiveRecord::Base.transaction do
       params[:user_ids].map { |user_id| @conversation.conversation_participants.find_by(user_id: user_id)&.destroy }
     end
-    notify_unread_count_change if participant_ids_to_remove.any?
     head :ok
   end
 
   private
 
   def participants_to_be_added_ids
-    participant_ids - current_participant_ids
+    params[:user_ids] - current_participant_ids
   end
 
   def participants_to_be_removed_ids
-    current_participant_ids - participant_ids
+    current_participant_ids - params[:user_ids]
   end
 
   def current_participant_ids
     @current_participant_ids ||= @conversation.conversation_participants.pluck(:user_id)
   end
-
-  def participant_ids
-    @participant_ids ||= params[:user_ids].map(&:to_i)
-  end
-
-  def validate_participant_ids
-    invalid_ids = participants_to_be_added_ids - @conversation.inbox.assignable_agents.map(&:id)
-    return if invalid_ids.empty?
-
-    render json: { error: 'Invalid participant IDs' }, status: :unprocessable_entity
-  end
-
-  def notify_unread_count_change
-    return unless Current.account.feature_enabled?('conversation_unread_counts')
-    return unless Current.account.feature_enabled?('unread_count_for_filters')
-
-    Rails.configuration.dispatcher.dispatch(CONVERSATION_UNREAD_COUNT_CHANGED, Time.zone.now, conversation: @conversation)
-  end
 end

app/controllers/api/v1/accounts/conversations/suggestions_controller.rb

@@ -1,23 +0,0 @@
-class Api::V1::Accounts::Conversations::SuggestionsController < Api::V1::Accounts::Conversations::BaseController
-  FEATURE = 'captain_classifier'.freeze
-
-  before_action :ensure_feature_enabled
-
-  def labels
-    render json: { labels: classifier.labels }
-  end
-
-  def priority
-    render json: classifier.priority
-  end
-
-  private
-
-  def ensure_feature_enabled
-    raise Pundit::NotAuthorizedError unless Current.account.feature_enabled?(FEATURE)
-  end
-
-  def classifier
-    Captain::ConversationClassifierService.new(conversation: @conversation)
-  end
-end

app/controllers/api/v1/accounts/conversations/unread_counts_controller.rb

@@ -1,32 +0,0 @@
-class Api::V1::Accounts::Conversations::UnreadCountsController < Api::V1::Accounts::BaseController
-  before_action :ensure_unread_counts_enabled
-
-  def index
-    counts = if filtered_unread_counts_enabled?
-               instrumentation.summarize_request(account_id: Current.account.id) { unread_counts }
-             else
-               unread_counts
-             end
-    render json: { payload: counts }
-  end
-
-  private
-
-  def unread_counts
-    ::Conversations::UnreadCounts::Counter.new(account: Current.account, user: Current.user).perform
-  end
-
-  def filtered_unread_counts_enabled?
-    Current.account.feature_enabled?(::Conversations::UnreadCounts::FilteredCounter::FEATURE_FLAG)
-  end
-
-  def instrumentation
-    ::Conversations::UnreadCounts::FilteredCountInstrumentation
-  end
-
-  def ensure_unread_counts_enabled
-    return if Current.account.feature_enabled?('conversation_unread_counts')
-
-    render json: { error: I18n.t('errors.conversations.unread_counts.feature_not_enabled') }, status: :forbidden
-  end
-end

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

@@ -2,7 +2,6 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
   include Events::Types
   include DateRangeHelper
   include HmacConcern
-  include ConversationCustomAttributesConcern
 
   before_action :conversation, except: [:index, :meta, :search, :create, :filter]
   before_action :inbox, :contact, :contact_inbox, only: [:create]
@@ -29,7 +28,7 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
   def attachments
     @attachments_count = @conversation.attachments.count
     @attachments = @conversation.attachments
-                                .includes({ file_attachment: :blob }, message: [:inbox, { sender: { avatar_attachment: :blob } }])
+                                .includes(:message)
                                 .order(created_at: :desc)
                                 .page(attachment_params[:page])
                                 .per(ATTACHMENT_RESULTS_PER_PAGE)
@@ -81,7 +80,7 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
 
   def toggle_status
     # FIXME: move this logic into a service object
-    if bot_handoff?
+    if pending_to_open_by_bot?
       @conversation.bot_handoff!
     elsif params[:status].present?
       set_conversation_status
@@ -89,17 +88,21 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
     else
       @status = @conversation.toggle_status
     end
-    handle_human_open if @conversation.open? && Current.user.is_a?(User)
+    assign_conversation if should_assign_conversation?
   end
 
-  def bot_handoff?
+  def pending_to_open_by_bot?
     return false unless Current.user.is_a?(AgentBot)
 
     @conversation.status == 'pending' && params[:status] == 'open'
   end
 
+  def should_assign_conversation?
+    @conversation.status == 'open' && Current.user.is_a?(User) && Current.user&.agent?
+  end
+
   def toggle_priority
-    @conversation.toggle_priority(permitted_update_params[:priority])
+    @conversation.toggle_priority(params[:priority])
     head :ok
   end
 
@@ -130,9 +133,14 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
     update_last_seen_on_conversation(last_seen_at, true)
   end
 
+  def custom_attributes
+    @conversation.custom_attributes = params.permit(custom_attributes: {})[:custom_attributes]
+    @conversation.save!
+  end
+
   def destroy
     authorize @conversation, :destroy?
-    ::Conversations::DeleteService.new(conversation: @conversation, user: Current.user, ip: request.ip).perform
+    ::DeleteObjectJob.perform_later(@conversation, Current.user, request.ip)
     head :ok
   end
 
@@ -140,8 +148,6 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
 
   def permitted_update_params
     # TODO: Move the other conversation attributes to this method and remove specific endpoints for each attribute
-    raise ActionController::ParameterMissing, :priority unless params[:priority].nil? || Conversation.priorities.key?(params[:priority])
-
     params.permit(:priority)
   end
 
@@ -156,9 +162,6 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
     # rubocop:disable Rails/SkipsModelValidations
     @conversation.update_columns(updates)
     # rubocop:enable Rails/SkipsModelValidations
-
-    ::Conversations::UnreadCounts::Notifier.new(@conversation).perform
-    ::Conversations::UnreadCounts::FilteredCountInvalidator.new(Current.account).conversation_changed!
   end
 
   def should_update_last_seen?
@@ -177,12 +180,9 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
     @conversation.snoozed_until = parse_date_time(params[:snoozed_until].to_s) if params[:snoozed_until]
   end
 
-  def handle_human_open
-    @conversation.with_lock do
-      @conversation.ai_assignee = nil
-      @conversation.assignee = Current.user if Current.user.agent?
-      @conversation.save!
-    end
+  def assign_conversation
+    @conversation.assignee = current_user
+    @conversation.save!
   end
 
   def conversation
@@ -209,8 +209,7 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
     # fallback for the old case where we do look up only using source id
     # In future we need to change this and make sure we do look up on combination of inbox_id and source_id
     # and deprecate the support of passing only source_id as the param
-    lookup_scope = @inbox ? @inbox.contact_inboxes : ContactInbox.joins(:inbox).where(inboxes: { account_id: Current.account.id })
-    @contact_inbox ||= lookup_scope.find_by!(source_id: params[:source_id])
+    @contact_inbox ||= ::ContactInbox.find_by!(source_id: params[:source_id])
     authorize @contact_inbox.inbox, :show?
   rescue ActiveRecord::RecordNotUnique
     render json: { error: 'source_id should be unique' }, status: :unprocessable_entity

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

@@ -1,7 +1,6 @@
 class Api::V1::Accounts::CustomAttributeDefinitionsController < Api::V1::Accounts::BaseController
   before_action :fetch_custom_attributes_definitions, except: [:create]
   before_action :fetch_custom_attribute_definition, only: [:show, :update, :destroy]
-  before_action :check_authorization
   DEFAULT_ATTRIBUTE_MODEL = 'conversation_attribute'.freeze
 
   def index; end

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

@@ -2,7 +2,6 @@ class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseContro
   before_action :check_authorization
   before_action :fetch_custom_filters, only: [:index]
   before_action :fetch_custom_filter, only: [:show, :update, :destroy]
-  before_action :validate_query_timezones, only: [:create, :update]
   DEFAULT_FILTER_TYPE = 'conversation'.freeze
 
   def index; end
@@ -48,22 +47,6 @@ class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseContro
     )
   end
 
-  def validate_query_timezones
-    query = permitted_payload.fetch(:query, {})
-    return unless query.key?(:payload)
-
-    payload = query[:payload]
-    unless payload.is_a?(Array) && payload.all?(ActionController::Parameters)
-      raise CustomExceptions::CustomFilter::InvalidValue.new(attribute_name: 'payload')
-    end
-
-    payload.each do |condition|
-      ::Filters::DateFilterHelper.timezone(condition[:timezone]) if condition.key?(:timezone)
-    end
-  rescue CustomExceptions::CustomFilter::InvalidValue => e
-    render_could_not_create_error(e.message)
-  end
-
   def permitted_params
     params.permit(:id, :filter_type)
   end

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

@@ -1,5 +1,4 @@
 class Api::V1::Accounts::DashboardAppsController < Api::V1::Accounts::BaseController
-  before_action :check_authorization
   before_action :fetch_dashboard_apps, except: [:create]
   before_action :fetch_dashboard_app, only: [:show, :update, :destroy]
 

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

@@ -1,199 +0,0 @@
-require 'csv'
-
-class Api::V1::Accounts::DataImportsController < Api::V1::Accounts::BaseController
-  DATA_IMPORT_FEATURE = 'data_import'.freeze
-
-  before_action :ensure_data_import_feature_enabled
-  before_action :set_data_import, only: [:show, :start, :retry_import, :abandon, :error_logs, :skip_logs]
-  before_action :check_authorization
-
-  def index
-    @data_imports = policy_scope(Current.account.data_imports).includes(:initiated_by).order(created_at: :desc)
-    data_import_ids = @data_imports.map(&:id)
-    @import_errors_counts = DataImportError.non_skip_logs.where(data_import_id: data_import_ids).group(:data_import_id).count
-    @skip_logs_counts = DataImportError.skip_logs.where(data_import_id: data_import_ids).group(:data_import_id).count
-  end
-
-  def show
-    render_show
-  end
-
-  def validate_source
-    totals = source_class.credentials_validator(source_params: permitted_params.to_h, import_types: import_types).perform
-    render json: { valid: true, totals: totals }
-  rescue ArgumentError => e
-    render_source_validation_error(e.message)
-  rescue StandardError => e
-    render_source_client_error(e)
-  end
-
-  def create
-    @data_import = creation_service.perform
-    unless @data_import
-      render json: { message: 'Another data import is already in progress.' }, status: :unprocessable_entity
-      return
-    end
-
-    enqueue_import(@data_import)
-    render_show
-  rescue ArgumentError => e
-    render_source_validation_error(e.message)
-  rescue StandardError => e
-    render_source_client_error(e)
-  end
-
-  def start
-    restart_service = DataImports::RestartService.new(account: Current.account, data_import: @data_import)
-    restart_result = restart_service.perform
-    @data_import = restart_service.data_import
-    if restart_result == :access_token_missing
-      render json: { message: "The #{source_name} #{credential_name} for this import is unavailable." }, status: :unprocessable_entity
-      return
-    end
-
-    enqueue_import(@data_import) if restart_result == :enqueue
-    render_show
-  end
-
-  def retry_import
-    retry_service = DataImports::RetryService.new(account: Current.account, data_import: @data_import)
-    retry_result = retry_service.perform
-    @data_import = retry_service.data_import
-
-    case retry_result
-    when :enqueue
-      enqueue_import(@data_import)
-      render_show
-    when :not_stalled
-      render json: { message: "This #{source_name} import is no longer stalled." }, status: :unprocessable_entity
-    when :active_import_exists
-      render json: { message: "Another #{source_name} import is already in progress." }, status: :unprocessable_entity
-    when :access_token_missing
-      render json: { message: "The #{source_name} #{credential_name} for this import is unavailable." }, status: :unprocessable_entity
-    end
-  end
-
-  def abandon
-    @data_import.abandon!
-    render_show
-  end
-
-  def skip_logs
-    send_data(
-      skip_logs_csv,
-      filename: "data-import-#{@data_import.id}-skip-logs.csv",
-      type: 'text/csv'
-    )
-  end
-
-  def error_logs
-    send_data(
-      error_logs_csv,
-      filename: "data-import-#{@data_import.id}-error-logs.csv",
-      type: 'text/csv'
-    )
-  end
-
-  private
-
-  def ensure_data_import_feature_enabled
-    raise Pundit::NotAuthorizedError unless Current.account.feature_enabled?(DATA_IMPORT_FEATURE)
-  end
-
-  def set_data_import
-    @data_import = Current.account.data_imports.find(params[:id])
-  end
-
-  def check_authorization
-    authorize(@data_import || DataImport)
-  end
-
-  def permitted_params
-    params.permit(:name, :source_provider, :access_token, :domain, import_types: [])
-  end
-
-  def creation_service
-    DataImports::CreationService.new(
-      account: Current.account,
-      initiated_by: Current.user,
-      source_params: permitted_params.to_h
-    )
-  end
-
-  def import_types
-    return DataImports::Importer::DEFAULT_IMPORT_TYPES unless permitted_params.key?(:import_types)
-
-    Array(permitted_params[:import_types]).compact_blank
-  end
-
-  def source_class
-    provider = @data_import&.source_provider || permitted_params[:source_provider]
-    DataImports::Source.source_class(provider)
-  end
-
-  def source_name
-    return 'Integration' unless DataImports::Source.supported?(@data_import&.source_provider || permitted_params[:source_provider])
-
-    source_class::DISPLAY_NAME
-  end
-
-  def credential_name
-    return 'credential' unless DataImports::Source.supported?(@data_import&.source_provider || permitted_params[:source_provider])
-
-    source_class.credential_name
-  end
-
-  def enqueue_import(data_import)
-    DataImports::Source.source_class(data_import.source_provider).import_job_class.perform_later(
-      data_import,
-      data_import.active_import_run_id
-    )
-  end
-
-  def render_source_validation_error(message)
-    render json: { valid: false, message: message }, status: :unprocessable_entity
-  end
-
-  def render_source_client_error(error)
-    raise error unless source_class.client_error?(error)
-
-    message = if source_class.authentication_error?(error)
-                "We could not validate this #{source_name} #{credential_name}. Check the key and its permissions."
-              else
-                "#{source_name} could not be reached. Please try again."
-              end
-    render_source_validation_error(message)
-  end
-
-  def render_show
-    @import_errors_finder = DataImportErrorFinder.new(@data_import)
-    @skip_logs_finder = DataImportSkipLogFinder.new(@data_import, params)
-    render :show
-  end
-
-  def skip_logs_csv
-    logs_csv(@data_import.import_errors.skip_logs)
-  end
-
-  def error_logs_csv
-    logs_csv(@data_import.import_errors.non_skip_logs)
-  end
-
-  def logs_csv(logs)
-    CSV.generate(headers: true) do |csv|
-      csv << %w[created_at kind source_object_type source_object_id error_code message details]
-
-      logs.order(:created_at).find_each do |log|
-        csv << [
-          log.created_at.iso8601,
-          log.details['kind'],
-          log.source_object_type,
-          log.source_object_id,
-          log.error_code,
-          log.message,
-          log.details.to_json
-        ]
-      end
-    end
-  end
-end

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

@@ -2,16 +2,14 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
   include Api::V1::InboxesHelper
   before_action :fetch_inbox, except: [:index, :create]
   before_action :fetch_agent_bot, only: [:set_agent_bot]
+  before_action :validate_limit, only: [:create]
   # we are already handling the authorization in fetch inbox
   before_action :check_authorization, except: [:show]
 
-  include Api::V1::Accounts::Concerns::InboxHealthManagement
-  include Api::V1::Accounts::Concerns::InboxSecretManagement
+  include Api::V1::Accounts::Concerns::WhatsappHealthManagement
 
   def index
-    @inboxes = policy_scope(Current.account.inboxes)
-               .includes(:channel, :portal, :working_hours, { avatar_attachment: :blob })
-               .order_by_name
+    @inboxes = policy_scope(Current.account.inboxes.order_by_name.includes(:channel, { avatar_attachment: [:blob] }))
   end
 
   def show; end
@@ -46,20 +44,11 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
   end
 
   def update
-    continue_update = false
-
-    ActiveRecord::Base.transaction do
-      continue_update = update_branded_email_layout
-      raise ActiveRecord::Rollback unless continue_update
-
-      inbox_params = permitted_params.except(:channel, :csat_config)
-      inbox_params[:csat_config] = format_csat_config(permitted_params[:csat_config]) if permitted_params[:csat_config].present?
-      @inbox.update!(inbox_params)
-      update_inbox_working_hours
-      update_channel if channel_update_required?
-    end
-
-    return unless continue_update
+    inbox_params = permitted_params.except(:channel, :csat_config)
+    inbox_params[:csat_config] = format_csat_config(permitted_params[:csat_config]) if permitted_params[:csat_config].present?
+    @inbox.update!(inbox_params)
+    update_inbox_working_hours
+    update_channel if channel_update_required?
   end
 
   def agent_bot
@@ -77,6 +66,12 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
     head :ok
   end
 
+  def reset_secret
+    return head :not_found unless @inbox.api?
+
+    @inbox.channel.reset_secret!
+  end
+
   def destroy
     ::DeleteObjectJob.perform_later(@inbox, Current.user, request.ip) if @inbox.present?
     render status: :ok, json: { message: I18n.t('messages.inbox_deletetion_response') }
@@ -90,7 +85,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
   end
 
   def fetch_agent_bot
-    @agent_bot = AgentBot.accessible_to(Current.account).find(params[:agent_bot]) if params[:agent_bot]
+    @agent_bot = AgentBot.find(params[:agent_bot]) if params[:agent_bot]
   end
 
   def create_channel
@@ -128,8 +123,8 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
   end
 
   def reauthorize_and_update_channel(channel_attributes)
-    @inbox.channel.update!(permitted_params(channel_attributes)[:channel])
     @inbox.channel.reauthorized! if @inbox.channel.respond_to?(:reauthorized!)
+    @inbox.channel.update!(permitted_params(channel_attributes)[:channel])
   end
 
   def update_channel_feature_flags
@@ -159,34 +154,6 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
     formatted['template'] = config['template'] if config['template'].present?
   end
 
-  def update_branded_email_layout
-    return true unless params.key?(:branded_email_layout)
-
-    branded_email_layout = normalized_branded_email_layout
-
-    unless Current.account.feature_enabled?(:branded_email_templates)
-      return true if branded_email_layout.blank?
-
-      render_could_not_create_error('Branded email templates feature is not enabled')
-      return false
-    end
-
-    unless @inbox.email?
-      return true if branded_email_layout.blank?
-
-      render_could_not_create_error('Branded email layout is only supported for email inboxes')
-      return false
-    end
-
-    @inbox.update_branded_email_layout!(branded_email_layout)
-    true
-  rescue ActiveRecord::RecordInvalid => e
-    render_could_not_create_error(e.record.errors.full_messages.join(', '))
-    false
-  end
-
-  def normalized_branded_email_layout = params[:branded_email_layout] == 'null' ? nil : params[:branded_email_layout]
-
   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,

app/controllers/api/v1/accounts/instagram/authorizations_controller.rb

@@ -9,9 +9,9 @@ class Api::V1::Accounts::Instagram::AuthorizationsController < Api::V1::Accounts
         redirect_uri: "#{base_url}/instagram/callback",
         scope: REQUIRED_SCOPES.join(','),
         enable_fb_login: '0',
-        force_reauth: 'true',
+        force_authentication: '1',
         response_type: 'code',
-        state: generate_instagram_token(Current.account.id, params[:return_to])
+        state: generate_instagram_token(Current.account.id)
       }
     )
     if redirect_url

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

@@ -15,9 +15,5 @@ class Api::V1::Accounts::Integrations::AppsController < Api::V1::Accounts::BaseC
 
   def fetch_app
     @app = Integrations::App.find(id: params[:id])
-    return unless @app&.id == 'shopify'
-
-    # Keep direct Shopify lookups subject to the same availability checks as the integrations list.
-    raise ActiveRecord::RecordNotFound unless @app.active?(Current.account)
   end
 end

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

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

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

@@ -15,7 +15,7 @@ class Api::V1::Accounts::Integrations::DyteController < Api::V1::Accounts::BaseC
     end
 
     render_response(
-      dyte_processor_service.add_participant_to_meeting(@message.content_attributes['data']['meeting_id'], Current.user, @message)
+      dyte_processor_service.add_participant_to_meeting(@message.content_attributes['data']['meeting_id'], Current.user)
     )
   end
 

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

@@ -1,7 +1,6 @@
-class Api::V1::Accounts::Integrations::HooksController < Api::V1::Accounts::Integrations::BaseController
+class Api::V1::Accounts::Integrations::HooksController < Api::V1::Accounts::BaseController
   before_action :fetch_hook, except: [:create]
   before_action :check_authorization
-  before_action :ensure_shopify_enabled, if: :shopify_hook?
 
   def create
     @hook = Current.account.hooks.create!(permitted_params)
@@ -36,15 +35,11 @@ class Api::V1::Accounts::Integrations::HooksController < Api::V1::Accounts::Inte
     @hook = Current.account.hooks.find(params[:id])
   end
 
+  def check_authorization
+    authorize(:hook)
+  end
+
   def permitted_params
     params.require(:hook).permit(:app_id, :inbox_id, :status, settings: {})
   end
-
-  def shopify_hook?
-    action_name == 'create' ? permitted_params[:app_id] == 'shopify' : @hook.app_id == 'shopify'
-  end
-
-  def ensure_shopify_enabled
-    head :not_found unless Shopify::FeatureGate.enabled?(account: Current.account)
-  end
 end

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

@@ -1,7 +1,6 @@
-class Api::V1::Accounts::Integrations::LinearController < Api::V1::Accounts::Integrations::BaseController
+class Api::V1::Accounts::Integrations::LinearController < Api::V1::Accounts::BaseController
   before_action :fetch_conversation, only: [:create_issue, :link_issue, :unlink_issue, :linked_issues]
   before_action :fetch_hook, only: [:destroy]
-  before_action :check_authorization, only: [:destroy]
 
   def destroy
     revoke_linear_token
@@ -29,7 +28,7 @@ class Api::V1::Accounts::Integrations::LinearController < Api::V1::Accounts::Int
   end
 
   def create_issue
-    issue = linear_processor_service.create_issue(permitted_params.to_h.stringify_keys, Current.user)
+    issue = linear_processor_service.create_issue(permitted_params, Current.user)
     if issue[:error]
       render json: { error: issue[:error] }, status: :unprocessable_entity
     else

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

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

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

@@ -1,27 +1,24 @@
-class Api::V1::Accounts::Integrations::ShopifyController < Api::V1::Accounts::Integrations::BaseController
+class Api::V1::Accounts::Integrations::ShopifyController < Api::V1::Accounts::BaseController
   include Shopify::IntegrationHelper
-  before_action :ensure_shopify_enabled
-  before_action -> { Shopify::ApiContext.setup! }, only: [:orders]
-  before_action :fetch_hook, except: [:auth, :complete_install]
-  before_action :check_authorization, only: [:auth, :complete_install, :destroy]
+  before_action :setup_shopify_context, only: [:orders]
+  before_action :fetch_hook, except: [:auth]
   before_action :validate_contact, only: [:orders]
 
   def auth
     shop_domain = params[:shop_domain]
-    unless shop_domain.is_a?(String) && Shopify::ShopDomain.valid?(shop_domain)
-      return render json: { error: 'Invalid Shopify shop domain' }, status: :unprocessable_entity
-    end
+    return render json: { error: 'Shop domain is required' }, status: :unprocessable_entity if shop_domain.blank?
 
     state = generate_shopify_token(Current.account.id)
-    raise 'Shopify OAuth is not configured' if client_id.blank? || state.blank?
 
-    oauth_client = OAuth2::Client.new(client_id, client_secret,
-                                      site: "https://#{Shopify::ShopDomain.normalize(shop_domain)}",
-                                      authorize_url: '/admin/oauth/authorize')
-    render json: { redirect_url: oauth_client.auth_code.authorize_url(
-      redirect_uri: "#{ENV.fetch('FRONTEND_URL', '')}/shopify/callback",
-      scope: REQUIRED_SCOPES.join(','), state: state
-    ) }
+    auth_url = "https://#{shop_domain}/admin/oauth/authorize?"
+    auth_url += URI.encode_www_form(
+      client_id: client_id,
+      scope: REQUIRED_SCOPES.join(','),
+      redirect_uri: redirect_uri,
+      state: state
+    )
+
+    render json: { redirect_url: auth_url }
   end
 
   def orders
@@ -34,25 +31,6 @@ class Api::V1::Accounts::Integrations::ShopifyController < Api::V1::Accounts::In
     render json: { error: e.message }, status: :unprocessable_entity
   end
 
-  def complete_install
-    pending_installation = Shopify::PendingInstallation.claim(
-      token: params[:pending_install_token]
-    )
-    Shopify::InstallationService.new(account: Current.account, pending_installation: pending_installation).perform
-    head :ok
-  rescue Shopify::PendingInstallation::AlreadyClaimed => e
-    pending_installation&.release!
-    render json: { error: e.message }, status: :conflict
-  rescue Shopify::PendingInstallation::CommitOutcomeUnknown
-    raise
-  rescue Shopify::PendingInstallation::Error => e
-    pending_installation&.release!
-    render json: { error: e.message }, status: :unprocessable_entity
-  rescue StandardError
-    pending_installation&.release!
-    raise
-  end
-
   def destroy
     @hook.destroy!
     head :ok
@@ -62,8 +40,8 @@ class Api::V1::Accounts::Integrations::ShopifyController < Api::V1::Accounts::In
 
   private
 
-  def ensure_shopify_enabled
-    head :not_found unless Shopify::FeatureGate.enabled?(account: Current.account)
+  def redirect_uri
+    "#{ENV.fetch('FRONTEND_URL', '')}/shopify/callback"
   end
 
   def contact
@@ -71,9 +49,7 @@ class Api::V1::Accounts::Integrations::ShopifyController < Api::V1::Accounts::In
   end
 
   def fetch_hook
-    hooks = Integrations::Hook.where(account: Current.account, app_id: 'shopify')
-    hooks = hooks.enabled if action_name == 'orders'
-    @hook = hooks.first!
+    @hook = Integrations::Hook.find_by!(account: Current.account, app_id: 'shopify')
   end
 
   def fetch_customers
@@ -105,15 +81,25 @@ class Api::V1::Accounts::Integrations::ShopifyController < Api::V1::Accounts::In
     end
   end
 
+  def setup_shopify_context
+    return if client_id.blank? || client_secret.blank?
+
+    ShopifyAPI::Context.setup(
+      api_key: client_id,
+      api_secret_key: client_secret,
+      api_version: '2025-01'.freeze,
+      scope: REQUIRED_SCOPES.join(','),
+      is_embedded: true,
+      is_private: false
+    )
+  end
+
   def shopify_session
     ShopifyAPI::Auth::Session.new(shop: @hook.reference_id, access_token: @hook.access_token)
   end
 
   def shopify_client
-    @shopify_client ||= ShopifyAPI::Clients::Rest::Admin.new(
-      session: shopify_session,
-      api_version: Shopify::ApiContext::API_VERSION
-    )
+    @shopify_client ||= ShopifyAPI::Clients::Rest::Admin.new(session: shopify_session)
   end
 
   def validate_contact

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

@@ -16,8 +16,6 @@ class Api::V1::Accounts::Integrations::SlackController < Api::V1::Accounts::Base
   end
 
   def update
-    return update_message_mode if permitted_params[:message_mode].present?
-
     @hook = channel_builder.update(permitted_params[:reference_id])
     render json: { error: I18n.t('errors.slack.invalid_channel_id') }, status: :unprocessable_entity if @hook.blank?
   end
@@ -37,11 +35,7 @@ class Api::V1::Accounts::Integrations::SlackController < Api::V1::Accounts::Base
     Integrations::Slack::ChannelBuilder.new(hook: @hook)
   end
 
-  def update_message_mode
-    @hook.update!(settings: @hook.settings.merge('message_mode' => permitted_params[:message_mode]))
-  end
-
   def permitted_params
-    params.permit(:reference_id, :message_mode)
+    params.permit(:reference_id)
   end
 end

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

@@ -1,4 +1,5 @@
 class Api::V1::Accounts::LabelsController < Api::V1::Accounts::BaseController
+  before_action :current_account
   before_action :fetch_label, except: [:index, :create]
   before_action :check_authorization
 
@@ -17,16 +18,7 @@ class Api::V1::Accounts::LabelsController < Api::V1::Accounts::BaseController
   end
 
   def destroy
-    label_title = @label.title
-    account_id = Current.account.id
-    label_deleted_at = Time.current
-
     @label.destroy!
-    Labels::RemoveAssociationsJob.perform_later(
-      label_title: label_title,
-      account_id: account_id,
-      label_deleted_at: label_deleted_at
-    )
     head :ok
   end
 

app/controllers/api/v1/accounts/microsoft/authorizations_controller.rb

@@ -7,9 +7,7 @@ class Api::V1::Accounts::Microsoft::AuthorizationsController < Api::V1::Accounts
         redirect_uri: "#{base_url}/microsoft/callback",
         scope: scope,
         state: state,
-        # Force the Microsoft account picker so an already-signed-in account does not
-        # silently authorize and re-bind to an existing inbox in the new-inbox flow.
-        prompt: 'select_account'
+        prompt: 'consent'
       }
     )
     if redirect_url

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

@@ -41,9 +41,9 @@ class Api::V1::Accounts::NotificationsController < Api::V1::Accounts::BaseContro
 
   def destroy_all
     if params[:type] == 'read'
-      ::Notification::DeleteNotificationJob.perform_later(Current.user, Current.account, type: :read)
+      ::Notification::DeleteNotificationJob.perform_later(Current.user, type: :read)
     else
-      ::Notification::DeleteNotificationJob.perform_later(Current.user, Current.account, type: :all)
+      ::Notification::DeleteNotificationJob.perform_later(Current.user, type: :all)
     end
     head :ok
   end
@@ -69,7 +69,7 @@ class Api::V1::Accounts::NotificationsController < Api::V1::Accounts::BaseContro
   end
 
   def fetch_notification
-    @notification = current_user.notifications.where(account_id: Current.account.id).find(params[:id])
+    @notification = current_user.notifications.find(params[:id])
   end
 
   def set_current_page

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

@@ -8,15 +8,7 @@ class Api::V1::Accounts::OauthAuthorizationController < Api::V1::Accounts::BaseC
   end
 
   def state
-    # The sgid purpose doubles as a return hint: onboarding tags it so the callback
-    # can route the user back to inbox setup. The purpose is part of the signed
-    # payload (tamper-proof), and a non-onboarding request keeps the default
-    # purpose, leaving callers like Notion byte-identical.
-    Current.account.to_sgid(expires_in: 15.minutes, for: state_purpose).to_s
-  end
-
-  def state_purpose
-    params[:return_to] == 'onboarding' ? 'onboarding' : 'default'
+    Current.account.to_sgid(expires_in: 15.minutes).to_s
   end
 
   def base_url

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

@@ -1,89 +0,0 @@
-class Api::V1::Accounts::OnboardingsController < Api::V1::Accounts::BaseController
-  before_action :check_admin_authorization?
-
-  ONBOARDING_STEP_KEY = 'onboarding_step'.freeze
-  STEP_ACCOUNT_DETAILS = 'account_details'.freeze
-  STEP_INBOX_SETUP = 'inbox_setup'.freeze
-  ONBOARDING_STEPS = [STEP_ACCOUNT_DETAILS, STEP_INBOX_SETUP].freeze
-
-  def update
-    return render json: { error: 'Invalid onboarding step' }, status: :unprocessable_entity unless ONBOARDING_STEPS.include?(params[:onboarding_step])
-
-    @account = Current.account
-    # The client declares the step it is completing; `account_details` runs
-    # `complete_account_details`, and so on. The known-step guard above keeps the
-    # client value from `send`-ing an arbitrary method.
-    send("complete_#{params[:onboarding_step]}")
-
-    render 'api/v1/accounts/update', format: :json
-  end
-
-  def help_center_generation
-    render json: help_center_generation_status
-  end
-
-  private
-
-  def complete_account_details
-    # Only act while the cursor still points here, so a stale replay after
-    # onboarding finished can't re-enter it.
-    return unless current_step == STEP_ACCOUNT_DETAILS
-
-    @account.assign_attributes(account_params)
-    @account.custom_attributes.merge!(custom_attributes_params)
-
-    # inbox_setup is a cloud-only step (DEPLOYMENT_ENV config, not a hardcoded
-    # environment check); self-hosted finishes onboarding here.
-    if ChatwootApp.chatwoot_cloud?
-      move_to_step(STEP_INBOX_SETUP)
-      create_onboarding_inboxes
-    else
-      finish_onboarding
-    end
-  end
-
-  def complete_inbox_setup
-    # Only finalize while the cursor still points here, so a stale or out-of-order
-    # request can't end onboarding early. Replays are no-ops.
-    return unless current_step == STEP_INBOX_SETUP
-
-    finish_onboarding
-  end
-
-  def current_step
-    @account.custom_attributes[ONBOARDING_STEP_KEY]
-  end
-
-  def move_to_step(step)
-    @account.custom_attributes[ONBOARDING_STEP_KEY] = step
-    @account.save!
-  end
-
-  def finish_onboarding
-    @account.custom_attributes.delete(ONBOARDING_STEP_KEY)
-    @account.save!
-  end
-
-  def create_onboarding_inboxes
-    Onboarding::WebWidgetCreationService.new(@account, Current.user).perform
-  end
-
-  def account_params
-    params.permit(:name, :locale)
-  end
-
-  def custom_attributes_params
-    params.permit(:industry, :company_size, :timezone, :referral_source, :user_role, :website)
-  end
-
-  def help_center_generation_status
-    {
-      generation_id: nil,
-      state: nil,
-      articles_count: 0,
-      categories_count: 0
-    }
-  end
-end
-
-Api::V1::Accounts::OnboardingsController.prepend_mod_with('Api::V1::Accounts::OnboardingsController')

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

@@ -3,7 +3,6 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
 
   before_action :fetch_portal, except: [:index, :create]
   before_action :check_authorization
-  before_action :validate_analytics_params, only: [:create, :update]
   before_action :set_current_page, only: [:index]
 
   def index
@@ -19,14 +18,11 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
     @portal = Current.account.portals.build(portal_params.merge(live_chat_widget_params))
     @portal.custom_domain = parsed_custom_domain
     @portal.save!
-    process_attached_logo if params[:blob_id].present?
+    process_attached_logo
   end
 
   def update
     ActiveRecord::Base.transaction do
-      # Lock the row so concurrent saves merge onto the latest committed config
-      # instead of a stale snapshot, which would drop the other save's keys.
-      @portal.lock!
       @portal.update!(portal_params.merge(live_chat_widget_params)) if params[:portal].present?
       # @portal.custom_domain = parsed_custom_domain
       process_attached_logo if params[:blob_id].present?
@@ -72,58 +68,26 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
   private
 
   def fetch_portal
-    @portal = Current.account.portals.find_by!(slug: permitted_params[:id])
+    @portal = Current.account.portals.find_by(slug: permitted_params[:id])
   end
 
   def permitted_params
     params.permit(:id, :email)
   end
 
-  def validate_analytics_params
-    analytics = params.dig(:portal, :config, :analytics)
-    return if analytics.blank?
-
-    valid = analytics.respond_to?(:each_pair) &&
-            analytics.keys.all? { |key| Portal::ANALYTICS_CONFIG_FORMATS.key?(key.to_s) } &&
-            analytics.values.all?(String)
-    return if valid
-
-    render json: { error: I18n.t('portals.analytics.invalid_configuration') }, status: :unprocessable_entity
-  end
-
   def portal_params
     params.require(:portal).permit(
       :id, :color, :custom_domain, :header_text, :homepage_link,
-      :name, :page_title, :slug, :archived,
-      { config: config_param_keys }
+      :name, :page_title, :slug, :archived, { config: [:default_locale, { allowed_locales: [] }, { draft_locales: [] }] }
     )
   end
 
-  def config_param_keys
-    keys = [:default_locale, :layout, { allowed_locales: [] }, { draft_locales: [] },
-            { social_profiles: %i[facebook x instagram linkedin youtube tiktok github whatsapp] },
-            { locale_translations: locale_translation_keys.index_with { %i[name page_title header_text] } },
-            { popular_content: popular_content_keys.index_with { { category_ids: [], article_ids: [] } } }]
-    # Analytics injects tracking scripts into every public page, so keep it admin-only even though
-    # Enterprise lets knowledge_base_manage roles edit other portal settings.
-    keys << { analytics: Portal::ANALYTICS_CONFIG_FORMATS.keys.map(&:to_sym) } if Current.account_user&.administrator?
-    keys
-  end
-
-  def locale_translation_keys
-    params.dig(:portal, :config, :locale_translations)&.keys || []
-  end
-
-  def popular_content_keys
-    params.dig(:portal, :config, :popular_content)&.keys || []
-  end
-
   def live_chat_widget_params
     permitted_params = params.permit(:inbox_id)
     return {} unless permitted_params.key?(:inbox_id)
     return { channel_web_widget_id: nil } if permitted_params[:inbox_id].blank?
 
-    inbox = Current.account.inboxes.find(permitted_params[:inbox_id])
+    inbox = Inbox.find(permitted_params[:inbox_id])
     return {} unless inbox.web_widget?
 
     { channel_web_widget_id: inbox.channel.id }
@@ -134,8 +98,6 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
   end
 
   def parsed_custom_domain
-    return @portal.custom_domain if @portal.custom_domain.blank?
-
     domain = URI.parse(@portal.custom_domain)
     domain.is_a?(URI::HTTP) ? domain.host : @portal.custom_domain
   end

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

@@ -29,6 +29,6 @@ class Api::V1::Accounts::TeamsController < Api::V1::Accounts::BaseController
   end
 
   def team_params
-    params.require(:team).permit(:name, :description, :allow_auto_assign, :icon, :icon_color)
+    params.require(:team).permit(:name, :description, :allow_auto_assign)
   end
 end

app/controllers/api/v1/accounts/tiktok/authorizations_controller.rb

@@ -1,11 +1,9 @@
 class Api::V1::Accounts::Tiktok::AuthorizationsController < Api::V1::Accounts::OauthAuthorizationController
   include Tiktok::IntegrationHelper
 
-  before_action :ensure_tiktok_enabled
-
   def create
     redirect_url = Tiktok::AuthClient.authorize_url(
-      state: generate_tiktok_token(Current.account.id, params[:return_to])
+      state: generate_tiktok_token(Current.account.id)
     )
 
     if redirect_url
@@ -14,10 +12,4 @@ class Api::V1::Accounts::Tiktok::AuthorizationsController < Api::V1::Accounts::O
       render json: { success: false }, status: :unprocessable_entity
     end
   end
-
-  private
-
-  def ensure_tiktok_enabled
-    raise Pundit::NotAuthorizedError unless Current.account.feature_enabled?('channel_tiktok')
-  end
 end

app/controllers/api/v1/accounts/whatsapp/authorizations_controller.rb

@@ -1,7 +1,4 @@
 class Api::V1::Accounts::Whatsapp::AuthorizationsController < Api::V1::Accounts::BaseController
-  before_action :ensure_embedded_signup_enabled
-  # Reconfiguring/reauthorizing a live inbox swaps its credentials, so restrict it to admins.
-  before_action :check_admin_authorization?, if: -> { params[:inbox_id].present? }
   before_action :fetch_and_validate_inbox, if: -> { params[:inbox_id].present? }
 
   # POST /api/v1/accounts/:account_id/whatsapp/authorization
@@ -11,26 +8,16 @@ class Api::V1::Accounts::Whatsapp::AuthorizationsController < Api::V1::Accounts:
     validate_embedded_signup_params!
     channel = process_embedded_signup
     render_success_response(channel.inbox)
-  rescue CustomExceptions::Inbox::LimitExceeded => e
-    render_error_response(e)
   rescue StandardError => e
-    render_embedded_signup_error(e)
+    render_error_response(e)
   end
 
   private
 
-  def ensure_embedded_signup_enabled
-    return if params[:inbox_id].present?
-    return unless ChatwootApp.chatwoot_cloud?
-    return if Current.account.feature_enabled?('whatsapp_embedded_signup_inbox_creation')
-
-    raise Pundit::NotAuthorizedError
-  end
-
   def process_embedded_signup
     service = Whatsapp::EmbeddedSignupService.new(
       account: Current.account,
-      params: params.permit(:code, :business_id, :waba_id, :phone_number_id, :is_coexistence).to_h.symbolize_keys,
+      params: params.permit(:code, :business_id, :waba_id, :phone_number_id).to_h.symbolize_keys,
       inbox_id: params[:inbox_id]
     )
     service.perform
@@ -42,7 +29,7 @@ class Api::V1::Accounts::Whatsapp::AuthorizationsController < Api::V1::Accounts:
   end
 
   def validate_reauthorization_required
-    return if @inbox.channel.reauthorization_required? || can_reconfigure_channel?
+    return if @inbox.channel.reauthorization_required? || can_upgrade_to_embedded_signup?
 
     render json: {
       success: false,
@@ -50,9 +37,11 @@ class Api::V1::Accounts::Whatsapp::AuthorizationsController < Api::V1::Accounts:
     }, status: :unprocessable_entity
   end
 
-  def can_reconfigure_channel?
+  def can_upgrade_to_embedded_signup?
     channel = @inbox.channel
-    channel.provider == 'whatsapp_cloud'
+    return false unless channel.provider == 'whatsapp_cloud'
+
+    true
   end
 
   def render_success_response(inbox)
@@ -66,7 +55,7 @@ class Api::V1::Accounts::Whatsapp::AuthorizationsController < Api::V1::Accounts:
     render json: response
   end
 
-  def render_embedded_signup_error(error)
+  def render_error_response(error)
     Rails.logger.error "[WHATSAPP AUTHORIZATION] Embedded signup error: #{error.message}"
     Rails.logger.error error.backtrace.join("\n")
     render json: {
@@ -78,6 +67,7 @@ class Api::V1::Accounts::Whatsapp::AuthorizationsController < Api::V1::Accounts:
   def validate_embedded_signup_params!
     missing_params = []
     missing_params << 'code' if params[:code].blank?
+    missing_params << 'business_id' if params[:business_id].blank?
     missing_params << 'waba_id' if params[:waba_id].blank?
 
     return if missing_params.empty?

app/controllers/api/v1/accounts/whatsapp/manual_setup_controller.rb

@@ -1,80 +0,0 @@
-class Api::V1::Accounts::Whatsapp::ManualSetupController < Api::V1::Accounts::BaseController
-  before_action :authorize_create, only: [:preview, :connect]
-  before_action :fetch_inbox, only: [:webhook_status, :setup_webhook]
-
-  def preview
-    render json: validation_service.perform
-  rescue StandardError => e
-    render_setup_error(e)
-  end
-
-  def connect
-    setup = Whatsapp::ManualSetupService.new(account: Current.account, **connect_params.to_h.symbolize_keys).perform
-    render json: connection_response(setup), status: :created
-  rescue CustomExceptions::Inbox::LimitExceeded => e
-    render_error_response(e)
-  rescue StandardError => e
-    render_setup_error(e)
-  end
-
-  def webhook_status
-    render json: Whatsapp::ManualWebhookStatusService.new(@inbox.channel).perform
-  rescue StandardError => e
-    render_setup_error(e)
-  end
-
-  def setup_webhook
-    channel = @inbox.channel
-    webhook_setup = Whatsapp::WebhookSetupService.new(channel)
-    webhook_setup.perform
-    raise webhook_setup.registration_error if webhook_setup.registration_error
-
-    render json: Whatsapp::ManualWebhookStatusService.new(channel.reload).perform
-  rescue StandardError => e
-    render_setup_error(e)
-  end
-
-  private
-
-  def authorize_create
-    authorize ::Inbox, :create?
-  end
-
-  def fetch_inbox
-    @inbox = Current.account.inboxes.find(params[:inbox_id])
-    authorize @inbox, :update?
-    channel = @inbox.channel
-    return if channel.is_a?(Channel::Whatsapp) && channel.provider_config['source'] == 'manual_setup_v2'
-
-    raise ActiveRecord::RecordNotFound
-  end
-
-  def validation_service
-    Whatsapp::ManualSetupValidationService.new(**connection_params.to_h.symbolize_keys)
-  end
-
-  def connection_params
-    params.permit(:waba_id, :phone_number_id, :access_token)
-  end
-
-  def connect_params
-    params.permit(:waba_id, :phone_number_id, :access_token, :inbox_name)
-  end
-
-  def connection_response(setup)
-    channel = setup.channel.reload
-    {
-      id: channel.inbox.id,
-      name: channel.inbox.name,
-      number_access: true,
-      template_access: true,
-      webhook_setup: setup.webhook_setup?,
-      webhook_error: setup.webhook_error
-    }
-  end
-
-  def render_setup_error(error)
-    Rails.logger.error "[WHATSAPP MANUAL SETUP] account_id=#{Current.account.id} error=#{error.class}: #{error.message}"
-    render json: { message: error.message }, status: :unprocessable_entity
-  end
-end

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

@@ -0,0 +1,18 @@
+class Api::V1::Accounts::WorkingHoursController < Api::V1::Accounts::BaseController
+  before_action :check_authorization
+  before_action :fetch_webhook, only: [:update]
+
+  def update
+    @working_hour.update!(working_hour_params)
+  end
+
+  private
+
+  def working_hour_params
+    params.require(:working_hour).permit(:inbox_id, :open_hour, :open_minutes, :close_hour, :close_minutes, :closed_all_day)
+  end
+
+  def fetch_working_hour
+    @working_hour = Current.account.working_hours.find(params[:id])
+  end
+end

app/controllers/api/v1/accounts_controller.rb

@@ -1,16 +1,13 @@
 class Api::V1::AccountsController < Api::BaseController
   include AuthHelper
-  include MfaEnforcementGuard
+  include CacheKeysHelper
 
   skip_before_action :authenticate_user!, :set_current_user, :handle_with_exception,
                      only: [:create], raise: false
   before_action :check_signup_enabled, only: [:create]
   before_action :ensure_account_name, only: [:create]
   before_action :validate_captcha, only: [:create]
-  before_action :check_user_mfa_enforcement, if: :authenticate_by_access_token?, only: [:create]
   before_action :fetch_account, except: [:create]
-  before_action :validate_token_api_access, if: :authenticate_by_access_token?, except: [:create]
-  before_action :check_account_mfa_enforcement, if: :authenticate_by_access_token?, except: [:create]
   before_action :check_authorization, except: [:create]
 
   rescue_from CustomExceptions::Account::InvalidEmail,
@@ -20,7 +17,7 @@ class Api::V1::AccountsController < Api::BaseController
               with: :render_error_response
 
   def show
-    @latest_chatwoot_version = latest_chatwoot_version
+    @latest_chatwoot_version = ::Redis::Alfred.get(::Redis::Alfred::LATEST_CHATWOOT_VERSION)
     render 'api/v1/accounts/show', format: :json
   end
 
@@ -54,13 +51,14 @@ class Api::V1::AccountsController < Api::BaseController
 
   def cache_keys
     expires_in 10.seconds, public: false, stale_while_revalidate: 5.minutes
-    render json: { cache_keys: @account.cache_keys }, status: :ok
+    render json: { cache_keys: cache_keys_for_account }, status: :ok
   end
 
   def update
     @account.assign_attributes(account_params.slice(:name, :locale, :domain, :support_email))
     @account.custom_attributes.merge!(custom_attributes_params)
     @account.settings.merge!(settings_params)
+    @account.custom_attributes.delete('onboarding_step') if @account.custom_attributes['onboarding_step'] == 'account_details'
     @account.custom_attributes['onboarding_step'] = 'invite_team' if @account.custom_attributes['onboarding_step'] == 'account_update'
     @account.save!
   end
@@ -73,10 +71,6 @@ class Api::V1::AccountsController < Api::BaseController
 
   private
 
-  def latest_chatwoot_version
-    Redis::Alfred.get(Redis::Alfred::LATEST_CHATWOOT_VERSION)
-  end
-
   def enqueue_branding_enrichment
     email = account_params[:email].presence || @user&.email
     return if email.blank?
@@ -99,23 +93,25 @@ class Api::V1::AccountsController < Api::BaseController
     raise CustomExceptions::Account::InvalidParams.new({})
   end
 
+  def cache_keys_for_account
+    {
+      label: fetch_value_for_key(params[:id], Label.name.underscore),
+      inbox: fetch_value_for_key(params[:id], Inbox.name.underscore),
+      team: fetch_value_for_key(params[:id], Team.name.underscore)
+    }
+  end
+
   def fetch_account
     @account = current_user.accounts.find(params[:id])
     @current_account_user = @account.account_users.find_by(user_id: current_user.id)
   end
 
-  def validate_token_api_access
-    return if @account.api_and_webhooks_enabled?
-
-    render json: { error: 'API access is not enabled for this account' }, status: :forbidden
-  end
-
   def account_params
     params.permit(:account_name, :email, :name, :password, :locale, :domain, :support_email, :user_full_name)
   end
 
   def custom_attributes_params
-    params.permit(:industry, :company_size, :timezone, :referral_source, :user_role, :website)
+    params.permit(:industry, :company_size, :timezone, :referral_source, :user_role)
   end
 
   def settings_params
@@ -123,9 +119,7 @@ class Api::V1::AccountsController < Api::BaseController
   end
 
   def permitted_settings_attributes
-    attributes = [:auto_resolve_after, :auto_resolve_message, :auto_resolve_ignore_waiting, :audio_transcriptions, :auto_resolve_label]
-    attributes << :enforce_mfa if Chatwoot.mfa_enabled?
-    attributes
+    [:auto_resolve_after, :auto_resolve_message, :auto_resolve_ignore_waiting, :audio_transcriptions, :auto_resolve_label]
   end
 
   def check_signup_enabled

app/controllers/api/v1/integrations/webhooks_controller.rb

@@ -1,8 +1,4 @@
 class Api::V1::Integrations::WebhooksController < ApplicationController
-  SIGNATURE_TOLERANCE = 5.minutes.to_i
-
-  prepend_before_action :verify_slack_signature!, only: [:create]
-
   def create
     builder = Integrations::Slack::IncomingMessageBuilder.new(permitted_params)
     response = builder.perform
@@ -11,35 +7,6 @@ class Api::V1::Integrations::WebhooksController < ApplicationController
 
   private
 
-  # Skip (rather than reject) when no secret is configured, so existing installs keep working.
-  def verify_slack_signature!
-    secret = slack_signing_secret
-    if secret.blank?
-      Rails.logger.warn('[SLACK] SLACK_SIGNING_SECRET not configured; skipping webhook signature verification')
-      return
-    end
-
-    head :unauthorized unless valid_slack_signature?(secret)
-  end
-
-  # Config reconciliation creates a blank row for this key on upgrade, and that blank row
-  # makes GlobalConfigService skip its ENV fallback, so read ENV directly as a last resort.
-  def slack_signing_secret
-    GlobalConfigService.load('SLACK_SIGNING_SECRET', nil).presence || ENV.fetch('SLACK_SIGNING_SECRET', nil)
-  end
-
-  def valid_slack_signature?(secret)
-    timestamp = request.headers['X-Slack-Request-Timestamp']
-    signature = request.headers['X-Slack-Signature']
-    return false if timestamp.blank? || signature.blank?
-    return false if (Time.current.to_i - timestamp.to_i).abs > SIGNATURE_TOLERANCE
-
-    # Build over raw bytes so a payload with invalid UTF-8 can't raise on interpolation.
-    basestring = "v0:#{timestamp}:".b << request.raw_post
-    expected = "v0=#{OpenSSL::HMAC.hexdigest('SHA256', secret, basestring)}"
-    ActiveSupport::SecurityUtils.secure_compare(expected, signature)
-  end
-
   # TODO: This is a temporary solution to permit all params for slack unfurling job.
   # We should only permit the params that we use. Handle all the params based on events and send it to the respective services.
   def permitted_params