chore: add logs for debug

feat: Add components to show steps in the copilot thinking process (#11530 )
This PR adds the components for new Copilot UI - Added a Header component - Added a thinking block. - Update the outline on copilot input --------- Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
2025-05-22 10:08:19 +05:30 · 2025-05-22 10:08:19 +05:30 · 2025-05-22 10:08:19 +05:30 · 2025-05-22 10:08:19 +05:30 · 2025-05-22 10:08:19 +05:30 · 2025-05-22 10:08:19 +05:30
2697 changed files with 28657 additions and 122336 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 install "3.3.3"
-            rvm use 3.4.4 --default
+            rvm use 3.3.3 --default
            gem install bundler -v 2.5.16
      - run:
@@ -0,0 +1,62 @@
 version: '2'
 plugins:
  rubocop:
    enabled: false
    channel: rubocop-0-73
  eslint:
    enabled: false
  csslint:
    enabled: true
  scss-lint:
    enabled: true
  brakeman:
    enabled: false
 checks:
  similar-code:
    enabled: false
  method-count:
    enabled: true
    config:
      threshold: 32
  file-lines:
    enabled: true
    config:
      threshold: 300
  method-lines:
    config:
      threshold: 50
 exclude_patterns:
  - 'spec/'
  - '**/specs/**/**'
  - '**/spec/**/**'
  - 'db/*'
  - 'bin/**/*'
  - 'db/**/*'
  - 'config/**/*'
  - 'public/**/*'
  - 'vendor/**/*'
  - 'node_modules/**/*'
  - 'lib/tasks/auto_annotate_models.rake'
  - 'app/test-matchers.js'
  - 'docs/*'
  - '**/*.md'
  - '**/*.yml'
  - 'app/javascript/dashboard/i18n/locale'
  - '**/*.stories.js'
  - 'stories/'
  - 'app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/index.js'
  - 'app/javascript/shared/constants/countries.js'
  - 'app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js'
  - 'app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js'
  - 'app/javascript/dashboard/routes/dashboard/settings/automation/constants.js'
  - 'app/javascript/dashboard/components/widgets/FilterInput/FilterOperatorTypes.js'
  - 'app/javascript/dashboard/routes/dashboard/settings/reports/constants.js'
  - 'app/javascript/dashboard/store/captain/storeFactory.js'
  - 'app/javascript/dashboard/i18n/index.js'
  - 'app/javascript/widget/i18n/index.js'
  - 'app/javascript/survey/i18n/index.js'
  - 'app/javascript/shared/constants/locales.js'
  - 'app/javascript/dashboard/helper/specs/macrosFixtures.js'
  - 'app/javascript/dashboard/routes/dashboard/settings/macros/constants.js'
  - '**/fixtures/**'
  - '**/*/fixtures.js'
@@ -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) \
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && curl -fsSL https://deb.nodesource.com/setup_${NODE_MAJOR}.x | bash - \
+  && apt-get -y install --no-install-recommends \
-    && apt-get update \
+    build-essential \
-    && apt-get -y install --no-install-recommends \
+    libssl-dev \
-        build-essential \
+    zlib1g-dev \
-        libssl-dev \
+    gnupg2 \
-        zlib1g-dev \
+    tar \
-        gnupg \
+    tzdata \
-        tar \
+    postgresql-client \
-        tzdata \
+    libpq-dev \
-        postgresql-client \
+    yarn \
-        libpq-dev \
+    git \
-        git \
+    imagemagick \
-        imagemagick \
+    tmux \
-        libyaml-dev \
+    zsh \
-        curl \
+    git-flow \
-        ca-certificates \
+    npm \
-        tmux \
+    libyaml-dev
        nodejs \
    && apt-get clean \
    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-# Install rbenv and ruby for root user first
+# Install rbenv and ruby
-RUN git clone --depth 1 https://github.com/rbenv/rbenv.git ~/.rbenv \
+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
+# Install overmind
 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
 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 \
+  && sudo mv overmind /usr/local/bin \
-  && chmod +x /usr/local/bin/overmind \
+  && 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 \
+# Install gh
-  && apt-get install -y --no-install-recommends gh \
+RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
-  && apt-get clean \
+   && 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 \
-  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+   && 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
+# set up ruby
-RUN npm install -g pnpm@${PNPM_VERSION} @anthropic-ai/claude-code \
+COPY Gemfile Gemfile.lock ./
-    && npm cache clean --force
+RUN gem install bundler && bundle install
-# Switch to vscode user
+# set up node js
-USER vscode
+RUN npm install n -g && \
-ENV PATH="/home/vscode/.rbenv/bin:/home/vscode/.rbenv/shims:$PATH"
+    n $NODE_VERSION
-
+RUN npm install --global yarn
-# Copy dependency files first for better caching
+RUN yarn
 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
@@ -4,26 +4,17 @@
  "dockerComposeFile": "docker-compose.yml",
  "settings": {
-    "terminal.integrated.shell.linux": "/bin/zsh",
+    "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
    }
  },
  // 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": {
+    "3035": {
-      "label": "Vite Dev Server"
+      "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
+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
-# Setup Claude Code API key if available
+# uncomment the webpacker env variable
-if [ -n "$CLAUDE_CODE_API_KEY" ]; then
+sed -i -e '/WEBPACKER_DEV_SERVER_PUBLIC/s/^# //' .env
-  mkdir -p ~/.claude
+# fix the error with webpacker
-  echo '{"apiKeyHelper": "~/.claude/anthropic_key.sh"}' > ~/.claude/settings.json
+echo 'export NODE_OPTIONS=--openssl-legacy-provider' >> ~/.zshrc
  echo "echo \"$CLAUDE_CODE_API_KEY\"" > ~/.claude/anthropic_key.sh
  chmod +x ~/.claude/anthropic_key.sh
 fi
 # 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
@@ -103,7 +103,6 @@ module.exports = {
          '⌘',
          '📄',
          '🎉',
          '🚀',
          '💬',
          '👥',
          '📥',
@@ -1,28 +0,0 @@
 name: Auto-assign PR to Author
 on:
  pull_request:
    types: [opened]
 jobs:
  auto-assign:
    runs-on: ubuntu-latest
    permissions:
      pull-requests: write
    steps:
      - name: Auto-assign PR to author
        uses: actions/github-script@v7
        with:
          script: |
            const { owner, repo } = context.repo;
            const pull_number = context.payload.pull_request.number;
            const author = context.payload.pull_request.user.login;
            await github.rest.issues.addAssignees({
              owner,
              repo,
              issue_number: pull_number,
              assignees: [author]
            });
            console.log(`Assigned PR #${pull_number} to ${author}`);
@@ -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
@@ -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
@@ -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
@@ -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:
  test:
    runs-on: ubuntu-22.04
@@ -94,4 +94,3 @@ yarn-debug.log*
 .vscode
 .claude/settings.local.json
 .cursor
 CLAUDE.local.md
@@ -1,7 +0,0 @@
 *
 !configs
 !configs/**
 !hooks
 !hooks/**
 !qlty.toml
 !.gitignore
@@ -1,2 +0,0 @@
 ignored:
  - DL3008
@@ -1 +0,0 @@
 source-path=SCRIPTDIR
@@ -1,8 +0,0 @@
 rules:
  document-start: disable
  quoted-strings:
    required: only-when-needed
    extra-allowed: ["{|}"]
  key-duplicates: {}
  octal-values:
    forbid-implicit-octal: true
@@ -1,84 +0,0 @@
 # This file was automatically generated by `qlty init`.
 # You can modify it to suit your needs.
 # We recommend you to commit this file to your repository.
 #
 # This configuration is used by both Qlty CLI and Qlty Cloud.
 #
 #     Qlty CLI -- Code quality toolkit for developers
 #     Qlty Cloud -- Fully automated Code Health Platform
 #
 # Try Qlty Cloud: https://qlty.sh
 #
 # For a guide to configuration, visit https://qlty.sh/d/config
 # Or for a full reference, visit https://qlty.sh/d/qlty-toml
 config_version = "0"
 exclude_patterns = [
  "*_min.*",
  "*-min.*",
  "*.min.*",
  "**/.yarn/**",
  "**/*.d.ts",
  "**/assets/**",
  "**/bower_components/**",
  "**/build/**",
  "**/cache/**",
  "**/config/**",
  "**/db/**",
  "**/deps/**",
  "**/dist/**",
  "**/extern/**",
  "**/external/**",
  "**/generated/**",
  "**/Godeps/**",
  "**/gradlew/**",
  "**/mvnw/**",
  "**/node_modules/**",
  "**/protos/**",
  "**/seed/**",
  "**/target/**",
  "**/templates/**",
  "**/testdata/**",
  "**/vendor/**", "spec/", "**/specs/**/**", "**/spec/**/**", "db/*", "bin/**/*", "db/**/*", "config/**/*", "public/**/*", "vendor/**/*", "node_modules/**/*", "lib/tasks/auto_annotate_models.rake", "app/test-matchers.js", "docs/*", "**/*.md", "**/*.yml", "app/javascript/dashboard/i18n/locale", "**/*.stories.js", "stories/", "app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/index.js", "app/javascript/shared/constants/countries.js", "app/javascript/dashboard/components/widgets/conversation/advancedFilterItems/languages.js", "app/javascript/dashboard/routes/dashboard/contacts/contactFilterItems/index.js", "app/javascript/dashboard/routes/dashboard/settings/automation/constants.js", "app/javascript/dashboard/components/widgets/FilterInput/FilterOperatorTypes.js", "app/javascript/dashboard/routes/dashboard/settings/reports/constants.js", "app/javascript/dashboard/store/captain/storeFactory.js", "app/javascript/dashboard/i18n/index.js", "app/javascript/widget/i18n/index.js", "app/javascript/survey/i18n/index.js", "app/javascript/shared/constants/locales.js", "app/javascript/dashboard/helper/specs/macrosFixtures.js", "app/javascript/dashboard/routes/dashboard/settings/macros/constants.js", "**/fixtures/**", "**/*/fixtures.js",
 ]
 test_patterns = [
  "**/test/**",
  "**/spec/**",
  "**/*.test.*",
  "**/*.spec.*",
  "**/*_test.*",
  "**/*_spec.*",
  "**/test_*.*",
  "**/spec_*.*",
 ]
 [smells]
 mode = "comment"
 [smells.boolean_logic]
 threshold = 4
 [smells.file_complexity]
 threshold = 66
 enabled = true
 [smells.return_statements]
 threshold = 4
 [smells.nested_control_flow]
 threshold = 4
 [smells.function_parameters]
 threshold = 4
 [smells.function_complexity]
 threshold = 5
 [smells.duplication]
 enabled = true
 threshold = 20
 [[source]]
 name = "default"
 default = true
@@ -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: true
 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
@@ -55,21 +55,4 @@
 ## Ruby Best Practices
- Use compact `module/class` definitions; avoid nested styles
+- Use compact `module/class` definitions; avoid nested styles
 ## Enterprise Edition Notes
 - Chatwoot has an Enterprise overlay under `enterprise/` that extends/overrides OSS code.
 - When you add or modify core functionality, always check for corresponding files in `enterprise/` and keep behavior compatible.
 - Follow the Enterprise development practices documented here:
  - https://chatwoot.help/hc/handbook/articles/developing-enterprise-edition-features-38
 Practical checklist for any change impacting core logic or public APIs
 - Search for related files in both trees before editing (e.g., `rg -n "FooService|ControllerName|ModelName" app enterprise`).
 - If adding new endpoints, services, or models, consider whether Enterprise needs:
  - An override (e.g., `enterprise/app/...`), or
  - An extension point (e.g., `prepend_mod_with`, hooks, configuration) to avoid hard forks.
 - Avoid hardcoding instance- or plan-specific behavior in OSS; prefer configuration, feature flags, or extension points consumed by Enterprise.
 - Keep request/response contracts stable across OSS and Enterprise; update both sets of routes/controllers when introducing new APIs.
 - When renaming/moving shared code, mirror the change in `enterprise/` to prevent drift.
 - Tests: Add Enterprise-specific specs under `spec/enterprise`, mirroring OSS spec layout where applicable.
@@ -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'
@@ -108,7 +106,7 @@ gem 'google-cloud-translate-v3', '>= 0.7.0'
 ##-- apm and error monitoring ---#
 # loaded only when environment variables are set.
 # ref application.rb
-gem 'datadog', '~> 2.0', require: false
+gem 'ddtrace', require: false
 gem 'elastic-apm', require: false
 gem 'newrelic_rpm', require: false
 gem 'newrelic-sidekiq-metrics', '>= 1.6.2', require: false
@@ -121,8 +119,6 @@ gem 'sentry-sidekiq', '>= 5.19.0', require: false
 gem 'sidekiq', '>= 7.3.1'
 # We want cron jobs
 gem 'sidekiq-cron', '>= 1.12.0'
 # for sidekiq healthcheck
 gem 'sidekiq_alive'
 ##-- Push notification service --##
 gem 'fcm'
@@ -179,10 +175,6 @@ gem 'reverse_markdown'
 gem 'iso-639'
 gem 'ruby-openai'
 gem 'ai-agents', '>= 0.4.3'
 # TODO: Move this gem as a dependency of ai-agents
 gem 'ruby_llm-schema'
 gem 'shopify_api'
@@ -204,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'
@@ -212,8 +207,6 @@ group :development do
  gem 'stackprof'
  # Should install the associated chrome extension to view query logs
  gem 'meta_request', '>= 0.8.3'
  gem 'tidewave'
 end
 group :test do
@@ -244,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.2)
+    actioncable (7.0.8.7)
-      actionpack (= 7.1.5.2)
+      actionpack (= 7.0.8.7)
-      activesupport (= 7.1.5.2)
+      activesupport (= 7.0.8.7)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-      zeitwerk (~> 2.6)
+    actionmailbox (7.0.8.7)
-    actionmailbox (7.1.5.2)
+      actionpack (= 7.0.8.7)
-      actionpack (= 7.1.5.2)
+      activejob (= 7.0.8.7)
-      activejob (= 7.1.5.2)
+      activerecord (= 7.0.8.7)
-      activerecord (= 7.1.5.2)
+      activestorage (= 7.0.8.7)
-      activestorage (= 7.1.5.2)
+      activesupport (= 7.0.8.7)
      activesupport (= 7.1.5.2)
      mail (>= 2.7.1)
      net-imap
      net-pop
      net-smtp
-    actionmailer (7.1.5.2)
+    actionmailer (7.0.8.7)
-      actionpack (= 7.1.5.2)
+      actionpack (= 7.0.8.7)
-      actionview (= 7.1.5.2)
+      actionview (= 7.0.8.7)
-      activejob (= 7.1.5.2)
+      activejob (= 7.0.8.7)
-      activesupport (= 7.1.5.2)
+      activesupport (= 7.0.8.7)
      mail (~> 2.5, >= 2.5.4)
      net-imap
      net-pop
      net-smtp
-      rails-dom-testing (~> 2.2)
+      rails-dom-testing (~> 2.0)
-    actionpack (7.1.5.2)
+    actionpack (7.0.8.7)
-      actionview (= 7.1.5.2)
+      actionview (= 7.0.8.7)
-      activesupport (= 7.1.5.2)
+      activesupport (= 7.0.8.7)
-      nokogiri (>= 1.8.5)
+      rack (~> 2.0, >= 2.2.4)
      racc
      rack (>= 2.2.4)
      rack-session (>= 1.0.1)
      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.2)
+      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.6)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.1.5.2)
+    actiontext (7.0.8.7)
-      actionpack (= 7.1.5.2)
+      actionpack (= 7.0.8.7)
-      activerecord (= 7.1.5.2)
+      activerecord (= 7.0.8.7)
-      activestorage (= 7.1.5.2)
+      activestorage (= 7.0.8.7)
-      activesupport (= 7.1.5.2)
+      activesupport (= 7.0.8.7)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (7.1.5.2)
+    actionview (7.0.8.7)
-      activesupport (= 7.1.5.2)
+      activesupport (= 7.0.8.7)
      builder (~> 3.1)
-      erubi (~> 1.11)
+      erubi (~> 1.4)
-      rails-dom-testing (~> 2.2)
+      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.6)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
    active_record_query_trace (1.8)
-    activejob (7.1.5.2)
+    activejob (7.0.8.7)
-      activesupport (= 7.1.5.2)
+      activesupport (= 7.0.8.7)
      globalid (>= 0.3.6)
-    activemodel (7.1.5.2)
+    activemodel (7.0.8.7)
-      activesupport (= 7.1.5.2)
+      activesupport (= 7.0.8.7)
-    activerecord (7.1.5.2)
+    activerecord (7.0.8.7)
-      activemodel (= 7.1.5.2)
+      activemodel (= 7.0.8.7)
-      activesupport (= 7.1.5.2)
+      activesupport (= 7.0.8.7)
-      timeout (>= 0.4.0)
+    activerecord-import (1.4.1)
    activerecord-import (2.1.0)
      activerecord (>= 4.2)
-    activestorage (7.1.5.2)
+    activestorage (7.0.8.7)
-      actionpack (= 7.1.5.2)
+      actionpack (= 7.0.8.7)
-      activejob (= 7.1.5.2)
+      activejob (= 7.0.8.7)
-      activerecord (= 7.1.5.2)
+      activerecord (= 7.0.8.7)
-      activesupport (= 7.1.5.2)
+      activesupport (= 7.0.8.7)
      marcel (~> 1.0)
-    activesupport (7.1.5.2)
+      mini_mime (>= 1.1.0)
-      base64
+    activesupport (7.0.8.7)
      benchmark (>= 0.3)
      bigdecimal
      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)
+    acts-as-taggable-on (9.0.1)
-      activerecord (>= 7.1, < 8.1)
+      activerecord (>= 6.0, < 7.1)
      zeitwerk (>= 2.4, < 3.0)
    addressable (2.8.7)
      public_suffix (>= 2.0.2, < 7.0)
    administrate (0.20.1)
@@ -126,12 +113,10 @@ GEM
      jbuilder (~> 2)
      rails (>= 4.2, < 7.2)
      selectize-rails (~> 0.6)
    ai-agents (0.4.3)
      ruby_llm (~> 1.3)
    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,17 +140,16 @@ GEM
    barnes (0.0.9)
      multi_json (~> 1)
      statsd-ruby (~> 1.1)
-    base64 (0.3.0)
+    base64 (0.2.0)
    bcrypt (3.1.20)
-    benchmark (0.4.1)
+    bigdecimal (3.1.8)
    bigdecimal (3.2.2)
    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)
@@ -174,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)
+    concurrent-ruby (1.3.4)
-    connection_pool (2.5.3)
+    connection_pool (2.4.1)
    crack (1.0.0)
      bigdecimal
      rexml
@@ -194,14 +176,16 @@ GEM
      activerecord (>= 5.a)
      database_cleaner-core (~> 2.0.0)
    database_cleaner-core (2.0.1)
-    datadog (2.19.0)
+    datadog-ci (0.8.3)
      datadog-ruby_core_source (~> 3.4, >= 3.4.1)
      libdatadog (~> 18.1.0.1.0)
      libddwaf (~> 1.24.1.0.3)
      logger
      msgpack
    datadog-ruby_core_source (3.4.1)
    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)
@@ -212,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)
@@ -228,37 +212,7 @@ GEM
      railties (>= 6.1)
    down (5.4.0)
      addressable (~> 2.8)
    drb (2.2.3)
    dry-cli (1.1.0)
    dry-configurable (1.3.0)
      dry-core (~> 1.1)
      zeitwerk (~> 2.6)
    dry-core (1.1.0)
      concurrent-ruby (~> 1.0)
      logger
      zeitwerk (~> 2.6)
    dry-inflector (1.2.0)
    dry-initializer (3.2.0)
    dry-logic (1.6.0)
      bigdecimal
      concurrent-ruby (~> 1.0)
      dry-core (~> 1.1)
      zeitwerk (~> 2.6)
    dry-schema (1.14.1)
      concurrent-ruby (~> 1.0)
      dry-configurable (~> 1.0, >= 1.0.1)
      dry-core (~> 1.1)
      dry-initializer (~> 3.2)
      dry-logic (~> 1.5)
      dry-types (~> 1.8)
      zeitwerk (~> 2.6)
    dry-types (1.8.3)
      bigdecimal (~> 3.0)
      concurrent-ruby (~> 1.0)
      dry-core (~> 1.0)
      dry-inflector (~> 1.0)
      dry-logic (~> 1.4)
      zeitwerk (~> 2.6)
    ecma-re-validator (0.4.0)
      regexp_parser (~> 2.2)
    elastic-apm (4.6.2)
@@ -281,10 +235,8 @@ GEM
      railties (>= 5.0.0)
    faker (3.2.0)
      i18n (>= 1.8.11, < 2)
-    faraday (2.13.1)
+    faraday (2.9.0)
-      faraday-net_http (>= 2.0, < 3.5)
+      faraday-net_http (>= 2.0, < 3.2)
      json
      logger
    faraday-follow_redirects (0.3.0)
      faraday (>= 1, < 3)
    faraday-mashify (0.1.1)
@@ -292,27 +244,17 @@ GEM
      hashie
    faraday-multipart (1.0.4)
      multipart-post (~> 2)
-    faraday-net_http (3.4.0)
+    faraday-net_http (3.1.0)
-      net-http (>= 0.5.0)
+      net-http
    faraday-net_http_persistent (2.1.0)
      faraday (~> 2.5)
      net-http-persistent (~> 4.0)
    faraday-retry (2.2.1)
      faraday (~> 2.0)
    fast-mcp (1.5.0)
      addressable (~> 2.8)
      base64
      dry-schema (~> 1.14)
      json (~> 2.0)
      mime-types (~> 3.4)
      rack (~> 3.1)
    fcm (1.0.8)
      faraday (>= 1.0.0, < 3.0)
      googleauth (~> 1)
-    ffi (1.17.2)
+    ffi (1.16.3)
    ffi (1.17.2-arm64-darwin)
    ffi (1.17.2-x86_64-darwin)
    ffi (1.17.2-x86_64-linux-gnu)
    ffi-compiler (1.0.1)
      ffi (>= 1.0.0)
      rake
@@ -373,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)
+    googleapis-common-protos-types (1.14.0)
-      google-protobuf (>= 3.18, < 5.a)
+      google-protobuf (~> 3.18)
    googleauth (1.11.2)
      faraday (>= 1.0, < 3.a)
      google-cloud-env (~> 2.1)
@@ -389,19 +334,18 @@ GEM
      signet (>= 0.16, < 2.a)
    groupdate (6.2.1)
      activesupport (>= 5.2)
-    grpc (1.72.0)
+    grpc (1.62.0)
-      google-protobuf (>= 3.25, < 5.0)
+      google-protobuf (~> 3.25)
      googleapis-common-protos-types (~> 1.0)
-    grpc (1.72.0-arm64-darwin)
+    grpc (1.62.0-arm64-darwin)
-      google-protobuf (>= 3.25, < 5.0)
+      google-protobuf (~> 3.25)
      googleapis-common-protos-types (~> 1.0)
-    grpc (1.72.0-x86_64-darwin)
+    grpc (1.62.0-x86_64-darwin)
-      google-protobuf (>= 3.25, < 5.0)
+      google-protobuf (~> 3.25)
      googleapis-common-protos-types (~> 1.0)
-    grpc (1.72.0-x86_64-linux)
+    grpc (1.62.0-x86_64-linux)
-      google-protobuf (>= 3.25, < 5.0)
+      google-protobuf (~> 3.25)
      googleapis-common-protos-types (~> 1.0)
    gserver (0.0.1)
    haikunator (1.1.1)
    hairtrigger (1.0.0)
      activerecord (>= 6.0, < 8)
@@ -426,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)
@@ -444,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)
@@ -459,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)
@@ -479,25 +423,21 @@ GEM
      faraday-multipart
      json (>= 1.8)
      rexml
-    language_server-protocol (3.17.0.5)
+    launchy (2.5.2)
    launchy (3.1.1)
      addressable (~> 2.8)
-      childprocess (~> 5.0)
+    letter_opener (1.8.1)
-      logger (~> 1.6)
+      launchy (>= 2.2, < 3)
-    letter_opener (1.10.0)
+    libdatadog (7.0.0.1.0)
-      launchy (>= 2.2, < 4)
+    libdatadog (7.0.0.1.0-x86_64-linux)
-    libdatadog (18.1.0.1.0)
+    libddwaf (1.14.0.0.0)
    libdatadog (18.1.0.1.0-x86_64-linux)
    libddwaf (1.24.1.0.3)
      ffi (~> 1.0)
-    libddwaf (1.24.1.0.3-arm64-darwin)
+    libddwaf (1.14.0.0.0-arm64-darwin)
      ffi (~> 1.0)
-    libddwaf (1.24.1.0.3-x86_64-darwin)
+    libddwaf (1.14.0.0.0-x86_64-darwin)
      ffi (~> 1.0)
-    libddwaf (1.24.1.0.3-x86_64-linux)
+    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)
@@ -505,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)
@@ -530,18 +470,18 @@ GEM
    mime-types-data (3.2023.0218.1)
    mini_magick (4.12.0)
    mini_mime (1.1.5)
-    mini_portile2 (2.8.9)
+    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)
@@ -561,14 +501,14 @@ GEM
    newrelic_rpm (9.6.0)
      base64
    nio4r (2.7.3)
-    nokogiri (1.18.9)
+    nokogiri (1.18.8)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    nokogiri (1.18.9-arm64-darwin)
+    nokogiri (1.18.8-arm64-darwin)
      racc (~> 1.4)
-    nokogiri (1.18.9-x86_64-darwin)
+    nokogiri (1.18.8-x86_64-darwin)
      racc (~> 1.4)
-    nokogiri (1.18.9-x86_64-linux-gnu)
+    nokogiri (1.18.8-x86_64-linux-gnu)
      racc (~> 1.4)
    oauth (1.1.0)
      oauth-tty (~> 1.0, >= 1.0.1)
@@ -605,16 +545,14 @@ GEM
    orm_adapter (0.5.0)
    os (1.1.4)
    ostruct (0.6.1)
-    parallel (1.27.0)
+    parallel (1.23.0)
-    parser (3.3.8.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)
@@ -622,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 (3.2.0)
+    rack (2.2.14)
    rack-attack (6.7.0)
      rack (>= 1.0, < 4)
    rack-contrib (2.5.0)
@@ -638,34 +576,28 @@ GEM
      rack (>= 2.0.0)
    rack-mini-profiler (3.2.0)
      rack (>= 1.2.0)
-    rack-protection (4.1.1)
+    rack-protection (3.2.0)
      base64 (>= 0.1.0)
-      logger (>= 1.6.0)
+      rack (~> 2.2, >= 2.2.4)
      rack (>= 3.0.0, < 4)
    rack-proxy (0.7.7)
      rack
    rack-session (2.1.1)
      base64 (>= 0.1.0)
      rack (>= 3.0.0)
    rack-test (2.1.0)
      rack (>= 1.3)
    rack-timeout (0.6.3)
-    rackup (2.2.1)
+    rails (7.0.8.7)
-      rack (>= 3)
+      actioncable (= 7.0.8.7)
-    rails (7.1.5.2)
+      actionmailbox (= 7.0.8.7)
-      actioncable (= 7.1.5.2)
+      actionmailer (= 7.0.8.7)
-      actionmailbox (= 7.1.5.2)
+      actionpack (= 7.0.8.7)
-      actionmailer (= 7.1.5.2)
+      actiontext (= 7.0.8.7)
-      actionpack (= 7.1.5.2)
+      actionview (= 7.0.8.7)
-      actiontext (= 7.1.5.2)
+      activejob (= 7.0.8.7)
-      actionview (= 7.1.5.2)
+      activemodel (= 7.0.8.7)
-      activejob (= 7.1.5.2)
+      activerecord (= 7.0.8.7)
-      activemodel (= 7.1.5.2)
+      activestorage (= 7.0.8.7)
-      activerecord (= 7.1.5.2)
+      activesupport (= 7.0.8.7)
      activestorage (= 7.1.5.2)
      activesupport (= 7.1.5.2)
      bundler (>= 1.15.0)
-      railties (= 7.1.5.2)
+      railties (= 7.0.8.7)
    rails-dom-testing (2.2.0)
      activesupport (>= 5.0.0)
      minitest
@@ -673,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.2)
+    railties (7.0.8.7)
-      actionpack (= 7.1.5.2)
+      actionpack (= 7.0.8.7)
-      activesupport (= 7.1.5.2)
+      activesupport (= 7.0.8.7)
-      irb
+      method_source
      rackup (>= 1.0.0)
      rake (>= 12.2)
-      thor (~> 1.0, >= 1.2.2)
+      thor (~> 1.0)
-      zeitwerk (~> 2.6)
+      zeitwerk (~> 2.5)
    rainbow (3.1.1)
    rake (13.2.1)
    rb-fsevent (0.11.2)
@@ -692,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)
@@ -712,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)
@@ -732,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)
+      regexp_parser (>= 1.8, < 3.0)
-      rubocop-ast (>= 1.44.0, < 2.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)
+      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.44.1)
+    rubocop-ast (1.28.1)
-      parser (>= 3.3.7.2)
+      parser (>= 3.2.1.0)
-      prism (~> 1.4)
+    rubocop-capybara (2.18.0)
-    rubocop-factory_bot (2.27.1)
+      rubocop (~> 1.41)
-      lint_roller (~> 1.1)
+    rubocop-performance (1.17.1)
-      rubocop (~> 1.72, >= 1.72.1)
+      rubocop (>= 1.7.0, < 2.0)
-    rubocop-performance (1.25.0)
+      rubocop-ast (>= 0.4.0)
-      lint_roller (~> 1.1)
+    rubocop-rails (2.19.1)
      rubocop (>= 1.75.0, < 2.0)
      rubocop-ast (>= 1.38.0, < 2.0)
    rubocop-rails (2.32.0)
      activesupport (>= 4.2.0)
      lint_roller (~> 1.1)
      rack (>= 1.1)
-      rubocop (>= 1.75.0, < 2.0)
+      rubocop (>= 1.33.0, < 2.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rspec (2.21.0)
-    rubocop-rspec (3.6.0)
+      rubocop (~> 1.33)
-      lint_roller (~> 1.1)
+      rubocop-capybara (~> 2.17)
      rubocop (~> 1.72, >= 1.72.1)
    ruby-openai (7.3.1)
      event_stream_parser (>= 0.3.0, < 2.0.0)
      faraday (>= 1)
@@ -773,16 +698,6 @@ GEM
    ruby2ruby (2.5.0)
      ruby_parser (~> 3.1)
      sexp_processor (~> 4.6)
    ruby_llm (1.5.1)
      base64
      event_stream_parser (~> 1)
      faraday (>= 1.10.0)
      faraday-multipart (>= 1)
      faraday-net_http (>= 1)
      faraday-retry (>= 1)
      marcel (~> 1.0)
      zeitwerk (~> 2)
    ruby_llm-schema (0.1.0)
    ruby_parser (3.20.0)
      sexp_processor (~> 4.16)
    sass (3.7.4)
@@ -840,9 +755,6 @@ GEM
      fugit (~> 1.8)
      globalid (>= 1.0.1)
      sidekiq (>= 6)
    sidekiq_alive (2.5.0)
      gserver (~> 0.0.1)
      sidekiq (>= 5, < 9)
    signet (0.17.0)
      addressable (~> 2.8)
      faraday (>= 0.17.5, < 3.a)
@@ -881,18 +793,14 @@ GEM
    stripe (8.5.0)
    telephone_number (1.4.20)
    test-prof (1.2.1)
-    thor (1.4.0)
+    thor (1.3.1)
    tidewave (0.2.0)
      fast-mcp (~> 1.5.0)
      rack (>= 2.0)
      rails (>= 7.1.0)
    tilt (2.3.0)
    time_diff (0.3.0)
      activesupport
      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)
@@ -908,10 +816,8 @@ GEM
    unf (0.1.4)
      unf_ext
    unf_ext (0.0.8.2)
-    unicode-display_width (3.1.4)
+    unicode-display_width (2.4.2)
-      unicode-emoji (~> 4.0, >= 4.0.4)
+    uniform_notifier (1.16.0)
    unicode-emoji (4.0.4)
    uniform_notifier (1.17.0)
    uri (1.0.3)
    uri_template (0.7.0)
    valid_email2 (5.2.6)
@@ -939,8 +845,7 @@ GEM
      addressable (>= 2.8.0)
      crack (>= 0.3.2)
      hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.7.7)
+    websocket-driver (0.7.6)
      base64
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.5)
    wisper (2.0.0)
@@ -967,7 +872,6 @@ DEPENDENCIES
  administrate (>= 0.20.1)
  administrate-field-active_storage (>= 1.0.3)
  administrate-field-belongs_to_search (>= 0.9.0)
  ai-agents (>= 0.4.3)
  annotate
  attr_extras
  audited (~> 5.4, >= 5.4.1)
@@ -984,7 +888,7 @@ DEPENDENCIES
  commonmarker
  csv-safe
  database_cleaner
-  datadog (~> 2.0)
+  ddtrace
  debug (~> 1.8)
  devise (>= 4.9.4)
  devise-secure_password!
@@ -1047,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)
@@ -1056,12 +960,10 @@ DEPENDENCIES
  rspec-rails (>= 6.1.5)
  rspec_junit_formatter
  rubocop
  rubocop-factory_bot
  rubocop-performance
  rubocop-rails
  rubocop-rspec
  ruby-openai
  ruby_llm-schema
  scout_apm
  scss_lint
  seed_dump
@@ -1072,7 +974,6 @@ DEPENDENCIES
  shoulda-matchers
  sidekiq (>= 7.3.1)
  sidekiq-cron (>= 1.12.0)
  sidekiq_alive
  simplecov (= 0.17.1)
  slack-ruby-client (~> 2.5.2)
  spring
@@ -1082,9 +983,8 @@ DEPENDENCIES
  stripe
  telephone_number
  test-prof
  tidewave
  time_diff
-  twilio-ruby
+  twilio-ruby (~> 5.66)
  twitty (~> 0.1.5)
  tzinfo-data
  uglifier
@@ -1097,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 +1 @@
-4.4.0
+3.13.0
@@ -1 +1 @@
-3.4.3
+3.2.0
@@ -6,7 +6,6 @@
 # We don't want to update the name of the identified original contact.
 class ContactIdentifyAction
  include UrlHelper
  pattr_initialize [:contact!, :params!, { retain_original_contact_name: false, discard_invalid_attrs: false }]
  def perform
@@ -105,14 +104,7 @@ class ContactIdentifyAction
    # TODO: replace reject { |_k, v| v.blank? } with compact_blank when rails is upgraded
    @contact.discard_invalid_attrs if discard_invalid_attrs
    @contact.save!
-    enqueue_avatar_job
+    Avatar::AvatarFromUrlJob.perform_later(@contact, params[:avatar_url]) if params[:avatar_url].present? && !@contact.avatar.attached?
  end
  def enqueue_avatar_job
    return unless params[:avatar_url].present? && !@contact.avatar.attached?
    return unless url_valid?(params[:avatar_url])
    Avatar::AvatarFromUrlJob.perform_later(@contact, params[:avatar_url])
  end
  def merge_contact(base_contact, merge_contact)
@@ -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(10);
    textElement.textContent = '•'.repeat(maskedLength);
    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],
+  button {
-  [data-secret-copier] {
+    margin-left: 5px;
    background: transparent;
    border: 0;
    color: inherit;
    margin-left: 0.5rem;
    padding: 0;
    svg {
      fill: currentColor;
      height: 1.25rem;
      width: 1.25rem;
    }
  }
 }
@@ -59,13 +59,11 @@ 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
@@ -152,13 +152,11 @@ class Messages::Instagram::BaseMessageBuilder < Messages::Messenger::MessageBuil
  end
  def message_already_exists?
-    find_message_by_source_id(@messaging[:message][:mid]).present?
+    cw_message = conversation.messages.where(
-  end
+      source_id: @messaging[:message][:mid]
    ).first
-  def find_message_by_source_id(source_id)
+    cw_message.present?
    return unless source_id
    @message = Message.find_by(source_id: source_id)
  end
  def all_unsupported_files?
@@ -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
@@ -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,20 +0,0 @@
 class Api::V1::Accounts::AssignmentPolicies::InboxesController < Api::V1::Accounts::BaseController
  before_action :fetch_assignment_policy
  before_action -> { check_authorization(AssignmentPolicy) }
  def index
    @inboxes = @assignment_policy.inboxes
  end
  private
  def fetch_assignment_policy
    @assignment_policy = Current.account.assignment_policies.find(
      params[:assignment_policy_id]
    )
  end
  def permitted_params
    params.permit(:assignment_policy_id)
  end
 end
@@ -1,36 +0,0 @@
 class Api::V1::Accounts::AssignmentPoliciesController < Api::V1::Accounts::BaseController
  before_action :fetch_assignment_policy, only: [:show, :update, :destroy]
  before_action :check_authorization
  def index
    @assignment_policies = Current.account.assignment_policies
  end
  def show; end
  def create
    @assignment_policy = Current.account.assignment_policies.create!(assignment_policy_params)
  end
  def update
    @assignment_policy.update!(assignment_policy_params)
  end
  def destroy
    @assignment_policy.destroy!
    head :ok
  end
  private
  def fetch_assignment_policy
    @assignment_policy = Current.account.assignment_policies.find(params[:id])
  end
  def assignment_policy_params
    params.require(:assignment_policy).permit(
      :name, :description, :assignment_order, :conversation_priority,
      :fair_distribution_limit, :fair_distribution_window, :enabled
    )
  end
 end
@@ -30,14 +30,7 @@ class Api::V1::Accounts::CallbacksController < Api::V1::Accounts::BaseController
  end
  def facebook_pages
-    pages = []
+    @page_details = mark_already_existing_facebook_pages(fb_object.get_connections('me', 'accounts'))
    fb_pages = fb_object.get_connections('me', 'accounts')
    pages.concat(fb_pages)
    while fb_pages.respond_to?(:next_page) && (next_page = fb_pages.next_page)
      fb_pages = next_page
      pages.concat(fb_pages)
    end
    @page_details = mark_already_existing_facebook_pages(pages)
  end
  def set_instagram_id(page_access_token, facebook_channel)
@@ -29,6 +29,6 @@ class Api::V1::Accounts::CampaignsController < Api::V1::Accounts::BaseController
  def campaign_params
    params.require(:campaign).permit(:title, :description, :message, :enabled, :trigger_only_during_business_hours, :inbox_id, :sender_id,
-                                     :scheduled_at, audience: [:type, :id], trigger_rules: {}, template_params: {})
+                                     :scheduled_at, audience: [:type, :id], trigger_rules: {})
  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
@@ -122,7 +122,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
  def resolved_contacts
    return @resolved_contacts if @resolved_contacts
-    @resolved_contacts = Current.account.contacts.resolved_contacts(use_crm_v2: Current.account.feature_enabled?('crm_v2'))
+    @resolved_contacts = Current.account.contacts.resolved_contacts
    @resolved_contacts = @resolved_contacts.tagged_with(params[:labels], any: true) if params[:labels].present?
    @resolved_contacts
@@ -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,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
@@ -1,46 +0,0 @@
 class Api::V1::Accounts::Inboxes::AssignmentPoliciesController < Api::V1::Accounts::BaseController
  before_action :fetch_inbox
  before_action :fetch_assignment_policy, only: [:create]
  before_action -> { check_authorization(AssignmentPolicy) }
  before_action :validate_assignment_policy, only: [:show, :destroy]
  def show
    @assignment_policy = @inbox.assignment_policy
  end
  def create
    # There should be only one assignment policy for an inbox.
    # If there is a new request to add an assignment policy, we will
    # delete the old one and attach the new policy
    remove_inbox_assignment_policy
    @inbox_assignment_policy = @inbox.create_inbox_assignment_policy!(assignment_policy: @assignment_policy)
    @assignment_policy = @inbox.assignment_policy
  end
  def destroy
    remove_inbox_assignment_policy
    head :ok
  end
  private
  def remove_inbox_assignment_policy
    @inbox.inbox_assignment_policy&.destroy
  end
  def fetch_inbox
    @inbox = Current.account.inboxes.find(permitted_params[:inbox_id])
  end
  def fetch_assignment_policy
    @assignment_policy = Current.account.assignment_policies.find(permitted_params[:assignment_policy_id])
  end
  def permitted_params
    params.permit(:assignment_policy_id, :inbox_id)
  end
  def validate_assignment_policy
    return render_not_found_error(I18n.t('errors.assignment_policy.not_found')) unless @inbox.assignment_policy
  end
 end
@@ -69,15 +69,6 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
    render status: :ok, json: { message: I18n.t('messages.inbox_deletetion_response') }
  end
  def sync_templates
    return render status: :unprocessable_entity, json: { error: 'Template sync is only available for WhatsApp channels' } unless whatsapp_channel?
    trigger_template_sync
    render status: :ok, json: { message: 'Template sync initiated successfully' }
  rescue StandardError => e
    render status: :internal_server_error, json: { error: e.message }
  end
  private
  def fetch_inbox
@@ -90,15 +81,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
@@ -183,18 +170,6 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
      []
    end
  end
  def whatsapp_channel?
    @inbox.whatsapp? || (@inbox.twilio? && @inbox.channel.whatsapp?)
  end
  def trigger_template_sync
    if @inbox.whatsapp?
      Channels::Whatsapp::TemplatesSyncJob.perform_later(@inbox.channel)
    elsif @inbox.twilio? && @inbox.channel.whatsapp?
      Channels::Twilio::TemplatesSyncJob.perform_later(@inbox.channel)
    end
  end
 end
 Api::V1::Accounts::InboxesController.prepend_mod_with('Api::V1::Accounts::InboxesController')
@@ -1,6 +1,7 @@
-class Api::V1::Accounts::Instagram::AuthorizationsController < Api::V1::Accounts::OauthAuthorizationController
+class Api::V1::Accounts::Instagram::AuthorizationsController < Api::V1::Accounts::BaseController
  include InstagramConcern
  include Instagram::IntegrationHelper
  before_action :check_authorization
  def create
    # https://developers.facebook.com/docs/instagram-platform/instagram-api-with-instagram-login/business-login#step-1--get-authorization
@@ -20,4 +21,10 @@ class Api::V1::Accounts::Instagram::AuthorizationsController < Api::V1::Accounts
      render json: { success: false }, status: :unprocessable_entity
    end
  end
  private
  def check_authorization
    raise Pundit::NotAuthorizedError unless Current.account_user.administrator?
  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
@@ -121,15 +101,4 @@ class Api::V1::Accounts::Integrations::LinearController < Api::V1::Accounts::Bas
  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,
+        scope: 'offline_access https://outlook.office.com/IMAP.AccessAsUser.All https://outlook.office.com/SMTP.Send openid profile',
        state: state,
        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
@@ -26,8 +26,9 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
      @portal.update!(portal_params.merge(live_chat_widget_params)) if params[:portal].present?
      # @portal.custom_domain = parsed_custom_domain
      process_attached_logo if params[:blob_id].present?
-    rescue ActiveRecord::RecordInvalid => e
+    rescue StandardError => e
-      render_record_invalid(e)
+      Rails.logger.error e
      render json: { error: @portal.errors.messages }.to_json, status: :unprocessable_entity
    end
  end
@@ -46,20 +47,6 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
    head :ok
  end
  def send_instructions
    email = permitted_params[:email]
    return render_could_not_create_error(I18n.t('portals.send_instructions.email_required')) if email.blank?
    return render_could_not_create_error(I18n.t('portals.send_instructions.invalid_email_format')) unless valid_email?(email)
    return render_could_not_create_error(I18n.t('portals.send_instructions.custom_domain_not_configured')) if @portal.custom_domain.blank?
    PortalInstructionsMailer.send_cname_instructions(
      portal: @portal,
      recipient_email: email
    ).deliver_later
    render json: { message: I18n.t('portals.send_instructions.instructions_sent_successfully') }, status: :ok
  end
  def process_attached_logo
    blob_id = params[:blob_id]
    blob = ActiveStorage::Blob.find_by(id: blob_id)
@@ -73,12 +60,12 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
  end
  def permitted_params
-    params.permit(:id, :email)
+    params.permit(:id)
  end
  def portal_params
    params.require(:portal).permit(
-      :id, :account_id, :color, :custom_domain, :header_text, :homepage_link,
+      :account_id, :color, :custom_domain, :header_text, :homepage_link,
      :name, :page_title, :slug, :archived, { config: [:default_locale, { allowed_locales: [] }] }
    )
  end
@@ -101,10 +88,4 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
    domain = URI.parse(@portal.custom_domain)
    domain.is_a?(URI::HTTP) ? domain.host : @portal.custom_domain
  end
  def valid_email?(email)
    ValidEmail2::Address.new(email).valid?
  end
 end
 Api::V1::Accounts::PortalsController.prepend_mod_with('Api::V1::Accounts::PortalsController')
@@ -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,87 +0,0 @@
 class Api::V1::Accounts::Whatsapp::AuthorizationsController < Api::V1::Accounts::BaseController
  before_action :validate_feature_enabled!
  before_action :fetch_and_validate_inbox, if: -> { params[:inbox_id].present? }
  # POST /api/v1/accounts/:account_id/whatsapp/authorization
  # Handles both initial authorization and reauthorization
  # If inbox_id is present in params, it performs reauthorization
  def create
    validate_embedded_signup_params!
    channel = process_embedded_signup
    render_success_response(channel.inbox)
  rescue StandardError => e
    render_error_response(e)
  end
  private
  def process_embedded_signup
    service = Whatsapp::EmbeddedSignupService.new(
      account: Current.account,
      params: params.permit(:code, :business_id, :waba_id, :phone_number_id).to_h.symbolize_keys,
      inbox_id: params[:inbox_id]
    )
    service.perform
  end
  def fetch_and_validate_inbox
    @inbox = Current.account.inboxes.find(params[:inbox_id])
    validate_reauthorization_required
  end
  def validate_reauthorization_required
    return if @inbox.channel.reauthorization_required? || can_upgrade_to_embedded_signup?
    render json: {
      success: false,
      message: I18n.t('inbox.reauthorization.not_required')
    }, status: :unprocessable_entity
  end
  def can_upgrade_to_embedded_signup?
    channel = @inbox.channel
    return false unless channel.provider == 'whatsapp_cloud'
    true
  end
  def render_success_response(inbox)
    response = {
      success: true,
      id: inbox.id,
      name: inbox.name,
      channel_type: 'whatsapp'
    }
    response[:message] = I18n.t('inbox.reauthorization.success') if params[:inbox_id].present?
    render json: response
  end
  def render_error_response(error)
    Rails.logger.error "[WHATSAPP AUTHORIZATION] Embedded signup error: #{error.message}"
    Rails.logger.error error.backtrace.join("\n")
    render json: {
      success: false,
      error: error.message
    }, status: :unprocessable_entity
  end
  def validate_feature_enabled!
    return if Current.account.feature_whatsapp_embedded_signup?
    render json: {
      success: false,
      error: 'WhatsApp embedded signup is not enabled for this account'
    }, status: :forbidden
  end
  def validate_embedded_signup_params!
    missing_params = []
    missing_params << 'code' if params[:code].blank?
    missing_params << 'business_id' if params[:business_id].blank?
    missing_params << 'waba_id' if params[:waba_id].blank?
    return if missing_params.empty?
    raise ArgumentError, "Required parameters are missing: #{missing_params.join(', ')}"
  end
 end
@@ -92,7 +92,7 @@ class Api::V1::AccountsController < Api::BaseController
  end
  def settings_params
-    params.permit(:auto_resolve_after, :auto_resolve_message, :auto_resolve_ignore_waiting, :audio_transcriptions, :auto_resolve_label)
+    params.permit(:auto_resolve_after, :auto_resolve_message, :auto_resolve_ignore_waiting)
  end
  def check_signup_enabled
@@ -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
@@ -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
@@ -14,7 +14,7 @@ module GoogleConcern
  private
-  def scope
+  def base_url
-    'email profile https://mail.google.com/'
+    ENV.fetch('FRONTEND_URL', 'http://localhost:3000')
  end
 end
@@ -15,7 +15,7 @@ module MicrosoftConcern
  private
-  def scope
+  def base_url
-    'offline_access https://outlook.office.com/IMAP.AccessAsUser.All https://outlook.office.com/SMTP.Send openid profile email'
+    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 unless request.format.html?
  end
  def set_global_config
@@ -67,8 +67,6 @@ class DashboardController < ActionController::Base
      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'),
      WHATSAPP_APP_ID: GlobalConfigService.load('WHATSAPP_APP_ID', ''),
      WHATSAPP_CONFIGURATION_ID: GlobalConfigService.load('WHATSAPP_CONFIGURATION_ID', ''),
      IS_ENTERPRISE: ChatwootApp.enterprise?,
      AZURE_APP_ID: GlobalConfigService.load('AZURE_APP_ID', ''),
      GIT_SHA: GIT_HASH
@@ -2,7 +2,7 @@ class MicrosoftController < ApplicationController
  after_action :set_version_header
  def identity_association
-    microsoft_identity
+    microsoft_indentity
  end
  private
@@ -11,7 +11,7 @@ class MicrosoftController < ApplicationController
    response.headers['Content-Length'] = { associatedApplications: [{ applicationId: @identity_json }] }.to_json.length
  end
-  def microsoft_identity
+  def microsoft_indentity
    @identity_json = GlobalConfigService.load('AZURE_APP_ID', nil)
  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
+  def account_id
-    raise ActionController::BadRequest, 'Missing state variable' if params[:state].blank?
+    ::Redis::Alfred.get(cache_key)
    account = GlobalID::Locator.locate_signed(params[:state])
    raise 'Invalid or expired state' if account.nil?
    account
  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,11 +1,4 @@
 class Platform::Api::V1::AccountsController < PlatformController
  def index
    @resources = @platform_app.platform_app_permissibles
                              .where(permissible_type: 'Account')
                              .includes(:permissible)
                              .map(&:permissible)
  end
  def show; end
  def create
@@ -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
+  # we want to add login to that chain as well
-  before_action(only: [:login, :token]) { set_resource }
+  before_action(only: [:login]) { set_resource }
-  before_action(only: [:login, :token]) { validate_platform_app_permissible }
+  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
+  def show; end
    @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
  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
+  def show; end
    @og_image_url = helpers.set_og_image_url(@portal.name, @category.name)
  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
+  def show; end
    @og_image_url = helpers.set_og_image_url('', @portal.header_text)
  end
  def sitemap
    @help_center_url = @portal.custom_domain || ChatwootApp.help_center_root
@@ -17,12 +17,7 @@ class SlackUploadsController < ApplicationController
  end
  def blob_url
-    # Only generate representations for images
+    url_for(@blob.representation(resize_to_fill: [250, nil]))
    if @blob.content_type.start_with?('image/')
      url_for(@blob.representation(resize_to_fill: [250, nil]))
    else
      url_for(@blob)
    end
  end
  def avatar_url
@@ -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)
@@ -32,20 +32,22 @@ class SuperAdmin::AppConfigsController < SuperAdmin::ApplicationController
  end
  def allowed_configs
-    mapping = {
+    @allowed_configs = case @config
-      'facebook' => %w[FB_APP_ID FB_VERIFY_TOKEN FB_APP_SECRET IG_VERIFY_TOKEN FACEBOOK_API_VERSION ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT],
+                       when 'facebook'
-      'shopify' => %w[SHOPIFY_CLIENT_ID SHOPIFY_CLIENT_SECRET],
+                         %w[FB_APP_ID FB_VERIFY_TOKEN FB_APP_SECRET IG_VERIFY_TOKEN FACEBOOK_API_VERSION ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT]
-      'microsoft' => %w[AZURE_APP_ID AZURE_APP_SECRET],
+                       when 'shopify'
-      'email' => ['MAILER_INBOUND_EMAIL_DOMAIN'],
+                         %w[SHOPIFY_CLIENT_ID SHOPIFY_CLIENT_SECRET]
-      'linear' => %w[LINEAR_CLIENT_ID LINEAR_CLIENT_SECRET],
+                       when 'microsoft'
-      'slack' => %w[SLACK_CLIENT_ID SLACK_CLIENT_SECRET],
+                         %w[AZURE_APP_ID AZURE_APP_SECRET]
-      'instagram' => %w[INSTAGRAM_APP_ID INSTAGRAM_APP_SECRET INSTAGRAM_VERIFY_TOKEN INSTAGRAM_API_VERSION ENABLE_INSTAGRAM_CHANNEL_HUMAN_AGENT],
+                       when 'email'
-      'whatsapp_embedded' => %w[WHATSAPP_APP_ID WHATSAPP_APP_SECRET WHATSAPP_CONFIGURATION_ID WHATSAPP_API_VERSION],
+                         ['MAILER_INBOUND_EMAIL_DOMAIN']
-      'notion' => %w[NOTION_CLIENT_ID NOTION_CLIENT_SECRET],
+                       when 'linear'
-      'google' => %w[GOOGLE_OAUTH_CLIENT_ID GOOGLE_OAUTH_CLIENT_SECRET GOOGLE_OAUTH_REDIRECT_URI]
+                         %w[LINEAR_CLIENT_ID LINEAR_CLIENT_SECRET]
-    }
+                       when '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])
+                       else
                         %w[ENABLE_ACCOUNT_SIGNUP FIREBASE_PROJECT_ID FIREBASE_CREDENTIALS]
                       end
  end
 end
@@ -7,9 +7,8 @@
 class SuperAdmin::ApplicationController < Administrate::ApplicationController
  include ActionView::Helpers::TagHelper
  include ActionView::Context
  include SuperAdmin::NavigationHelper
-  helper_method :render_vue_component, :settings_open?, :settings_pages
+  helper_method :render_vue_component
  # authenticiation done via devise : SuperAdmin Model
  before_action :authenticate_super_admin!
@@ -27,11 +27,7 @@ class Twilio::CallbackController < ApplicationController
      *Array.new(10) { |i| :"MediaUrl#{i}" },
      *Array.new(10) { |i| :"MediaContentType#{i}" },
      :MessagingServiceSid,
-      :NumMedia,
+      :NumMedia
      :Latitude,
      :Longitude,
      :MessageType,
      :ProfileName
    )
  end
 end
@@ -4,16 +4,7 @@ class Webhooks::InstagramController < ActionController::API
  def events
    Rails.logger.info('Instagram webhook received events')
    if params['object'].casecmp('instagram').zero?
-      entry_params = params.to_unsafe_hash[:entry]
+      ::Webhooks::InstagramEventsJob.perform_later(params.to_unsafe_hash[:entry])
      if contains_echo_event?(entry_params)
        # Add delay to prevent race condition where echo arrives before send message API completes
        # This avoids duplicate messages when echo comes early during API processing
        ::Webhooks::InstagramEventsJob.set(wait: 2.seconds).perform_later(entry_params)
      else
        ::Webhooks::InstagramEventsJob.perform_later(entry_params)
      end
      render json: :ok
    else
      Rails.logger.warn("Message is not received from the instagram webhook event: #{params['object']}")
@@ -23,16 +14,6 @@ class Webhooks::InstagramController < ActionController::API
  private
  def contains_echo_event?(entry_params)
    return false unless entry_params.is_a?(Array)
    entry_params.any? do |entry|
      # Check messaging array for echo events
      messaging_events = entry[:messaging] || []
      messaging_events.any? { |messaging| messaging.dig(:message, :is_echo).present? }
    end
  end
  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)
@@ -15,13 +15,7 @@ class NotificationFinder
  end
  def unread_count
-    if type_included?('read')
+    @notifications.where(read_at: nil).count
      # If we're including read notifications, filter to unread
      @notifications.where(read_at: nil).count
    else
      # Already filtered to unread notifications, just count
      @notifications.count
    end
  end
  def count
@@ -33,7 +27,7 @@ class NotificationFinder
  def set_up
    find_all_notifications
    filter_snoozed_notifications
-    filter_read_notifications
+    fitler_read_notifications
  end
  def find_all_notifications
@@ -44,7 +38,7 @@ class NotificationFinder
    @notifications = @notifications.where(snoozed_until: nil) unless type_included?('snoozed')
  end
-  def filter_read_notifications
+  def fitler_read_notifications
    @notifications = @notifications.where(read_at: nil) unless type_included?('read')
  end
@@ -36,13 +36,9 @@ module Api::V2::Accounts::ReportsHelper
  end
  def generate_labels_report
-    reports = V2::Reports::LabelSummaryBuilder.new(
+    Current.account.labels.map do |label|
-      account: Current.account,
+      label_report = report_builder({ type: :label, id: label.id }).short_summary
-      params: build_params({})
+      [label.title] + generate_readable_report_metrics(label_report)
    ).build
    reports.map do |report|
      [report[:name]] + generate_readable_report_metrics(report)
    end
  end
@@ -1,13 +1,9 @@
 module MessageFormatHelper
  include RegexHelper
  def transform_user_mention_content(message_content)
    # attachment message without content, message_content is nil
-    return '' unless message_content.presence
+    message_content.presence ? message_content.gsub(MENTION_REGEX, '\1') : ''
    # Use CommonMarker to convert markdown to plain text for notifications
    # This handles all markdown formatting (links, bold, italic, etc.) not just mentions
    # Converts: [@👍 customer support](mention://team/1/%F0%9F%91%8D%20customer%20support)
    # To: @👍 customer support
    CommonMarker.render_doc(message_content).to_plaintext.strip
  end
  def render_message_content(message_content)
@@ -1,21 +1,4 @@
 module PortalHelper
  def set_og_image_url(portal_name, title)
    cdn_url = GlobalConfig.get('OG_IMAGE_CDN_URL')['OG_IMAGE_CDN_URL']
    return if cdn_url.blank?
    client_ref = GlobalConfig.get('OG_IMAGE_CLIENT_REF')['OG_IMAGE_CLIENT_REF']
    uri = URI.parse(cdn_url)
    uri.path = '/og'
    uri.query = URI.encode_www_form(
      clientRef: client_ref,
      title: title,
      portalName: portal_name
    )
    uri.to_s
  end
  def generate_portal_bg_color(portal_color, theme)
    base_color = theme == 'dark' ? 'black' : 'white'
    "color-mix(in srgb, #{portal_color} 20%, #{base_color})"
@@ -18,25 +18,12 @@ module ReportingEventHelper
  end
  def last_non_human_activity(conversation)
-    # Try to get either a handoff or reopened event first
+    # check if a handoff event already exists
-    # These will always take precedence over any other activity
+    handoff_event = ReportingEvent.where(conversation_id: conversation.id, name: 'conversation_bot_handoff').last
    # Also, any of these events can happen at any time in the course of a conversation lifecycle.
    # So we pick the latest event
    event = ReportingEvent.where(
      conversation_id: conversation.id,
      name: %w[conversation_bot_handoff conversation_opened]
    ).order(event_end_time: :desc).first
-    return event.event_end_time if event&.event_end_time
+    # if a handoff exists, last non human activity is when the handoff ended,
-
+    # otherwise it's when the conversation was created
-    # Fallback to bot resolved event
+    handoff_event&.event_end_time || conversation.created_at
    # Because this will be closest to the most accurate activity instead of conversation.created_at
    bot_event = ReportingEvent.where(conversation_id: conversation.id, name: 'conversation_bot_resolved').last
    return bot_event.event_end_time if bot_event&.event_end_time
    # If no events found, return conversation creation time
    conversation.created_at
  end
  private
@@ -1,16 +0,0 @@
 module SuperAdmin::NavigationHelper
  def settings_open?
    params[:controller].in? %w[super_admin/settings super_admin/app_configs]
  end
  def settings_pages
    features = SuperAdmin::FeaturesHelper.available_features.select do |_feature, attrs|
      attrs['config_key'].present? && attrs['enabled']
    end
    # Add general at the beginning
    general_feature = [['general', { 'config_key' => 'general', 'name' => 'General' }]]
    general_feature + features.to_a
  end
 end
@@ -1,6 +1,6 @@
 <script>
 import { mapGetters } from 'vuex';
-import AddAccountModal from './components/app/AddAccountModal.vue';
+import AddAccountModal from '../dashboard/components/layout/sidebarComponents/AddAccountModal.vue';
 import LoadingState from './components/widgets/LoadingState.vue';
 import NetworkNotification from './components/NetworkNotification.vue';
 import UpdateBanner from './components/app/UpdateBanner.vue';
@@ -136,7 +136,8 @@ export default {
  <div
    v-if="!authUIFlags.isFetching && !accountUIFlags.isFetchingItem"
    id="app"
-    class="flex flex-col w-full h-screen min-h-0"
+    class="flex-grow-0 w-full h-full min-h-0 app-wrapper"
    :class="{ 'app-rtl--wrapper': isRTL }"
    :dir="isRTL ? 'rtl' : 'ltr'"
  >
    <UpdateBanner :latest-chatwoot-version="latestChatwootVersion" />
@@ -21,10 +21,6 @@ class AgentBotsAPI extends ApiClient {
  deleteAgentBotAvatar(botId) {
    return axios.delete(`${this.url}/${botId}/avatar`);
  }
  resetAccessToken(botId) {
    return axios.post(`${this.url}/${botId}/reset_access_token`);
  }
 }
 export default new AgentBotsAPI();
@@ -38,7 +38,13 @@ export default {
    }
    return false;
  },
-  profileUpdate({ displayName, avatar, ...profileAttributes }) {
+  profileUpdate({
    password,
    password_confirmation,
    displayName,
    avatar,
    ...profileAttributes
  }) {
    const formData = new FormData();
    Object.keys(profileAttributes).forEach(key => {
      const hasValue = profileAttributes[key] === undefined;
@@ -47,22 +53,16 @@ export default {
      }
    });
    formData.append('profile[display_name]', displayName || '');
    if (password && password_confirmation) {
      formData.append('profile[password]', password);
      formData.append('profile[password_confirmation]', password_confirmation);
    }
    if (avatar) {
      formData.append('profile[avatar]', avatar);
    }
    return axios.put(endPoints('profileUpdate').url, formData);
  },
  profilePasswordUpdate({ currentPassword, password, passwordConfirmation }) {
    return axios.put(endPoints('profileUpdate').url, {
      profile: {
        current_password: currentPassword,
        password,
        password_confirmation: passwordConfirmation,
      },
    });
  },
  updateUISettings({ uiSettings }) {
    return axios.put(endPoints('profileUpdate').url, {
      profile: { ui_settings: uiSettings },
@@ -102,8 +102,4 @@ export default {
    const urlData = endPoints('resendConfirmation');
    return axios.post(urlData.url);
  },
  resetAccessToken() {
    const urlData = endPoints('resetAccessToken');
    return axios.post(urlData.url);
  },
 };
@@ -1,18 +0,0 @@
 /* global axios */
 import ApiClient from '../ApiClient';
 class CopilotMessages extends ApiClient {
  constructor() {
    super('captain/copilot_threads', { accountScoped: true });
  }
  get(threadId) {
    return axios.get(`${this.url}/${threadId}/copilot_messages`);
  }
  create({ threadId, ...rest }) {
    return axios.post(`${this.url}/${threadId}/copilot_messages`, rest);
  }
 }
 export default new CopilotMessages();
@@ -1,9 +0,0 @@
 import ApiClient from '../ApiClient';
 class CopilotThreads extends ApiClient {
  constructor() {
    super('captain/copilot_threads', { accountScoped: true });
  }
 }
 export default new CopilotThreads();
@@ -1,36 +0,0 @@
 /* global axios */
 import ApiClient from '../ApiClient';
 class CaptainScenarios extends ApiClient {
  constructor() {
    super('captain/assistants', { accountScoped: true });
  }
  get({ assistantId, page = 1, searchKey } = {}) {
    return axios.get(`${this.url}/${assistantId}/scenarios`, {
      params: { page, searchKey },
    });
  }
  show({ assistantId, id }) {
    return axios.get(`${this.url}/${assistantId}/scenarios/${id}`);
  }
  create({ assistantId, ...data } = {}) {
    return axios.post(`${this.url}/${assistantId}/scenarios`, {
      scenario: data,
    });
  }
  update({ assistantId, id }, data = {}) {
    return axios.put(`${this.url}/${assistantId}/scenarios/${id}`, {
      scenario: data,
    });
  }
  delete({ assistantId, id }) {
    return axios.delete(`${this.url}/${assistantId}/scenarios/${id}`);
  }
 }
 export default new CaptainScenarios();
@@ -1,16 +0,0 @@
 /* global axios */
 import ApiClient from '../ApiClient';
 class CaptainTools extends ApiClient {
  constructor() {
    super('captain/assistants/tools', { accountScoped: true });
  }
  get(params = {}) {
    return axios.get(this.url, {
      params,
    });
  }
 }
 export default new CaptainTools();
@@ -1,21 +0,0 @@
 /* global axios */
 import ApiClient from '../ApiClient';
 class WhatsappChannel extends ApiClient {
  constructor() {
    super('whatsapp', { accountScoped: true });
  }
  createEmbeddedSignup(params) {
    return axios.post(`${this.baseUrl()}/whatsapp/authorization`, params);
  }
  reauthorizeWhatsApp({ inboxId, ...params }) {
    return axios.post(`${this.baseUrl()}/whatsapp/authorization`, {
      ...params,
      inbox_id: inboxId,
    });
  }
 }
 export default new WhatsappChannel();
@@ -61,11 +61,6 @@ class ContactAPI extends ApiClient {
    return axios.get(requestURL);
  }
  active(page = 1, sortAttr = 'name') {
    let requestURL = `${this.url}/active?${buildContactParams(page, sortAttr)}`;
    return axios.get(requestURL);
  }
  // eslint-disable-next-line default-param-last
  filter(page = 1, sortAttr = 'name', queryPayload) {
    let requestURL = `${this.url}/filter?${buildContactParams(page, sortAttr)}`;
@@ -51,10 +51,6 @@ const endPoints = {
  resendConfirmation: {
    url: '/api/v1/profile/resend_confirmation',
  },
  resetAccessToken: {
    url: '/api/v1/profile/reset_access_token',
  },
 };
 export default page => {
@@ -1,29 +0,0 @@
 /* global axios */
 import ApiClient from '../ApiClient';
 class PdfDocumentsAPI extends ApiClient {
  constructor() {
    super('portals', { accountScoped: true });
  }
  uploadContent(portalSlug, formData) {
    return axios.post(`${this.url}/${portalSlug}/upload_content`, formData, {
      headers: {
        'Content-Type': 'multipart/form-data',
      },
    });
  }
  getGeneratedContent(portalSlug) {
    return axios.get(`${this.url}/${portalSlug}/generated_content`);
  }
  publishContent(portalSlug, responseIds, categoryId = null) {
    return axios.post(`${this.url}/${portalSlug}/publish_content`, {
      response_ids: responseIds,
      category_id: categoryId
    });
  }
 }
 export default PdfDocumentsAPI;
@@ -21,14 +21,6 @@ class PortalsAPI extends ApiClient {
  deleteLogo(portalSlug) {
    return axios.delete(`${this.url}/${portalSlug}/logo`);
  }
  sendCnameInstructions(portalSlug, email) {
    return axios.post(`${this.url}/${portalSlug}/send_instructions`, { email });
  }
  sslStatus(portalSlug) {
    return axios.get(`${this.url}/${portalSlug}/ssl_status`);
  }
 }
 export default PortalsAPI;
@@ -134,12 +134,12 @@ class ConversationApi extends ApiClient {
    return axios.get(`${this.url}/${conversationId}/attachments`);
  }
-  getInboxAssistant(conversationId) {
+  requestCopilot(conversationId, body) {
-    return axios.get(`${this.url}/${conversationId}/inbox_assistant`);
+    return axios.post(`${this.url}/${conversationId}/copilot`, body);
  }
-  delete(conversationId) {
+  getInboxAssistant(conversationId) {
-    return axios.delete(`${this.url}/${conversationId}`);
+    return axios.get(`${this.url}/${conversationId}/inbox_assistant`);
  }
 }
@@ -28,10 +28,6 @@ class Inboxes extends CacheEnabledApiClient {
      agent_bot: botId,
    });
  }
  syncTemplates(inboxId) {
    return axios.post(`${this.url}/${inboxId}/sync_templates`);
  }
 }
 export default new Inboxes();
@@ -33,11 +33,9 @@ class LinearAPI extends ApiClient {
    );
  }
-  unlinkIssue(linkId, issueIdentifier, conversationId) {
+  unlinkIssue(linkId) {
    return axios.post(`${this.url}/unlink_issue`, {
      link_id: linkId,
      issue_id: issueIdentifier,
      conversation_id: conversationId,
    });
  }
@@ -1,14 +0,0 @@
 /* global axios */
 import ApiClient from './ApiClient';
 class NotionOAuthClient extends ApiClient {
  constructor() {
    super('notion', { accountScoped: true });
  }
  generateAuthorization() {
    return axios.post(`${this.url}/authorization`);
  }
 }
 export default new NotionOAuthClient();
@@ -40,15 +40,6 @@ class SearchAPI extends ApiClient {
      },
    });
  }
  articles({ q, page = 1 }) {
    return axios.get(`${this.url}/articles`, {
      params: {
        q,
        page: page,
      },
    });
  }
 }
 export default new SearchAPI();
@@ -9,6 +9,5 @@ describe('#AgentBotsAPI', () => {
    expect(AgentBotsAPI).toHaveProperty('create');
    expect(AgentBotsAPI).toHaveProperty('update');
    expect(AgentBotsAPI).toHaveProperty('delete');
    expect(AgentBotsAPI).toHaveProperty('resetAccessToken');
  });
 });
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Shivam Mishra	648b9c9507	chore: add logs for debug	2025-05-22 10:08:19 +05:30
Pranav Shivam Mishra Sivin Varghese	611fc82847	feat: Add components to show steps in the copilot thinking process (#11530 ) This PR adds the components for new Copilot UI - Added a Header component - Added a thinking block. - Update the outline on copilot input --------- Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>	2025-05-22 10:08:19 +05:30
Sivin Varghese Shivam Mishra Pranav	ffad8458cb	feat: Delete a contact from the contacts page (#11529 ) # Pull Request Template ## Description This PR includes: 1. Adds the ability to delete a contact from the contacts list accordion section. 2. Improves the expand/collapse transition for the accordion. Fixes [CW-4375](https://linear.app/chatwoot/issue/CW-4375/allow-users-to-delete-a-contact-from-the-contacts-page) ## Type of change - [x] New feature (non-breaking change which adds functionality) ## How Has This Been Tested? ### Loom video https://www.loom.com/share/8c897d24737f40f6b8b29fef76ba18e2?sid=70910b9d-f3db-4d54-8bfc-820db680e537 ## Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my code - [ ] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules --------- Co-authored-by: Pranav <pranavrajs@gmail.com>	2025-05-22 10:08:19 +05:30
Vishnu Narayanan Shivam Mishra Sojan Jose	5869a98e6e	fix: account email validation during signup (#11307 ) - Refactor email validation logic to be a service - Use the service for both email/pass signup and Google SSO - fix account email validation during signup - Use `blocked_domain` setting for both email/pass signup and Google Sign In [`BLOCKED_DOMAIN` via GlobalConfig] - add specs for `account_builder` - add specs for the new service --------- Co-authored-by: Sojan Jose <sojan@pepalo.com>	2025-05-22 10:08:19 +05:30
Pranav Shivam Mishra Sojan Sivin Varghese Muhsin Keloth	dde08b0bd9	feat: Add support for search_conversations in copilot (#11520 ) Earlier, we were manually checking if a user was an agent and filtering their conversations based on inboxes. This logic should have been part of the conversation permissions service. This PR moves the check to the right place and updates the logic accordingly. Other updates: - Add support for search_conversations service for copilot. - Use PermissionFilterService in contacts/conversations, conversations, copilot search_conversations. --------- Co-authored-by: Sojan <sojan@pepalo.com> Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com> Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>	2025-05-22 10:08:19 +05:30
Sivin VargheseandShivam Mishra	5a4201ae58	chore: Display Agent Bot token after creation (#11488 ) This PR includes: - Displaying the Agent Bot token after creation - Updating the avatar icon when an avatar image is not present Fixes: https://linear.app/chatwoot/issue/CW-4337/agent-bot-token-not-visible	2025-05-22 10:08:19 +05:30
Sivin VargheseandShivam Mishra	fc8fe9a8d1	feat: Prevent saving preferences and status when impersonating (#11164 ) This PR will prevent saving user preferences and online status when impersonating. Previously, these settings could be updated during impersonation, causing the user to see a different view or UI settings. Fixes https://linear.app/chatwoot/issue/CW-4163/impersonation-improvements	2025-05-22 10:08:19 +05:30
Muhsin KelothandShivam Mishra	2fe0761fd5	fix: Display message content for CSAT messages in non-widget inboxes (#11528 ) We made so many improvements for CSAT via https://github.com/chatwoot/chatwoot/pull/11485. However, we missed showing message content in the dashboard for CSAT URLs created in non-widget inboxes. This PR fixes the issue by ensuring that CSAT-configured messages are passed along with CSAT responses, otherwise defaulting to the translation.	2025-05-22 10:08:19 +05:30
Sivin VargheseandShivam Mishra	9dd2d14655	fix: Status not updating when creating a Linear issue (#11523 )	2025-05-22 10:08:19 +05:30