DEV: Decorate boosted and AI results

It also removes the need for multiple versions of our seeded prompts per model, further simplifying the code.

.discourse-compatibility

@@ -1,3 +1,5 @@
+< 3.2.0.beta4-dev: 493b48477a9288f2f1b6f021954088705a6673d6
+< 3.2.0.beta2-dev: 3bced1c6f525553fe2b5b79d29bd66c1cf2a47d5
 3.1.999: c0415bb7eb878b1b7abf112d65cba981030df8df
 < 3.2.0.beta1-dev: 3e7c99de894b03e9161d9481da118fe893991a1d
 3.1.0.beta3: 057fbe1ce6

.eslintrc

@@ -1,3 +0,0 @@
-{
-  "extends": "eslint-config-discourse"
-}

.eslintrc.cjs

@@ -0,0 +1 @@
+module.exports = require("@discourse/lint-configs/eslint");

.prettierignore

@@ -0,0 +1,21 @@
+app/assets/stylesheets/vendor/
+documentation/
+package.json
+config/locales/**/*.yml
+!config/locales/**/*.en*.yml
+script/import_scripts/**/*.yml
+
+plugins/**/lib/javascripts/locale
+public/
+!/app/assets/javascripts/discourse/public
+vendor/
+app/assets/javascripts/discourse/tests/fixtures
+spec/
+node_modules/
+dist/
+tmp/
+
+**/*.rb
+**/*.html
+**/*.json
+**/*.md

.prettierrc

@@ -1 +0,0 @@
-{}

.prettierrc.cjs

@@ -0,0 +1 @@
+module.exports = require("@discourse/lint-configs/prettier");

.rubocop.yml

@@ -1,2 +1,4 @@
 inherit_gem:
   rubocop-discourse: stree-compat.yml
+RSpec/NamedSubject:
+  Enabled: false

.streerc

@@ -1,2 +1,2 @@
 --print-width=100
---plugins=plugin/trailing_comma,disable_ternary
+--plugins=plugin/trailing_comma,plugin/disable_auto_ternary

.template-lintrc.js

@@ -1,4 +1 @@
-module.exports = {
-  plugins: ["ember-template-lint-plugin-discourse"],
-  extends: "discourse:recommended",
-};
+module.exports = require("@discourse/lint-configs/template-lint");

Gemfile

@@ -5,5 +5,4 @@ source "https://rubygems.org"
 group :development do
   gem "rubocop-discourse"
   gem "syntax_tree"
-  gem "syntax_tree-disable_ternary"
 end

Gemfile.lock

@@ -2,36 +2,45 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    json (2.6.2)
-    parallel (1.22.1)
-    parser (3.1.2.1)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
+    parallel (1.23.0)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
-    prettier_print (1.2.0)
+      racc
+    prettier_print (1.2.1)
+    racc (1.7.2)
     rainbow (3.1.1)
-    regexp_parser (2.6.0)
-    rexml (3.2.5)
-    rubocop (1.36.0)
+    regexp_parser (2.8.2)
+    rexml (3.2.6)
+    rubocop (1.57.2)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
-    rubocop-discourse (3.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.19.0)
+      rubocop (~> 1.41)
+    rubocop-discourse (3.4.0)
       rubocop (>= 1.1.0)
       rubocop-rspec (>= 2.0.0)
-    rubocop-rspec (2.13.2)
+    rubocop-factory_bot (2.24.0)
       rubocop (~> 1.33)
-    ruby-progressbar (1.11.0)
-    syntax_tree (5.1.0)
+    rubocop-rspec (2.25.0)
+      rubocop (~> 1.40)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
+    syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
-    syntax_tree-disable_ternary (1.0.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   arm64-darwin-20
@@ -44,7 +53,6 @@ PLATFORMS
 DEPENDENCIES
   rubocop-discourse
   syntax_tree
-  syntax_tree-disable_ternary
 
 BUNDLED WITH
-   2.3.10
+   2.4.21

app/controllers/discourse_ai/admin/ai_personas_controller.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module DiscourseAi
+  module Admin
+    class AiPersonasController < ::Admin::AdminController
+      before_action :find_ai_persona, only: %i[show update destroy]
+
+      def index
+        ai_personas =
+          AiPersona.ordered.map do |persona|
+            # we use a special serializer here cause names and descriptions are
+            # localized for system personas
+            LocalizedAiPersonaSerializer.new(persona, root: false)
+          end
+        commands =
+          DiscourseAi::AiBot::Personas::Persona.all_available_commands.map do |command|
+            { id: command.to_s.split("::").last, name: command.name.humanize.titleize }
+          end
+        render json: { ai_personas: ai_personas, meta: { commands: commands } }
+      end
+
+      def show
+        render json: LocalizedAiPersonaSerializer.new(@ai_persona)
+      end
+
+      def create
+        ai_persona = AiPersona.new(ai_persona_params)
+        if ai_persona.save
+          render json: { ai_persona: ai_persona }, status: :created
+        else
+          render_json_error ai_persona
+        end
+      end
+
+      def update
+        if @ai_persona.update(ai_persona_params)
+          render json: @ai_persona
+        else
+          render_json_error @ai_persona
+        end
+      end
+
+      def destroy
+        if @ai_persona.destroy
+          head :no_content
+        else
+          render_json_error @ai_persona
+        end
+      end
+
+      private
+
+      def find_ai_persona
+        @ai_persona = AiPersona.find(params[:id])
+      end
+
+      def ai_persona_params
+        params.require(:ai_persona).permit(
+          :name,
+          :description,
+          :enabled,
+          :system_prompt,
+          :enabled,
+          :priority,
+          allowed_group_ids: [],
+          commands: [],
+        )
+      end
+    end
+  end
+end

app/controllers/discourse_ai/admin/dashboard_controller.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module DiscourseAi
+  module Admin
+    class DashboardController < ::Admin::StaffController
+      requires_plugin DiscourseAi::PLUGIN_NAME
+
+      def sentiment
+      end
+    end
+  end
+end

app/controllers/discourse_ai/ai_helper/assistant_controller.rb

@@ -11,7 +11,7 @@ module DiscourseAi
       def prompts
         render json:
                  ActiveModel::ArraySerializer.new(
-                   DiscourseAi::AiHelper::LlmPrompt.new.available_prompts,
+                   DiscourseAi::AiHelper::Assistant.new.available_prompts,
                    root: false,
                  ),
                status: 200
@@ -29,39 +29,34 @@ module DiscourseAi
 
         hijack do
           render json:
-                   DiscourseAi::AiHelper::LlmPrompt.new.generate_and_send_prompt(prompt, params),
+                   DiscourseAi::AiHelper::Assistant.new.generate_and_send_prompt(
+                     prompt,
+                     input,
+                     current_user,
+                   ),
                  status: 200
         end
-      rescue ::DiscourseAi::Inference::OpenAiCompletions::CompletionFailed,
-             ::DiscourseAi::Inference::HuggingFaceTextGeneration::CompletionFailed,
-             ::DiscourseAi::Inference::AnthropicCompletions::CompletionFailed => e
+      rescue DiscourseAi::Completions::Endpoints::Base::CompletionFailed => e
         render_json_error I18n.t("discourse_ai.ai_helper.errors.completion_request_failed"),
                           status: 502
       end
 
       def suggest_title
         input = get_text_param!
-        input_hash = { text: input }
 
-        llm_prompt =
-          DiscourseAi::AiHelper::LlmPrompt
-            .new
-            .available_prompts(name_filter: "generate_titles")
-            .first
-        prompt = CompletionPrompt.find_by(id: llm_prompt[:id])
-        raise Discourse::InvalidParameters.new(:mode) if !prompt || !prompt.enabled?
+        prompt = CompletionPrompt.enabled_by_name("generate_titles")
+        raise Discourse::InvalidParameters.new(:mode) if !prompt
 
         hijack do
           render json:
-                   DiscourseAi::AiHelper::LlmPrompt.new.generate_and_send_prompt(
+                   DiscourseAi::AiHelper::Assistant.new.generate_and_send_prompt(
                      prompt,
-                     input_hash,
+                     input,
+                     current_user,
                    ),
                  status: 200
         end
-      rescue ::DiscourseAi::Inference::OpenAiCompletions::CompletionFailed,
-             ::DiscourseAi::Inference::HuggingFaceTextGeneration::CompletionFailed,
-             ::DiscourseAi::Inference::AnthropicCompletions::CompletionFailed => e
+      rescue DiscourseAi::Completions::Endpoints::Base::CompletionFailed => e
         render_json_error I18n.t("discourse_ai.ai_helper.errors.completion_request_failed"),
                           status: 502
       end
@@ -96,12 +91,34 @@ module DiscourseAi
         end
       end
 
+      def explain
+        post_id = get_post_param!
+        term_to_explain = get_text_param!
+        post = Post.includes(:topic).find_by(id: post_id)
+
+        raise Discourse::InvalidParameters.new(:post_id) unless post
+
+        render json:
+                 DiscourseAi::AiHelper::TopicHelper.new(current_user).explain(
+                   term_to_explain,
+                   post,
+                 ),
+               status: 200
+      rescue DiscourseAi::Completions::Endpoints::Base::CompletionFailed => e
+        render_json_error I18n.t("discourse_ai.ai_helper.errors.completion_request_failed"),
+                          status: 502
+      end
+
       private
 
       def get_text_param!
         params[:text].tap { |t| raise Discourse::InvalidParameters.new(:text) if t.blank? }
       end
 
+      def get_post_param!
+        params[:post_id].tap { |t| raise Discourse::InvalidParameters.new(:post_id) if t.blank? }
+      end
+
       def rate_limiter_performed!
         RateLimiter.new(current_user, "ai_assistant", 6, 3.minutes).performed!
       end

app/models/ai_api_audit_log.rb

@@ -15,6 +15,8 @@ end
 #  id                   :bigint           not null, primary key
 #  provider_id          :integer          not null
 #  user_id              :integer
+#  topic_id             :integer
+#  post_id              :integer
 #  request_tokens       :integer
 #  response_tokens      :integer
 #  raw_request_payload  :string

app/models/ai_persona.rb

@@ -0,0 +1,179 @@
+# frozen_string_literal: true
+
+class AiPersona < ActiveRecord::Base
+  # places a hard limit, so per site we cache a maximum of 500 classes
+  MAX_PERSONAS_PER_SITE = 500
+
+  validates :name, presence: true, uniqueness: true, length: { maximum: 100 }
+  validates :description, presence: true, length: { maximum: 2000 }
+  validates :system_prompt, presence: true, length: { maximum: 10_000_000 }
+  validate :system_persona_unchangeable, on: :update, if: :system
+
+  before_destroy :ensure_not_system
+
+  class MultisiteHash
+    def initialize(id)
+      @hash = Hash.new { |h, k| h[k] = {} }
+      @id = id
+
+      MessageBus.subscribe(channel_name) { |message| @hash[message.data] = {} }
+    end
+
+    def channel_name
+      "/multisite-hash-#{@id}"
+    end
+
+    def current_db
+      RailsMultisite::ConnectionManagement.current_db
+    end
+
+    def [](key)
+      @hash.dig(current_db, key)
+    end
+
+    def []=(key, val)
+      @hash[current_db][key] = val
+    end
+
+    def flush!
+      @hash[current_db] = {}
+      MessageBus.publish(channel_name, current_db)
+    end
+  end
+
+  def self.persona_cache
+    @persona_cache ||= MultisiteHash.new("persona_cache")
+  end
+
+  scope :ordered, -> { order("priority DESC, lower(name) ASC") }
+
+  def self.all_personas
+    persona_cache[:value] ||= AiPersona
+      .ordered
+      .where(enabled: true)
+      .all
+      .limit(MAX_PERSONAS_PER_SITE)
+      .map(&:class_instance)
+  end
+
+  after_commit :bump_cache
+
+  def bump_cache
+    self.class.persona_cache.flush!
+  end
+
+  def class_instance
+    allowed_group_ids = self.allowed_group_ids
+    id = self.id
+    system = self.system
+
+    persona_class = DiscourseAi::AiBot::Personas.system_personas_by_id[self.id]
+    if persona_class
+      persona_class.define_singleton_method :allowed_group_ids do
+        allowed_group_ids
+      end
+
+      persona_class.define_singleton_method :id do
+        id
+      end
+
+      persona_class.define_singleton_method :system do
+        system
+      end
+
+      return persona_class
+    end
+
+    name = self.name
+    description = self.description
+    ai_persona_id = self.id
+    commands =
+      self.commands.filter_map do |inner_name|
+        begin
+          ("DiscourseAi::AiBot::Commands::#{inner_name}").constantize
+        rescue StandardError
+          nil
+        end
+      end
+
+    Class.new(DiscourseAi::AiBot::Personas::Persona) do
+      define_singleton_method :id do
+        id
+      end
+
+      define_singleton_method :name do
+        name
+      end
+
+      define_singleton_method :description do
+        description
+      end
+
+      define_singleton_method :system do
+        system
+      end
+
+      define_singleton_method :allowed_group_ids do
+        allowed_group_ids
+      end
+
+      define_singleton_method :to_s do
+        "#<DiscourseAi::AiBot::Personas::Persona::Custom @name=#{self.name} @allowed_group_ids=#{self.allowed_group_ids.join(",")}>"
+      end
+
+      define_singleton_method :inspect do
+        "#<DiscourseAi::AiBot::Personas::Persona::Custom @name=#{self.name} @allowed_group_ids=#{self.allowed_group_ids.join(",")}>"
+      end
+
+      define_method :initialize do |*args, **kwargs|
+        @ai_persona = AiPersona.find_by(id: ai_persona_id)
+        super(*args, **kwargs)
+      end
+
+      define_method :commands do
+        commands
+      end
+
+      define_method :system_prompt do
+        @ai_persona&.system_prompt || "You are a helpful bot."
+      end
+    end
+  end
+
+  private
+
+  def system_persona_unchangeable
+    if system_prompt_changed? || commands_changed? || name_changed? || description_changed?
+      errors.add(:base, I18n.t("discourse_ai.ai_bot.personas.cannot_edit_system_persona"))
+    end
+  end
+
+  def ensure_not_system
+    if system
+      errors.add(:base, I18n.t("discourse_ai.ai_bot.personas.cannot_delete_system_persona"))
+      throw :abort
+    end
+  end
+end
+
+# == Schema Information
+#
+# Table name: ai_personas
+#
+#  id                :bigint           not null, primary key
+#  name              :string(100)      not null
+#  description       :string(2000)     not null
+#  commands          :string           default([]), not null, is an Array
+#  system_prompt     :string(10000000) not null
+#  allowed_group_ids :integer          default([]), not null, is an Array
+#  created_by_id     :integer
+#  enabled           :boolean          default(TRUE), not null
+#  created_at        :datetime         not null
+#  updated_at        :datetime         not null
+#  system            :boolean          default(FALSE), not null
+#  priority          :integer          default(0), not null
+#
+# Indexes
+#
+#  index_ai_personas_on_name  (name) UNIQUE
+#

app/models/completion_prompt.rb

@@ -1,38 +1,37 @@
 # frozen_string_literal: true
 
 class CompletionPrompt < ActiveRecord::Base
-  # TODO(roman): Remove sept 2023.
-  self.ignored_columns = ["value"]
+  # TODO(roman): Remove may 2024.
+  self.ignored_columns = ["provider"]
+
+  TRANSLATE = -301
+  GENERATE_TITLES = -302
+  PROOFREAD = -303
+  MARKDOWN_TABLE = -304
+  CUSTOM_PROMPT = -305
+  EXPLAIN = -306
 
   enum :prompt_type, { text: 0, list: 1, diff: 2 }
 
   validates :messages, length: { maximum: 20 }
   validate :each_message_length
 
-  def messages_with_user_input(user_input)
-    if user_input[:custom_prompt].present?
-      case ::DiscourseAi::AiHelper::LlmPrompt.new.enabled_provider
-      when "huggingface"
-        self.messages.each { |msg| msg.sub!("{{custom_prompt}}", user_input[:custom_prompt]) }
-      else
-        self.messages.each do |msg|
-          msg["content"].sub!("{{custom_prompt}}", user_input[:custom_prompt])
-        end
-      end
-    end
+  def self.enabled_by_name(name)
+    where(enabled: true).find_by(name: name)
+  end
 
-    case ::DiscourseAi::AiHelper::LlmPrompt.new.enabled_provider
-    when "openai"
-      self.messages << { role: "user", content: user_input[:text] }
-    when "anthropic"
-      self.messages << { "role" => "Input", "content" => "<input>#{user_input[:text]}</input>" }
-    when "huggingface"
-      self.messages.first.sub("{{user_input}}", user_input[:text])
-    end
+  def messages_with_input(input)
+    return unless input
+
+    messages_hash.merge(input: "<input>#{input}</input")
   end
 
   private
 
+  def messages_hash
+    @messages_hash ||= messages.symbolize_keys!
+  end
+
   def each_message_length
     messages.each_with_index do |msg, idx|
       next if msg["content"].length <= 1000
@@ -54,7 +53,6 @@ end
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
 #  messages        :jsonb
-#  provider        :text
 #
 # Indexes
 #

app/serializers/localized_ai_persona_serializer.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class LocalizedAiPersonaSerializer < ApplicationSerializer
+  root "ai_persona"
+
+  attributes :id,
+             :name,
+             :description,
+             :enabled,
+             :system,
+             :priority,
+             :commands,
+             :system_prompt,
+             :allowed_group_ids
+
+  def name
+    object.class_instance.name
+  end
+
+  def description
+    object.class_instance.description
+  end
+end

assets/javascripts/discourse/admin-discourse-ai-personas-route-map.js

@@ -0,0 +1,14 @@
+export default {
+  resource: "admin.adminPlugins",
+
+  path: "/plugins",
+
+  map() {
+    this.route("discourse-ai", { path: "discourse-ai" }, function () {
+      this.route("ai-personas", { path: "ai_personas" }, function () {
+        this.route("new", { path: "/new" });
+        this.route("show", { path: "/:id" });
+      });
+    });
+  },
+};

assets/javascripts/discourse/admin-discourse-ai-route-map.js

@@ -0,0 +1,10 @@
+export default {
+  resource: "admin.dashboard",
+  path: "/dashboard",
+  map() {
+    this.route("admin.dashboardSentiment", {
+      path: "/dashboard/sentiment",
+      resetNamespace: true,
+    });
+  },
+};

assets/javascripts/discourse/admin/adapters/ai-persona.js

@@ -0,0 +1,17 @@
+import RestAdapter from "discourse/adapters/rest";
+
+export default class Adapter extends RestAdapter {
+  jsonMode = true;
+
+  basePath() {
+    return "/admin/plugins/discourse-ai/";
+  }
+
+  pathFor() {
+    return super.pathFor(...arguments) + ".json";
+  }
+
+  apiNameFor() {
+    return "ai-persona";
+  }
+}

assets/javascripts/discourse/admin/models/ai-persona.js

@@ -0,0 +1,28 @@
+import RestModel from "discourse/models/rest";
+
+const ATTRIBUTES = [
+  "name",
+  "description",
+  "commands",
+  "system_prompt",
+  "allowed_group_ids",
+  "enabled",
+  "system",
+  "priority",
+];
+
+export default class AiPersona extends RestModel {
+  updateProperties() {
+    let attrs = this.getProperties(ATTRIBUTES);
+    attrs.id = this.id;
+    return attrs;
+  }
+
+  createProperties() {
+    return this.getProperties(ATTRIBUTES);
+  }
+
+  workingCopy() {
+    return AiPersona.create(this.createProperties());
+  }
+}

assets/javascripts/discourse/components/ai-bot-header-panel.js

@@ -1,9 +1,8 @@
+import Component from "@glimmer/component";
 import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
-import Component from "@glimmer/component";
-import { composeAiBotMessage } from "discourse/plugins/discourse-ai/discourse/lib/ai-bot-helper";
-
 import I18n from "I18n";
+import { composeAiBotMessage } from "discourse/plugins/discourse-ai/discourse/lib/ai-bot-helper";
 
 export default class AiBotHeaderPanel extends Component {
   @service siteSettings;

assets/javascripts/discourse/components/ai-command-selector.gjs

@@ -0,0 +1,18 @@
+import { computed, observer } from "@ember/object";
+import MultiSelectComponent from "select-kit/components/multi-select";
+
+export default MultiSelectComponent.extend({
+  _modelDisabledChanged: observer("attrs.disabled", function () {
+    this.selectKit.options.set("disabled", this.get("attrs.disabled.value"));
+  }),
+
+  content: computed(function () {
+    return this.attrs.commands.value;
+  }),
+
+  value: "",
+
+  selectKitOptions: {
+    filterable: true,
+  },
+});

assets/javascripts/discourse/components/ai-persona-editor.gjs

@@ -0,0 +1,226 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { Input } from "@ember/component";
+import { on } from "@ember/modifier";
+import { action } from "@ember/object";
+import didInsert from "@ember/render-modifiers/modifiers/did-insert";
+import didUpdate from "@ember/render-modifiers/modifiers/did-update";
+import { later } from "@ember/runloop";
+import { inject as service } from "@ember/service";
+import DButton from "discourse/components/d-button";
+import Textarea from "discourse/components/d-textarea";
+import DToggleSwitch from "discourse/components/d-toggle-switch";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import Group from "discourse/models/group";
+import i18n from "discourse-common/helpers/i18n";
+import I18n from "discourse-i18n";
+import GroupChooser from "select-kit/components/group-chooser";
+import DTooltip from "float-kit/components/d-tooltip";
+import AiCommandSelector from "./ai-command-selector";
+
+export default class PersonaEditor extends Component {
+  @service router;
+  @service store;
+  @service dialog;
+  @service toasts;
+
+  @tracked allGroups = [];
+  @tracked isSaving = false;
+  @tracked editingModel = null;
+  @tracked showDelete = false;
+
+  @action
+  updateModel() {
+    this.editingModel = this.args.model.workingCopy();
+    this.showDelete = !this.args.model.isNew && !this.args.model.system;
+  }
+
+  @action
+  async updateAllGroups() {
+    this.allGroups = await Group.findAll();
+  }
+
+  @action
+  async save() {
+    const isNew = this.args.model.isNew;
+    this.isSaving = true;
+
+    const backupModel = this.args.model.workingCopy();
+
+    this.args.model.setProperties(this.editingModel);
+    try {
+      await this.args.model.save();
+      this.#sortPersonas();
+      if (isNew) {
+        this.args.personas.addObject(this.args.model);
+        this.router.transitionTo(
+          "adminPlugins.discourse-ai.ai-personas.show",
+          this.args.model
+        );
+      } else {
+        this.toasts.success({
+          data: { message: I18n.t("discourse_ai.ai_persona.saved") },
+          duration: 2000,
+        });
+      }
+    } catch (e) {
+      this.args.model.setProperties(backupModel);
+      popupAjaxError(e);
+    } finally {
+      later(() => {
+        this.isSaving = false;
+      }, 1000);
+    }
+  }
+
+  @action
+  delete() {
+    return this.dialog.confirm({
+      message: I18n.t("discourse_ai.ai_persona.confirm_delete"),
+      didConfirm: () => {
+        return this.args.model.destroyRecord().then(() => {
+          this.args.personas.removeObject(this.args.model);
+          this.router.transitionTo(
+            "adminPlugins.discourse-ai.ai-personas.index"
+          );
+        });
+      },
+    });
+  }
+
+  @action
+  updateAllowedGroups(ids) {
+    this.editingModel.set("allowed_group_ids", ids);
+  }
+
+  @action
+  async toggleEnabled() {
+    this.args.model.set("enabled", !this.args.model.enabled);
+    this.editingModel.set("enabled", this.args.model.enabled);
+    if (!this.args.model.isNew) {
+      try {
+        await this.args.model.update({ enabled: this.args.model.enabled });
+      } catch (e) {
+        popupAjaxError(e);
+      }
+    }
+  }
+
+  @action
+  async togglePriority() {
+    this.args.model.set("priority", !this.args.model.priority);
+    this.editingModel.set("priority", this.args.model.priority);
+    if (!this.args.model.isNew) {
+      try {
+        await this.args.model.update({ priority: this.args.model.priority });
+
+        this.#sortPersonas();
+      } catch (e) {
+        popupAjaxError(e);
+      }
+    }
+  }
+
+  #sortPersonas() {
+    const sorted = this.args.personas.toArray().sort((a, b) => {
+      if (a.priority && !b.priority) {
+        return -1;
+      } else if (!a.priority && b.priority) {
+        return 1;
+      } else {
+        return a.name.localeCompare(b.name);
+      }
+    });
+    this.args.personas.clear();
+    this.args.personas.setObjects(sorted);
+  }
+
+  <template>
+    <form
+      class="form-horizontal ai-persona-editor"
+      {{didUpdate this.updateModel @model.id}}
+      {{didInsert this.updateModel @model.id}}
+      {{didInsert this.updateAllGroups @model.id}}
+    >
+      <div class="control-group">
+        <DToggleSwitch
+          class="ai-persona-editor__enabled"
+          @state={{@model.enabled}}
+          @label="discourse_ai.ai_persona.enabled"
+          {{on "click" this.toggleEnabled}}
+        />
+      </div>
+      <div class="control-group ai-persona-editor__priority">
+        <DToggleSwitch
+          class="ai-persona-editor__priority"
+          @state={{@model.priority}}
+          @label="discourse_ai.ai_persona.priority"
+          {{on "click" this.togglePriority}}
+        />
+        <DTooltip
+          @icon="question-circle"
+          @content={{i18n "discourse_ai.ai_persona.priority_help"}}
+        />
+      </div>
+      <div class="control-group">
+        <label>{{I18n.t "discourse_ai.ai_persona.name"}}</label>
+        <Input
+          class="ai-persona-editor__name"
+          @type="text"
+          @value={{this.editingModel.name}}
+          disabled={{this.editingModel.system}}
+        />
+      </div>
+      <div class="control-group">
+        <label>{{I18n.t "discourse_ai.ai_persona.description"}}</label>
+        <Textarea
+          class="ai-persona-editor__description"
+          @value={{this.editingModel.description}}
+          disabled={{this.editingModel.system}}
+        />
+      </div>
+      <div class="control-group">
+        <label>{{I18n.t "discourse_ai.ai_persona.commands"}}</label>
+        <AiCommandSelector
+          class="ai-persona-editor__commands"
+          @value={{this.editingModel.commands}}
+          @disabled={{this.editingModel.system}}
+          @commands={{@personas.resultSetMeta.commands}}
+        />
+      </div>
+      <div class="control-group">
+        <label>{{I18n.t "discourse_ai.ai_persona.allowed_groups"}}</label>
+        <GroupChooser
+          @value={{this.editingModel.allowed_group_ids}}
+          @content={{this.allGroups}}
+          @onChange={{this.updateAllowedGroups}}
+        />
+      </div>
+      <div class="control-group">
+        <label for="ai-persona-editor__system_prompt">{{I18n.t
+            "discourse_ai.ai_persona.system_prompt"
+          }}</label>
+        <Textarea
+          class="ai-persona-editor__system_prompt"
+          @value={{this.editingModel.system_prompt}}
+          disabled={{this.editingModel.system}}
+        />
+      </div>
+      <div class="control-group ai-persona-editor__action_panel">
+        <DButton
+          class="btn-primary ai-persona-editor__save"
+          @action={{this.save}}
+          @disabled={{this.isSaving}}
+        >{{I18n.t "discourse_ai.ai_persona.save"}}</DButton>
+        {{#if this.showDelete}}
+          <DButton
+            @action={{this.delete}}
+            class="btn-danger ai-persona-editor__delete"
+          >
+            {{I18n.t "discourse_ai.ai_persona.delete"}}
+          </DButton>
+        {{/if}}
+      </div>
+    </form>
+  </template>
+}

assets/javascripts/discourse/components/ai-persona-list-editor.gjs

@@ -0,0 +1,66 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { LinkTo } from "@ember/routing";
+import concatClass from "discourse/helpers/concat-class";
+import { cook } from "discourse/lib/text";
+import icon from "discourse-common/helpers/d-icon";
+import I18n from "discourse-i18n";
+import AiPersonaEditor from "./ai-persona-editor";
+
+export default class AiPersonaListEditor extends Component {
+  @tracked _noPersonaText = null;
+
+  get noPersonaText() {
+    if (this._noPersonaText === null) {
+      const raw = I18n.t("discourse_ai.ai_persona.no_persona_selected");
+      cook(raw).then((result) => {
+        this._noPersonaText = result;
+      });
+    }
+
+    return this._noPersonaText;
+  }
+
+  <template>
+    <div class="ai-persona-list-editor__header">
+      <h3>{{I18n.t "discourse_ai.ai_persona.title"}}</h3>
+      {{#unless @currentPersona.isNew}}
+        <LinkTo
+          @route="adminPlugins.discourse-ai.ai-personas.new"
+          class="btn btn-primary"
+        >
+          {{icon "plus"}}
+          <span>{{I18n.t "discourse_ai.ai_persona.new"}}</span>
+        </LinkTo>
+      {{/unless}}
+    </div>
+    <div class="content-list ai-persona-list-editor">
+      <ul>
+        {{#each @personas as |persona|}}
+          <li
+            class={{concatClass
+              (if persona.enabled "" "diabled")
+              (if persona.priority "priority")
+            }}
+          >
+            <LinkTo
+              @route="adminPlugins.discourse-ai.ai-personas.show"
+              current-when="true"
+              @model={{persona}}
+            >{{persona.name}}
+            </LinkTo>
+          </li>
+        {{/each}}
+      </ul>
+    </div>
+    <section class="ai-persona-list-editor__current content-body">
+      {{#if @currentPersona}}
+        <AiPersonaEditor @model={{@currentPersona}} @personas={{@personas}} />
+      {{else}}
+        <div class="ai-persona-list-editor__empty">
+          {{this.noPersonaText}}
+        </div>
+      {{/if}}
+    </section>
+  </template>
+}

assets/javascripts/discourse/components/ai-suggestion-dropdown.gjs

@@ -1,47 +1,15 @@
-import Component from '@glimmer/component';
+import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
+import didInsert from "@ember/render-modifiers/modifiers/did-insert";
+import { inject as service } from "@ember/service";
+import DButton from "discourse/components/d-button";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import didInsert from "@ember/render-modifiers/modifiers/did-insert";
 import { bind } from "discourse-common/utils/decorators";
-import { inject as service } from "@ember/service";
 import I18n from "I18n";
-import DButton from "discourse/components/d-button";
 
 export default class AISuggestionDropdown extends Component {
-  <template>
-    {{#if this.showAIButton}}
-      <DButton
-        @class="suggestion-button {{if this.loading 'is-loading'}}"
-        @icon={{this.suggestIcon}}
-        @title="discourse_ai.ai_helper.suggest"
-        @action={{this.performSuggestion}}
-        @disabled={{this.disableSuggestionButton}}
-        ...attributes
-      />
-    {{/if}}
-
-    {{#if this.showMenu}}
-      {{! template-lint-disable modifier-name-case }}
-      <ul class="popup-menu ai-suggestions-menu" {{didInsert this.handleClickOutside}}>
-        {{#if this.showErrors}}
-          <li class="ai-suggestions-menu__errors">{{this.error}}</li>
-        {{/if}}
-        {{#each this.generatedSuggestions as |suggestion index|}}
-          <li data-name={{suggestion}} data-value={{index}}>
-              <DButton
-                @class="popup-menu-btn"
-                @translatedLabel={{suggestion}}
-                @action={{this.applySuggestion}}
-                @actionParam={{suggestion}}
-              />
-          </li>
-        {{/each}}
-      </ul>
-    {{/if}}
-  </template>
-
   @service dialog;
   @service siteSettings;
   @service composer;
@@ -64,13 +32,33 @@ export default class AISuggestionDropdown extends Component {
 
   get showAIButton() {
     const minCharacterCount = 40;
-    return this.composer.model.replyLength > minCharacterCount;
+    const isShowAIButton = this.composer.model.replyLength > minCharacterCount;
+    const composerFields = document.querySelector(".composer-fields");
+
+    if (composerFields) {
+      if (isShowAIButton) {
+        composerFields.classList.add("showing-ai-suggestions");
+      } else {
+        composerFields.classList.remove("showing-ai-suggestions");
+      }
+    }
+
+    return isShowAIButton;
   }
 
   get disableSuggestionButton() {
     return this.loading;
   }
 
+  @action
+  applyClasses() {
+    if (this.showAIButton) {
+      document.querySelector(".composer-fields")?.classList.add("showing-ai-suggestions");
+    } else {
+      document.querySelector(".composer-fields")?.classList.remove("showing-ai-suggestions");
+    }
+  }
+
   @bind
   onClickOutside(event) {
     const menu = document.querySelector(".ai-title-suggestions-menu");
@@ -98,16 +86,17 @@ export default class AISuggestionDropdown extends Component {
       return;
     }
 
-
     if (this.args.mode === this.SUGGESTION_TYPES.title) {
       composer.set("title", suggestion);
       return this.#closeMenu();
     }
 
     if (this.args.mode === this.SUGGESTION_TYPES.category) {
-    const selectedCategoryId = this.composer.categories.find((c) => c.slug === suggestion).id;
-    composer.set("categoryId", selectedCategoryId);
-    return this.#closeMenu();
+      const selectedCategoryId = this.composer.categories.find(
+        (c) => c.slug === suggestion
+      ).id;
+      composer.set("categoryId", selectedCategoryId);
+      return this.#closeMenu();
     }
 
     if (this.args.mode === this.SUGGESTION_TYPES.tag) {
@@ -122,7 +111,9 @@ export default class AISuggestionDropdown extends Component {
     }
 
     if (this.composer.model.replyLength === 0) {
-      return this.dialog.alert(I18n.t("discourse_ai.ai_helper.missing_content"));
+      return this.dialog.alert(
+        I18n.t("discourse_ai.ai_helper.missing_content")
+      );
     }
 
     this.loading = true;
@@ -131,16 +122,27 @@ export default class AISuggestionDropdown extends Component {
     return ajax(`/discourse-ai/ai-helper/${this.args.mode}`, {
       method: "POST",
       data: { text: this.composer.model.reply },
-    }).then((data) => {
-      this.#assignGeneratedSuggestions(data, this.args.mode);
-    }).catch(popupAjaxError).finally(() => {
-      this.loading = false;
-      this.suggestIcon = "sync-alt";
-      this.showMenu = true;
-    });
+    })
+      .then((data) => {
+        this.#assignGeneratedSuggestions(data, this.args.mode);
+      })
+      .catch(popupAjaxError)
+      .finally(() => {
+        this.loading = false;
+        this.suggestIcon = "sync-alt";
+        this.showMenu = true;
+
+        if (this.args.mode === "suggest_category") {
+          document.querySelector(".category-input")?.classList.add("showing-ai-suggestion-menu");
+        }
+      });
   }
 
   #closeMenu() {
+    if (this.showMenu && this.args.mode === "suggest_category") {
+      document.querySelector(".category-input")?.classList.remove("showing-ai-suggestion-menu");
+    }
+
     this.suggestIcon = "discourse-sparkles";
     this.showMenu = false;
     this.showErrors = false;
@@ -153,7 +155,9 @@ export default class AISuggestionDropdown extends Component {
     if (!composer.tags) {
       composer.set("tags", [suggestion]);
       // remove tag from the list of suggestions once added
-      this.generatedSuggestions = this.generatedSuggestions.filter((s) => s !== suggestion);
+      this.generatedSuggestions = this.generatedSuggestions.filter(
+        (s) => s !== suggestion
+      );
       return;
     }
     const tags = composer.tags;
@@ -161,14 +165,16 @@ export default class AISuggestionDropdown extends Component {
     if (tags?.length >= maxTags) {
       // Show error if trying to add more tags than allowed
       this.showErrors = true;
-      this.error = I18n.t("select_kit.max_content_reached", { count: maxTags});
+      this.error = I18n.t("select_kit.max_content_reached", { count: maxTags });
       return;
     }
 
     tags.push(suggestion);
     composer.set("tags", [...tags]);
     // remove tag from the list of suggestions once added
-    return this.generatedSuggestions = this.generatedSuggestions.filter((s) => s !== suggestion);
+    return (this.generatedSuggestions = this.generatedSuggestions.filter(
+      (s) => s !== suggestion
+    ));
   }
 
   #tagSelectorHasValues() {
@@ -177,7 +183,7 @@ export default class AISuggestionDropdown extends Component {
 
   #assignGeneratedSuggestions(data, mode) {
     if (mode === this.SUGGESTION_TYPES.title) {
-      return this.generatedSuggestions = data.suggestions;
+      return (this.generatedSuggestions = data.suggestions);
     }
 
     const suggestions = data.assistant.map((s) => s.name);
@@ -185,12 +191,49 @@ export default class AISuggestionDropdown extends Component {
     if (mode === this.SUGGESTION_TYPES.tag) {
       if (this.#tagSelectorHasValues()) {
         // Filter out tags if they are already selected in the tag input
-        return this.generatedSuggestions = suggestions.filter((t) => !this.args.composer.tags.includes(t));
+        return (this.generatedSuggestions = suggestions.filter(
+          (t) => !this.args.composer.tags.includes(t)
+        ));
       } else {
-        return this.generatedSuggestions = suggestions;
+        return (this.generatedSuggestions = suggestions);
       }
     }
 
-    return this.generatedSuggestions = suggestions;
+    return (this.generatedSuggestions = suggestions);
   }
-}
+
+  <template>
+    {{#if this.showAIButton}}
+      <DButton
+        @class="suggestion-button {{if this.loading 'is-loading'}}"
+        @icon={{this.suggestIcon}}
+        @title="discourse_ai.ai_helper.suggest"
+        @action={{this.performSuggestion}}
+        @disabled={{this.disableSuggestionButton}}
+        ...attributes
+      />
+    {{/if}}
+
+    {{#if this.showMenu}}
+      {{! template-lint-disable modifier-name-case }}
+      <ul
+        class="popup-menu ai-suggestions-menu"
+        {{didInsert this.handleClickOutside}}
+      >
+        {{#if this.showErrors}}
+          <li class="ai-suggestions-menu__errors">{{this.error}}</li>
+        {{/if}}
+        {{#each this.generatedSuggestions as |suggestion index|}}
+          <li data-name={{suggestion}} data-value={{index}}>
+            <DButton
+              @class="popup-menu-btn"
+              @translatedLabel={{suggestion}}
+              @action={{this.applySuggestion}}
+              @actionParam={{suggestion}}
+            />
+          </li>
+        {{/each}}
+      </ul>
+    {{/if}}
+  </template>
+}

assets/javascripts/discourse/components/modal/diff-modal.gjs

@@ -1,14 +1,25 @@
 import Component from "@glimmer/component";
 import { action } from "@ember/object";
+import { htmlSafe } from "@ember/template";
 import DButton from "discourse/components/d-button";
 import DModal from "discourse/components/d-modal";
-import DModalCancel from "discourse/components/d-modal-cancel";
 import I18n from "I18n";
-import { htmlSafe } from "@ember/template";
 
 const t = I18n.t.bind(I18n);
 
 export default class ModalDiffModal extends Component {
+  @action
+  triggerConfirmChanges() {
+    this.args.closeModal();
+    this.args.confirm();
+  }
+
+  @action
+  triggerRevertChanges() {
+    this.args.closeModal();
+    this.args.revert();
+  }
+
   <template>
     <DModal
       class="composer-ai-helper-modal"
@@ -35,14 +46,12 @@ export default class ModalDiffModal extends Component {
           @action={{this.triggerConfirmChanges}}
           @label="discourse_ai.ai_helper.context_menu.confirm"
         />
-        <DModalCancel @close={{@closeModal}} />
+        <DButton
+          class="btn-flat"
+          @action={{this.triggerRevertChanges}}
+          @label="discourse_ai.ai_helper.context_menu.revert"
+        />
       </:footer>
     </DModal>
   </template>
-
-  @action
-  triggerConfirmChanges() {
-    this.args.closeModal();
-    this.args.confirm();
-  }
 }

assets/javascripts/discourse/components/reviewable-ai-chat-message.js

@@ -1,13 +1,8 @@
 import Component from "@glimmer/component";
-import { inject as service } from "@ember/service";
+import ChatChannel from "discourse/plugins/chat/discourse/models/chat-channel";
 
 export default class ReviewableAiChatMessage extends Component {
-  @service store;
-
   get chatChannel() {
-    return this.store.createRecord(
-      "chat-channel",
-      this.args.reviewable.chat_channel
-    );
+    return ChatChannel.create(this.args.reviewable.chat_channel);
   }
 }

assets/javascripts/discourse/connectors/admin-dashboard-tabs-after/admin-sentiment-dashbboard.gjs

@@ -0,0 +1,19 @@
+import Component from "@glimmer/component";
+import { LinkTo } from "@ember/routing";
+import I18n from "discourse-i18n";
+
+const i18n = I18n.t.bind(I18n);
+
+export default class AISentimentDashboard extends Component {
+  <template>
+    <li class="navigation-item sentiment">
+      <LinkTo @route="admin.dashboardSentiment" class="navigation-link">
+        {{i18n "discourse_ai.sentiments.dashboard.title"}}
+      </LinkTo>
+    </li>
+  </template>
+
+  static shouldRender(_outletArgs, helper) {
+    return helper.siteSettings.ai_sentiment_enabled;
+  }
+}