fixed "fools" to "tools" typo in client.en.yml

.eslintrc.cjs

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

app/controllers/discourse_ai/ai_bot/artifacts_controller.rb

@@ -1,87 +0,0 @@
-# frozen_string_literal: true
-
-module DiscourseAi
-  module AiBot
-    class ArtifactsController < ApplicationController
-      requires_plugin DiscourseAi::PLUGIN_NAME
-      before_action :require_site_settings!
-
-      skip_before_action :preload_json, :check_xhr, only: %i[show]
-
-      def show
-        artifact = AiArtifact.find(params[:id])
-
-        post = Post.find_by(id: artifact.post_id)
-        if artifact.metadata&.dig("public")
-          # no guardian needed
-        else
-          raise Discourse::NotFound if !post&.topic&.private_message?
-          raise Discourse::NotFound if !guardian.can_see?(post)
-        end
-
-        # Prepare the inner (untrusted) HTML document
-        untrusted_html = <<~HTML
-          <!DOCTYPE html>
-          <html>
-            <head>
-              <meta charset="UTF-8">
-              <title>#{ERB::Util.html_escape(artifact.name)}</title>
-              <style>
-                #{artifact.css}
-              </style>
-            </head>
-            <body>
-              #{artifact.html}
-              <script>
-                #{artifact.js}
-              </script>
-            </body>
-          </html>
-        HTML
-
-        # Prepare the outer (trusted) HTML document
-        trusted_html = <<~HTML
-          <!DOCTYPE html>
-          <html>
-            <head>
-              <meta charset="UTF-8">
-              <title>#{ERB::Util.html_escape(artifact.name)}</title>
-              <style>
-                html, body, iframe {
-                  margin: 0;
-                  padding: 0;
-                  width: 100%;
-                  height: 100%;
-                  border: 0;
-                  overflow: hidden;
-                }
-                iframe {
-                  overflow: auto;
-                }
-              </style>
-            </head>
-            <body>
-              <iframe sandbox="allow-scripts allow-forms" height="100%" width="100%" srcdoc="#{ERB::Util.html_escape(untrusted_html)}" frameborder="0"></iframe>
-            </body>
-          </html>
-        HTML
-
-        response.headers.delete("X-Frame-Options")
-        response.headers["Content-Security-Policy"] = "script-src 'unsafe-inline';"
-        response.headers["X-Robots-Tag"] = "noindex"
-
-        # Render the content
-        render html: trusted_html.html_safe, layout: false, content_type: "text/html"
-      end
-
-      private
-
-      def require_site_settings!
-        if !SiteSetting.discourse_ai_enabled ||
-             !SiteSetting.ai_artifact_security.in?(%w[lax strict])
-          raise Discourse::NotFound
-        end
-      end
-    end
-  end
-end

app/controllers/discourse_ai/ai_bot/shared_ai_conversations_controller.rb

@@ -7,8 +7,7 @@ module DiscourseAi
       requires_login only: %i[create update destroy]
       before_action :require_site_settings!
 
-      skip_before_action :preload_json, :check_xhr, only: %i[show asset]
-      skip_before_action :verify_authenticity_token, only: ["asset"]
+      skip_before_action :preload_json, :check_xhr, only: %i[show]
 
       def create
         ensure_allowed_create!
@@ -51,30 +50,6 @@ module DiscourseAi
         end
       end
 
-      def asset
-        no_cookies
-
-        name = params[:name]
-        path, content_type =
-          if name == "share"
-            %w[share.css text/css]
-          elsif name == "highlight"
-            %w[highlight.min.js application/javascript]
-          else
-            raise Discourse::NotFound
-          end
-
-        content = File.read(DiscourseAi.public_asset_path("ai-share/#{path}"))
-
-        # note, path contains a ":version" which automatically busts the cache
-        # based on file content, so this is safe
-        response.headers["Last-Modified"] = 10.years.ago.httpdate
-        response.headers["Content-Length"] = content.bytesize.to_s
-        immutable_for 1.year
-
-        render plain: content, disposition: :nil, content_type: content_type
-      end
-
       def preview
         ensure_allowed_preview!
         data = SharedAiConversation.build_conversation_data(@topic, include_usernames: true)

app/helpers/discourse_ai/ai_bot/shared_ai_conversations_helper.rb

@@ -2,29 +2,13 @@
 module DiscourseAi
   module AiBot
     module SharedAiConversationsHelper
-      # keeping it here for caching
-      def self.share_asset_url(asset_name)
-        if !%w[share.css highlight.js].include?(asset_name)
-          raise StandardError, "unknown asset type #{asset_name}"
-        end
+      # bump up version when assets change
+      # long term we may want to change this cause it is hard to remember
+      # to bump versions, but for now this does the job
+      VERSION = "1"
 
-        @urls ||= {}
-        url = @urls[asset_name]
-        return url if url
-
-        path = asset_name
-        path = "highlight.min.js" if asset_name == "highlight.js"
-
-        content = File.read(DiscourseAi.public_asset_path("ai-share/#{path}"))
-        sha1 = Digest::SHA1.hexdigest(content)
-
-        url = "/discourse-ai/ai-bot/shared-ai-conversations/asset/#{sha1}/#{asset_name}"
-
-        @urls[asset_name] = GlobalPath.cdn_path(url)
-      end
-
-      def share_asset_url(asset_name)
-        DiscourseAi::AiBot::SharedAiConversationsHelper.share_asset_url(asset_name)
+      def share_asset_url(short_path)
+        ::UrlHelper.absolute("/plugins/discourse-ai/ai-share/#{short_path}?#{VERSION}")
       end
     end
   end

app/models/ai_api_audit_log.rb

@@ -13,7 +13,6 @@ class AiApiAuditLog < ActiveRecord::Base
     Cohere = 6
     Ollama = 7
     SambaNova = 8
-    Mistral = 9
   end
 
   def next_log_id

app/models/ai_artifact.rb

@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-class AiArtifact < ActiveRecord::Base
-  belongs_to :user
-  belongs_to :post
-  validates :html, length: { maximum: 65_535 }
-  validates :css, length: { maximum: 65_535 }
-  validates :js, length: { maximum: 65_535 }
-
-  def self.iframe_for(id)
-    <<~HTML
-      <div class='ai-artifact'>
-        <iframe src='#{url(id)}' frameborder="0" height="100%" width="100%"></iframe>
-        <a href='#{url(id)}' target='_blank'>#{I18n.t("discourse_ai.ai_artifact.link")}</a>
-      </div>
-    HTML
-  end
-
-  def self.url(id)
-    Discourse.base_url + "/discourse-ai/ai-bot/artifacts/#{id}"
-  end
-
-  def self.share_publicly(id:, post:)
-    artifact = AiArtifact.find_by(id: id)
-    artifact.update!(metadata: { public: true }) if artifact&.post&.topic&.id == post.topic.id
-  end
-
-  def self.unshare_publicly(id:)
-    artifact = AiArtifact.find_by(id: id)
-    artifact&.update!(metadata: { public: false })
-  end
-
-  def url
-    self.class.url(id)
-  end
-end
-
-# == Schema Information
-#
-# Table name: ai_artifacts
-#
-#  id         :bigint           not null, primary key
-#  user_id    :integer          not null
-#  post_id    :integer          not null
-#  name       :string(255)      not null
-#  html       :string(65535)
-#  css        :string(65535)
-#  js         :string(65535)
-#  metadata   :jsonb
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
-#

app/models/ai_summary.rb

@@ -51,6 +51,5 @@ end
 #
 # Indexes
 #
-#  idx_on_target_id_target_type_summary_type_3355609fbb  (target_id,target_type,summary_type) UNIQUE
-#  index_ai_summaries_on_target_type_and_target_id       (target_type,target_id)
+#  index_ai_summaries_on_target_type_and_target_id  (target_type,target_id)
 #

app/models/completion_prompt.rb

@@ -8,7 +8,6 @@ class CompletionPrompt < ActiveRecord::Base
   CUSTOM_PROMPT = -305
   EXPLAIN = -306
   ILLUSTRATE_POST = -308
-  DETECT_TEXT_LOCALE = -309
 
   enum :prompt_type, { text: 0, list: 1, diff: 2 }
 

app/models/llm_model.rb

@@ -26,16 +26,6 @@ class LlmModel < ActiveRecord::Base
       },
       open_ai: {
         organization: :text,
-        disable_native_tools: :checkbox,
-      },
-      mistral: {
-        disable_native_tools: :checkbox,
-      },
-      google: {
-        disable_native_tools: :checkbox,
-      },
-      azure: {
-        disable_native_tools: :checkbox,
       },
       hugging_face: {
         disable_system_prompt: :checkbox,

app/models/shared_ai_conversation.rb

@@ -34,12 +34,6 @@ class SharedAiConversation < ActiveRecord::Base
 
   def self.destroy_conversation(conversation)
     conversation.destroy
-
-    maybe_topic = conversation.target
-    if maybe_topic.is_a?(Topic)
-      AiArtifact.where(post: maybe_topic.posts).update_all(metadata: { public: false })
-    end
-
     ::Jobs.enqueue(
       :shared_conversation_adjust_upload_security,
       target_id: conversation.target_id,
@@ -171,7 +165,7 @@ class SharedAiConversation < ActiveRecord::Base
             id: post.id,
             user_id: post.user_id,
             created_at: post.created_at,
-            cooked: cook_artifacts(post),
+            cooked: post.cooked,
           }
 
           mapped[:persona] = persona if ai_bot_participant&.id == post.user_id
@@ -181,24 +175,6 @@ class SharedAiConversation < ActiveRecord::Base
     }
   end
 
-  def self.cook_artifacts(post)
-    html = post.cooked
-    return html if !%w[lax strict].include?(SiteSetting.ai_artifact_security)
-
-    doc = Nokogiri::HTML5.fragment(html)
-    doc
-      .css("div.ai-artifact")
-      .each do |node|
-        id = node["data-ai-artifact-id"].to_i
-        if id > 0
-          AiArtifact.share_publicly(id: id, post: post)
-          node.replace(AiArtifact.iframe_for(id))
-        end
-      end
-
-    doc.to_s
-  end
-
   private
 
   def populate_user_info!(posts)

app/views/discourse_ai/ai_bot/shared_ai_conversations/show.html.erb

@@ -10,7 +10,7 @@
     <meta name="twitter:title" content="<%= I18n.t("discourse_ai.share_ai.title", title: @shared_conversation.title, site_name: SiteSetting.title) %>">
     <meta name="twitter:description" content="<%= @shared_conversation.formatted_excerpt %>">
     <meta name="viewport" content="width=device-width">
-    <link rel="stylesheet" href="<%= share_asset_url("share.css")  %>">
+    <link rel="stylesheet" href="<%= ::UrlHelper.absolute("/plugins/discourse-ai/ai-share/share.css") %>">
   </head>
   <body>
     <header class="site-header">
@@ -54,7 +54,7 @@
         </article>
       <% end %>
     </section>
-    <script src="<%= share_asset_url("highlight.js") %>" nonce="<%= csp_nonce_placeholder %>" ></script>
+    <script src="<%= share_asset_url("highlight.min.js") %>" nonce="<%= csp_nonce_placeholder %>" ></script>
     <script nonce="<%= csp_nonce_placeholder %>">
       document.querySelectorAll('pre code').forEach((el) => {
         hljs.highlightElement(el);

assets/javascripts/discourse/components/admin-report-emotion.hbs

@@ -1,45 +0,0 @@
-<div class="cell title">
-  {{#if this.model.icon}}
-    {{d-icon this.model.icon}}
-  {{/if}}
-  {{this.model.title}}
-</div>
-
-<div class="cell value today-count">
-  <a href={{this.todayLink}}>
-    {{number this.model.todayCount}}
-  </a>
-</div>
-
-<div
-  class="cell value yesterday-count {{this.model.yesterdayTrend}}"
-  title={{this.model.yesterdayCountTitle}}
->
-  <a href={{this.yesterdayLink}}>
-    {{number this.model.yesterdayCount}}
-  </a>
-  {{d-icon this.model.yesterdayTrendIcon}}
-</div>
-
-<div
-  class="cell value sevendays-count {{this.model.sevenDaysTrend}}"
-  title={{this.model.sevenDaysCountTitle}}
->
-  <a href={{this.lastSevenDaysLink}}>
-    {{number this.model.lastSevenDaysCount}}
-  </a>
-  {{d-icon this.model.sevenDaysTrendIcon}}
-</div>
-
-<div
-  class="cell value thirty-days-count {{this.model.thirtyDaysTrend}}"
-  title={{this.model.thirtyDaysCountTitle}}
->
-
-  <a href={{this.lastThirtyDaysLink}}>
-    {{number this.model.lastThirtyDaysCount}}
-  </a>
-  {{#if this.model.canDisplayTrendIcon}}
-    {{d-icon this.model.thirtyDaysTrendIcon}}
-  {{/if}}
-</div>

assets/javascripts/discourse/components/admin-report-emotion.js

@@ -1,39 +0,0 @@
-import Component from "@ember/component";
-import { attributeBindings, classNames } from "@ember-decorators/component";
-import getURL from "discourse-common/lib/get-url";
-
-@classNames("admin-report-counters")
-@attributeBindings("model.description:title")
-export default class AdminReportEmotion extends Component {
-  get todayLink() {
-    let date = moment().format("YYYY-MM-DD");
-    return this._filterURL(date);
-  }
-
-  get yesterdayLink() {
-    let date = moment().subtract(1, "day").format("YYYY-MM-DD");
-    return this._filterURL(date);
-  }
-
-  get lastSevenDaysLink() {
-    let date = moment().subtract(1, "week").format("YYYY-MM-DD");
-    return this._filterURL(date);
-  }
-
-  get lastThirtyDaysLink() {
-    let date = moment().subtract(1, "month").format("YYYY-MM-DD");
-    return this._filterURL(date);
-  }
-
-  _baseFilter() {
-    return "/filter?q=activity-after%3A";
-  }
-
-  _model() {
-    return "%20order%3A" + this.model.type;
-  }
-
-  _filterURL(date) {
-    return getURL(`${this._baseFilter()}${date}${this._model()}`);
-  }
-}

assets/javascripts/discourse/components/ai-artifact.gjs

@@ -1,121 +0,0 @@
-import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
-import { on } from "@ember/modifier";
-import { action } from "@ember/object";
-import { service } from "@ember/service";
-import DButton from "discourse/components/d-button";
-import htmlClass from "discourse/helpers/html-class";
-import getURL from "discourse-common/lib/get-url";
-
-export default class AiArtifactComponent extends Component {
-  @service siteSettings;
-  @tracked expanded = false;
-  @tracked showingArtifact = false;
-
-  constructor() {
-    super(...arguments);
-    this.keydownHandler = this.handleKeydown.bind(this);
-  }
-
-  willDestroy() {
-    super.willDestroy(...arguments);
-    window.removeEventListener("keydown", this.keydownHandler);
-  }
-
-  @action
-  handleKeydown(event) {
-    if (event.key === "Escape" || event.key === "Esc") {
-      this.expanded = false;
-    }
-  }
-
-  get requireClickToRun() {
-    if (this.showingArtifact) {
-      return false;
-    }
-    return this.siteSettings.ai_artifact_security === "strict";
-  }
-
-  get artifactUrl() {
-    return getURL(`/discourse-ai/ai-bot/artifacts/${this.args.artifactId}`);
-  }
-
-  @action
-  showArtifact() {
-    this.showingArtifact = true;
-  }
-
-  @action
-  toggleView() {
-    this.expanded = !this.expanded;
-    if (this.expanded) {
-      window.addEventListener("keydown", this.keydownHandler);
-    } else {
-      window.removeEventListener("keydown", this.keydownHandler);
-    }
-  }
-
-  get wrapperClasses() {
-    return `ai-artifact__wrapper ${
-      this.expanded ? "ai-artifact__expanded" : ""
-    }`;
-  }
-
-  @action
-  artifactPanelHover() {
-    // retrrigger animation
-    const panel = document.querySelector(".ai-artifact__panel");
-    panel.style.animation = "none"; // Stop the animation
-    setTimeout(() => {
-      panel.style.animation = ""; // Re-trigger the animation by removing the none style
-    }, 0);
-  }
-
-  <template>
-    {{#if this.expanded}}
-      {{htmlClass "ai-artifact-expanded"}}
-    {{/if}}
-    <div class={{this.wrapperClasses}}>
-      <div
-        class="ai-artifact__panel--wrapper"
-        {{on "mouseleave" this.artifactPanelHover}}
-      >
-        <div class="ai-artifact__panel">
-          <DButton
-            class="btn-flat btn-icon-text"
-            @icon="discourse-compress"
-            @label="discourse_ai.ai_artifact.collapse_view_label"
-            @action={{this.toggleView}}
-          />
-        </div>
-      </div>
-      {{#if this.requireClickToRun}}
-        <div class="ai-artifact__click-to-run">
-          <DButton
-            class="btn btn-primary"
-            @icon="play"
-            @label="discourse_ai.ai_artifact.click_to_run_label"
-            @action={{this.showArtifact}}
-          />
-        </div>
-      {{else}}
-        <iframe
-          title="AI Artifact"
-          src={{this.artifactUrl}}
-          width="100%"
-          frameborder="0"
-        ></iframe>
-      {{/if}}
-      {{#unless this.requireClickToRun}}
-        <div class="ai-artifact__footer">
-          <DButton
-            class="btn-flat btn-icon-text ai-artifact__expand-button"
-            @icon="discourse-expand"
-            @label="discourse_ai.ai_artifact.expand_view_label"
-            @action={{this.toggleView}}
-          />
-        </div>
-      {{/unless}}
-    </div>
-  </template>
-}

assets/javascripts/discourse/components/ai-gist-toggle.gjs

@@ -4,43 +4,35 @@ import { action } from "@ember/object";
 import { service } from "@ember/service";
 import DButton from "discourse/components/d-button";
 import DropdownMenu from "discourse/components/dropdown-menu";
-import bodyClass from "discourse/helpers/body-class";
 import icon from "discourse-common/helpers/d-icon";
 import i18n from "discourse-common/helpers/i18n";
 import DMenu from "float-kit/components/d-menu";
-import eq from "truth-helpers/helpers/eq";
 
 export default class AiGistToggle extends Component {
-  @service gists;
+  @service router;
+  @service gistPreference;
+
+  get shouldShow() {
+    return this.router.currentRoute.attributes?.list?.topics?.some(
+      (topic) => topic.ai_topic_gist
+    );
+  }
 
   get buttons() {
     return [
       {
-        id: "table",
-        label: "discourse_ai.summarization.topic_list_layout.button.compact",
-        icon: "discourse-table",
+        id: "gists_enabled",
+        label: "discourse_ai.summarization.gists_enabled_long",
+        icon: "discourse-sparkles",
       },
       {
-        id: "table-ai",
-        label: "discourse_ai.summarization.topic_list_layout.button.expanded",
-        icon: "discourse-table-sparkles",
-        description:
-          "discourse_ai.summarization.topic_list_layout.button.expanded_description",
+        id: "gists_disabled",
+        label: "discourse_ai.summarization.gists_disabled",
+        icon: "far-eye-slash",
       },
     ];
   }
 
-  get selectedOptionId() {
-    return this.gists.get("preference");
-  }
-
-  get currentButton() {
-    const buttonPreference = this.buttons.find(
-      (button) => button.id === this.selectedOptionId
-    );
-    return buttonPreference || this.buttons[0];
-  }
-
   @action
   onRegisterApi(api) {
     this.dMenu = api;
@@ -48,22 +40,29 @@ export default class AiGistToggle extends Component {
 
   @action
   onSelect(optionId) {
-    this.gists.setPreference(optionId);
+    this.gistPreference.setPreference(optionId);
     this.dMenu.close();
   }
 
   <template>
-    {{#if this.gists.shouldShow}}
-      {{bodyClass (concat "topic-list-layout-" this.gists.preference)}}
+    {{#if this.shouldShow}}
+
       <DMenu
         @modalForMobile={{true}}
         @autofocus={{true}}
-        @identifier="topic-list-layout"
+        @identifier="ai-gists-dropdown"
         @onRegisterApi={{this.onRegisterApi}}
-        @triggerClass="btn-default btn-icon"
+        @triggerClass="btn-transparent"
       >
         <:trigger>
-          {{icon this.currentButton.icon}}
+          <span class="d-button-label">
+            {{i18n
+              (concat
+                "discourse_ai.summarization." this.gistPreference.preference
+              )
+            }}
+          </span>
+          {{icon "angle-down"}}
         </:trigger>
         <:content>
           <DropdownMenu as |dropdown|>
@@ -72,17 +71,9 @@ export default class AiGistToggle extends Component {
                 <DButton
                   @label={{button.label}}
                   @icon={{button.icon}}
-                  class="btn-transparent
-                    {{if button.description '--with-description'}}
-                    {{if (eq this.currentButton.id button.id) '--active'}}"
+                  class="btn-transparent"
                   @action={{fn this.onSelect button.id}}
-                >
-                  {{#if button.description}}
-                    <div class="btn__description">
-                      {{i18n button.description}}
-                    </div>
-                  {{/if}}
-                </DButton>
+                />
               </dropdown.item>
             {{/each}}
           </DropdownMenu>

assets/javascripts/discourse/components/ai-llm-editor-form.gjs

@@ -6,7 +6,7 @@ import { on } from "@ember/modifier";
 import { action, computed } from "@ember/object";
 import { LinkTo } from "@ember/routing";
 import { later } from "@ember/runloop";
-import { service } from "@ember/service";
+import { inject as service } from "@ember/service";
 import { eq } from "truth-helpers";
 import DButton from "discourse/components/d-button";
 import Avatar from "discourse/helpers/bound-avatar-template";

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

@@ -2,7 +2,7 @@ import Component from "@glimmer/component";
 import { concat, fn } from "@ember/helper";
 import { action } from "@ember/object";
 import { LinkTo } from "@ember/routing";
-import { service } from "@ember/service";
+import { inject as service } from "@ember/service";
 import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";
 import icon from "discourse-common/helpers/d-icon";
 import i18n from "discourse-common/helpers/i18n";

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

@@ -7,7 +7,7 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";
 import didUpdate from "@ember/render-modifiers/modifiers/did-update";
 import { LinkTo } from "@ember/routing";
 import { later } from "@ember/runloop";
-import { service } from "@ember/service";
+import { inject as service } from "@ember/service";
 import BackButton from "discourse/components/back-button";
 import DButton from "discourse/components/d-button";
 import Textarea from "discourse/components/d-textarea";

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

@@ -4,7 +4,7 @@ import { fn } from "@ember/helper";
 import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import { LinkTo } from "@ember/routing";
-import { service } from "@ember/service";
+import { inject as service } from "@ember/service";
 import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";
 import DToggleSwitch from "discourse/components/d-toggle-switch";
 import concatClass from "discourse/helpers/concat-class";

assets/javascripts/discourse/components/ai-post-helper-menu.gjs

@@ -3,7 +3,7 @@ import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
 import didInsert from "@ember/render-modifiers/modifiers/did-insert";
 import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";
-import { service } from "@ember/service";
+import { inject as service } from "@ember/service";
 import { and } from "truth-helpers";
 import CookText from "discourse/components/cook-text";
 import DButton from "discourse/components/d-button";

assets/javascripts/discourse/components/ai-split-topic-suggester.gjs

@@ -3,7 +3,7 @@ import { tracked } from "@glimmer/tracking";
 import { fn } from "@ember/helper";
 import { on } from "@ember/modifier";
 import { action } from "@ember/object";
-import { service } from "@ember/service";
+import { inject as service } from "@ember/service";
 import DButton from "discourse/components/d-button";
 import categoryBadge from "discourse/helpers/category-badge";
 import { ajax } from "discourse/lib/ajax";

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

@@ -3,7 +3,7 @@ import { tracked } from "@glimmer/tracking";
 import { fn } from "@ember/helper";
 import { action } from "@ember/object";
 import didInsert from "@ember/render-modifiers/modifiers/did-insert";
-import { service } from "@ember/service";
+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";

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

@@ -1,6 +1,6 @@
 import Component from "@glimmer/component";
 import { LinkTo } from "@ember/routing";
-import { service } from "@ember/service";
+import { inject as service } from "@ember/service";
 import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";
 import icon from "discourse-common/helpers/d-icon";
 import i18n from "discourse-common/helpers/i18n";

assets/javascripts/discourse/components/ai-tool-selector.js

@@ -1,5 +1,4 @@
-import { observer } from "@ember/object";
-import { readOnly } from "@ember/object/computed";
+import { computed, observer } from "@ember/object";
 import MultiSelectComponent from "select-kit/components/multi-select";
 
 export default MultiSelectComponent.extend({
@@ -7,7 +6,9 @@ export default MultiSelectComponent.extend({
     this.selectKit.options.set("disabled", this.get("attrs.disabled.value"));
   }),
 
-  content: readOnly("tools"),
+  content: computed("tools", function () {
+    return this.tools;
+  }),
 
   value: "",
 

assets/javascripts/discourse/components/ai-topic-gist.gjs

@@ -1,41 +1,33 @@
 import Component from "@glimmer/component";
 import { service } from "@ember/service";
-import { htmlSafe } from "@ember/template";
+import bodyClass from "discourse/helpers/body-class";
 
 export default class AiTopicGist extends Component {
-  @service gists;
+  @service router;
+  @service gistPreference;
 
-  get shouldShow() {
-    return this.gists.preference === "table-ai" && this.gists.shouldShow;
+  get prefersGist() {
+    return this.gistPreference.preference === "gists_enabled";
   }
 
-  get hasGist() {
-    return !!this.gist;
-  }
-
-  get gist() {
-    return this.args.topic.get("ai_topic_gist");
-  }
-
-  get escapedExceprt() {
-    return this.args.topic.get("escapedExcerpt");
+  get showGist() {
+    return (
+      this.router.currentRoute.attributes?.filterType === "hot" &&
+      this.args.topic?.ai_topic_gist &&
+      !this.args.topic?.excerpt &&
+      this.prefersGist &&
+      !this.args.topic?.excerpt
+    );
   }
 
   <template>
-    {{#if this.shouldShow}}
-      {{#if this.hasGist}}
-        <div class="excerpt">
-          <div class="excerpt__contents">{{this.gist}}</div>
+    {{#if this.showGist}}
+      {{bodyClass "--topic-list-with-gist"}}
+      <div class="ai-topic-gist">
+        <div class="ai-topic-gist__text">
+          {{@topic.ai_topic_gist}}
         </div>
-      {{else}}
-        {{#if this.esacpedExceprt}}
-          <div class="excerpt">
-            <div class="excerpt__contents">
-              {{htmlSafe this.escapedExceprt}}
-            </div>
-          </div>
-        {{/if}}
-      {{/if}}
+      </div>
     {{/if}}
   </template>
 }

assets/javascripts/discourse/components/modal/debug-ai-modal.gjs

@@ -39,7 +39,7 @@ export default class DebugAiModal extends Component {
       } else {
         return this.formattedResponse(this.info.raw_response_payload);
       }
-    } catch {
+    } catch (e) {
       return this.info.raw_request_payload;
     }
 

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

@@ -1,7 +1,7 @@
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
-import { service } from "@ember/service";
+import { inject as service } from "@ember/service";
 import { htmlSafe } from "@ember/template";
 import CookText from "discourse/components/cook-text";
 import DButton from "discourse/components/d-button";

assets/javascripts/discourse/components/modal/share-full-topic-modal.gjs

@@ -1,7 +1,7 @@
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
-import { service } from "@ember/service";
+import { inject as service } from "@ember/service";
 import { htmlSafe } from "@ember/template";
 import DButton from "discourse/components/d-button";
 import DModal from "discourse/components/d-modal";

assets/javascripts/discourse/components/post-menu/ai-debug-button.gjs

@@ -1,6 +1,6 @@
 import Component from "@glimmer/component";
 import { action } from "@ember/object";
-import { service } from "@ember/service";
+import { inject as service } from "@ember/service";
 import DButton from "discourse/components/d-button";
 import { isPostFromAiBot } from "../../lib/ai-bot-helper";
 import DebugAiModal from "../modal/debug-ai-modal";

assets/javascripts/discourse/components/post-menu/ai-share-button.gjs

@@ -1,6 +1,6 @@
 import Component from "@glimmer/component";
 import { action } from "@ember/object";
-import { service } from "@ember/service";
+import { inject as service } from "@ember/service";
 import DButton from "discourse/components/d-button";
 import { isPostFromAiBot } from "../../lib/ai-bot-helper";
 import copyConversation from "../../lib/copy-conversation";