fix: Instead of blocking every content type, block only json requests

2025-03-20 21:29:59 -07:00
2541 changed files with 30630 additions and 116914 deletions
@@ -73,15 +73,15 @@ jobs:
              libvips

      - run:
-          name: Install RVM and Ruby 3.4.4
+          name: Install RVM and Ruby 3.3.3
          command: |
            sudo apt-get install -y gpg
            gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
            \curl -sSL https://get.rvm.io | bash -s stable
            echo 'source ~/.rvm/scripts/rvm' >> $BASH_ENV
            source ~/.rvm/scripts/rvm
-            rvm install "3.4.4"
-            rvm use 3.4.4 --default
+            rvm install "3.3.3"
+            rvm use 3.3.3 --default
            gem install bundler -v 2.5.16

      - run:
@@ -4,15 +4,5 @@ FROM ghcr.io/chatwoot/chatwoot_codespace:latest

 # Do the set up required for chatwoot app
 WORKDIR /workspace
-
-# Copy dependency files first for better caching
-COPY package.json pnpm-lock.yaml ./
-COPY Gemfile Gemfile.lock ./
-
-# Install dependencies (will be cached if files don't change)
-RUN pnpm install --frozen-lockfile && \
-    gem install bundler && \
-    bundle install --jobs=$(nproc)
-
-# Copy source code after dependencies are installed
 COPY . /workspace
+RUN yarn && gem install bundler && bundle install
@@ -1,16 +1,12 @@
-ARG VARIANT="ubuntu-22.04"
+
+ARG VARIANT

 FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}

-ENV DEBIAN_FRONTEND=noninteractive
-
 ARG NODE_VERSION
 ARG RUBY_VERSION
 ARG USER_UID
 ARG USER_GID
-ARG PNPM_VERSION="10.2.0"
-ENV PNPM_VERSION ${PNPM_VERSION}
-ENV RUBY_CONFIGURE_OPTS=--disable-install-doc

 # Update args in docker-compose.yaml to set the UID/GID of the "vscode" user.
 RUN if [ "$USER_GID" != "1000" ] || [ "$USER_UID" != "1000" ]; then \
@@ -19,80 +15,61 @@ RUN if [ "$USER_GID" != "1000" ] || [ "$USER_UID" != "1000" ]; then \
        && chmod -R $USER_UID:$USER_GID /home/vscode; \
    fi

-RUN NODE_MAJOR=$(echo $NODE_VERSION | cut -d. -f1) \
-    && curl -fsSL https://deb.nodesource.com/setup_${NODE_MAJOR}.x | bash - \
-    && apt-get update \
-    && apt-get -y install --no-install-recommends \
-        build-essential \
-        libssl-dev \
-        zlib1g-dev \
-        gnupg \
-        tar \
-        tzdata \
-        postgresql-client \
-        libpq-dev \
-        git \
-        imagemagick \
-        libyaml-dev \
-        curl \
-        ca-certificates \
-        tmux \
-        nodejs \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+  && apt-get -y install --no-install-recommends \
+    build-essential \
+    libssl-dev \
+    zlib1g-dev \
+    gnupg2 \
+    tar \
+    tzdata \
+    postgresql-client \
+    libpq-dev \
+    yarn \
+    git \
+    imagemagick \
+    tmux \
+    zsh \
+    git-flow \
+    npm \
+    libyaml-dev

-# Install rbenv and ruby for root user first
-RUN git clone --depth 1 https://github.com/rbenv/rbenv.git ~/.rbenv \
+# Install rbenv and ruby
+RUN git clone https://github.com/rbenv/rbenv.git ~/.rbenv \
    &&  echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc \
    &&  echo 'eval "$(rbenv init -)"' >> ~/.bashrc
 ENV PATH "/root/.rbenv/bin/:/root/.rbenv/shims/:$PATH"
-RUN git clone --depth 1 https://github.com/rbenv/ruby-build.git && \
+RUN git clone https://github.com/rbenv/ruby-build.git && \
    PREFIX=/usr/local ./ruby-build/install.sh

 RUN rbenv install $RUBY_VERSION && \
    rbenv global $RUBY_VERSION && \
    rbenv versions

-# Set up rbenv for vscode user
-RUN su - vscode -c "git clone --depth 1 https://github.com/rbenv/rbenv.git ~/.rbenv" \
-    && su - vscode -c "echo 'export PATH=\"\$HOME/.rbenv/bin:\$PATH\"' >> ~/.bashrc" \
-    && su - vscode -c "echo 'eval \"\$(rbenv init -)\"' >> ~/.bashrc" \
-    && su - vscode -c "PATH=\"/home/vscode/.rbenv/bin:\$PATH\" rbenv install $RUBY_VERSION" \
-    && su - vscode -c "PATH=\"/home/vscode/.rbenv/bin:\$PATH\" rbenv global $RUBY_VERSION"
-
-# Install overmind and gh in single layer
+# Install overmind
 RUN curl -L https://github.com/DarthSim/overmind/releases/download/v2.1.0/overmind-v2.1.0-linux-amd64.gz > overmind.gz \
  && gunzip overmind.gz \
-  && mv overmind /usr/local/bin \
-  && chmod +x /usr/local/bin/overmind \
-  && curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
-  && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
-  && apt-get update \
-  && apt-get install -y --no-install-recommends gh \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+  && sudo mv overmind /usr/local/bin \
+  && chmod +x /usr/local/bin/overmind
+
+
+# Install gh
+RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
+   && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
+   && sudo apt update \
+   && sudo apt install gh


 # Do the set up required for chatwoot app
 WORKDIR /workspace
-RUN chown vscode:vscode /workspace
+COPY . /workspace

-# set up node js, pnpm and claude code in single layer
-RUN npm install -g pnpm@${PNPM_VERSION} @anthropic-ai/claude-code \
-    && npm cache clean --force
+# set up ruby
+COPY Gemfile Gemfile.lock ./
+RUN gem install bundler && bundle install

-# Switch to vscode user
-USER vscode
-ENV PATH="/home/vscode/.rbenv/bin:/home/vscode/.rbenv/shims:$PATH"
-
-# Copy dependency files first for better caching
-COPY --chown=vscode:vscode Gemfile Gemfile.lock package.json pnpm-lock.yaml ./
-
-# Install dependencies as vscode user
-RUN eval "$(rbenv init -)" \
-    && gem install bundler -N \
-    && bundle install --jobs=$(nproc) \
-    && pnpm install --frozen-lockfile
-
-# Copy source code after dependencies are installed
-COPY --chown=vscode:vscode . /workspace
+# set up node js
+RUN npm install n -g && \
+    n $NODE_VERSION
+RUN npm install --global yarn
+RUN yarn
@@ -4,26 +4,17 @@
  "dockerComposeFile": "docker-compose.yml",

  "settings": {
-    "terminal.integrated.shell.linux": "/bin/zsh",
-    "extensions.showRecommendationsOnlyOnDemand": true,
-    "editor.formatOnSave": true,
-    "files.trimTrailingWhitespace": true,
-    "files.insertFinalNewline": true,
-    "search.exclude": {
-      "**/node_modules": true,
-      "**/tmp": true,
-      "**/log": true,
-      "**/coverage": true,
-      "**/public/packs": true
-    }
+    "terminal.integrated.shell.linux": "/bin/zsh"
  },


  // Add the IDs of extensions you want installed when the container is created.
  "extensions": [
-    "Shopify.ruby-lsp",
+    "rebornix.Ruby",
    "misogi.ruby-rubocop",
+    "wingrunr21.vscode-ruby",
    "davidpallinder.rails-test-runner",
+    "eamodio.gitlens",
    "github.copilot",
    "mrmlnc.vscode-duplicate"
  ],
@@ -32,15 +23,15 @@
  // 5432 postgres
  // 6379 redis
  // 1025,8025 mailhog
-  "forwardPorts": [8025, 3000, 3036],
+  "forwardPorts": [8025, 3000, 3035],

-  "postCreateCommand": ".devcontainer/scripts/setup.sh && POSTGRES_STATEMENT_TIMEOUT=600s bundle exec rake db:chatwoot_prepare && pnpm install",
+  "postCreateCommand": ".devcontainer/scripts/setup.sh && POSTGRES_STATEMENT_TIMEOUT=600s bundle exec rake db:chatwoot_prepare && yarn",
  "portsAttributes": {
    "3000": {
      "label": "Rails Server"
    },
-    "3036": {
-      "label": "Vite Dev Server"
+    "3035": {
+      "label": "Webpack Dev Server"
    },
    "8025": {
      "label": "Mailhog UI"
@@ -1,18 +0,0 @@
-# Docker Compose file for building the base image in GitHub Actions
-# Usage: docker-compose -f .devcontainer/docker-compose.base.yml build base
-
-version: '3'
-
-services:
-  base:
-    build:
-      context: ..
-      dockerfile: .devcontainer/Dockerfile.base
-      args:
-        VARIANT: 'ubuntu-22.04'
-        NODE_VERSION: '23.7.0'
-        RUBY_VERSION: '3.4.4'
-        # On Linux, you may need to update USER_UID and USER_GID below if not your local UID is not 1000.
-        USER_UID: '1000'
-        USER_GID: '1000'
-    image: ghcr.io/chatwoot/chatwoot_codespace:latest
@@ -5,6 +5,19 @@
 version: '3'

 services:
+  base:
+    build:
+      context: ..
+      dockerfile: .devcontainer/Dockerfile.base
+      args:
+        VARIANT: 'ubuntu-22.04'
+        NODE_VERSION: '23.7.0'
+        RUBY_VERSION: '3.3.3'
+        # On Linux, you may need to update USER_UID and USER_GID below if not your local UID is not 1000.
+        USER_UID: '1000'
+        USER_GID: '1000'
+    image: base:latest
+
  app:
    build:
      context: ..
@@ -12,7 +25,7 @@ services:
      args:
        VARIANT: 'ubuntu-22.04'
        NODE_VERSION: '23.7.0'
-        RUBY_VERSION: '3.4.4'
+        RUBY_VERSION: '3.3.3'
        # On Linux, you may need to update USER_UID and USER_GID below if not your local UID is not 1000.
        USER_UID: '1000'
        USER_GID: '1000'
@@ -2,15 +2,12 @@ cp .env.example .env
 sed -i -e '/REDIS_URL/ s/=.*/=redis:\/\/localhost:6379/' .env
 sed -i -e '/POSTGRES_HOST/ s/=.*/=localhost/' .env
 sed -i -e '/SMTP_ADDRESS/ s/=.*/=localhost/' .env
-sed -i -e "/FRONTEND_URL/ s/=.*/=https:\/\/$CODESPACE_NAME-3000.app.github.dev/" .env
-
-# Setup Claude Code API key if available
-if [ -n "$CLAUDE_CODE_API_KEY" ]; then
-  mkdir -p ~/.claude
-  echo '{"apiKeyHelper": "~/.claude/anthropic_key.sh"}' > ~/.claude/settings.json
-  echo "echo \"$CLAUDE_CODE_API_KEY\"" > ~/.claude/anthropic_key.sh
-  chmod +x ~/.claude/anthropic_key.sh
-fi
+sed -i -e "/FRONTEND_URL/ s/=.*/=https:\/\/$CODESPACE_NAME-3000.githubpreview.dev/" .env
+sed -i -e "/WEBPACKER_DEV_SERVER_PUBLIC/ s/=.*/=https:\/\/$CODESPACE_NAME-3035.githubpreview.dev/" .env
+# uncomment the webpacker env variable
+sed -i -e '/WEBPACKER_DEV_SERVER_PUBLIC/s/^# //' .env
+# fix the error with webpacker
+echo 'export NODE_OPTIONS=--openssl-legacy-provider' >> ~/.zshrc

 # codespaces make the ports public
-gh codespace ports visibility 3000:public 3036:public 8025:public -c $CODESPACE_NAME
+gh codespace ports visibility 3000:public 3035:public 8025:public -c $CODESPACE_NAME
@@ -2,7 +2,7 @@
 # https://www.chatwoot.com/docs/self-hosted/configuration/environment-variables/#rails-production-variables

 # Used to verify the integrity of signed cookies. so ensure a secure value is set
-# SECRET_KEY_BASE should be alphanumeric. Avoid special characters or symbols.
+# SECRET_KEY_BASE should be alphanumeric. Avoid special characters or symbols. 
 # Use `rake secret` to generate this variable
 SECRET_KEY_BASE=replace_with_lengthy_secure_hex

@@ -216,8 +216,6 @@ ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:
 # ENABLE_RACK_ATTACK=true
 # RACK_ATTACK_LIMIT=300
 # ENABLE_RACK_ATTACK_WIDGET_API=true
-# Comma-separated list of trusted IPs that bypass Rack Attack throttling rules
-# RACK_ATTACK_ALLOWED_IPS=127.0.0.1,::1,192.168.0.10

 ## Running chatwoot as an API only server
 ## setting this value to true will disable the frontend dashboard endpoints
@@ -259,3 +257,4 @@ AZURE_APP_SECRET=
 # Set to true if you want to remove stale contact inboxes
 # contact_inboxes with no conversation older than 90 days will be removed
 # REMOVE_STALE_CONTACT_INBOX_JOB_STATUS=false
+
@@ -103,7 +103,6 @@ module.exports = {
          '⌘',
          '📄',
          '🎉',
-          '🚀',
          '💬',
          '👥',
          '📥',
@@ -6,11 +6,6 @@ name: Deploy Check
 on:
  pull_request:

-# If two pushes happen within a short time in the same PR, cancel the run of the oldest push
-concurrency:
-  group: pr-${{ github.workflow }}-${{ github.head_ref }}
-  cancel-in-progress: true
-
 jobs:
  deployment_check:
    name: Check Deployment
@@ -10,7 +10,7 @@ on:

 jobs:
  test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04

    steps:
      - uses: actions/checkout@v4
@@ -5,11 +5,6 @@ on:
    branches:
      - develop

-# If two pushes happen within a short time in the same PR, cancel the run of the oldest push
-concurrency:
-  group: pr-${{ github.workflow }}-${{ github.head_ref }}
-  cancel-in-progress: true
-
 jobs:
  log_lines_check:
    runs-on: ubuntu-latest
@@ -2,7 +2,7 @@
 # #
 # # Linux nightly installer action
 # # This action will try to install and setup
-# # chatwoot on an Ubuntu 22.04 machine using
+# # chatwoot on an Ubuntu 20.04 machine using
 # # the linux installer script.
 # #
 # # This is set to run daily at midnight.
@@ -19,5 +19,6 @@ jobs:

    - name: Build the Codespace Base Image
      run: |
-        docker compose -f .devcontainer/docker-compose.base.yml build base
+        docker-compose -f .devcontainer/docker-compose.yml build base
+        docker tag base:latest ghcr.io/chatwoot/chatwoot_codespace:latest
        docker push ghcr.io/chatwoot/chatwoot_codespace:latest
@@ -9,7 +9,7 @@ on:

 jobs:
  test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
    services:
      postgres:
        image: pgvector/pgvector:pg15
@@ -5,14 +5,9 @@ on:
    branches:
      - develop

-# If two pushes happen within a short time in the same PR, cancel the run of the oldest push
-concurrency:
-  group: pr-${{ github.workflow }}-${{ github.head_ref }}
-  cancel-in-progress: true
-
 jobs:
  test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04

    steps:
      - uses: actions/checkout@v4
@@ -71,6 +71,9 @@ test/cypress/videos/*
 /config/master.key
 /config/*.enc

+#ignore files under .vscode directory
+.vscode
+.cursor

 # yalc for local testing
 .yalc
@@ -88,9 +91,3 @@ yarn-debug.log*
 # Vite uses dotenv and suggests to ignore local-only env files. See
 # https://vitejs.dev/guide/env-and-mode.html#env-files
 *.local
-
-
-# TextEditors & AI Agents config files
-.vscode
-.claude/settings.local.json
-.cursor
@@ -4,8 +4,8 @@
 # lint js and vue files
 npx --no-install lint-staged

-# lint only staged ruby files that still exist (not deleted)
-git diff --name-only --cached | xargs -I {} sh -c 'test -f "{}" && echo "{}"' | grep '\.rb$' | xargs -I {} bundle exec rubocop --force-exclusion -a "{}" || true
+# lint only staged ruby files
+git diff --name-only --cached | xargs ls -1 2>/dev/null | grep '\.rb$' | xargs bundle exec rubocop --force-exclusion -a

 # stage rubocop changes to files
-git diff --name-only --cached | xargs -I {} sh -c 'test -f "{}" && git add "{}"' || true
+git diff --name-only --cached | xargs git add
@@ -1,10 +1,7 @@
-plugins:
+require:
  - rubocop-performance
  - rubocop-rails
  - rubocop-rspec
-  - rubocop-factory_bot
-
-require:
  - ./rubocop/use_from_email.rb
  - ./rubocop/custom_cop_location.rb

@@ -16,61 +13,44 @@ Metrics/ClassLength:
  Exclude:
    - 'app/models/message.rb'
    - 'app/models/conversation.rb'
-
 Metrics/MethodLength:
  Max: 19
-  Exclude:
-    - 'enterprise/lib/captain/agent.rb'
-
 RSpec/ExampleLength:
  Max: 25
-
 Style/Documentation:
  Enabled: false
-
 Style/ExponentialNotation:
  Enabled: false
-
 Style/FrozenStringLiteralComment:
  Enabled: false
-
 Style/SymbolArray:
  Enabled: false
-
 Style/OpenStructUse:
  Enabled: false
-
 Style/OptionalBooleanParameter:
  Exclude:
    - 'app/services/email_templates/db_resolver_service.rb'
    - 'app/dispatchers/dispatcher.rb'
-
 Style/GlobalVars:
  Exclude:
    - 'config/initializers/01_redis.rb'
    - 'config/initializers/rack_attack.rb'
    - 'lib/redis/alfred.rb'
    - 'lib/global_config.rb'
-
 Style/ClassVars:
  Exclude:
    - 'app/services/email_templates/db_resolver_service.rb'
-
 Lint/MissingSuper:
  Exclude:
    - 'app/drops/base_drop.rb'
-
 Lint/SymbolConversion:
  Enabled: false
-
 Lint/EmptyBlock:
  Exclude:
    - 'app/views/api/v1/accounts/conversations/toggle_status.json.jbuilder'
-
 Lint/OrAssignmentToConstant:
  Exclude:
    - 'lib/redis/config.rb'
-
 Metrics/BlockLength:
  Max: 30
  Exclude:
@@ -78,16 +58,10 @@ Metrics/BlockLength:
    - '**/routes.rb'
    - 'config/environments/*'
    - db/schema.rb
-
 Metrics/ModuleLength:
  Exclude:
    - lib/seeders/message_seeder.rb
    - spec/support/slack_stubs.rb
-
-Rails/HelperInstanceVariable:
-  Exclude:
-    - enterprise/app/helpers/captain/chat_helper.rb
-
 Rails/ApplicationController:
  Exclude:
    - 'app/controllers/api/v1/widget/messages_controller.rb'
@@ -97,101 +71,74 @@ Rails/ApplicationController:
    - 'app/controllers/platform_controller.rb'
    - 'app/controllers/public_controller.rb'
    - 'app/controllers/survey/responses_controller.rb'
-
 Rails/FindEach:
  Enabled: true
  Include:
    - 'app/**/*.rb'
-
 Rails/CompactBlank:
  Enabled: false
-
 Rails/EnvironmentVariableAccess:
  Enabled: false
-
 Rails/TimeZoneAssignment:
  Enabled: false
-
 Rails/RedundantPresenceValidationOnBelongsTo:
  Enabled: false
-
-Rails/InverseOf:
-  Exclude:
-    - enterprise/app/models/captain/assistant.rb
-
-Rails/UniqueValidationWithoutIndex:
-  Exclude:
-    - app/models/canned_response.rb
-    - app/models/telegram_bot.rb
-    - enterprise/app/models/captain_inbox.rb
-    - 'app/models/channel/twitter_profile.rb'
-    - 'app/models/webhook.rb'
-    - 'app/models/contact.rb'
-
 Style/ClassAndModuleChildren:
  EnforcedStyle: compact
  Exclude:
    - 'config/application.rb'
    - 'config/initializers/monkey_patches/*'
-
 Style/MapToHash:
  Enabled: false
-
 Style/HashSyntax:
  Enabled: true
  EnforcedStyle: no_mixed_keys
  EnforcedShorthandSyntax: never
-
 RSpec/NestedGroups:
  Enabled: true
  Max: 4
-
 RSpec/MessageSpies:
  Enabled: false
-
 RSpec/StubbedMock:
  Enabled: false
-
+RSpec/FactoryBot/SyntaxMethods:
+  Enabled: false
 Naming/VariableNumber:
  Enabled: false
-
 Naming/MemoizedInstanceVariableName:
  Exclude:
    - 'app/models/message.rb'
-
 Style/GuardClause:
  Exclude:
    - 'app/builders/account_builder.rb'
    - 'app/models/attachment.rb'
    - 'app/models/message.rb'
-
 Metrics/AbcSize:
  Max: 26
  Exclude:
    - 'app/controllers/concerns/auth_helper.rb'
-
+Rails/UniqueValidationWithoutIndex:
+  Exclude:
+    - 'app/models/channel/twitter_profile.rb'
+    - 'app/models/webhook.rb'
+    - 'app/models/contact.rb'
    - 'app/models/integrations/hook.rb'
    - 'app/models/canned_response.rb'
    - 'app/models/telegram_bot.rb'
-
 Rails/RenderInline:
  Exclude:
    - 'app/controllers/swagger_controller.rb'
-
 Rails/ThreeStateBooleanColumn:
  Exclude:
    - 'db/migrate/20230503101201_create_sla_policies.rb'
-
 RSpec/IndexedLet:
  Enabled: false
-
 RSpec/NamedSubject:
  Enabled: false

 # we should bring this down
 RSpec/MultipleExpectations:
  Max: 7
-
 RSpec/MultipleMemoizedHelpers:
  Max: 14

@@ -219,121 +166,3 @@ AllCops:
    - 'tmp/**/*'
    - 'storage/**/*'
    - 'db/migrate/20230426130150_init_schema.rb'
-
-FactoryBot/SyntaxMethods:
-  Enabled: false
-
-# Disable new rules causing errors
-Layout/LeadingCommentSpace:
-  Enabled: false
-
-Style/ReturnNilInPredicateMethodDefinition:
-  Enabled: false
-
-Style/RedundantParentheses:
-  Enabled: false
-
-Performance/StringIdentifierArgument:
-  Enabled: false
-
-Layout/EmptyLinesAroundExceptionHandlingKeywords:
-  Enabled: false
-
-Lint/LiteralAsCondition:
-  Enabled: false
-
-Style/RedundantReturn:
-  Enabled: false
-
-Layout/SpaceAroundOperators:
-  Enabled: false
-
-Rails/EnvLocal:
-  Enabled: false
-
-Rails/WhereRange:
-  Enabled: false
-
-Lint/UselessConstantScoping:
-  Enabled: false
-
-Style/MultipleComparison:
-  Enabled: false
-
-Bundler/OrderedGems:
-  Enabled: false
-
-RSpec/ExampleWording:
-  Enabled: false
-
-RSpec/ReceiveMessages:
-  Enabled: false
-
-FactoryBot/AssociationStyle:
-  Enabled: false
-
-Rails/EnumSyntax:
-  Enabled: false
-
-Lint/RedundantTypeConversion:
-  Enabled: false
-
-# Additional rules to disable
-Rails/RedundantActiveRecordAllMethod:
-  Enabled: false
-
-Layout/TrailingEmptyLines:
-  Enabled: false
-
-Style/SafeNavigationChainLength:
-  Enabled: false
-
-Lint/SafeNavigationConsistency:
-  Enabled: false
-
-Lint/CopDirectiveSyntax:
-  Enabled: false
-
-# Final set of rules to disable
-FactoryBot/ExcessiveCreateList:
-  Enabled: false
-
-RSpec/MissingExpectationTargetMethod:
-  Enabled: false
-
-Performance/InefficientHashSearch:
-  Enabled: false
-
-Style/RedundantSelfAssignmentBranch:
-  Enabled: false
-
-Style/YAMLFileRead:
-  Enabled: false
-
-Layout/ExtraSpacing:
-  Enabled: false
-
-Style/RedundantFilterChain:
-  Enabled: false
-
-Performance/MapMethodChain:
-  Enabled: false
-
-Rails/RootPathnameMethods:
-  Enabled: false
-
-Style/SuperArguments:
-  Enabled: false
-
-# Final remaining rules to disable
-Rails/Delegate:
-  Enabled: false
-
-Style/CaseLikeIf:
-  Enabled: false
-
-FactoryBot/RedundantFactoryOption:
-  Enabled: false
-
-FactoryBot/FactoryAssociationWithStrategy:
-  Enabled: false
@@ -1 +1 @@
-3.4.4
+3.3.3
@@ -1 +0,0 @@
-../../AGENTS.md
@@ -1,58 +0,0 @@
-# Chatwoot Development Guidelines
-
-## Build / Test / Lint
-
- **Setup**: `bundle install && pnpm install`
- **Run Dev**: `pnpm dev` or `overmind start -f ./Procfile.dev`
- **Lint JS/Vue**: `pnpm eslint` / `pnpm eslint:fix`
- **Lint Ruby**: `bundle exec rubocop -a`
- **Test JS**: `pnpm test` or `pnpm test:watch`
- **Test Ruby**: `bundle exec rspec spec/path/to/file_spec.rb`
- **Single Test**: `bundle exec rspec spec/path/to/file_spec.rb:LINE_NUMBER`
- **Run Project**: `overmind start -f Procfile.dev`
-
-## Code Style
-
- **Ruby**: Follow RuboCop rules (150 character max line length)
- **Vue/JS**: Use ESLint (Airbnb base + Vue 3 recommended)
- **Vue Components**: Use PascalCase
- **Events**: Use camelCase
- **I18n**: No bare strings in templates; use i18n
- **Error Handling**: Use custom exceptions (`lib/custom_exceptions/`)
- **Models**: Validate presence/uniqueness, add proper indexes
- **Type Safety**: Use PropTypes in Vue, strong params in Rails
- **Naming**: Use clear, descriptive names with consistent casing
- **Vue API**: Always use Composition API with `<script setup>` at the top
-
-## Styling
-
- **Tailwind Only**:  
-  - Do not write custom CSS  
-  - Do not use scoped CSS  
-  - Do not use inline styles  
-  - Always use Tailwind utility classes  
- **Colors**: Refer to `tailwind.config.js` for color definitions
-
-## General Guidelines
-
- MVP focus: Least code change, happy-path only
- No unnecessary defensive programming
- Break down complex tasks into small, testable units
- Iterate after confirmation
- Avoid writing specs unless explicitly asked
- Remove dead/unreachable/unused code
- Don’t write multiple versions or backups for the same logic — pick the best approach and implement it
- Don't reference Claude in commit messages
-
-## Project-Specific
-
- **Translations**:
-  - Only update `en.yml` and `en.json`
-  - Other languages are handled by the community
-  - Backend i18n → `en.yml`, Frontend i18n → `en.json`
- **Frontend**:
-  - Use `components-next/` for message bubbles (the rest is being deprecated)
-
-## Ruby Best Practices
-
- Use compact `module/class` definitions; avoid nested styles
@@ -1 +0,0 @@
-AGENTS.md
@@ -1,10 +1,10 @@
 source 'https://rubygems.org'

-ruby '3.4.4'
+ruby '3.3.3'

 ##-- base gems for rails --##
 gem 'rack-cors', '2.0.0', require: 'rack/cors'
-gem 'rails', '~> 7.1'
+gem 'rails', '~> 7.0.8.4'
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', require: false

@@ -33,8 +33,6 @@ gem 'liquid'
 gem 'commonmarker'
 # Validate Data against JSON Schema
 gem 'json_schemer'
-# used in swagger build
-gem 'json_refs'
 # Rack middleware for blocking & throttling abusive requests
 gem 'rack-attack', '>= 6.7.0'
 # a utility tool for streaming, flexible and safe downloading of remote files
@@ -89,7 +87,7 @@ gem 'wisper', '2.0.0'
 ##--- gems for channels ---##
 gem 'facebook-messenger'
 gem 'line-bot-api'
-gem 'twilio-ruby'
+gem 'twilio-ruby', '~> 5.66'
 # twitty will handle subscription of twitter account events
 # gem 'twitty', git: 'https://github.com/chatwoot/twitty'
 gem 'twitty', '~> 0.1.5'
@@ -198,6 +196,9 @@ group :development do
  gem 'scss_lint', require: false
  gem 'web-console', '>= 4.2.1'

+  # used in swagger build
+  gem 'json_refs'
+
  # When we want to squash migrations
  gem 'squasher'

@@ -236,7 +237,6 @@ group :development, :test do
  gem 'rubocop-performance', require: false
  gem 'rubocop-rails', require: false
  gem 'rubocop-rspec', require: false
-  gem 'rubocop-factory_bot', require: false
  gem 'seed_dump'
  gem 'shoulda-matchers'
  gem 'simplecov', '0.17.1', require: false
@@ -25,89 +25,76 @@ GIT
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (7.1.5.1)
-      actionpack (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
+    actioncable (7.0.8.7)
+      actionpack (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-      zeitwerk (~> 2.6)
-    actionmailbox (7.1.5.1)
-      actionpack (= 7.1.5.1)
-      activejob (= 7.1.5.1)
-      activerecord (= 7.1.5.1)
-      activestorage (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
+    actionmailbox (7.0.8.7)
+      actionpack (= 7.0.8.7)
+      activejob (= 7.0.8.7)
+      activerecord (= 7.0.8.7)
+      activestorage (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
      mail (>= 2.7.1)
      net-imap
      net-pop
      net-smtp
-    actionmailer (7.1.5.1)
-      actionpack (= 7.1.5.1)
-      actionview (= 7.1.5.1)
-      activejob (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
+    actionmailer (7.0.8.7)
+      actionpack (= 7.0.8.7)
+      actionview (= 7.0.8.7)
+      activejob (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
      mail (~> 2.5, >= 2.5.4)
      net-imap
      net-pop
      net-smtp
-      rails-dom-testing (~> 2.2)
-    actionpack (7.1.5.1)
-      actionview (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
-      nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4)
-      rack-session (>= 1.0.1)
+      rails-dom-testing (~> 2.0)
+    actionpack (7.0.8.7)
+      actionview (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
+      rack (~> 2.0, >= 2.2.4)
      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.5.1)
-      actionpack (= 7.1.5.1)
-      activerecord (= 7.1.5.1)
-      activestorage (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (7.0.8.7)
+      actionpack (= 7.0.8.7)
+      activerecord (= 7.0.8.7)
+      activestorage (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (7.1.5.1)
-      activesupport (= 7.1.5.1)
+    actionview (7.0.8.7)
+      activesupport (= 7.0.8.7)
      builder (~> 3.1)
-      erubi (~> 1.11)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
    active_record_query_trace (1.8)
-    activejob (7.1.5.1)
-      activesupport (= 7.1.5.1)
+    activejob (7.0.8.7)
+      activesupport (= 7.0.8.7)
      globalid (>= 0.3.6)
-    activemodel (7.1.5.1)
-      activesupport (= 7.1.5.1)
-    activerecord (7.1.5.1)
-      activemodel (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
-      timeout (>= 0.4.0)
-    activerecord-import (2.1.0)
+    activemodel (7.0.8.7)
+      activesupport (= 7.0.8.7)
+    activerecord (7.0.8.7)
+      activemodel (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
+    activerecord-import (1.4.1)
      activerecord (>= 4.2)
-    activestorage (7.1.5.1)
-      actionpack (= 7.1.5.1)
-      activejob (= 7.1.5.1)
-      activerecord (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
+    activestorage (7.0.8.7)
+      actionpack (= 7.0.8.7)
+      activejob (= 7.0.8.7)
+      activerecord (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
      marcel (~> 1.0)
-    activesupport (7.1.5.1)
-      base64
-      benchmark (>= 0.3)
-      bigdecimal
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.8.7)
      concurrent-ruby (~> 1.0, >= 1.0.2)
-      connection_pool (>= 2.2.5)
-      drb
      i18n (>= 1.6, < 2)
-      logger (>= 1.4.2)
      minitest (>= 5.1)
-      mutex_m
-      securerandom (>= 0.3)
      tzinfo (~> 2.0)
-    acts-as-taggable-on (12.0.0)
-      activerecord (>= 7.1, < 8.1)
-      zeitwerk (>= 2.4, < 3.0)
+    acts-as-taggable-on (9.0.1)
+      activerecord (>= 6.0, < 7.1)
    addressable (2.8.7)
      public_suffix (>= 2.0.2, < 7.0)
    administrate (0.20.1)
@@ -129,7 +116,7 @@ GEM
    annotate (3.2.0)
      activerecord (>= 3.2, < 8.0)
      rake (>= 10.4, < 14.0)
-    ast (2.4.3)
+    ast (2.4.2)
    attr_extras (7.1.0)
    audited (5.4.1)
      activerecord (>= 5.0, < 7.7)
@@ -155,15 +142,14 @@ GEM
      statsd-ruby (~> 1.1)
    base64 (0.2.0)
    bcrypt (3.1.20)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
+    bigdecimal (3.1.8)
    bindex (0.8.1)
    bootsnap (1.16.0)
      msgpack (~> 1.2)
    brakeman (5.4.1)
    browser (5.3.1)
    builder (3.3.0)
-    bullet (8.0.7)
+    bullet (7.0.7)
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.11)
    bundle-audit (0.1.0)
@@ -172,13 +158,11 @@ GEM
      bundler (>= 1.2.0, < 3)
      thor (~> 1.0)
    byebug (11.1.3)
-    childprocess (5.1.0)
-      logger (~> 1.5)
    climate_control (1.2.0)
    coderay (1.1.3)
    commonmarker (0.23.10)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
    crack (1.0.0)
      bigdecimal
      rexml
@@ -192,10 +176,16 @@ GEM
      activerecord (>= 5.a)
      database_cleaner-core (~> 2.0.0)
    database_cleaner-core (2.0.1)
-    date (3.4.1)
-    ddtrace (0.48.0)
-      ffi (~> 1.0)
+    datadog-ci (0.8.3)
      msgpack
+    date (3.4.1)
+    ddtrace (1.23.2)
+      datadog-ci (~> 0.8.1)
+      debase-ruby_core_source (= 3.3.1)
+      libdatadog (~> 7.0.0.1.0)
+      libddwaf (~> 1.14.0.0.0)
+      msgpack
+    debase-ruby_core_source (3.3.1)
    debug (1.8.0)
      irb (>= 1.5.0)
      reline (>= 0.3.1)
@@ -206,10 +196,10 @@ GEM
      railties (>= 4.1.0)
      responders
      warden (~> 1.2.3)
-    devise_token_auth (1.2.5)
+    devise_token_auth (1.2.3)
      bcrypt (~> 3.0)
      devise (> 3.5.2, < 5)
-      rails (>= 4.2.0, < 8.1)
+      rails (>= 4.2.0, < 7.2)
    diff-lcs (1.5.1)
    digest-crc (0.6.5)
      rake (>= 12.0.0, < 14.0.0)
@@ -222,7 +212,6 @@ GEM
      railties (>= 6.1)
    down (5.4.0)
      addressable (~> 2.8)
-    drb (2.2.3)
    dry-cli (1.1.0)
    ecma-re-validator (0.4.0)
      regexp_parser (~> 2.2)
@@ -246,10 +235,8 @@ GEM
      railties (>= 5.0.0)
    faker (3.2.0)
      i18n (>= 1.8.11, < 2)
-    faraday (2.13.1)
-      faraday-net_http (>= 2.0, < 3.5)
-      json
-      logger
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
    faraday-follow_redirects (0.3.0)
      faraday (>= 1, < 3)
    faraday-mashify (0.1.1)
@@ -257,8 +244,8 @@ GEM
      hashie
    faraday-multipart (1.0.4)
      multipart-post (~> 2)
-    faraday-net_http (3.4.0)
-      net-http (>= 0.5.0)
+    faraday-net_http (3.1.0)
+      net-http
    faraday-net_http_persistent (2.1.0)
      faraday (~> 2.5)
      net-http-persistent (~> 4.0)
@@ -267,10 +254,7 @@ GEM
    fcm (1.0.8)
      faraday (>= 1.0.0, < 3.0)
      googleauth (~> 1)
-    ffi (1.17.2)
-    ffi (1.17.2-arm64-darwin)
-    ffi (1.17.2-x86_64-darwin)
-    ffi (1.17.2-x86_64-linux-gnu)
+    ffi (1.16.3)
    ffi-compiler (1.0.1)
      ffi (>= 1.0.0)
      rake
@@ -331,13 +315,16 @@ GEM
    google-cloud-translate-v3 (0.10.0)
      gapic-common (>= 0.20.0, < 2.a)
      google-cloud-errors (~> 1.0)
-    google-protobuf (3.25.7)
+    google-protobuf (3.25.5)
+    google-protobuf (3.25.5-arm64-darwin)
+    google-protobuf (3.25.5-x86_64-darwin)
+    google-protobuf (3.25.5-x86_64-linux)
    googleapis-common-protos (1.6.0)
      google-protobuf (>= 3.18, < 5.a)
      googleapis-common-protos-types (~> 1.7)
      grpc (~> 1.41)
-    googleapis-common-protos-types (1.20.0)
-      google-protobuf (>= 3.18, < 5.a)
+    googleapis-common-protos-types (1.14.0)
+      google-protobuf (~> 3.18)
    googleauth (1.11.2)
      faraday (>= 1.0, < 3.a)
      google-cloud-env (~> 2.1)
@@ -347,17 +334,17 @@ GEM
      signet (>= 0.16, < 2.a)
    groupdate (6.2.1)
      activesupport (>= 5.2)
-    grpc (1.72.0)
-      google-protobuf (>= 3.25, < 5.0)
+    grpc (1.62.0)
+      google-protobuf (~> 3.25)
      googleapis-common-protos-types (~> 1.0)
-    grpc (1.72.0-arm64-darwin)
-      google-protobuf (>= 3.25, < 5.0)
+    grpc (1.62.0-arm64-darwin)
+      google-protobuf (~> 3.25)
      googleapis-common-protos-types (~> 1.0)
-    grpc (1.72.0-x86_64-darwin)
-      google-protobuf (>= 3.25, < 5.0)
+    grpc (1.62.0-x86_64-darwin)
+      google-protobuf (~> 3.25)
      googleapis-common-protos-types (~> 1.0)
-    grpc (1.72.0-x86_64-linux)
-      google-protobuf (>= 3.25, < 5.0)
+    grpc (1.62.0-x86_64-linux)
+      google-protobuf (~> 3.25)
      googleapis-common-protos-types (~> 1.0)
    haikunator (1.1.1)
    hairtrigger (1.0.0)
@@ -383,7 +370,7 @@ GEM
      mini_mime (>= 1.0.0)
      multi_xml (>= 0.5.2)
    httpclient (2.8.3)
-    i18n (1.14.7)
+    i18n (1.14.6)
      concurrent-ruby (~> 1.0)
    image_processing (1.12.2)
      mini_magick (>= 4.9.5, < 5)
@@ -401,7 +388,7 @@ GEM
      rails-dom-testing (>= 1, < 3)
      railties (>= 4.2.0)
      thor (>= 0.14, < 2.0)
-    json (2.12.0)
+    json (2.6.3)
    json_refs (0.1.8)
      hana
    json_schemer (0.2.24)
@@ -416,7 +403,7 @@ GEM
    judoscale-sidekiq (1.8.2)
      judoscale-ruby (= 1.8.2)
      sidekiq (>= 5.0)
-    jwt (2.10.1)
+    jwt (2.8.1)
      base64
    kaminari (1.2.2)
      activesupport (>= 4.1.0)
@@ -436,15 +423,21 @@ GEM
      faraday-multipart
      json (>= 1.8)
      rexml
-    language_server-protocol (3.17.0.5)
-    launchy (3.1.1)
+    launchy (2.5.2)
      addressable (~> 2.8)
-      childprocess (~> 5.0)
-      logger (~> 1.6)
-    letter_opener (1.10.0)
-      launchy (>= 2.2, < 4)
+    letter_opener (1.8.1)
+      launchy (>= 2.2, < 3)
+    libdatadog (7.0.0.1.0)
+    libdatadog (7.0.0.1.0-x86_64-linux)
+    libddwaf (1.14.0.0.0)
+      ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-arm64-darwin)
+      ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-x86_64-darwin)
+      ffi (~> 1.0)
+    libddwaf (1.14.0.0.0-x86_64-linux)
+      ffi (~> 1.0)
    line-bot-api (1.28.0)
-    lint_roller (1.1.0)
    liquid (5.4.0)
    listen (3.8.0)
      rb-fsevent (~> 0.10, >= 0.10.3)
@@ -452,7 +445,7 @@ GEM
    llhttp-ffi (0.4.0)
      ffi-compiler (~> 1.0)
      rake (~> 13.0)
-    logger (1.7.0)
+    logger (1.6.0)
    lograge (0.14.0)
      actionpack (>= 4)
      activesupport (>= 4)
@@ -478,21 +471,21 @@ GEM
    mini_magick (4.12.0)
    mini_mime (1.1.5)
    mini_portile2 (2.8.8)
-    minitest (5.25.5)
+    minitest (5.25.4)
    mock_redis (0.36.0)
      ruby2_keywords
-    msgpack (1.8.0)
+    msgpack (1.7.0)
    multi_json (1.15.0)
    multi_xml (0.6.0)
    multipart-post (2.3.0)
    mutex_m (0.3.0)
    neighbor (0.2.3)
      activerecord (>= 5.2)
-    net-http (0.6.0)
+    net-http (0.4.1)
      uri
    net-http-persistent (4.0.2)
      connection_pool (~> 2.2)
-    net-imap (0.4.20)
+    net-imap (0.4.19)
      date
      net-protocol
    net-pop (0.1.2)
@@ -508,14 +501,14 @@ GEM
    newrelic_rpm (9.6.0)
      base64
    nio4r (2.7.3)
-    nokogiri (1.18.8)
+    nokogiri (1.18.3)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    nokogiri (1.18.8-arm64-darwin)
+    nokogiri (1.18.3-arm64-darwin)
      racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-darwin)
+    nokogiri (1.18.3-x86_64-darwin)
      racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-gnu)
+    nokogiri (1.18.3-x86_64-linux-gnu)
      racc (~> 1.4)
    oauth (1.1.0)
      oauth-tty (~> 1.0, >= 1.0.1)
@@ -552,16 +545,14 @@ GEM
    orm_adapter (0.5.0)
    os (1.1.4)
    ostruct (0.6.1)
-    parallel (1.27.0)
-    parser (3.3.8.0)
+    parallel (1.23.0)
+    parser (3.2.2.1)
      ast (~> 2.4.1)
-      racc
    pg (1.5.3)
    pg_search (2.3.6)
      activerecord (>= 5.2)
      activesupport (>= 5.2)
    pgvector (0.1.1)
-    prism (1.4.0)
    procore-sift (1.0.0)
      activerecord (>= 6.1)
    pry (0.14.2)
@@ -569,14 +560,14 @@ GEM
      method_source (~> 1.0)
    pry-rails (0.3.9)
      pry (>= 0.10.4)
-    public_suffix (6.0.2)
+    public_suffix (6.0.0)
    puma (6.4.3)
      nio4r (~> 2.0)
    pundit (2.3.0)
      activesupport (>= 3.0.0)
    raabro (1.4.0)
    racc (1.8.1)
-    rack (2.2.15)
+    rack (2.2.13)
    rack-attack (6.7.0)
      rack (>= 1.0, < 4)
    rack-contrib (2.5.0)
@@ -590,28 +581,23 @@ GEM
      rack (~> 2.2, >= 2.2.4)
    rack-proxy (0.7.7)
      rack
-    rack-session (1.0.2)
-      rack (< 3)
    rack-test (2.1.0)
      rack (>= 1.3)
    rack-timeout (0.6.3)
-    rackup (1.0.1)
-      rack (< 3)
-      webrick
-    rails (7.1.5.1)
-      actioncable (= 7.1.5.1)
-      actionmailbox (= 7.1.5.1)
-      actionmailer (= 7.1.5.1)
-      actionpack (= 7.1.5.1)
-      actiontext (= 7.1.5.1)
-      actionview (= 7.1.5.1)
-      activejob (= 7.1.5.1)
-      activemodel (= 7.1.5.1)
-      activerecord (= 7.1.5.1)
-      activestorage (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
+    rails (7.0.8.7)
+      actioncable (= 7.0.8.7)
+      actionmailbox (= 7.0.8.7)
+      actionmailer (= 7.0.8.7)
+      actionpack (= 7.0.8.7)
+      actiontext (= 7.0.8.7)
+      actionview (= 7.0.8.7)
+      activejob (= 7.0.8.7)
+      activemodel (= 7.0.8.7)
+      activerecord (= 7.0.8.7)
+      activestorage (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
      bundler (>= 1.15.0)
-      railties (= 7.1.5.1)
+      railties (= 7.0.8.7)
    rails-dom-testing (2.2.0)
      activesupport (>= 5.0.0)
      minitest
@@ -619,14 +605,13 @@ GEM
    rails-html-sanitizer (1.6.1)
      loofah (~> 2.21)
      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (7.1.5.1)
-      actionpack (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
-      irb
-      rackup (>= 1.0.0)
+    railties (7.0.8.7)
+      actionpack (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
+      method_source
      rake (>= 12.2)
-      thor (~> 1.0, >= 1.2.2)
-      zeitwerk (~> 2.6)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
    rainbow (3.1.1)
    rake (13.2.1)
    rb-fsevent (0.11.2)
@@ -638,7 +623,7 @@ GEM
      connection_pool
    redis-namespace (1.10.0)
      redis (>= 4)
-    regexp_parser (2.10.0)
+    regexp_parser (2.8.0)
    reline (0.3.6)
      io-console (~> 0.5)
    representable (3.2.0)
@@ -658,7 +643,7 @@ GEM
    retriable (3.1.2)
    reverse_markdown (2.1.1)
      nokogiri
-    rexml (3.4.1)
+    rexml (3.3.9)
    rspec-core (3.13.0)
      rspec-support (~> 3.13.0)
    rspec-expectations (3.13.2)
@@ -678,36 +663,30 @@ GEM
    rspec-support (3.13.1)
    rspec_junit_formatter (0.6.0)
      rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.75.6)
+    rubocop (1.50.2)
      json (~> 2.3)
-      language_server-protocol (~> 3.17.0.2)
-      lint_roller (~> 1.1.0)
      parallel (~> 1.10)
-      parser (>= 3.3.0.2)
+      parser (>= 3.2.0.0)
      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.44.1)
-      parser (>= 3.3.7.2)
-      prism (~> 1.4)
-    rubocop-factory_bot (2.27.1)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
-    rubocop-performance (1.25.0)
-      lint_roller (~> 1.1)
-      rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
-    rubocop-rails (2.32.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.1)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
+      rubocop (~> 1.41)
+    rubocop-performance (1.17.1)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.19.1)
      activesupport (>= 4.2.0)
-      lint_roller (~> 1.1)
      rack (>= 1.1)
-      rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
-    rubocop-rspec (3.6.0)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
+      rubocop (>= 1.33.0, < 2.0)
+    rubocop-rspec (2.21.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
    ruby-openai (7.3.1)
      event_stream_parser (>= 0.3.0, < 2.0.0)
      faraday (>= 1)
@@ -821,7 +800,7 @@ GEM
      i18n
    timeout (0.4.3)
    trailblazer-option (0.1.2)
-    twilio-ruby (7.6.0)
+    twilio-ruby (5.77.0)
      faraday (>= 0.9, < 3.0)
      jwt (>= 1.5, < 3.0)
      nokogiri (>= 1.6, < 2.0)
@@ -837,10 +816,8 @@ GEM
    unf (0.1.4)
      unf_ext
    unf_ext (0.0.8.2)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
-    uniform_notifier (1.17.0)
+    unicode-display_width (2.4.2)
+    uniform_notifier (1.16.0)
    uri (1.0.3)
    uri_template (0.7.0)
    valid_email2 (5.2.6)
@@ -868,9 +845,7 @@ GEM
      addressable (>= 2.8.0)
      crack (>= 0.3.2)
      hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.9.1)
-    websocket-driver (0.7.7)
-      base64
+    websocket-driver (0.7.6)
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.5)
    wisper (2.0.0)
@@ -976,7 +951,7 @@ DEPENDENCIES
  rack-cors (= 2.0.0)
  rack-mini-profiler (>= 3.2.0)
  rack-timeout
-  rails (~> 7.1)
+  rails (~> 7.0.8.4)
  redis
  redis-namespace
  responders (>= 3.1.1)
@@ -985,7 +960,6 @@ DEPENDENCIES
  rspec-rails (>= 6.1.5)
  rspec_junit_formatter
  rubocop
-  rubocop-factory_bot
  rubocop-performance
  rubocop-rails
  rubocop-rspec
@@ -1010,7 +984,7 @@ DEPENDENCIES
  telephone_number
  test-prof
  time_diff
-  twilio-ruby
+  twilio-ruby (~> 5.66)
  twitty (~> 0.1.5)
  tzinfo-data
  uglifier
@@ -1023,7 +997,7 @@ DEPENDENCIES
  working_hours

 RUBY VERSION
-   ruby 3.4.4p34
+   ruby 3.3.3p89

 BUNDLED WITH
   2.5.16
@@ -41,15 +41,8 @@ run:

 force_run:
 	rm -f ./.overmind.sock
-	rm -f tmp/pids/*.pid
 	overmind start -f Procfile.dev

-force_run_tunnel:
-	lsof -ti:3000 | xargs kill -9 2>/dev/null || true
-	rm -f ./.overmind.sock
-	rm -f tmp/pids/*.pid
-	overmind start -f Procfile.tunnel
-
 debug:
 	overmind connect backend

@@ -59,4 +52,4 @@ debug_worker:
 docker: 
 	docker build -t $(APP_NAME) -f ./docker/Dockerfile .

-.PHONY: setup db_create db_migrate db_seed db_reset db console server burn docker run force_run force_run_tunnel debug debug_worker
+.PHONY: setup db_create db_migrate db_seed db_reset db console server burn docker run force_run debug debug_worker
@@ -1,4 +0,0 @@
-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
@@ -1,11 +1,22 @@
-<img src="./.github/screenshots/header.png#gh-light-mode-only" width="100%" alt="Header light mode"/>
-<img src="./.github/screenshots/header-dark.png#gh-dark-mode-only" width="100%" alt="Header dark mode"/>
+## 🚨 Note: This branch is unstable. For the stable branch's source code, please use the branch [3.x](https://github.com/chatwoot/chatwoot/tree/3.x)
+
+
+<img src="https://user-images.githubusercontent.com/2246121/282256557-1570674b-d142-4198-9740-69404cc6a339.png#gh-light-mode-only" width="100%" alt="Chat dashboard dark mode"/>
+<img src="https://user-images.githubusercontent.com/2246121/282256632-87f6a01b-6467-4e0e-8a93-7bbf66d03a17.png#gh-dark-mode-only" width="100%" alt="Chat dashboard"/>

 ___

 # Chatwoot

-The modern customer support platform, an open-source alternative to Intercom, Zendesk, Salesforce Service Cloud etc.
+Customer engagement suite, an open-source alternative to Intercom, Zendesk, Salesforce Service Cloud etc.
+<p>
+  <a href="https://heroku.com/deploy?template=https://github.com/chatwoot/chatwoot/tree/master" alt="Deploy to Heroku">
+     <img width="150" alt="Deploy" src="https://www.herokucdn.com/deploy/button.svg"/>
+  </a>
+  <a href="https://marketplace.digitalocean.com/apps/chatwoot?refcode=f2238426a2a8" alt="Deploy to DigitalOcean">
+     <img width="200" alt="Deploy to DO" src="https://www.deploytodo.com/do-btn-blue.svg"/>
+  </a>
+</p>

 <p>
  <a href="https://codeclimate.com/github/chatwoot/chatwoot/maintainability"><img src="https://api.codeclimate.com/v1/badges/e6e3f66332c91e5a4c0c/maintainability" alt="Maintainability"></a>
@@ -20,71 +31,41 @@ The modern customer support platform, an open-source alternative to Intercom, Ze
  <a href="https://artifacthub.io/packages/helm/chatwoot/chatwoot"><img src="https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/artifact-hub" alt="Artifact HUB"></a>
 </p>

+<img src="https://user-images.githubusercontent.com/2246121/282255783-ee8a50c9-f42d-4752-8201-2d59965a663d.png#gh-light-mode-only" width="100%" alt="Chat dashboard dark mode"/>
+<img src="https://user-images.githubusercontent.com/2246121/282255784-3d1994ec-d895-4ff5-ac68-d819987e1869.png#gh-dark-mode-only" width="100%" alt="Chat dashboard"/>

-<p>
-  <a href="https://heroku.com/deploy?template=https://github.com/chatwoot/chatwoot/tree/master" alt="Deploy to Heroku">
-     <img width="150" alt="Deploy" src="https://www.herokucdn.com/deploy/button.svg"/>
-  </a>
-  <a href="https://marketplace.digitalocean.com/apps/chatwoot?refcode=f2238426a2a8" alt="Deploy to DigitalOcean">
-     <img width="200" alt="Deploy to DO" src="https://www.deploytodo.com/do-btn-blue.svg"/>
-  </a>
-</p>
+Chatwoot is an open-source, self-hosted customer engagement suite. Chatwoot lets you view and manage your customer data, communicate with them irrespective of which medium they use, and re-engage them based on their profile.

-<img src="./.github/screenshots/dashboard.png#gh-light-mode-only" width="100%" alt="Chat dashboard dark mode"/>
-<img src="./.github/screenshots/dashboard-dark.png#gh-dark-mode-only" width="100%" alt="Chat dashboard"/>
+## Features

---
+Chatwoot supports the following conversation channels:

-Chatwoot is the modern, open-source, and self-hosted customer support platform designed to help businesses deliver exceptional customer support experience. Built for scale and flexibility, Chatwoot gives you full control over your customer data while providing powerful tools to manage conversations across channels.
+ - **Website**: Talk to your customers using our live chat widget and make use of our SDK to identify a user and provide contextual support.
+ - **Facebook**: Connect your Facebook pages and start replying to the direct messages to your page.
+ - **Instagram**: Connect your Instagram profile and start replying to the direct messages.
+ - **Twitter**: Connect your Twitter profiles and reply to direct messages or the tweets where you are mentioned.
+ - **Telegram**: Connect your Telegram bot and reply to your customers right from a single dashboard.
+ - **WhatsApp**: Connect your WhatsApp business account and manage the conversation in Chatwoot.
+ - **Line**: Connect your Line account and manage the conversations in Chatwoot.
+ - **SMS**: Connect your Twilio SMS account and reply to the SMS queries in Chatwoot.
+ - **API Channel**: Build custom communication channels using our API channel.
+ - **Email**: Forward all your email queries to Chatwoot and view it in our integrated dashboard.

-### ✨ Captain – AI Agent for Support
+And more.

-Supercharge your support with Captain, Chatwoot’s AI agent. Captain helps automate responses, handle common queries, and reduce agent workload—ensuring customers get instant, accurate answers. With Captain, your team can focus on complex conversations while routine questions are resolved automatically. Read more about Captain [here](https://chwt.app/captain-docs).
-
-### 💬 Omnichannel Support Desk
-
-Chatwoot centralizes all customer conversations into one powerful inbox, no matter where your customers reach out from. It supports live chat on your website, email, Facebook, Instagram, Twitter, WhatsApp, Telegram, Line, SMS etc.
-
-### 📚 Help center portal
-
-Publish help articles, FAQs, and guides through the built-in Help Center Portal. Enable customers to find answers on their own, reduce repetitive queries, and keep your support team focused on more complex issues.
-
-### 🗂️ Other features
-
-#### Collaboration & Productivity
-
- Private Notes and @mentions for internal team discussions.
- Labels to organize and categorize conversations.
- Keyboard Shortcuts and a Command Bar for quick navigation.
- Canned Responses to reply faster to frequently asked questions.
- Auto-Assignment to route conversations based on agent availability.
- Multi-lingual Support to serve customers in multiple languages.
- Custom Views and Filters for better inbox organization.
- Business Hours and Auto-Responders to manage response expectations.
- Teams and Automation tools for scaling support workflows.
- Agent Capacity Management to balance workload across the team.
-
-#### Customer Data & Segmentation
- Contact Management with profiles and interaction history.
- Contact Segments and Notes for targeted communication.
- Campaigns to proactively engage customers.
- Custom Attributes for storing additional customer data.
- Pre-Chat Forms to collect user information before starting conversations.
-
-#### Integrations
- Slack Integration to manage conversations directly from Slack.
- Dialogflow Integration for chatbot automation.
- Dashboard Apps to embed internal tools within Chatwoot.
- Shopify Integration to view and manage customer orders right within Chatwoot.
- Use Google Translate to translate messages from your customers in realtime.
- Create and manage Linear tickets within Chatwoot.
-
-#### Reports & Insights
- Live View of ongoing conversations for real-time monitoring.
- Conversation, Agent, Inbox, Label, and Team Reports for operational visibility.
- CSAT Reports to measure customer satisfaction.
- Downloadable Reports for offline analysis and reporting.
+Other features include:

+- **CRM**: Save all your customer information right inside Chatwoot, use contact notes to log emails, phone calls, or meeting notes.
+- **Custom Attributes**: Define custom attribute attributes to store information about a contact or a conversation and extend the product to match your workflow.
+- **Shared multi-brand inboxes**: Manage multiple brands or pages using a shared inbox.
+- **Private notes**: Use @mentions and private notes to communicate internally about a conversation.
+- **Canned responses (Saved replies)**: Improve the response rate by adding saved replies for frequently asked questions.
+- **Conversation Labels**: Use conversation labels to create custom workflows.
+- **Auto assignment**: Chatwoot intelligently assigns a ticket to the agents who have access to the inbox depending on their availability and load.
+- **Conversation continuity**: If the user has provided an email address through the chat widget, Chatwoot will send an email to the customer under the agent name so that the user can continue the conversation over the email.
+- **Multi-lingual support**: Chatwoot supports 10+ languages.
+- **Powerful API & Webhooks**: Extend the capability of the software using Chatwoot’s webhooks and APIs.
+- **Integrations**: Chatwoot natively integrates with Slack right now. Manage your conversations in Slack without logging into the dashboard.

 ## Documentation

@@ -126,11 +107,13 @@ For other supported options, checkout our [deployment page](https://chatwoot.com

 Looking to report a vulnerability? Please refer our [SECURITY.md](./SECURITY.md) file.

-## Community
+
+## Community? Questions? Support ?

 If you need help or just want to hang out, come, say hi on our [Discord](https://discord.gg/cJXdrwS) server.

-## Contributors
+
+## Contributors ✨

 Thanks goes to all these [wonderful people](https://www.chatwoot.com/docs/contributors):

@@ -10,8 +10,7 @@ function toggleSecretField(e) {
  if (!textElement) return;

  if (textElement.dataset.secretMasked === 'false') {
-    const maskedLength = secretField.dataset.secretText?.length || 10;
-    textElement.textContent = '•'.repeat(maskedLength);
+    textElement.textContent = '•'.repeat(10);
    textElement.dataset.secretMasked = 'true';
    toggler.querySelector('svg use').setAttribute('xlink:href', '#eye-show');

@@ -33,13 +32,3 @@ function copySecretField(e) {

  navigator.clipboard.writeText(secretField.dataset.secretText);
 }
-
-document.addEventListener('DOMContentLoaded', () => {
-  document.querySelectorAll('.cell-data__secret-field').forEach(field => {
-    const span = field.querySelector('[data-secret-masked]');
-    if (span && span.dataset.secretMasked === 'true') {
-      const len = field.dataset.secretText?.length || 10;
-      span.textContent = '•'.repeat(len);
-    }
-  });
-});
@@ -46,25 +46,17 @@

 .cell-data__secret-field {
  align-items: center;
-  color: $hint-grey;
  display: flex;

  span {
-    flex: 0 0 auto;
+    flex: 1;
  }

-  [data-secret-toggler],
-  [data-secret-copier] {
-    background: transparent;
-    border: 0;
-    color: inherit;
-    margin-left: 0.5rem;
-    padding: 0;
+  button {
+    margin-left: 5px;

    svg {
      fill: currentColor;
-      height: 1.25rem;
-      width: 1.25rem;
    }
  }
 }
@@ -32,7 +32,14 @@ class AccountBuilder
  end

  def validate_email
-    Account::SignUpEmailValidationService.new(@email).perform
+    raise InvalidEmail.new({ domain_blocked: domain_blocked }) if domain_blocked?
+
+    address = ValidEmail2::Address.new(@email)
+    if address.valid? && !address.disposable?
+      true
+    else
+      raise InvalidEmail.new({ valid: address.valid?, disposable: address.disposable? })
+    end
  end

  def validate_user
@@ -74,4 +81,21 @@ class AccountBuilder
    @user.confirm if @confirmed
    @user.save!
  end
+
+  def domain_blocked?
+    domain = @email.split('@').last
+
+    blocked_domains.each do |blocked_domain|
+      return true if domain.match?(blocked_domain)
+    end
+
+    false
+  end
+
+  def blocked_domains
+    domains = GlobalConfigService.load('BLOCKED_EMAIL_DOMAINS', '')
+    return [] if domains.blank?
+
+    domains.split("\n").map(&:strip)
+  end
 end
@@ -9,7 +9,7 @@ class Campaigns::CampaignConversationBuilder
      @contact_inbox.lock!

      # We won't send campaigns if a conversation is already present
-      raise 'Conversation already present' if @contact_inbox.reload.conversations.present?
+      raise 'Conversation alread present' if @contact_inbox.reload.conversations.present?

      @conversation = ::Conversation.create!(conversation_params)
      Messages::MessageBuilder.new(@campaign.sender, @conversation, message_params).perform
@@ -21,8 +21,6 @@ class ContactInboxBuilder
      email_source_id
    when 'Channel::Sms'
      phone_source_id
-    when 'Channel::Voice'
-      phone_source_id # Voice uses phone number as source ID
    when 'Channel::Api', 'Channel::WebWidget'
      SecureRandom.uuid
    else
@@ -37,12 +35,7 @@ class ContactInboxBuilder
  end

  def phone_source_id
-    unless @contact.phone_number.present?
-      # For voice channels, we'll create a fallback source ID if phone number is missing
-      return SecureRandom.uuid if @inbox.channel_type == 'Channel::Voice'
-
-      raise ActionController::ParameterMissing, 'contact phone number'
-    end
+    raise ActionController::ParameterMissing, 'contact phone number' unless @contact.phone_number

    @contact.phone_number
  end
@@ -66,47 +59,10 @@ class ContactInboxBuilder
  end

  def create_contact_inbox
-    attrs = {
+    ::ContactInbox.create_with(hmac_verified: hmac_verified || false).find_or_create_by!(
      contact_id: @contact.id,
      inbox_id: @inbox.id,
      source_id: @source_id
-    }
-
-    ::ContactInbox.where(attrs).first_or_create!(hmac_verified: hmac_verified || false)
-  rescue ActiveRecord::RecordNotUnique
-    Rails.logger.info("[ContactInboxBuilder] RecordNotUnique #{@source_id} #{@contact.id} #{@inbox.id}")
-    update_old_contact_inbox
-    retry
-  end
-
-  def update_old_contact_inbox
-    # The race condition occurs when there’s a contact inbox with the
-    # same source ID but linked to a different contact. This can happen
-    # if the agent updates the contact’s email or phone number, or
-    # if the contact is merged with another.
-    #
-    # We update the old contact inbox source_id to a random value to
-    # avoid disrupting the current flow. However, the root cause of
-    # this issue is a flaw in the contact inbox model design.
-    # Contact inbox is essentially tracking a session and is not
-    # needed for non-live chat channels.
-    raise ActiveRecord::RecordNotUnique unless allowed_channels?
-
-    contact_inbox = ::ContactInbox.find_by(inbox_id: @inbox.id, source_id: @source_id)
-    return if contact_inbox.blank?
-
-    contact_inbox.update!(source_id: new_source_id)
-  end
-
-  def new_source_id
-    if @inbox.whatsapp? || @inbox.sms? || @inbox.twilio?
-      "whatsapp:#{@source_id}#{rand(100)}"
-    else
-      "#{rand(10)}#{@source_id}"
-    end
-  end
-
-  def allowed_channels?
-    @inbox.email? || @inbox.sms? || @inbox.twilio? || @inbox.whatsapp? || @inbox.channel_type == 'Channel::Voice'
+    )
  end
 end
@@ -63,33 +63,9 @@ class ContactInboxWithContactBuilder
    contact = find_contact_by_identifier(contact_attributes[:identifier])
    contact ||= find_contact_by_email(contact_attributes[:email])
    contact ||= find_contact_by_phone_number(contact_attributes[:phone_number])
-    contact ||= find_contact_by_instagram_source_id(source_id) if instagram_channel?
-
    contact
  end

-  def instagram_channel?
-    inbox.channel_type == 'Channel::Instagram'
-  end
-
-  # There might be existing contact_inboxes created through Channel::FacebookPage
-  # with the same Instagram source_id. New Instagram interactions should create fresh contact_inboxes
-  # while still reusing contacts if found in Facebook channels so that we can create
-  # new conversations with the same contact.
-  def find_contact_by_instagram_source_id(instagram_id)
-    return if instagram_id.blank?
-
-    existing_contact_inbox = ContactInbox.joins(:inbox)
-                                         .where(source_id: instagram_id)
-                                         .where(
-                                           'inboxes.channel_type = ? AND inboxes.account_id = ?',
-                                           'Channel::FacebookPage',
-                                           account.id
-                                         ).first
-
-    existing_contact_inbox&.contact
-  end
-
  def find_contact_by_identifier(identifier)
    return if identifier.blank?

@@ -1,180 +0,0 @@
-class Messages::Instagram::BaseMessageBuilder < Messages::Messenger::MessageBuilder
-  attr_reader :messaging
-
-  def initialize(messaging, inbox, outgoing_echo: false)
-    super()
-    @messaging = messaging
-    @inbox = inbox
-    @outgoing_echo = outgoing_echo
-  end
-
-  def perform
-    return if @inbox.channel.reauthorization_required?
-
-    ActiveRecord::Base.transaction do
-      build_message
-    end
-  rescue StandardError => e
-    handle_error(e)
-  end
-
-  private
-
-  def attachments
-    @messaging[:message][:attachments] || {}
-  end
-
-  def message_type
-    @outgoing_echo ? :outgoing : :incoming
-  end
-
-  def message_identifier
-    message[:mid]
-  end
-
-  def message_source_id
-    @outgoing_echo ? recipient_id : sender_id
-  end
-
-  def message_is_unsupported?
-    message[:is_unsupported].present? && @messaging[:message][:is_unsupported] == true
-  end
-
-  def sender_id
-    @messaging[:sender][:id]
-  end
-
-  def recipient_id
-    @messaging[:recipient][:id]
-  end
-
-  def message
-    @messaging[:message]
-  end
-
-  def contact
-    @contact ||= @inbox.contact_inboxes.find_by(source_id: message_source_id)&.contact
-  end
-
-  def conversation
-    @conversation ||= set_conversation_based_on_inbox_config
-  end
-
-  def set_conversation_based_on_inbox_config
-    if @inbox.lock_to_single_conversation
-      find_conversation_scope.order(created_at: :desc).first || build_conversation
-    else
-      find_or_build_for_multiple_conversations
-    end
-  end
-
-  def find_conversation_scope
-    Conversation.where(conversation_params)
-  end
-
-  def find_or_build_for_multiple_conversations
-    last_conversation = find_conversation_scope.where.not(status: :resolved).order(created_at: :desc).first
-    return build_conversation if last_conversation.nil?
-
-    last_conversation
-  end
-
-  def message_content
-    @messaging[:message][:text]
-  end
-
-  def story_reply_attributes
-    message[:reply_to][:story] if message[:reply_to].present? && message[:reply_to][:story].present?
-  end
-
-  def message_reply_attributes
-    message[:reply_to][:mid] if message[:reply_to].present? && message[:reply_to][:mid].present?
-  end
-
-  def build_message
-    # Duplicate webhook events may be sent for the same message
-    # when a user is connected to the Instagram account through both Messenger and Instagram login.
-    # There is chance for echo events to be sent for the same message.
-    # Therefore, we need to check if the message already exists before creating it.
-    return if message_already_exists?
-
-    return if message_content.blank? && all_unsupported_files?
-
-    @message = conversation.messages.create!(message_params)
-    save_story_id
-
-    attachments.each do |attachment|
-      process_attachment(attachment)
-    end
-  end
-
-  def save_story_id
-    return if story_reply_attributes.blank?
-
-    @message.save_story_info(story_reply_attributes)
-  end
-
-  def build_conversation
-    @contact_inbox ||= contact.contact_inboxes.find_by!(source_id: message_source_id)
-    Conversation.create!(conversation_params.merge(
-                           contact_inbox_id: @contact_inbox.id,
-                           additional_attributes: additional_conversation_attributes
-                         ))
-  end
-
-  def additional_conversation_attributes
-    {}
-  end
-
-  def conversation_params
-    {
-      account_id: @inbox.account_id,
-      inbox_id: @inbox.id,
-      contact_id: contact.id
-    }
-  end
-
-  def message_params
-    params = {
-      account_id: conversation.account_id,
-      inbox_id: conversation.inbox_id,
-      message_type: message_type,
-      source_id: message_identifier,
-      content: message_content,
-      sender: @outgoing_echo ? nil : contact,
-      content_attributes: {
-        in_reply_to_external_id: message_reply_attributes
-      }
-    }
-
-    params[:content_attributes][:is_unsupported] = true if message_is_unsupported?
-    params
-  end
-
-  def message_already_exists?
-    find_message_by_source_id(@messaging[:message][:mid]).present?
-  end
-
-  def find_message_by_source_id(source_id)
-    return unless source_id
-
-    @message = Message.find_by(source_id: source_id)
-  end
-
-  def all_unsupported_files?
-    return if attachments.empty?
-
-    attachments_type = attachments.pluck(:type).uniq.first
-    unsupported_file_type?(attachments_type)
-  end
-
-  def handle_error(error)
-    ChatwootExceptionTracker.new(error, account: @inbox.account).capture_exception
-    true
-  end
-
-  # Abstract methods to be implemented by subclasses
-  def get_story_object_from_source_id(source_id)
-    raise NotImplementedError
-  end
-end
@@ -1,42 +1,200 @@
-class Messages::Instagram::MessageBuilder < Messages::Instagram::BaseMessageBuilder
+# This class creates both outgoing messages from chatwoot and echo outgoing messages based on the flag `outgoing_echo`
+# Assumptions
+# 1. Incase of an outgoing message which is echo, source_id will NOT be nil,
+#    based on this we are showing "not sent from chatwoot" message in frontend
+#    Hence there is no need to set user_id in message for outgoing echo messages.
+
+class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
+  attr_reader :messaging
+
  def initialize(messaging, inbox, outgoing_echo: false)
-    super(messaging, inbox, outgoing_echo: outgoing_echo)
+    super()
+    @messaging = messaging
+    @inbox = inbox
+    @outgoing_echo = outgoing_echo
+  end
+
+  def perform
+    return if @inbox.channel.reauthorization_required?
+
+    ActiveRecord::Base.transaction do
+      build_message
+    end
+  rescue Koala::Facebook::AuthenticationError => e
+    Rails.logger.warn("Instagram authentication error for inbox: #{@inbox.id} with error: #{e.message}")
+    Rails.logger.error e
+    @inbox.channel.authorization_error!
+    raise
+  rescue StandardError => e
+    ChatwootExceptionTracker.new(e, account: @inbox.account).capture_exception
+    true
  end

  private

-  def get_story_object_from_source_id(source_id)
-    url = "#{base_uri}/#{source_id}?fields=story,from&access_token=#{@inbox.channel.access_token}"
-
-    response = HTTParty.get(url)
-
-    return JSON.parse(response.body).with_indifferent_access if response.success?
-
-    # Create message first if it doesn't exist
-    @message ||= conversation.messages.create!(message_params)
-    handle_error_response(response)
-    nil
+  def attachments
+    @messaging[:message][:attachments] || {}
  end

-  def handle_error_response(response)
-    parsed_response = JSON.parse(response.body)
-    error_code = parsed_response.dig('error', 'code')
+  def message_type
+    @outgoing_echo ? :outgoing : :incoming
+  end

-    # https://developers.facebook.com/docs/messenger-platform/error-codes
-    # Access token has expired or become invalid.
-    channel.authorization_error! if error_code == 190
+  def message_identifier
+    message[:mid]
+  end

-    # There was a problem scraping data from the provided link.
-    # https://developers.facebook.com/docs/graph-api/guides/error-handling/ search for error code 1609005
-    if error_code == 1_609_005
-      @message.attachments.destroy_all
-      @message.update(content: I18n.t('conversations.messages.instagram_deleted_story_content'))
+  def message_source_id
+    @outgoing_echo ? recipient_id : sender_id
+  end
+
+  def message_is_unsupported?
+    message[:is_unsupported].present? && @messaging[:message][:is_unsupported] == true
+  end
+
+  def sender_id
+    @messaging[:sender][:id]
+  end
+
+  def recipient_id
+    @messaging[:recipient][:id]
+  end
+
+  def message
+    @messaging[:message]
+  end
+
+  def contact
+    @contact ||= @inbox.contact_inboxes.find_by(source_id: message_source_id)&.contact
+  end
+
+  def conversation
+    @conversation ||= set_conversation_based_on_inbox_config
+  end
+
+  def instagram_direct_message_conversation
+    Conversation.where(conversation_params)
+                .where("additional_attributes ->> 'type' = 'instagram_direct_message'")
+  end
+
+  def set_conversation_based_on_inbox_config
+    if @inbox.lock_to_single_conversation
+      instagram_direct_message_conversation.order(created_at: :desc).first || build_conversation
+    else
+      find_or_build_for_multiple_conversations
    end
-
-    Rails.logger.error("[InstagramStoryFetchError]: #{parsed_response.dig('error', 'message')} #{error_code}")
  end

-  def base_uri
-    "https://graph.instagram.com/#{GlobalConfigService.load('INSTAGRAM_API_VERSION', 'v22.0')}"
+  def find_or_build_for_multiple_conversations
+    last_conversation = instagram_direct_message_conversation.where.not(status: :resolved).order(created_at: :desc).first
+
+    return build_conversation if last_conversation.nil?
+
+    last_conversation
  end
+
+  def message_content
+    @messaging[:message][:text]
+  end
+
+  def story_reply_attributes
+    message[:reply_to][:story] if message[:reply_to].present? && message[:reply_to][:story].present?
+  end
+
+  def message_reply_attributes
+    message[:reply_to][:mid] if message[:reply_to].present? && message[:reply_to][:mid].present?
+  end
+
+  def build_message
+    return if @outgoing_echo && already_sent_from_chatwoot?
+    return if message_content.blank? && all_unsupported_files?
+
+    @message = conversation.messages.create!(message_params)
+    save_story_id
+
+    attachments.each do |attachment|
+      process_attachment(attachment)
+    end
+  end
+
+  def save_story_id
+    return if story_reply_attributes.blank?
+
+    @message.save_story_info(story_reply_attributes)
+  end
+
+  def build_conversation
+    @contact_inbox ||= contact.contact_inboxes.find_by!(source_id: message_source_id)
+
+    Conversation.create!(conversation_params.merge(
+                           contact_inbox_id: @contact_inbox.id,
+                           additional_attributes: { type: 'instagram_direct_message' }
+                         ))
+  end
+
+  def conversation_params
+    {
+      account_id: @inbox.account_id,
+      inbox_id: @inbox.id,
+      contact_id: contact.id
+    }
+  end
+
+  def message_params
+    params = {
+      account_id: conversation.account_id,
+      inbox_id: conversation.inbox_id,
+      message_type: message_type,
+      source_id: message_identifier,
+      content: message_content,
+      sender: @outgoing_echo ? nil : contact,
+      content_attributes: {
+        in_reply_to_external_id: message_reply_attributes
+      }
+    }
+
+    params[:content_attributes][:is_unsupported] = true if message_is_unsupported?
+    params
+  end
+
+  def already_sent_from_chatwoot?
+    cw_message = conversation.messages.where(
+      source_id: @messaging[:message][:mid]
+    ).first
+
+    cw_message.present?
+  end
+
+  def all_unsupported_files?
+    return if attachments.empty?
+
+    attachments_type = attachments.pluck(:type).uniq.first
+    unsupported_file_type?(attachments_type)
+  end
+
+  ### Sample response
+  # {
+  #   "object": "instagram",
+  #   "entry": [
+  #     {
+  #       "id": "<IGID>",// ig id of the business
+  #       "time": 1569262486134,
+  #       "messaging": [
+  #         {
+  #           "sender": {
+  #             "id": "<IGSID>"
+  #           },
+  #           "recipient": {
+  #             "id": "<IGID>"
+  #           },
+  #           "timestamp": 1569262485349,
+  #           "message": {
+  #             "mid": "<MESSAGE_ID>",
+  #             "text": "<MESSAGE_CONTENT>"
+  #           }
+  #         }
+  #       ]
+  #     }
+  #   ],
+  # }
 end
@@ -1,33 +0,0 @@
-class Messages::Instagram::Messenger::MessageBuilder < Messages::Instagram::BaseMessageBuilder
-  def initialize(messaging, inbox, outgoing_echo: false)
-    super(messaging, inbox, outgoing_echo: outgoing_echo)
-  end
-
-  private
-
-  def get_story_object_from_source_id(source_id)
-    k = Koala::Facebook::API.new(@inbox.channel.page_access_token) if @inbox.facebook?
-    k.get_object(source_id, fields: %w[story from]) || {}
-  rescue Koala::Facebook::AuthenticationError
-    @inbox.channel.authorization_error!
-    raise
-  rescue Koala::Facebook::ClientError => e
-    # The exception occurs when we are trying fetch the deleted story or blocked story.
-    @message.attachments.destroy_all
-    @message.update(content: I18n.t('conversations.messages.instagram_deleted_story_content'))
-    Rails.logger.error e
-    {}
-  rescue StandardError => e
-    ChatwootExceptionTracker.new(e, account: @inbox.account).capture_exception
-    {}
-  end
-
-  def find_conversation_scope
-    Conversation.where(conversation_params)
-                .where("additional_attributes ->> 'type' = 'instagram_direct_message'")
-  end
-
-  def additional_conversation_attributes
-    { type: 'instagram_direct_message' }
-  end
-end
@@ -7,7 +7,7 @@ class Messages::MessageBuilder
    @private = params[:private] || false
    @conversation = conversation
    @user = user
-    @message_type = params[:message_type].to_s || 'outgoing'
+    @message_type = params[:message_type] || 'outgoing'
    @attachments = params[:attachments]
    @automation_rule = content_attributes&.dig(:automation_rule_id)
    return unless params.instance_of?(ActionController::Parameters)
@@ -33,6 +33,11 @@ class Messages::MessageBuilder
  def content_attributes
    params = convert_to_hash(@params)
    content_attributes = params.fetch(:content_attributes, {})
+
+    return parse_json(content_attributes) if content_attributes.is_a?(String)
+    return content_attributes if content_attributes.is_a?(Hash)
+
+    {}
  end

  # Converts the given object to a hash.
@@ -100,9 +105,8 @@ class Messages::MessageBuilder
  end

  def message_type
-    # Allow incoming messages in both API and Voice channels
-    if !['Channel::Api', 'Channel::Voice'].include?(@conversation.inbox.channel_type) && @message_type == 'incoming'
-      raise StandardError, 'Incoming messages are only allowed in Api and Voice inboxes'
+    if @conversation.inbox.channel_type != 'Channel::Api' && @message_type == 'incoming'
+      raise StandardError, 'Incoming messages are only allowed in Api inboxes'
    end

    @message_type
@@ -135,7 +139,7 @@ class Messages::MessageBuilder
  end

  def message_params
-    message_attrs = {
+    {
      account_id: @conversation.account_id,
      inbox_id: @conversation.inbox_id,
      message_type: message_type,
@@ -148,12 +152,5 @@ class Messages::MessageBuilder
      echo_id: @params[:echo_id],
      source_id: @params[:source_id]
    }.merge(external_created_at).merge(automation_rule_id).merge(campaign_id).merge(template_params)
-    
-    # Directly add content_attributes from params if present
-    if @params[:content_attributes].present?
-      message_attrs[:content_attributes] = content_attributes
-    end
-    
-    message_attrs
  end
-end
+end
@@ -68,8 +68,20 @@ class Messages::Messenger::MessageBuilder
    message.save!
  end

-  # This is a placeholder method to be overridden by child classes
-  def get_story_object_from_source_id(_source_id)
+  def get_story_object_from_source_id(source_id)
+    k = Koala::Facebook::API.new(@inbox.channel.page_access_token) if @inbox.facebook?
+    k.get_object(source_id, fields: %w[story from]) || {}
+  rescue Koala::Facebook::AuthenticationError
+    @inbox.channel.authorization_error!
+    raise
+  rescue Koala::Facebook::ClientError => e
+    # The exception occurs when we are trying fetch the deleted story or blocked story.
+    @message.attachments.destroy_all
+    @message.update(content: I18n.t('conversations.messages.instagram_deleted_story_content'))
+    Rails.logger.error e
+    {}
+  rescue StandardError => e
+    ChatwootExceptionTracker.new(e, account: @inbox.account).capture_exception
    {}
  end

@@ -1,103 +0,0 @@
-class V2::Reports::LabelSummaryBuilder < V2::Reports::BaseSummaryBuilder
-  attr_reader :account, :params
-
-  # rubocop:disable Lint/MissingSuper
-  # the parent class has no initialize
-  def initialize(account:, params:)
-    @account = account
-    @params = params
-
-    timezone_offset = (params[:timezone_offset] || 0).to_f
-    @timezone = ActiveSupport::TimeZone[timezone_offset]&.name
-  end
-  # rubocop:enable Lint/MissingSuper
-
-  def build
-    labels = account.labels.to_a
-    return [] if labels.empty?
-
-    report_data = collect_report_data
-    labels.map { |label| build_label_report(label, report_data) }
-  end
-
-  private
-
-  def collect_report_data
-    conversation_filter = build_conversation_filter
-    use_business_hours = use_business_hours?
-
-    {
-      conversation_counts: fetch_conversation_counts(conversation_filter),
-      resolved_counts: fetch_resolved_counts(conversation_filter),
-      resolution_metrics: fetch_metrics(conversation_filter, 'conversation_resolved', use_business_hours),
-      first_response_metrics: fetch_metrics(conversation_filter, 'first_response', use_business_hours),
-      reply_metrics: fetch_metrics(conversation_filter, 'reply_time', use_business_hours)
-    }
-  end
-
-  def build_label_report(label, report_data)
-    {
-      id: label.id,
-      name: label.title,
-      conversations_count: report_data[:conversation_counts][label.title] || 0,
-      avg_resolution_time: report_data[:resolution_metrics][label.title] || 0,
-      avg_first_response_time: report_data[:first_response_metrics][label.title] || 0,
-      avg_reply_time: report_data[:reply_metrics][label.title] || 0,
-      resolved_conversations_count: report_data[:resolved_counts][label.title] || 0
-    }
-  end
-
-  def use_business_hours?
-    ActiveModel::Type::Boolean.new.cast(params[:business_hours])
-  end
-
-  def build_conversation_filter
-    conversation_filter = { account_id: account.id }
-    conversation_filter[:created_at] = range if range.present?
-
-    conversation_filter
-  end
-
-  def fetch_conversation_counts(conversation_filter)
-    fetch_counts(conversation_filter)
-  end
-
-  def fetch_resolved_counts(conversation_filter)
-    # since the base query is ActsAsTaggableOn,
-    # the status :resolved won't automatically be converted to integer status
-    fetch_counts(conversation_filter.merge(status: Conversation.statuses[:resolved]))
-  end
-
-  def fetch_counts(conversation_filter)
-    ActsAsTaggableOn::Tagging
-      .joins('INNER JOIN conversations ON taggings.taggable_id = conversations.id')
-      .joins('INNER JOIN tags ON taggings.tag_id = tags.id')
-      .where(
-        taggable_type: 'Conversation',
-        context: 'labels',
-        conversations: conversation_filter
-      )
-      .select('tags.name, COUNT(taggings.*) AS count')
-      .group('tags.name')
-      .each_with_object({}) { |record, hash| hash[record.name] = record.count }
-  end
-
-  def fetch_metrics(conversation_filter, event_name, use_business_hours)
-    ReportingEvent
-      .joins('INNER JOIN conversations ON reporting_events.conversation_id = conversations.id')
-      .joins('INNER JOIN taggings ON taggings.taggable_id = conversations.id')
-      .joins('INNER JOIN tags ON taggings.tag_id = tags.id')
-      .where(
-        conversations: conversation_filter,
-        name: event_name,
-        taggings: { taggable_type: 'Conversation', context: 'labels' }
-      )
-      .group('tags.name')
-      .order('tags.name')
-      .select(
-        'tags.name',
-        use_business_hours ? 'AVG(reporting_events.value_in_business_hours) as avg_value' : 'AVG(reporting_events.value) as avg_value'
-      )
-      .each_with_object({}) { |record, hash| hash[record.name] = record.avg_value.to_f }
-  end
-end
@@ -29,11 +29,6 @@ class Api::V1::Accounts::AgentBotsController < Api::V1::Accounts::BaseController
    head :ok
  end

-  def reset_access_token
-    @agent_bot.access_token.regenerate_token
-    @agent_bot.reload
-  end
-
  private

  def agent_bot
@@ -42,7 +37,7 @@ class Api::V1::Accounts::AgentBotsController < Api::V1::Accounts::BaseController
  end

  def permitted_params
-    params.permit(:name, :description, :outgoing_url, :avatar, :avatar_url, :bot_type, bot_config: {})
+    params.permit(:name, :description, :outgoing_url, :avatar, :avatar_url, :bot_type, bot_config: [:csml_content])
  end

  def process_avatar_from_url
@@ -72,7 +72,7 @@ class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
  end

  def allowed_agent_params
-    [:name, :email, :role, :availability, :auto_offline]
+    [:name, :email, :name, :role, :availability, :auto_offline]
  end

  def agent_params
@@ -68,7 +68,7 @@ class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController

  def article_params
    params.require(:article).permit(
-      :title, :slug, :position, :content, :description, :category_id, :author_id, :associated_article_id, :status,
+      :title, :slug, :position, :content, :description, :position, :category_id, :author_id, :associated_article_id, :status,
      :locale, meta: [:title,
                      :description,
                      { tags: [] }]
@@ -1,6 +1,3 @@
-# TODO : Move this to inboxes controller and deprecate this controller
-# No need to retain this controller as we could handle everything centrally in inboxes controller
-
 class Api::V1::Accounts::Channels::TwilioChannelsController < Api::V1::Accounts::BaseController
  before_action :authorize_request

@@ -1,152 +0,0 @@
-class Api::V1::Accounts::Channels::Voice::WebhooksController < Api::V1::Accounts::BaseController
-  skip_before_action :authenticate_user!, :set_current_user, only: [:incoming, :conference_status]
-  protect_from_forgery with: :null_session, only: [:incoming, :conference_status]
-  before_action :validate_twilio_signature, only: [:incoming]
-  before_action :handle_options_request, only: [:incoming, :conference_status]
-  
-  # Handle CORS preflight OPTIONS requests
-  def handle_options_request
-    if request.method == "OPTIONS"
-      set_cors_headers
-      head :ok
-      return true
-    end
-    false
-  end
-  
-  def set_cors_headers
-    headers['Access-Control-Allow-Origin'] = '*'
-    headers['Access-Control-Allow-Methods'] = 'POST, OPTIONS'
-    headers['Access-Control-Allow-Headers'] = 'Content-Type, X-Twilio-Signature'
-    headers['Access-Control-Max-Age'] = '86400' # 24 hours
-  end
-
-  # Handle incoming calls from Twilio
-  def incoming
-    # Set CORS headers first to ensure they're included
-    set_cors_headers
-    
-    # Log basic request info
-    Rails.logger.info("🔔 INCOMING CALL WEBHOOK: CallSid=#{params['CallSid']} From=#{params['From']} To=#{params['To']}")
-    
-    # Process incoming call using service
-    begin
-      # Ensure account is set properly
-      if !Current.account && params[:account_id].present?
-        Current.account = Account.find(params[:account_id])
-        Rails.logger.info("👑 Set Current.account to #{Current.account.id}")
-      end
-      
-      # Validate required parameters
-      validate_incoming_params
-      
-      # Process the call
-      service = Voice::IncomingCallService.new(
-        account: Current.account, 
-        params: params.to_unsafe_h.merge(host_with_port: request.host_with_port)
-      )
-      twiml_response = service.process
-      
-      # Return TwiML response
-      Rails.logger.info("✅ INCOMING CALL: Successfully processed")
-      render xml: twiml_response
-    rescue StandardError => e
-      # Log the error with detailed information
-      Rails.logger.error("❌ INCOMING CALL ERROR: #{e.message}")
-      Rails.logger.error("❌ BACKTRACE: #{e.backtrace[0..5].join("\n")}")
-      
-      # Return friendly error message to caller
-      render_error("We're sorry, but we're experiencing technical difficulties. Please try your call again later.")
-    end
-  end
-
-  # Handle conference status updates
-  def conference_status
-    # Set CORS headers first to ensure they're always included
-    set_cors_headers
-    
-    # Return immediately for OPTIONS requests
-    if request.method == "OPTIONS"
-      return head :ok
-    end
-    
-    # Log basic request info
-    Rails.logger.info("🎧 CONFERENCE STATUS WEBHOOK: ConferenceSid=#{params['ConferenceSid']} Event=#{params['StatusCallbackEvent']}")
-    
-    # Process conference status updates using service
-    begin
-      # Set account for local development if needed
-      if !Current.account && params[:account_id].present?
-        Current.account = Account.find(params[:account_id])
-        Rails.logger.info("👑 Set Current.account to #{Current.account.id}")
-      end
-      
-      # Validate required parameters
-      if params['ConferenceSid'].blank? && params['CallSid'].blank?
-        Rails.logger.error("❌ MISSING REQUIRED PARAMS: Need either ConferenceSid or CallSid")
-      end
-      
-      # Use service to process conference status
-      service = Voice::ConferenceStatusService.new(account: Current.account, params: params)
-      service.process
-      
-      Rails.logger.info("✅ CONFERENCE STATUS: Successfully processed")
-    rescue StandardError => e
-      # Log errors but don't affect the response
-      Rails.logger.error("❌ CONFERENCE STATUS ERROR: #{e.message}")
-      Rails.logger.error("❌ BACKTRACE: #{e.backtrace[0..5].join("\n")}")
-    end
-    
-    # Always return a successful response for Twilio
-    head :ok
-  end
-
-  private
-
-  def validate_incoming_params
-    if params['CallSid'].blank?
-      raise "Missing required parameter: CallSid"
-    end
-    
-    if params['From'].blank?
-      raise "Missing required parameter: From"
-    end
-    
-    if params['To'].blank?
-      raise "Missing required parameter: To"
-    end
-    
-    if Current.account.nil?
-      raise "Current account not set"
-    end
-  end
-
-  def validate_twilio_signature
-    begin
-      validator = Voice::TwilioValidatorService.new(
-        account: Current.account,
-        params: params,
-        request: request
-      )
-      
-      if !validator.valid?
-        Rails.logger.error("❌ INVALID TWILIO SIGNATURE")
-        render_error('Invalid Twilio signature')
-        return false
-      end
-      
-      return true
-    rescue StandardError => e
-      Rails.logger.error("❌ TWILIO VALIDATION ERROR: #{e.message}")
-      render_error('Error validating Twilio request')
-      return false
-    end
-  end
-
-  def render_error(message)
-    response = Twilio::TwiML::VoiceResponse.new
-    response.say(message: message)
-    response.hangup
-    render xml: response.to_s
-  end
-end
@@ -1,39 +0,0 @@
-class Api::V1::Accounts::Contacts::CallsController < Api::V1::Accounts::BaseController
-  before_action :fetch_contact
-
-  def create
-    # Validate that contact has a phone number
-    if @contact.phone_number.blank?
-      render json: { error: 'Contact has no phone number' }, status: :unprocessable_entity
-      return
-    end
-
-    begin
-      # Use the outgoing call service to handle the entire process
-      service = Voice::OutgoingCallService.new(
-        account: Current.account,
-        contact: @contact,
-        user: Current.user
-      )
-      
-      # Process the call - this handles all the steps
-      conversation = service.process
-      
-      # Assign to @conversation so jbuilder template can access it
-      @conversation = conversation
-
-      # Use the conversation jbuilder template to ensure consistent representation
-      # This will ensure only display_id is used as the id, not the internal database id
-      render 'api/v1/accounts/conversations/show'
-    rescue StandardError => e
-      Rails.logger.error("Error initiating call: #{e.message}")
-      render json: { error: e.message }, status: :unprocessable_entity
-    end
-  end
-
-  private
-
-  def fetch_contact
-    @contact = Current.account.contacts.find(params[:contact_id])
-  end
-end
@@ -1,17 +1,17 @@
 class Api::V1::Accounts::Contacts::ConversationsController < Api::V1::Accounts::Contacts::BaseController
  def index
-    # Start with all conversations for this contact
-    conversations = Current.account.conversations.includes(
+    @conversations = Current.account.conversations.includes(
      :assignee, :contact, :inbox, :taggings
-    ).where(contact_id: @contact.id)
+    ).where(inbox_id: inbox_ids, contact_id: @contact.id).order(last_activity_at: :desc).limit(20)
+  end

-    # Apply permission-based filtering using the existing service
-    conversations = Conversations::PermissionFilterService.new(
-      conversations,
-      Current.user,
-      Current.account
-    ).perform
+  private

-    @conversations = conversations.order(last_activity_at: :desc).limit(20)
+  def inbox_ids
+    if Current.user.administrator? || Current.user.agent?
+      Current.user.assigned_inboxes.pluck(:id)
+    else
+      []
+    end
  end
 end
@@ -14,7 +14,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
  before_action :check_authorization
  before_action :set_current_page, only: [:index, :active, :search, :filter]
  before_action :fetch_contact, only: [:show, :update, :destroy, :avatar, :contactable_inboxes, :destroy_custom_attributes]
-  before_action :set_include_contact_inboxes, only: [:index, :active, :search, :filter, :show, :update]
+  before_action :set_include_contact_inboxes, only: [:index, :search, :filter, :show, :update]

  def index
    @contacts_count = resolved_contacts.count
@@ -56,7 +56,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
    contacts = Current.account.contacts.where(id: ::OnlineStatusTracker
                  .get_available_contact_ids(Current.account.id))
    @contacts_count = contacts.count
-    @contacts = fetch_contacts(contacts)
+    @contacts = contacts.page(@current_page)
  end

  def show; end
@@ -163,16 +163,9 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
    @contact.custom_attributes
  end

-  def contact_additional_attributes
-    return @contact.additional_attributes.merge(permitted_params[:additional_attributes]) if permitted_params[:additional_attributes]
-
-    @contact.additional_attributes
-  end
-
  def contact_update_params
-    permitted_params.except(:custom_attributes, :avatar_url)
-                    .merge({ custom_attributes: contact_custom_attributes })
-                    .merge({ additional_attributes: contact_additional_attributes })
+    # we want the merged custom attributes not the original one
+    permitted_params.except(:custom_attributes, :avatar_url).merge({ custom_attributes: contact_custom_attributes })
  end

  def set_include_contact_inboxes
@@ -1,6 +1,4 @@
 class Api::V1::Accounts::Conversations::MessagesController < Api::V1::Accounts::Conversations::BaseController
-  before_action :ensure_api_inbox, only: :update
-
  def index
    @messages = message_finder.perform
  end
@@ -13,11 +11,6 @@ class Api::V1::Accounts::Conversations::MessagesController < Api::V1::Accounts::
    render_could_not_create_error(e.message)
  end

-  def update
-    Messages::StatusUpdateService.new(message, permitted_params[:status], permitted_params[:external_error]).perform
-    @message = message
-  end
-
  def destroy
    ActiveRecord::Base.transaction do
      message.update!(content: I18n.t('conversations.messages.deleted'), content_type: :text, content_attributes: { deleted: true })
@@ -28,9 +21,7 @@ class Api::V1::Accounts::Conversations::MessagesController < Api::V1::Accounts::
  def retry
    return if message.blank?

-    service = Messages::StatusUpdateService.new(message, 'sent')
-    service.perform
-    message.update!(content_attributes: {})
+    message.update!(status: :sent, content_attributes: {})
    ::SendReplyJob.perform_later(message.id)
  rescue StandardError => e
    render_could_not_create_error(e.message)
@@ -65,16 +56,10 @@ class Api::V1::Accounts::Conversations::MessagesController < Api::V1::Accounts::
  end

  def permitted_params
-    params.permit(:id, :target_language, :status, :external_error)
+    params.permit(:id, :target_language)
  end

  def already_translated_content_available?
    message.translations.present? && message.translations[permitted_params[:target_language]].present?
  end
-
-  # API inbox check
-  def ensure_api_inbox
-    # Only API inboxes can update messages
-    render json: { error: 'Message status update is only allowed for API inboxes' }, status: :forbidden unless @conversation.inbox.api?
-  end
 end
@@ -48,7 +48,7 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
  end

  def filter
-    result = ::Conversations::FilterService.new(params.permit!, current_user, current_account).perform
+    result = ::Conversations::FilterService.new(params.permit!, current_user).perform
    @conversations = result[:conversations]
    @conversations_count = result[:count]
  rescue CustomExceptions::CustomFilter::InvalidAttribute,
@@ -124,12 +124,6 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
    @conversation.save!
  end

-  def destroy
-    authorize @conversation, :destroy?
-    ::DeleteObjectJob.perform_later(@conversation, Current.user, request.ip)
-    head :ok
-  end
-
  private

  def permitted_update_params
@@ -1,6 +1,6 @@
 class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseController
  before_action :check_authorization
-  before_action :fetch_custom_filters, only: [:index]
+  before_action :fetch_custom_filters, except: [:create]
  before_action :fetch_custom_filter, only: [:show, :update, :destroy]
  DEFAULT_FILTER_TYPE = 'conversation'.freeze

@@ -9,8 +9,8 @@ class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseContro
  def show; end

  def create
-    @custom_filter = Current.account.custom_filters.create!(
-      permitted_payload.merge(user: Current.user)
+    @custom_filter = current_user.custom_filters.create!(
+      permitted_payload.merge(account_id: Current.account.id)
    )
    render json: { error: @custom_filter.errors.messages }, status: :unprocessable_entity and return unless @custom_filter.valid?
  end
@@ -27,16 +27,14 @@ class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseContro
  private

  def fetch_custom_filters
-    @custom_filters = Current.account.custom_filters.where(
-      user: Current.user,
+    @custom_filters = current_user.custom_filters.where(
+      account_id: Current.account.id,
      filter_type: permitted_params[:filter_type] || DEFAULT_FILTER_TYPE
    )
  end

  def fetch_custom_filter
-    @custom_filter = Current.account.custom_filters.where(
-      user: Current.user
-    ).find(permitted_params[:id])
+    @custom_filter = @custom_filters.find(permitted_params[:id])
  end

  def permitted_payload
@@ -1,23 +1,32 @@
-class Api::V1::Accounts::Google::AuthorizationsController < Api::V1::Accounts::OauthAuthorizationController
+class Api::V1::Accounts::Google::AuthorizationsController < Api::V1::Accounts::BaseController
  include GoogleConcern
+  before_action :check_authorization

  def create
+    email = params[:authorization][:email]
    redirect_url = google_client.auth_code.authorize_url(
      {
        redirect_uri: "#{base_url}/google/callback",
-        scope: scope,
+        scope: 'email profile https://mail.google.com/',
        response_type: 'code',
        prompt: 'consent', # the oauth flow does not return a refresh token, this is supposed to fix it
        access_type: 'offline', # the default is 'online'
-        state: state,
        client_id: GlobalConfigService.load('GOOGLE_OAUTH_CLIENT_ID', nil)
      }
    )

    if redirect_url
+      cache_key = "google::#{email.downcase}"
+      ::Redis::Alfred.setex(cache_key, Current.account.id, 5.minutes)
      render json: { success: true, url: redirect_url }
    else
      render json: { success: false }, status: :unprocessable_entity
    end
  end
+
+  private
+
+  def check_authorization
+    raise Pundit::NotAuthorizedError unless Current.account_user.administrator?
+  end
 end
@@ -42,9 +42,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
  end

  def 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)
+    @inbox.update!(permitted_params.except(:channel))
    update_inbox_working_hours
    update_channel if channel_update_required?
  end
@@ -81,15 +79,11 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
  end

  def create_channel
-    return unless allowed_channel_types.include?(permitted_params[:channel][:type])
+    return unless %w[web_widget api email line telegram whatsapp sms].include?(permitted_params[:channel][:type])

    account_channels_method.create!(permitted_params(channel_type_from_params::EDITABLE_ATTRS)[:channel].except(:type))
  end

-  def allowed_channel_types
-    %w[web_widget api email line telegram whatsapp sms]
-  end
-
  def update_inbox_working_hours
    @inbox.update_working_hours(params.permit(working_hours: Inbox::OFFISABLE_ATTRS)[:working_hours]) if params[:working_hours]
  end
@@ -127,22 +121,10 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
    @inbox.channel.save!
  end

-  def format_csat_config(config)
-    {
-      display_type: config['display_type'] || 'emoji',
-      message: config['message'] || '',
-      survey_rules: {
-        operator: config.dig('survey_rules', 'operator') || 'contains',
-        values: config.dig('survey_rules', 'values') || []
-      }
-    }
-  end
-
  def inbox_attributes
    [:name, :avatar, :greeting_enabled, :greeting_message, :enable_email_collect, :csat_survey_enabled,
     :enable_auto_assignment, :working_hours_enabled, :out_of_office_message, :timezone, :allow_messages_after_resolved,
-     :lock_to_single_conversation, :portal_id, :sender_name_type, :business_name,
-     { csat_config: [:display_type, :message, { survey_rules: [:operator, { values: [] }] }] }]
+     :lock_to_single_conversation, :portal_id, :sender_name_type, :business_name]
  end

  def permitted_params(channel_attributes = [])
@@ -163,8 +145,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
      'line' => Channel::Line,
      'telegram' => Channel::Telegram,
      'whatsapp' => Channel::Whatsapp,
-      'sms' => Channel::Sms,
-      'voice' => Channel::Voice
+      'sms' => Channel::Sms
    }[permitted_params[:channel][:type]]
  end

@@ -1,23 +0,0 @@
-class Api::V1::Accounts::Instagram::AuthorizationsController < Api::V1::Accounts::OauthAuthorizationController
-  include InstagramConcern
-  include Instagram::IntegrationHelper
-
-  def create
-    # https://developers.facebook.com/docs/instagram-platform/instagram-api-with-instagram-login/business-login#step-1--get-authorization
-    redirect_url = instagram_client.auth_code.authorize_url(
-      {
-        redirect_uri: "#{base_url}/instagram/callback",
-        scope: REQUIRED_SCOPES.join(','),
-        enable_fb_login: '0',
-        force_authentication: '1',
-        response_type: 'code',
-        state: generate_instagram_token(Current.account.id)
-      }
-    )
-    if redirect_url
-      render json: { success: true, url: redirect_url }
-    else
-      render json: { success: false }, status: :unprocessable_entity
-    end
-  end
-end
@@ -1,9 +1,8 @@
 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_conversation, only: [:link_issue, :linked_issues]
  before_action :fetch_hook, only: [:destroy]

  def destroy
-    revoke_linear_token
    @hook.destroy!
    head :ok
  end
@@ -28,16 +27,10 @@ class Api::V1::Accounts::Integrations::LinearController < Api::V1::Accounts::Bas
  end

  def create_issue
-    issue = linear_processor_service.create_issue(permitted_params, Current.user)
+    issue = linear_processor_service.create_issue(permitted_params)
    if issue[:error]
      render json: { error: issue[:error] }, status: :unprocessable_entity
    else
-      Linear::ActivityMessageService.new(
-        conversation: @conversation,
-        action_type: :issue_created,
-        issue_data: { id: issue[:data][:identifier] },
-        user: Current.user
-      ).perform
      render json: issue[:data], status: :ok
    end
  end
@@ -45,34 +38,21 @@ class Api::V1::Accounts::Integrations::LinearController < Api::V1::Accounts::Bas
  def link_issue
    issue_id = permitted_params[:issue_id]
    title = permitted_params[:title]
-    issue = linear_processor_service.link_issue(conversation_link, issue_id, title, Current.user)
+    issue = linear_processor_service.link_issue(conversation_link, issue_id, title)
    if issue[:error]
      render json: { error: issue[:error] }, status: :unprocessable_entity
    else
-      Linear::ActivityMessageService.new(
-        conversation: @conversation,
-        action_type: :issue_linked,
-        issue_data: { id: issue_id },
-        user: Current.user
-      ).perform
      render json: issue[:data], status: :ok
    end
  end

  def unlink_issue
    link_id = permitted_params[:link_id]
-    issue_id = permitted_params[:issue_id]
    issue = linear_processor_service.unlink_issue(link_id)

    if issue[:error]
      render json: { error: issue[:error] }, status: :unprocessable_entity
    else
-      Linear::ActivityMessageService.new(
-        conversation: @conversation,
-        action_type: :issue_unlinked,
-        issue_data: { id: issue_id },
-        user: Current.user
-      ).perform
      render json: issue[:data], status: :ok
    end
  end
@@ -114,22 +94,10 @@ class Api::V1::Accounts::Integrations::LinearController < Api::V1::Accounts::Bas
  end

  def permitted_params
-    params.permit(:team_id, :project_id, :conversation_id, :issue_id, :link_id, :title, :description, :assignee_id, :priority, :state_id,
-                  label_ids: [])
+    params.permit(:team_id, :project_id, :conversation_id, :issue_id, :link_id, :title, :description, :assignee_id, :priority, label_ids: [])
  end

  def fetch_hook
    @hook = Integrations::Hook.where(account: Current.account).find_by(app_id: 'linear')
  end
-
-  def revoke_linear_token
-    return unless @hook&.access_token
-
-    begin
-      linear_client = Linear.new(@hook.access_token)
-      linear_client.revoke_token
-    rescue StandardError => e
-      Rails.logger.error "Failed to revoke Linear token: #{e.message}"
-    end
-  end
 end
@@ -1,14 +0,0 @@
-class Api::V1::Accounts::Integrations::NotionController < Api::V1::Accounts::BaseController
-  before_action :fetch_hook, only: [:destroy]
-
-  def destroy
-    @hook.destroy!
-    head :ok
-  end
-
-  private
-
-  def fetch_hook
-    @hook = Integrations::Hook.where(account: Current.account).find_by(app_id: 'notion')
-  end
-end
@@ -1,19 +1,28 @@
-class Api::V1::Accounts::Microsoft::AuthorizationsController < Api::V1::Accounts::OauthAuthorizationController
+class Api::V1::Accounts::Microsoft::AuthorizationsController < Api::V1::Accounts::BaseController
  include MicrosoftConcern
+  before_action :check_authorization

  def create
+    email = params[:authorization][:email]
    redirect_url = microsoft_client.auth_code.authorize_url(
      {
        redirect_uri: "#{base_url}/microsoft/callback",
-        scope: scope,
-        state: state,
+        scope: 'offline_access https://outlook.office.com/IMAP.AccessAsUser.All https://outlook.office.com/SMTP.Send openid profile',
        prompt: 'consent'
      }
    )
    if redirect_url
+      cache_key = "microsoft::#{email.downcase}"
+      ::Redis::Alfred.setex(cache_key, Current.account.id, 5.minutes)
      render json: { success: true, url: redirect_url }
    else
      render json: { success: false }, status: :unprocessable_entity
    end
  end
+
+  private
+
+  def check_authorization
+    raise Pundit::NotAuthorizedError unless Current.account_user.administrator?
+  end
 end
@@ -1,21 +0,0 @@
-class Api::V1::Accounts::Notion::AuthorizationsController < Api::V1::Accounts::OauthAuthorizationController
-  include NotionConcern
-
-  def create
-    redirect_url = notion_client.auth_code.authorize_url(
-      {
-        redirect_uri: "#{base_url}/notion/callback",
-        response_type: 'code',
-        owner: 'user',
-        state: state,
-        client_id: GlobalConfigService.load('NOTION_CLIENT_ID', nil)
-      }
-    )
-
-    if redirect_url
-      render json: { success: true, url: redirect_url }
-    else
-      render json: { success: false }, status: :unprocessable_entity
-    end
-  end
-end
@@ -1,23 +0,0 @@
-class Api::V1::Accounts::OauthAuthorizationController < Api::V1::Accounts::BaseController
-  before_action :check_authorization
-
-  protected
-
-  def scope
-    ''
-  end
-
-  def state
-    Current.account.to_sgid(expires_in: 15.minutes).to_s
-  end
-
-  def base_url
-    ENV.fetch('FRONTEND_URL', 'http://localhost:3000')
-  end
-
-  private
-
-  def check_authorization
-    raise Pundit::NotAuthorizedError unless Current.account_user.administrator?
-  end
-end
@@ -9,6 +9,11 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
    @portals = Current.account.portals
  end

+  def add_members
+    agents = Current.account.agents.where(id: portal_member_params[:member_ids])
+    @portal.members << agents
+  end
+
  def show
    @all_articles = @portal.articles
    @articles = @all_articles.search(locale: params[:locale])
@@ -80,6 +85,10 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
    { channel_web_widget_id: inbox.channel.id }
  end

+  def portal_member_params
+    params.require(:portal).permit(:account_id, member_ids: [])
+  end
+
  def set_current_page
    @current_page = params[:page] || 1
  end
@@ -15,10 +15,6 @@ class Api::V1::Accounts::SearchController < Api::V1::Accounts::BaseController
    @result = search('Message')
  end

-  def articles
-    @result = search('Article')
-  end
-
  private

  def search(search_type)
@@ -1,80 +0,0 @@
-class Api::V1::Accounts::Voice::TokensController < Api::V1::Accounts::BaseController
-  before_action :set_voice_inbox
-
-  def create
-    render json: build_response
-  rescue StandardError => e
-    Rails.logger.error("Voice::TokensController#create: #{e.class} - #{e.message}\n#{e.backtrace.first(5).join("\n")}")
-    render json: { error: 'Failed to generate token', details: e.message }, status: :internal_server_error
-  end
-
-  private
-
-  def build_response
-    {
-      token:          twilio_token.to_jwt,
-      identity:       client_identity,
-      voice_enabled:  true,
-      account_sid:    twilio_config[:account_sid],
-      agent_id:       Current.user.id,
-      account_id:     Current.account.id,
-      inbox_id:       @voice_inbox.id,
-      phone_number:   twilio_config[:phone_number],
-      twiml_endpoint: twilio_config[:twiml_url],
-      has_twiml_app:  twilio_config[:outgoing_app_sid].present?
-    }
-  end
-
-  def twilio_token
-    Twilio::JWT::AccessToken.new(
-      *twilio_credentials,
-      identity: client_identity,
-      ttl: 1.hour.to_i
-    ).tap { |t| t.add_grant(voice_grant) }
-  end
-
-  def twilio_credentials
-    twilio_config.values_at(:account_sid, :api_key_sid, :api_key_secret)
-  end
-
-  def voice_grant
-    Twilio::JWT::AccessToken::VoiceGrant.new.tap do |grant|
-      grant.incoming_allow = true
-      grant.outgoing_application_sid    = twilio_config[:outgoing_app_sid]
-      grant.outgoing_application_params = outgoing_params
-    end
-  end
-
-  def outgoing_params
-    {
-      account_id:  Current.account.id,
-      agent_id:    Current.user.id,
-      identity:    client_identity,
-      client_name: client_identity,
-      accountSid:  twilio_config[:account_sid],
-      is_agent:    'true'
-    }
-  end
-
-  def twilio_config
-    @twilio_config ||= begin
-      cfg = @voice_inbox.channel.provider_config_hash || {}
-      {
-        account_sid:      cfg['account_sid'],
-        api_key_sid:      cfg['api_key_sid'],
-        api_key_secret:   cfg['api_key_secret'],
-        outgoing_app_sid: cfg['outgoing_application_sid'],
-        phone_number:     @voice_inbox.channel.phone_number,
-        twiml_url:        "#{ENV.fetch('FRONTEND_URL', '')}/api/v1/accounts/#{Current.account.id}/voice/twiml_for_client"
-      }.with_indifferent_access.merge(client_identity:)
-    end
-  end
-
-  def client_identity
-    @client_identity ||= "agent-#{Current.user.id}-account-#{Current.account.id}"
-  end
-
-  def set_voice_inbox
-    @voice_inbox = Current.account.inboxes.find(params[:inbox_id])
-  end
-end
@@ -1,230 +0,0 @@
-require 'twilio-ruby'
-
-class Api::V1::Accounts::VoiceController < Api::V1::Accounts::BaseController
-  before_action :fetch_conversation, only: %i[end_call join_call reject_call]
-  skip_before_action :authenticate_user!, only: :twiml_for_client
-  protect_from_forgery with: :null_session, only: :twiml_for_client
-
-  before_action :render_options, if: -> { request.options? }
-  after_action  :set_cors_headers, if: -> { action_name == 'twiml_for_client' }
-
-  # ---------- PUBLIC ACTIONS --------------------------------------------------
-
-  def end_call
-    call_sid = params[:call_sid] || convo_attr('call_sid')
-    return render_not_found('active call') unless call_sid
-
-    twilio_client.calls(call_sid).update(status: 'completed') if in_progress?(call_sid)
-
-    Voice::CallStatus::Manager.new(conversation: @conversation,
-                                   call_sid:    call_sid,
-                                   provider:    :twilio)
-                              .process_status_update('completed', nil, false, "Call ended by #{current_user.name}")
-
-    broadcast_status(call_sid, 'completed')
-    render_success('Call successfully ended')
-  rescue StandardError => e
-    render_error("Failed to end call: #{e.message}")
-  end
-
-  def join_call
-    call_sid = params[:call_sid] || convo_attr('call_sid')
-    outbound  = convo_attr('requires_agent_join') == true
-
-    return render_not_found('active call') unless call_sid || outbound
-
-    conference_sid = convo_attr('conference_sid') || create_conference_sid!
-    update_join_metadata!(call_sid)
-    broadcast_status(call_sid, 'in-progress')
-
-    render json: {
-      status:         'success',
-      message:        'Agent joining call via WebRTC',
-      conference_sid: conference_sid,
-      using_webrtc:   true,
-      conversation_id: @conversation.display_id,
-      account_id:     Current.account.id
-    }
-  rescue StandardError => e
-    render_error("Failed to join call: #{e.message}")
-  end
-
-  def reject_call
-    call_sid = params[:call_sid] || convo_attr('call_sid')
-    return render_not_found('active call') unless call_sid
-
-    @conversation.update!(additional_attributes: convo_attrs.merge(
-      'agent_rejected' => true,
-      'rejected_at'    => Time.current.to_i,
-      'rejected_by'    => user_meta
-    ))
-
-    Voice::CallStatus::Manager.new(conversation: @conversation,
-                                   call_sid:    call_sid,
-                                   provider:    :twilio)
-                              .create_activity_message("#{current_user.name} declined to answer",
-                                                       rejected_by: current_user.name,
-                                                       rejected_at: Time.current.to_i)
-
-    render_success('Call rejected by agent')
-  end
-
-  def call_status
-    call_sid = params[:call_sid]
-    return render_not_found('active call') unless call_sid
-
-    call = twilio_client.calls(call_sid).fetch
-    render json: call.slice(:status, :duration, :direction, :from, :to, :start_time, :end_time)
-  rescue StandardError => e
-    render_error("Failed to fetch call status: #{e.message}")
-  end
-
-  # TwiML for agent WebRTC dial‑in
-  def twiml_for_client
-    to          = params[:To] || params[:to]
-    return render_twiml_error('Missing conference ID parameter') if to.blank?
-
-    render xml: build_twiml(to), content_type: 'text/xml'
-  rescue StandardError => e
-    render_twiml_error(e.message)
-  end
-
-  # ---------- PRIVATE ---------------------------------------------------------
-
-  private
-
-  # ---- Helpers ---------------------------------------------------------------
-
-  def render_options
-    head :ok
-  end
-
-  def set_cors_headers
-    headers['Content-Type']                 ||= 'text/xml; charset=utf-8'
-    headers['Access-Control-Allow-Origin']   = '*'
-    headers['Access-Control-Allow-Methods']  = 'POST, GET, OPTIONS'
-    headers['Access-Control-Allow-Headers']  = 'Content-Type, X-Twilio-Signature'
-    headers['Access-Control-Max-Age']        = '86400'
-  end
-
-  def render_success(msg) = render json: { status: 'success', message: msg }
-  def render_not_found(resource) = render json: { error: "No #{resource} found" }, status: :not_found
-  def render_error(msg) = render json: { error: msg }, status: :internal_server_error
-
-  def fetch_conversation
-    @conversation = Current.account.conversations.find_by(display_id: params[:conversation_id])
-  end
-
-  def twilio_client
-    @twilio_client ||= begin
-      cfg = @conversation.inbox.channel.provider_config_hash
-      Twilio::REST::Client.new(cfg['account_sid'], cfg['auth_token'])
-    end
-  end
-
-  def in_progress?(call_sid)
-    %w[in-progress ringing].include?(twilio_client.calls(call_sid).fetch.status)
-  end
-
-  def convo_attrs
-    @conversation.additional_attributes || {}
-  end
-
-  def convo_attr(key)
-    convo_attrs[key]
-  end
-
-  def user_meta
-    { id: current_user.id, name: current_user.name }
-  end
-
-  def create_conference_sid!
-    sid = "conf_account_#{Current.account.id}_conv_#{@conversation.display_id}"
-    @conversation.update!(additional_attributes: convo_attrs.merge('conference_sid' => sid))
-    sid
-  end
-
-  def update_join_metadata!(call_sid)
-    @conversation.update!(additional_attributes: convo_attrs.merge(
-      'agent_joined' => true,
-      'joined_at'    => Time.current.to_i,
-      'joined_by'    => user_meta,
-      'call_status'  => 'in-progress'
-    ))
-
-    Voice::CallStatus::Manager.new(conversation: @conversation,
-                                   call_sid:    call_sid,
-                                   provider:    :twilio)
-                              .process_status_update('in-progress', nil, false, "#{current_user.name} joined the call")
-  end
-
-  def broadcast_status(call_sid, status)
-    ActionCable.server.broadcast "account_#{@conversation.account_id}", {
-      event_name: 'call_status_changed',
-      data: {
-        call_sid:        call_sid,
-        status:          status,
-        conversation_id: @conversation.display_id,
-        inbox_id:        @conversation.inbox_id,
-        timestamp:       Time.current.to_i
-      }
-    }
-  end
-
-  # ---- TwiML -----------------------------------------------------------------
-
-  def build_twiml(conference_name)
-    # For agent legs, we need to add transcription too
-    account_id = params[:account_id] || Current.account&.id
-    agent_id = params[:agent_id] || current_user&.id
-    transcription_url = "#{base_url}/twilio/transcription_callback?account_id=#{account_id}&conference_sid=#{conference_name}&speaker_type=agent&agent_id=#{agent_id}"
-
-    Twilio::TwiML::VoiceResponse.new do |r|
-      # Add transcription for the agent leg too
-      r.start do |start|
-        start.transcription(
-          status_callback_url: transcription_url,
-          status_callback_method: 'POST',
-          track: 'inbound_track', # Use inbound_track consistently for conference calls
-          language_code: 'en-US'
-        )
-      end
-
-      r.dial do |dial|
-        dial.conference(
-          conference_name,
-          startConferenceOnEnter: true,
-          endConferenceOnExit:    true,
-          muted:                  false,
-          beep:                   false,
-          waitUrl:                '',
-          earlyMedia:             true,
-          statusCallback:         conference_callback_url,
-          statusCallbackEvent:    'start end join leave',
-          statusCallbackMethod:   'POST',
-          participantLabel:       "agent-#{params[:agent_id] || current_user&.id}"
-        )
-      end
-    end.to_s
-  end
-
-  def conference_callback_url
-    account_id = params[:account_id] || Current.account&.id
-    "#{base_url.chomp('/')}/api/v1/accounts/#{account_id}/channels/voice/webhooks/conference_status"
-  end
-
-  def base_url
-    ENV.fetch('FRONTEND_URL', '')
-  end
-
-  # ---- TwiML Error -----------------------------------------------------------
-
-  def render_twiml_error(message)
-    response = Twilio::TwiML::VoiceResponse.new do |r|
-      r.say(message: "Error: #{message}")
-      r.hangup
-    end
-    set_cors_headers
-    render xml: response.to_s, content_type: 'text/xml'
-  end
-end
@@ -44,9 +44,8 @@ class Api::V1::AccountsController < Api::BaseController
  end

  def update
-    @account.assign_attributes(account_params.slice(:name, :locale, :domain, :support_email))
+    @account.assign_attributes(account_params.slice(:name, :locale, :domain, :support_email, :auto_resolve_duration))
    @account.custom_attributes.merge!(custom_attributes_params)
-    @account.settings.merge!(settings_params)
    @account.custom_attributes['onboarding_step'] = 'invite_team' if @account.custom_attributes['onboarding_step'] == 'account_update'
    @account.save!
  end
@@ -84,17 +83,13 @@ class Api::V1::AccountsController < Api::BaseController
  end

  def account_params
-    params.permit(:account_name, :email, :name, :password, :locale, :domain, :support_email, :user_full_name)
+    params.permit(:account_name, :email, :name, :password, :locale, :domain, :support_email, :auto_resolve_duration, :user_full_name)
  end

  def custom_attributes_params
    params.permit(:industry, :company_size, :timezone)
  end

-  def settings_params
-    params.permit(:auto_resolve_after, :auto_resolve_message, :auto_resolve_ignore_waiting, :audio_transcriptions, :auto_resolve_label)
-  end
-
  def check_signup_enabled
    raise ActionController::RoutingError, 'Not Found' if GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'false') == 'false'
  end
@@ -38,11 +38,6 @@ class Api::V1::ProfilesController < Api::BaseController
    head :ok
  end

-  def reset_access_token
-    @user.access_token.regenerate_token
-    @user.reload
-  end
-
  private

  def set_user
@@ -2,15 +2,10 @@ class Api::V1::Widget::CampaignsController < Api::V1::Widget::BaseController
  skip_before_action :set_contact

  def index
-    account = @web_widget.inbox.account
-    @campaigns = if account.feature_enabled?('campaigns')
-                   @web_widget
-                     .inbox
-                     .campaigns
-                     .where(enabled: true, account_id: account.id)
-                     .includes(:sender)
-                 else
-                   []
-                 end
+    @campaigns = @web_widget
+                 .inbox
+                 .campaigns
+                 .where(enabled: true, account_id: @web_widget.inbox.account_id)
+                 .includes(:sender)
  end
 end
@@ -66,7 +66,9 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
  end

  def check_authorization
-    authorize :report, :view?
+    return if Current.account_user.administrator?
+
+    raise Pundit::NotAuthorizedError
  end

  def common_params
@@ -135,3 +137,5 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
    V2::ReportBuilder.new(Current.account, conversation_params).conversation_metrics
  end
 end
+
+Api::V2::Accounts::ReportsController.prepend_mod_with('Api::V2::Accounts::ReportsController')
@@ -1,6 +1,6 @@
 class Api::V2::Accounts::SummaryReportsController < Api::V1::Accounts::BaseController
  before_action :check_authorization
-  before_action :prepare_builder_params, only: [:agent, :team, :inbox, :label]
+  before_action :prepare_builder_params, only: [:agent, :team, :inbox]

  def agent
    render_report_with(V2::Reports::AgentSummaryBuilder)
@@ -14,10 +14,6 @@ class Api::V2::Accounts::SummaryReportsController < Api::V1::Accounts::BaseContr
    render_report_with(V2::Reports::InboxSummaryBuilder)
  end

-  def label
-    render_report_with(V2::Reports::LabelSummaryBuilder)
-  end
-
  private

  def check_authorization
@@ -54,7 +54,7 @@ class Api::V2::AccountsController < Api::BaseController
  end

  def account_params
-    params.permit(:account_name, :email, :name, :password, :locale, :domain, :support_email, :user_full_name)
+    params.permit(:account_name, :email, :name, :password, :locale, :domain, :support_email, :auto_resolve_duration, :user_full_name)
  end

  def check_signup_enabled
@@ -1,6 +1,6 @@
 module AccessTokenAuthHelper
  BOT_ACCESSIBLE_ENDPOINTS = {
-    'api/v1/accounts/conversations' => %w[toggle_status toggle_priority create update custom_attributes],
+    'api/v1/accounts/conversations' => %w[toggle_status toggle_priority create update],
    'api/v1/accounts/conversations/messages' => ['create'],
    'api/v1/accounts/conversations/assignments' => ['create']
  }.freeze
@@ -14,7 +14,7 @@ module GoogleConcern

  private

-  def scope
-    'email profile https://mail.google.com/'
+  def base_url
+    ENV.fetch('FRONTEND_URL', 'http://localhost:3000')
  end
 end
@@ -1,74 +0,0 @@
-module InstagramConcern
-  extend ActiveSupport::Concern
-
-  def instagram_client
-    ::OAuth2::Client.new(
-      client_id,
-      client_secret,
-      {
-        site: 'https://api.instagram.com',
-        authorize_url: 'https://api.instagram.com/oauth/authorize',
-        token_url: 'https://api.instagram.com/oauth/access_token',
-        auth_scheme: :request_body,
-        token_method: :post
-      }
-    )
-  end
-
-  private
-
-  def client_id
-    GlobalConfigService.load('INSTAGRAM_APP_ID', nil)
-  end
-
-  def client_secret
-    GlobalConfigService.load('INSTAGRAM_APP_SECRET', nil)
-  end
-
-  def exchange_for_long_lived_token(short_lived_token)
-    endpoint = 'https://graph.instagram.com/access_token'
-    params = {
-      grant_type: 'ig_exchange_token',
-      client_secret: client_secret,
-      access_token: short_lived_token,
-      client_id: client_id
-    }
-
-    make_api_request(endpoint, params, 'Failed to exchange token')
-  end
-
-  def fetch_instagram_user_details(access_token)
-    endpoint = 'https://graph.instagram.com/v22.0/me'
-    params = {
-      fields: 'id,username,user_id,name,profile_picture_url,account_type',
-      access_token: access_token
-    }
-
-    make_api_request(endpoint, params, 'Failed to fetch Instagram user details')
-  end
-
-  def make_api_request(endpoint, params, error_prefix)
-    response = HTTParty.get(
-      endpoint,
-      query: params,
-      headers: { 'Accept' => 'application/json' }
-    )
-
-    unless response.success?
-      Rails.logger.error "#{error_prefix}. Status: #{response.code}, Body: #{response.body}"
-      raise "#{error_prefix}: #{response.body}"
-    end
-
-    begin
-      JSON.parse(response.body)
-    rescue JSON::ParserError => e
-      ChatwootExceptionTracker.new(e).capture_exception
-      Rails.logger.error "Invalid JSON response: #{response.body}"
-      raise e
-    end
-  end
-
-  def base_url
-    ENV.fetch('FRONTEND_URL', 'http://localhost:3000')
-  end
-end
@@ -15,7 +15,7 @@ module MicrosoftConcern

  private

-  def scope
-    'offline_access https://outlook.office.com/IMAP.AccessAsUser.All https://outlook.office.com/SMTP.Send openid profile email'
+  def base_url
+    ENV.fetch('FRONTEND_URL', 'http://localhost:3000')
  end
 end
@@ -1,21 +0,0 @@
-module NotionConcern
-  extend ActiveSupport::Concern
-
-  def notion_client
-    app_id = GlobalConfigService.load('NOTION_CLIENT_ID', nil)
-    app_secret = GlobalConfigService.load('NOTION_CLIENT_SECRET', nil)
-
-    ::OAuth2::Client.new(app_id, app_secret, {
-                           site: 'https://api.notion.com',
-                           authorize_url: 'https://api.notion.com/v1/oauth/authorize',
-                           token_url: 'https://api.notion.com/v1/oauth/token',
-                           auth_scheme: :basic_auth
-                         })
-  end
-
-  private
-
-  def scope
-    ''
-  end
-end
@@ -15,7 +15,7 @@ class DashboardController < ActionController::Base
  private

  def ensure_html_format
-    render json: { error: 'Please use API routes instead of dashboard routes for JSON requests' }, status: :not_acceptable if request.format.json?
+    head :not_acceptable if request.format.json?
  end

  def set_global_config
@@ -36,7 +36,7 @@ class DashboardController < ActionController::Base
      'LOGOUT_REDIRECT_LINK',
      'DISABLE_USER_PROFILE_UPDATE',
      'DEPLOYMENT_ENV',
-      'INSTALLATION_PRICING_PLAN'
+      'CSML_EDITOR_HOST', 'INSTALLATION_PRICING_PLAN'
    ).merge(app_config)
  end

@@ -65,7 +65,6 @@ class DashboardController < ActionController::Base
      VAPID_PUBLIC_KEY: VapidService.public_key,
      ENABLE_ACCOUNT_SIGNUP: GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'false'),
      FB_APP_ID: GlobalConfigService.load('FB_APP_ID', ''),
-      INSTAGRAM_APP_ID: GlobalConfigService.load('INSTAGRAM_APP_ID', ''),
      FACEBOOK_API_VERSION: GlobalConfigService.load('FACEBOOK_API_VERSION', 'v17.0'),
      IS_ENTERPRISE: ChatwootApp.enterprise?,
      AZURE_APP_ID: GlobalConfigService.load('AZURE_APP_ID', ''),
@@ -21,7 +21,7 @@ class DeviseOverrides::OmniauthCallbacksController < DeviseTokenAuth::OmniauthCa

  def sign_up_user
    return redirect_to login_page_url(error: 'no-account-found') unless account_signup_allowed?
-    return redirect_to login_page_url(error: 'business-account-only') unless validate_signup_email_is_business_domain?
+    return redirect_to login_page_url(error: 'business-account-only') unless validate_business_account?

    create_account_for_user
    token = @resource.send(:set_reset_password_token)
@@ -53,11 +53,9 @@ class DeviseOverrides::OmniauthCallbacksController < DeviseTokenAuth::OmniauthCa
    ).first
  end

-  def validate_signup_email_is_business_domain?
-    # return true if the user is a business account, false if it is a blocked domain account
-    Account::SignUpEmailValidationService.new(auth_hash['info']['email']).perform
-  rescue CustomExceptions::Account::InvalidEmail
-    false
+  def validate_business_account?
+    # return true if the user is a business account, false if it is a gmail account
+    auth_hash['info']['email'].exclude?('@gmail.com')
  end

  def create_account_for_user
@@ -1,163 +0,0 @@
-class Instagram::CallbacksController < ApplicationController
-  include InstagramConcern
-  include Instagram::IntegrationHelper
-
-  def show
-    # Check if Instagram redirected with an error (user canceled authorization)
-    # See: https://developers.facebook.com/docs/instagram-platform/instagram-api-with-instagram-login/business-login#canceled-authorization
-    if params[:error].present?
-      handle_authorization_error
-      return
-    end
-
-    process_successful_authorization
-  rescue StandardError => e
-    handle_error(e)
-  end
-
-  private
-
-  # Process the authorization code and create inbox
-  def process_successful_authorization
-    @response = instagram_client.auth_code.get_token(
-      oauth_code,
-      redirect_uri: "#{base_url}/#{provider_name}/callback",
-      grant_type: 'authorization_code'
-    )
-
-    @long_lived_token_response = exchange_for_long_lived_token(@response.token)
-    inbox, already_exists = find_or_create_inbox
-
-    if already_exists
-      redirect_to app_instagram_inbox_settings_url(account_id: account_id, inbox_id: inbox.id)
-    else
-      redirect_to app_instagram_inbox_agents_url(account_id: account_id, inbox_id: inbox.id)
-    end
-  end
-
-  # Handle all errors that might occur during authorization
-  # https://developers.facebook.com/docs/instagram-platform/instagram-api-with-instagram-login/business-login#sample-rejected-response
-  def handle_error(error)
-    Rails.logger.error("Instagram Channel creation Error: #{error.message}")
-    ChatwootExceptionTracker.new(error).capture_exception
-
-    error_info = extract_error_info(error)
-    redirect_to_error_page(error_info)
-  end
-
-  # Extract error details from the exception
-  def extract_error_info(error)
-    if error.is_a?(OAuth2::Error)
-      begin
-        # Instagram returns JSON error response which we parse to extract error details
-        JSON.parse(error.message)
-      rescue JSON::ParseError
-        # Fall back to a generic OAuth error if JSON parsing fails
-        { 'error_type' => 'OAuthException', 'code' => 400, 'error_message' => error.message }
-      end
-    else
-      # For other unexpected errors
-      { 'error_type' => error.class.name, 'code' => 500, 'error_message' => error.message }
-    end
-  end
-
-  # Handles the case when a user denies permissions or cancels the authorization flow
-  # Error parameters are documented at:
-  # https://developers.facebook.com/docs/instagram-platform/instagram-api-with-instagram-login/business-login#canceled-authorization
-  def handle_authorization_error
-    error_info = {
-      'error_type' => params[:error] || 'authorization_error',
-      'code' => 400,
-      'error_message' => params[:error_description] || 'Authorization was denied'
-    }
-
-    Rails.logger.error("Instagram Authorization Error: #{error_info['error_message']}")
-    redirect_to_error_page(error_info)
-  end
-
-  # Centralized method to redirect to error page with appropriate parameters
-  # This ensures consistent error handling across different error scenarios
-  # Frontend will handle the error page based on the error_type
-  def redirect_to_error_page(error_info)
-    redirect_to app_new_instagram_inbox_url(
-      account_id: account_id,
-      error_type: error_info['error_type'],
-      code: error_info['code'],
-      error_message: error_info['error_message']
-    )
-  end
-
-  def find_or_create_inbox
-    user_details = fetch_instagram_user_details(@long_lived_token_response['access_token'])
-    channel_instagram = find_channel_by_instagram_id(user_details['user_id'].to_s)
-    channel_exists = channel_instagram.present?
-
-    if channel_instagram
-      update_channel(channel_instagram, user_details)
-    else
-      channel_instagram = create_channel_with_inbox(user_details)
-    end
-
-    # reauthorize channel, this code path only triggers when instagram auth is successful
-    # reauthorized will also update cache keys for the associated inbox
-    channel_instagram.reauthorized!
-
-    [channel_instagram.inbox, channel_exists]
-  end
-
-  def find_channel_by_instagram_id(instagram_id)
-    Channel::Instagram.find_by(instagram_id: instagram_id, account: account)
-  end
-
-  def update_channel(channel_instagram, user_details)
-    expires_at = Time.current + @long_lived_token_response['expires_in'].seconds
-
-    channel_instagram.update!(
-      access_token: @long_lived_token_response['access_token'],
-      expires_at: expires_at
-    )
-
-    # Update inbox name if username changed
-    channel_instagram.inbox.update!(name: user_details['username'])
-    channel_instagram
-  end
-
-  def create_channel_with_inbox(user_details)
-    ActiveRecord::Base.transaction do
-      expires_at = Time.current + @long_lived_token_response['expires_in'].seconds
-
-      channel_instagram = Channel::Instagram.create!(
-        access_token: @long_lived_token_response['access_token'],
-        instagram_id: user_details['user_id'].to_s,
-        account: account,
-        expires_at: expires_at
-      )
-
-      account.inboxes.create!(
-        account: account,
-        channel: channel_instagram,
-        name: user_details['username']
-      )
-
-      channel_instagram
-    end
-  end
-
-  def account_id
-    return unless params[:state]
-
-    verify_instagram_token(params[:state])
-  end
-
-  def oauth_code
-    params[:code]
-  end
-
-  def account
-    @account ||= Account.find(account_id)
-  end
-
-  def provider_name
-    'instagram'
-  end
-end
@@ -1,36 +0,0 @@
-class Notion::CallbacksController < OauthCallbackController
-  include NotionConcern
-
-  private
-
-  def provider_name
-    'notion'
-  end
-
-  def oauth_client
-    notion_client
-  end
-
-  def handle_response
-    hook = account.hooks.new(
-      access_token: parsed_body['access_token'],
-      status: 'enabled',
-      app_id: 'notion',
-      settings: {
-        token_type: parsed_body['token_type'],
-        workspace_name: parsed_body['workspace_name'],
-        workspace_id: parsed_body['workspace_id'],
-        workspace_icon: parsed_body['workspace_icon'],
-        bot_id: parsed_body['bot_id'],
-        owner: parsed_body['owner']
-      }
-    )
-
-    hook.save!
-    redirect_to notion_redirect_uri
-  end
-
-  def notion_redirect_uri
-    "#{ENV.fetch('FRONTEND_URL', nil)}/app/accounts/#{account.id}/settings/integrations/notion"
-  end
-end
@@ -6,6 +6,7 @@ class OauthCallbackController < ApplicationController
    )

    handle_response
+    ::Redis::Alfred.delete(cache_key)
  rescue StandardError => e
    ChatwootExceptionTracker.new(e).capture_exception
    redirect_to '/'
@@ -63,10 +64,13 @@ class OauthCallbackController < ApplicationController
    raise NotImplementedError
  end

+  def cache_key
+    "#{provider_name}::#{users_data['email'].downcase}"
+  end
+
  def create_channel_with_inbox
    ActiveRecord::Base.transaction do
      channel_email = Channel::Email.create!(email: users_data['email'], account: account)
-
      account.inboxes.create!(
        account: account,
        channel: channel_email,
@@ -81,17 +85,12 @@ class OauthCallbackController < ApplicationController
    decoded_token[0]
  end

-  def account_from_signed_id
-    raise ActionController::BadRequest, 'Missing state variable' if params[:state].blank?
-
-    account = GlobalID::Locator.locate_signed(params[:state])
-    raise 'Invalid or expired state' if account.nil?
-
-    account
+  def account_id
+    ::Redis::Alfred.get(cache_key)
  end

  def account
-    @account ||= account_from_signed_id
+    @account ||= Account.find(account_id)
  end

  # Fallback name, for when name field is missing from users_data
@@ -1,9 +1,9 @@
 class Platform::Api::V1::UsersController < PlatformController
  # ref: https://stackoverflow.com/a/45190318/939299
  # set resource is called for other actions already in platform controller
-  # we want to add login and token to that chain as well
-  before_action(only: [:login, :token]) { set_resource }
-  before_action(only: [:login, :token]) { validate_platform_app_permissible }
+  # we want to add login to that chain as well
+  before_action(only: [:login]) { set_resource }
+  before_action(only: [:login]) { validate_platform_app_permissible }

  def show; end

@@ -18,8 +18,6 @@ class Platform::Api::V1::UsersController < PlatformController
    render json: { url: @resource.generate_sso_link }
  end

-  def token; end
-
  def update
    @resource.assign_attributes(user_update_params)

@@ -1,40 +1,19 @@
 class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::BaseController
  before_action :ensure_custom_domain_request, only: [:show, :index]
  before_action :portal
-  before_action :set_category, except: [:index, :show, :tracking_pixel]
+  before_action :set_category, except: [:index, :show]
  before_action :set_article, only: [:show]
  layout 'portal'

  def index
    @articles = @portal.articles.published.includes(:category, :author)
-
-    @articles = @articles.where(locale: permitted_params[:locale]) if permitted_params[:locale].present?
-
    @articles_count = @articles.count
-
    search_articles
    order_by_sort_param
    limit_results
  end

-  def show
-    @og_image_url = helpers.set_og_image_url(@portal.name, @article.title)
-  end
-
-  def tracking_pixel
-    @article = @portal.articles.find_by(slug: permitted_params[:article_slug])
-    return head :not_found unless @article
-
-    @article.increment_view_count if @article.published?
-
-    # Serve the 1x1 tracking pixel with 24-hour private cache
-    # Private cache bypasses CDN but allows browser caching to prevent duplicate views from same user
-    expires_in 24.hours, public: false
-    response.headers['Content-Type'] = 'image/png'
-
-    pixel_path = Rails.public_path.join('assets/images/tracking-pixel.png')
-    send_file pixel_path, type: 'image/png', disposition: 'inline'
-  end
+  def show; end

  private

@@ -60,6 +39,7 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B

  def set_article
    @article = @portal.articles.find_by(slug: permitted_params[:article_slug])
+    @article.increment_view_count if @article.published?
    @parsed_content = render_article_content(@article.content)
  end

@@ -8,9 +8,7 @@ class Public::Api::V1::Portals::CategoriesController < Public::Api::V1::Portals:
    @categories = @portal.categories.order(position: :asc)
  end

-  def show
-    @og_image_url = helpers.set_og_image_url(@portal.name, @category.name)
-  end
+  def show; end

  private

@@ -4,9 +4,7 @@ class Public::Api::V1::PortalsController < Public::Api::V1::Portals::BaseControl
  before_action :redirect_to_portal_with_locale, only: [:show]
  layout 'portal'

-  def show
-    @og_image_url = helpers.set_og_image_url('', @portal.header_text)
-  end
+  def show; end

  def sitemap
    @help_center_url = @portal.custom_domain || ChatwootApp.help_center_root
@@ -2,13 +2,6 @@ class SuperAdmin::AccountUsersController < SuperAdmin::ApplicationController
  # Overwrite any of the RESTful controller actions to implement custom behavior
  # For example, you may want to send an email after a foo is updated.
  #
-
-  # Since account/user page - account user role attribute links to the show page
-  # Handle with a redirect to the user show page
-  def show
-    redirect_to super_admin_user_path(requested_resource.user)
-  end
-
  def create
    resource = resource_class.new(resource_params)
    authorize_resource(resource)
@@ -66,5 +66,3 @@ class SuperAdmin::AccountsController < SuperAdmin::ApplicationController
    # rubocop:enable Rails/I18nLocaleTexts
  end
 end
-
-SuperAdmin::AccountsController.prepend_mod_with('SuperAdmin::AccountsController')
@@ -32,18 +32,20 @@ class SuperAdmin::AppConfigsController < SuperAdmin::ApplicationController
  end

  def allowed_configs
-    mapping = {
-      'facebook' => %w[FB_APP_ID FB_VERIFY_TOKEN FB_APP_SECRET IG_VERIFY_TOKEN FACEBOOK_API_VERSION ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT],
-      'shopify' => %w[SHOPIFY_CLIENT_ID SHOPIFY_CLIENT_SECRET],
-      'microsoft' => %w[AZURE_APP_ID AZURE_APP_SECRET],
-      'email' => ['MAILER_INBOUND_EMAIL_DOMAIN'],
-      'linear' => %w[LINEAR_CLIENT_ID LINEAR_CLIENT_SECRET],
-      'slack' => %w[SLACK_CLIENT_ID SLACK_CLIENT_SECRET],
-      'notion' => %w[NOTION_CLIENT_ID NOTION_CLIENT_SECRET],
-      'instagram' => %w[INSTAGRAM_APP_ID INSTAGRAM_APP_SECRET INSTAGRAM_VERIFY_TOKEN INSTAGRAM_API_VERSION ENABLE_INSTAGRAM_CHANNEL_HUMAN_AGENT]
-    }
-
-    @allowed_configs = mapping.fetch(@config, %w[ENABLE_ACCOUNT_SIGNUP FIREBASE_PROJECT_ID FIREBASE_CREDENTIALS])
+    @allowed_configs = case @config
+                       when 'facebook'
+                         %w[FB_APP_ID FB_VERIFY_TOKEN FB_APP_SECRET IG_VERIFY_TOKEN FACEBOOK_API_VERSION ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT]
+                       when 'shopify'
+                         %w[SHOPIFY_CLIENT_ID SHOPIFY_CLIENT_SECRET]
+                       when 'microsoft'
+                         %w[AZURE_APP_ID AZURE_APP_SECRET]
+                       when 'email'
+                         ['MAILER_INBOUND_EMAIL_DOMAIN']
+                       when 'linear'
+                         %w[LINEAR_CLIENT_ID LINEAR_CLIENT_SECRET]
+                       else
+                         %w[ENABLE_ACCOUNT_SIGNUP FIREBASE_PROJECT_ID FIREBASE_CREDENTIALS]
+                       end
  end
 end

@@ -24,13 +24,9 @@ class Twilio::CallbackController < ApplicationController
      :Body,
      :ToCountry,
      :FromState,
-      *Array.new(10) { |i| :"MediaUrl#{i}" },
-      *Array.new(10) { |i| :"MediaContentType#{i}" },
-      :MessagingServiceSid,
-      :NumMedia,
-      :Latitude,
-      :Longitude,
-      :MessageType
+      :MediaUrl0,
+      :MediaContentType0,
+      :MessagingServiceSid
    )
  end
 end
@@ -1,81 +0,0 @@
-# frozen_string_literal: true
-
-class Twilio::RecordingController < ActionController::Base
-  skip_forgery_protection
-
-  # POST /twilio/recording_callback
-  # This endpoint is called by Twilio when a call recording is available
-  def recording_callback
-    conference_sid = params['conference_sid']
-    call_sid = params['CallSid']
-    recording_url = params['RecordingUrl']
-    recording_sid = params['RecordingSid']
-    account_id = params['account_id']
-    Rails.logger.info("[Twilio::RecordingController] Incoming recording_callback with params: #{params.inspect}")
-    unless recording_url && account_id && (conference_sid || call_sid)
-      Rails.logger.warn("[Twilio::RecordingController] Missing required params. recording_url: #{recording_url}, account_id: #{account_id}, conference_sid: #{conference_sid}, call_sid: #{call_sid}")
-      return head :bad_request
-    end
-
-    # Find the account
-    account = Account.find_by(id: account_id)
-    unless account
-      Rails.logger.warn("[Twilio::RecordingController] Account not found for id: #{account_id}")
-      return head :not_found
-    end
-
-    # Prefer lookup by conference_sid (most robust for conference recordings)
-    conversation = if conference_sid
-      account.conversations.find_by("additional_attributes ->> 'conference_sid' = ?", conference_sid)
-    elsif call_sid
-      account.conversations.find_by("additional_attributes ->> 'call_sid' = ?", call_sid)
-    end
-    unless conversation
-      Rails.logger.warn("[Twilio::RecordingController] Conversation not found for conference_sid: #{conference_sid} or call_sid: #{call_sid}")
-      return head :not_found
-    end
-
-    # Find the original voice call message (should be unique per conference)
-    message = conversation.messages.voice_call.order(:created_at).first
-    unless message
-      Rails.logger.warn("[Twilio::RecordingController] No voice_call message found in conversation_id: #{conversation.id}")
-      return head :not_found
-    end
-
-    # Download the recording from Twilio
-    begin
-      Rails.logger.info("[Twilio::RecordingController] Downloading recording from: #{recording_url}.mp3")
-      file = URI.open(recording_url + '.mp3')
-    rescue => e
-      Rails.logger.error("[Twilio::RecordingController] Failed to download recording: #{e.message}")
-      return head :internal_server_error
-    end
-
-    # Attach the audio file to the message as an audio attachment
-    begin
-      att = message.attachments.create!(
-        account_id: account.id,
-        file: {
-          io: file,
-          filename: "twilio_recording_#{recording_sid}.mp3",
-          content_type: 'audio/mpeg'
-        },
-        file_type: :audio,
-        external_url: recording_url + '.mp3',
-        meta: { recording_sid: recording_sid, conference_sid: conference_sid, call_sid: call_sid }
-      )
-      Rails.logger.info("[Twilio::RecordingController] Successfully attached recording to message_id: #{message.id}, attachment_id: #{att.id}")
-    rescue => e
-      Rails.logger.error("[Twilio::RecordingController] Failed to attach recording: #{e.message}")
-      return head :internal_server_error
-    end
-
-    # Optionally, update message content_attributes to indicate recording is attached
-    content_attributes = message.content_attributes || {}
-    content_attributes['recording_attached'] = true
-    content_attributes['conference_sid'] = conference_sid if conference_sid
-    message.update!(content_attributes: content_attributes)
-
-    head :ok
-  end
-end
@@ -1,62 +0,0 @@
-class Twilio::TranscriptionController < ActionController::Base
-  skip_forgery_protection
-
-  # Receives real-time transcription updates from Twilio
-  def transcription_callback
-    # Set Current.account
-    Current.account = Account.find_by(id: params[:account_id])
-    
-    # Only process transcription content events
-    if params['TranscriptionEvent'] == 'transcription-content'
-      process_transcription_content
-    end
-
-    head :ok
-  end
-
-  private
-
-  def process_transcription_content
-    # Extract transcript content from JSON
-    data = JSON.parse(params['TranscriptionData'])
-    transcript_content = data['transcript']
-    confidence = data['confidence']
-  
-    
-    # Find conversation by conference_sid from our standard format
-    display_id = params[:conference_sid].match(/^conf_account_\d+_conv_(\d+)$/)[1]
-    conversation = Current.account.conversations.find_by(display_id: display_id)
-    
-    # Create message based on speaker_type
-    create_message(conversation, transcript_content, confidence)
-  end
-  
-  def create_message(conversation, content, confidence)
-    if params[:speaker_type] == 'contact'
-      # Contact message (incoming)
-      sender = conversation.contact
-      message_type = :incoming
-    else
-      # Agent message (outgoing)
-      sender = User.find_by(id: params[:agent_id])
-      message_type = :outgoing
-    end
-    
-    # Create the message
-    Messages::MessageBuilder.new(
-      sender,
-      conversation,
-      content: content,
-      message_type: message_type,
-      private: false,
-      additional_attributes: {
-        transcription: true,
-        call_sid: params['CallSid'],
-        conference_sid: params[:conference_sid],
-        speaker_type: params[:speaker_type],
-        confidence: confidence,
-        track: params['Track']
-      }
-    ).perform
-  end
-end
@@ -1,189 +0,0 @@
-class Twilio::VoiceController < ActionController::Base
-  skip_forgery_protection
-
-  before_action :set_call_details, only: %i[status_callback simple_twiml]
-  before_action :set_inbox,        only: %i[status_callback simple_twiml]
-
- 
-  def status_callback
-    return head :ok unless @inbox
-
-    conversation = Voice::ConversationFinderService.new(
-      account:      @inbox.account,
-      call_sid:     @call_sid,
-      phone_number: incoming_number,
-      is_outbound:  outbound?,
-      inbox:        @inbox
-    ).perform
-
-    Voice::CallStatus::Manager.new(
-      conversation: conversation,
-      call_sid:     @call_sid,
-      provider:     :twilio
-    ).process_status_update(params[:CallStatus], params[:CallDuration]&.to_i, first_status_response?)
-
-    head :ok
-  end
-
-  def simple_twiml
-    return fallback_twiml unless @inbox
-
-    conversation = Voice::ConversationFinderService.new(
-      account:      @inbox.account,
-      call_sid:     @call_sid,
-      phone_number: incoming_number,
-      is_outbound:  outbound?,
-      inbox:        @inbox
-    ).perform
-
-    Voice::CallStatus::Manager.new(
-      conversation: conversation,
-      call_sid:     @call_sid,
-      provider:     :twilio
-    ).process_status_update('in-progress', nil, true)
-
-    conference_name = ensure_conference_name(conversation, params[:conference_name])
-
-    conversation.update!(
-      additional_attributes: conversation.additional_attributes.merge(
-        'conference_sid'       => conference_name,
-        'call_direction'       => outbound? ? 'outbound' : 'inbound',
-        'requires_agent_join'  => true
-      )
-    )
-
-    render_twiml do |r|
-      r.say(message: 'Please wait while we connect you to an agent')
-
-      # Enable real-time transcription for this call leg
-      # For outbound calls, we're connecting to the contact, so this track is for the contact
-      contact_id = conversation.contact_id
-      callback_url = "#{base_url}/twilio/transcription_callback?account_id=#{@inbox.account_id}&conference_sid=#{conference_name}&speaker_type=contact&contact_id=#{contact_id}"
-      Rails.logger.info("📞 VoiceController: Setting transcription callback to: #{callback_url}")
-
-      r.start do |start|
-        start.transcription(
-          status_callback_url: callback_url,
-          status_callback_method: 'POST',
-          track: 'inbound_track',
-          language_code: 'en-US'
-        )
-      end
-
-      # Set up the conference
-      conference_callback_url = "#{base_url}/api/v1/accounts/#{@inbox.account_id}/channels/voice/webhooks/conference_status"
-      Rails.logger.info("📞 VoiceController: Setting conference callback to: #{conference_callback_url}")
-
-      r.dial do |d|
-        d.conference(
-          conference_name,
-          startConferenceOnEnter: false,
-          endConferenceOnExit:    true,
-          beep:                   false,
-          muted:                  false,
-          waitUrl:                '',
-          earlyMedia:             true,
-          statusCallback:         conference_callback_url,
-          statusCallbackMethod:   'POST',
-          statusCallbackEvent:    'start end join leave',
-          participantLabel:       "caller-#{@call_sid.last(8)}",
-          record:                 'record-from-start',
-          recording_status_callback: "#{base_url}/twilio/recording_callback?account_id=#{@inbox.account_id}&conference_sid=#{conference_name}",
-          recording_status_callback_method: 'POST'
-        )
-      end
-    end
-  rescue StandardError => e
-    Rails.logger.error("Error creating voice conversation: #{e.message}")
-    fallback_twiml
-  end
-
-  private
-
-  def set_call_details
-    @call_sid  = params[:CallSid]
-    @direction = params[:Direction]
-  end
-
-  def set_inbox
-    @inbox = find_inbox(outbound? ? params[:From] : params[:To])
-  end
-
-  def outbound?
-    @direction == 'outbound-api'
-  end
-
-  def incoming_number
-    outbound? ? params[:To] : params[:From]
-  end
-
-  def first_status_response?
-    params[:IsFirstResponseForStatus] == 'true'
-  end
-
-  def render_twiml(status: :ok)
-    response = Twilio::TwiML::VoiceResponse.new
-    yield response
-    render xml: response.to_s, status: status
-  end
-
-  def build_message(conversation, content)
-    Messages::MessageBuilder.new(
-      nil,
-      conversation,
-      content:               content,
-      message_type:          :activity,
-      additional_attributes: { call_sid: @call_sid, call_status: 'in-progress', user_input: true }
-    ).perform
-  end
-
-  def input_text
-    return "Caller pressed #{params[:Digits]}"           if params[:Digits].present?
-    return "Caller said: \"#{params[:SpeechResult]}\""   if params[:SpeechResult].present?
-
-    'Caller responded'
-  end
-
-  def ensure_conference_name(conversation, supplied)
-    name = supplied.presence ||
-           conversation.additional_attributes['conference_sid'] ||
-           conversation.additional_attributes['conference_name']
-
-    return name if name&.match?(/^conf_account_\d+_conv_\d+$/)
-
-    "conf_account_#{@inbox.account_id}_conv_#{conversation.display_id}"
-  end
-
-  def fallback_twiml
-    render_twiml do |r|
-      r.say(message: 'Hello from Chatwoot. This is a courtesy call to check on your recent signup.')
-      r.pause(length: 1)
-      r.say(message: 'We will connect you with an agent shortly.')
-      r.hangup
-    end
-  end
-
-  def base_url
-    ENV.fetch('FRONTEND_URL', 'http://localhost:3000')
-  end
-
-  def find_inbox(phone_number)
-    return nil if phone_number.blank?
-
-    Inbox.joins('INNER JOIN channel_voice ON channel_voice.account_id = inboxes.account_id AND inboxes.channel_id = channel_voice.id')
-         .find_by('channel_voice.phone_number = ?', phone_number)
-  end
-
-  def find_or_create_conversation(inbox, phone_number, call_sid)
-    Voice::ConversationFinderService.new(
-      account:      inbox.account,
-      call_sid:     call_sid,
-      phone_number: phone_number,
-      is_outbound:  false,
-      inbox:        inbox
-    ).perform
-  rescue StandardError => e
-    Rails.logger.error("find_or_create_conversation error: #{e.message}")
-    nil
-  end
-end
@@ -15,9 +15,6 @@ class Webhooks::InstagramController < ActionController::API
  private

  def valid_token?(token)
-    # Validates against both IG_VERIFY_TOKEN (Instagram channel via Facebook page) and
-    # INSTAGRAM_VERIFY_TOKEN (Instagram channel via direct Instagram login)
-    token == GlobalConfigService.load('IG_VERIFY_TOKEN', '') ||
-      token == GlobalConfigService.load('INSTAGRAM_VERIFY_TOKEN', '')
+    token == GlobalConfigService.load('IG_VERIFY_TOKEN', '')
  end
 end
@@ -9,17 +9,10 @@ class AccountDashboard < Administrate::BaseDashboard
  # on pages throughout the dashboard.

  enterprise_attribute_types = if ChatwootApp.enterprise?
-                                 attributes = {
-                                   limits: AccountLimitsField
+                                 {
+                                   limits: Enterprise::AccountLimitsField,
+                                   all_features: Enterprise::AccountFeaturesField
                                 }
-
-                                 # Only show manually managed features in Chatwoot Cloud deployment
-                                 attributes[:manually_managed_features] = ManuallyManagedFeaturesField if ChatwootApp.chatwoot_cloud?
-
-                                 # Add all_features last so it appears after manually_managed_features
-                                 attributes[:all_features] = AccountFeaturesField
-
-                                 attributes
                               else
                                 {}
                               end
@@ -53,14 +46,7 @@ class AccountDashboard < Administrate::BaseDashboard

  # SHOW_PAGE_ATTRIBUTES
  # an array of attributes that will be displayed on the model's show page.
-  enterprise_show_page_attributes = if ChatwootApp.enterprise?
-                                      attrs = %i[custom_attributes limits]
-                                      attrs << :manually_managed_features if ChatwootApp.chatwoot_cloud?
-                                      attrs << :all_features
-                                      attrs
-                                    else
-                                      []
-                                    end
+  enterprise_show_page_attributes = ChatwootApp.enterprise? ? %i[custom_attributes limits all_features] : []
  SHOW_PAGE_ATTRIBUTES = (%i[
    id
    name
@@ -75,14 +61,7 @@ class AccountDashboard < Administrate::BaseDashboard
  # FORM_ATTRIBUTES
  # an array of attributes that will be displayed
  # on the model's form (`new` and `edit`) pages.
-  enterprise_form_attributes = if ChatwootApp.enterprise?
-                                 attrs = %i[limits]
-                                 attrs << :manually_managed_features if ChatwootApp.chatwoot_cloud?
-                                 attrs << :all_features
-                                 attrs
-                               else
-                                 []
-                               end
+  enterprise_form_attributes = ChatwootApp.enterprise? ? %i[limits all_features] : []
  FORM_ATTRIBUTES = (%i[
    name
    locale
@@ -102,8 +81,7 @@ class AccountDashboard < Administrate::BaseDashboard
  COLLECTION_FILTERS = {
    active: ->(resources) { resources.where(status: :active) },
    suspended: ->(resources) { resources.where(status: :suspended) },
-    recent: ->(resources) { resources.where('created_at > ?', 30.days.ago) },
-    marked_for_deletion: ->(resources) { resources.where("custom_attributes->>'marked_for_deletion_at' IS NOT NULL") }
+    recent: ->(resources) { resources.where('created_at > ?', 30.days.ago) }
  }.freeze

  # Overwrite this method to customize how accounts are displayed
@@ -117,11 +95,6 @@ class AccountDashboard < Administrate::BaseDashboard
  # to prevent an error from being raised (wrong number of arguments)
  # Reference: https://github.com/thoughtbot/administrate/pull/2356/files#diff-4e220b661b88f9a19ac527c50d6f1577ef6ab7b0bed2bfdf048e22e6bfa74a05R204
  def permitted_attributes(action)
-    attrs = super + [limits: {}]
-
-    # Add manually_managed_features to permitted attributes only for Chatwoot Cloud
-    attrs << { manually_managed_features: [] } if ChatwootApp.chatwoot_cloud?
-
-    attrs
+    super + [limits: {}]
  end
 end
@@ -15,7 +15,6 @@ class AsyncDispatcher < BaseDispatcher
      CsatSurveyListener.instance,
      HookListener.instance,
      InstallationWebhookListener.instance,
-      MessageListener.instance,
      NotificationListener.instance,
      ParticipationListener.instance,
      ReportingEventListener.instance,
@@ -0,0 +1,7 @@
+require 'administrate/field/base'
+
+class Enterprise::AccountFeaturesField < Administrate::Field::Base
+  def to_s
+    data
+  end
+end
@@ -1,6 +1,6 @@
 require 'administrate/field/base'

-class AccountLimitsField < Administrate::Field::Base
+class Enterprise::AccountLimitsField < Administrate::Field::Base
  def to_s
    data.present? ? data.to_json : { agents: nil, inboxes: nil, captain_responses: nil, captain_documents: nil }.to_json
  end
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .4.4
 .3.3