diff --git a/assets/javascripts/discourse/connectors/admin-dashboard-tabs-after/admin-sentiment-dashbboard.gjs b/assets/javascripts/discourse/connectors/admin-dashboard-tabs-after/admin-sentiment-dashbboard.gjs
index ea00263c..c059f610 100644
--- a/assets/javascripts/discourse/connectors/admin-dashboard-tabs-after/admin-sentiment-dashbboard.gjs
+++ b/assets/javascripts/discourse/connectors/admin-dashboard-tabs-after/admin-sentiment-dashbboard.gjs
@@ -3,8 +3,8 @@ import { LinkTo } from "@ember/routing";
 import { i18n } from "discourse-i18n";
 
 export default class AISentimentDashboard extends Component {
-  static shouldRender(_outletArgs, helper) {
-    return helper.siteSettings.ai_sentiment_enabled;
+  static shouldRender(args, context) {
+    return context.siteSettings.ai_sentiment_enabled;
   }
 
   <template>
diff --git a/assets/javascripts/discourse/connectors/after-composer-category-input/ai-category-suggestion.gjs b/assets/javascripts/discourse/connectors/after-composer-category-input/ai-category-suggestion.gjs
index b756a2af..8474895d 100644
--- a/assets/javascripts/discourse/connectors/after-composer-category-input/ai-category-suggestion.gjs
+++ b/assets/javascripts/discourse/connectors/after-composer-category-input/ai-category-suggestion.gjs
@@ -4,11 +4,11 @@ import AiCategorySuggester from "../../components/suggestion-menus/ai-category-s
 import { showComposerAiHelper } from "../../lib/show-ai-helper";
 
 export default class AiCategorySuggestion extends Component {
-  static shouldRender(outletArgs, helper) {
+  static shouldRender(args, context) {
     return showComposerAiHelper(
-      outletArgs?.composer,
-      helper.siteSettings,
-      helper.currentUser,
+      args?.composer,
+      context.siteSettings,
+      context.currentUser,
       "suggestions"
     );
   }
diff --git a/assets/javascripts/discourse/connectors/after-composer-tag-input/ai-tag-suggestion.gjs b/assets/javascripts/discourse/connectors/after-composer-tag-input/ai-tag-suggestion.gjs
index 9f02ed19..69bbb2bb 100644
--- a/assets/javascripts/discourse/connectors/after-composer-tag-input/ai-tag-suggestion.gjs
+++ b/assets/javascripts/discourse/connectors/after-composer-tag-input/ai-tag-suggestion.gjs
@@ -3,11 +3,11 @@ import AiTagSuggester from "../../components/suggestion-menus/ai-tag-suggester";
 import { showComposerAiHelper } from "../../lib/show-ai-helper";
 
 export default class AiTagSuggestion extends Component {
-  static shouldRender(outletArgs, helper) {
+  static shouldRender(args, context) {
     return showComposerAiHelper(
-      outletArgs?.composer,
-      helper.siteSettings,
-      helper.currentUser,
+      args?.composer,
+      context.siteSettings,
+      context.currentUser,
       "suggestions"
     );
   }
diff --git a/assets/javascripts/discourse/connectors/after-composer-title-input/ai-title-suggestion.gjs b/assets/javascripts/discourse/connectors/after-composer-title-input/ai-title-suggestion.gjs
index df1bbd9d..4a864077 100644
--- a/assets/javascripts/discourse/connectors/after-composer-title-input/ai-title-suggestion.gjs
+++ b/assets/javascripts/discourse/connectors/after-composer-title-input/ai-title-suggestion.gjs
@@ -3,11 +3,11 @@ import AiTitleSuggester from "../../components/suggestion-menus/ai-title-suggest
 import { showComposerAiHelper } from "../../lib/show-ai-helper";
 
 export default class AiTitleSuggestion extends Component {
-  static shouldRender(outletArgs, helper) {
+  static shouldRender(args, context) {
     return showComposerAiHelper(
-      outletArgs?.composer,
-      helper.siteSettings,
-      helper.currentUser,
+      args?.composer,
+      context.siteSettings,
+      context.currentUser,
       "suggestions"
     );
   }
diff --git a/assets/javascripts/discourse/connectors/composer-fields/persona-llm-selector.gjs b/assets/javascripts/discourse/connectors/composer-fields/persona-llm-selector.gjs
index 3eaaaf71..2d9cc6bc 100644
--- a/assets/javascripts/discourse/connectors/composer-fields/persona-llm-selector.gjs
+++ b/assets/javascripts/discourse/connectors/composer-fields/persona-llm-selector.gjs
@@ -19,10 +19,10 @@ function isBotMessage(composer, currentUser) {
 }
 
 export default class BotSelector extends Component {
-  static shouldRender(args, container) {
+  static shouldRender(args, context) {
     return (
-      container?.currentUser?.ai_enabled_personas &&
-      isBotMessage(args.model, container.currentUser)
+      context?.currentUser?.ai_enabled_personas &&
+      isBotMessage(args.model, context.currentUser)
     );
   }
 
diff --git a/assets/javascripts/discourse/connectors/edit-topic-category__after/ai-category-suggestion.gjs b/assets/javascripts/discourse/connectors/edit-topic-category__after/ai-category-suggestion.gjs
index 1dcf3483..2227beaf 100644
--- a/assets/javascripts/discourse/connectors/edit-topic-category__after/ai-category-suggestion.gjs
+++ b/assets/javascripts/discourse/connectors/edit-topic-category__after/ai-category-suggestion.gjs
@@ -3,11 +3,11 @@ import AiCategorySuggester from "../../components/suggestion-menus/ai-category-s
 import { showComposerAiHelper } from "../../lib/show-ai-helper";
 
 export default class AiCategorySuggestion extends Component {
-  static shouldRender(outletArgs, helper) {
+  static shouldRender(args, context) {
     return showComposerAiHelper(
-      outletArgs?.composer,
-      helper.siteSettings,
-      helper.currentUser,
+      args?.composer,
+      context.siteSettings,
+      context.currentUser,
       "suggestions"
     );
   }
diff --git a/assets/javascripts/discourse/connectors/edit-topic-tags__after/ai-tag-suggestion.gjs b/assets/javascripts/discourse/connectors/edit-topic-tags__after/ai-tag-suggestion.gjs
index 7404822b..aef1a2bc 100644
--- a/assets/javascripts/discourse/connectors/edit-topic-tags__after/ai-tag-suggestion.gjs
+++ b/assets/javascripts/discourse/connectors/edit-topic-tags__after/ai-tag-suggestion.gjs
@@ -3,11 +3,11 @@ import AiTagSuggester from "../../components/suggestion-menus/ai-tag-suggester";
 import { showComposerAiHelper } from "../../lib/show-ai-helper";
 
 export default class AiCategorySuggestion extends Component {
-  static shouldRender(outletArgs, helper) {
+  static shouldRender(args, context) {
     return showComposerAiHelper(
-      outletArgs?.composer,
-      helper.siteSettings,
-      helper.currentUser,
+      args?.composer,
+      context.siteSettings,
+      context.currentUser,
       "suggestions"
     );
   }
diff --git a/assets/javascripts/discourse/connectors/edit-topic-title__after/ai-title-suggestion.gjs b/assets/javascripts/discourse/connectors/edit-topic-title__after/ai-title-suggestion.gjs
index c17f5a4d..632b17a0 100644
--- a/assets/javascripts/discourse/connectors/edit-topic-title__after/ai-title-suggestion.gjs
+++ b/assets/javascripts/discourse/connectors/edit-topic-title__after/ai-title-suggestion.gjs
@@ -3,11 +3,11 @@ import AiTitleSuggester from "../../components/suggestion-menus/ai-title-suggest
 import { showComposerAiHelper } from "../../lib/show-ai-helper";
 
 export default class AiTitleSuggestion extends Component {
-  static shouldRender(outletArgs, helper) {
+  static shouldRender(args, context) {
     return showComposerAiHelper(
-      outletArgs?.composer,
-      helper.siteSettings,
-      helper.currentUser,
+      args?.composer,
+      context.siteSettings,
+      context.currentUser,
       "suggestions"
     );
   }
diff --git a/assets/javascripts/discourse/connectors/fast-edit-footer-after/ai-edit-suggestion-button.gjs b/assets/javascripts/discourse/connectors/fast-edit-footer-after/ai-edit-suggestion-button.gjs
index 4da354cf..0cb98123 100644
--- a/assets/javascripts/discourse/connectors/fast-edit-footer-after/ai-edit-suggestion-button.gjs
+++ b/assets/javascripts/discourse/connectors/fast-edit-footer-after/ai-edit-suggestion-button.gjs
@@ -8,8 +8,8 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
 import { showPostAIHelper } from "../../lib/show-ai-helper";
 
 export default class AiEditSuggestionButton extends Component {
-  static shouldRender(outletArgs, helper) {
-    return showPostAIHelper(outletArgs, helper);
+  static shouldRender(args, context) {
+    return showPostAIHelper(args, context);
   }
 
   @service currentUser;
diff --git a/assets/javascripts/discourse/connectors/full-page-search-below-search-header/ai-full-page-discobot-discoveries.gjs b/assets/javascripts/discourse/connectors/full-page-search-below-search-header/ai-full-page-discobot-discoveries.gjs
index 77ef1e89..2fdf66b9 100644
--- a/assets/javascripts/discourse/connectors/full-page-search-below-search-header/ai-full-page-discobot-discoveries.gjs
+++ b/assets/javascripts/discourse/connectors/full-page-search-below-search-header/ai-full-page-discobot-discoveries.gjs
@@ -7,7 +7,7 @@ import AiSearchDiscoveries from "../../components/ai-search-discoveries";
 import AiSearchDiscoveriesTooltip from "../../components/ai-search-discoveries-tooltip";
 
 export default class AiFullPageDiscobotDiscoveries extends Component {
-  static shouldRender(_args, { siteSettings, currentUser }) {
+  static shouldRender(args, { siteSettings, currentUser }) {
     return (
       siteSettings.ai_bot_discover_persona &&
       currentUser?.can_use_ai_bot_discover_persona &&
diff --git a/assets/javascripts/discourse/connectors/full-page-search-below-search-header/ai-full-page-search.gjs b/assets/javascripts/discourse/connectors/full-page-search-below-search-header/ai-full-page-search.gjs
index 3bb1be92..a0f1c5d8 100644
--- a/assets/javascripts/discourse/connectors/full-page-search-below-search-header/ai-full-page-search.gjs
+++ b/assets/javascripts/discourse/connectors/full-page-search-below-search-header/ai-full-page-search.gjs
@@ -2,7 +2,7 @@ import Component from "@glimmer/component";
 import AiFullPageSearch from "../../components/ai-full-page-search";
 
 export default class AiFullPageSearchConnector extends Component {
-  static shouldRender(_args, { siteSettings }) {
+  static shouldRender(args, { siteSettings }) {
     return siteSettings.ai_embeddings_semantic_search_enabled;
   }
 
diff --git a/assets/javascripts/discourse/connectors/post-text-buttons/ai-post-helper-trigger.gjs b/assets/javascripts/discourse/connectors/post-text-buttons/ai-post-helper-trigger.gjs
index 2a0ec521..54d2c0d3 100644
--- a/assets/javascripts/discourse/connectors/post-text-buttons/ai-post-helper-trigger.gjs
+++ b/assets/javascripts/discourse/connectors/post-text-buttons/ai-post-helper-trigger.gjs
@@ -8,8 +8,8 @@ import AiPostHelperMenu from "../../components/ai-post-helper-menu";
 import { showPostAIHelper } from "../../lib/show-ai-helper";
 
 export default class AiPostHelperTrigger extends Component {
-  static shouldRender(outletArgs, helper) {
-    return showPostAIHelper(outletArgs, helper);
+  static shouldRender(args, context) {
+    return showPostAIHelper(args, context);
   }
 
   @service menu;
diff --git a/assets/javascripts/discourse/connectors/search-menu-initial-options/ai-quick-semantic-search.gjs b/assets/javascripts/discourse/connectors/search-menu-initial-options/ai-quick-semantic-search.gjs
index a73927fd..62e3d4ed 100644
--- a/assets/javascripts/discourse/connectors/search-menu-initial-options/ai-quick-semantic-search.gjs
+++ b/assets/javascripts/discourse/connectors/search-menu-initial-options/ai-quick-semantic-search.gjs
@@ -8,7 +8,7 @@ import { isValidSearchTerm, translateResults } from "discourse/lib/search";
 import { i18n } from "discourse-i18n";
 
 export default class AiQuickSemanticSearch extends Component {
-  static shouldRender(_args, { siteSettings }) {
+  static shouldRender(args, { siteSettings }) {
     return siteSettings.ai_embeddings_semantic_quick_search_enabled;
   }
 
diff --git a/assets/javascripts/discourse/connectors/split-new-topic-category-after/ai-category-suggestion.gjs b/assets/javascripts/discourse/connectors/split-new-topic-category-after/ai-category-suggestion.gjs
index 03c146f5..7cca3f50 100644
--- a/assets/javascripts/discourse/connectors/split-new-topic-category-after/ai-category-suggestion.gjs
+++ b/assets/javascripts/discourse/connectors/split-new-topic-category-after/ai-category-suggestion.gjs
@@ -4,8 +4,8 @@ import AiSplitTopicSuggester from "../../components/ai-split-topic-suggester";
 import { showPostAIHelper } from "../../lib/show-ai-helper";
 
 export default class AiCategorySuggestion extends Component {
-  static shouldRender(outletArgs, helper) {
-    return showPostAIHelper(outletArgs, helper);
+  static shouldRender(args, context) {
+    return showPostAIHelper(args, context);
   }
 
   @service siteSettings;
diff --git a/assets/javascripts/discourse/connectors/split-new-topic-tag-after/ai-tag-suggestion.gjs b/assets/javascripts/discourse/connectors/split-new-topic-tag-after/ai-tag-suggestion.gjs
index 09d17656..e3b7cecd 100644
--- a/assets/javascripts/discourse/connectors/split-new-topic-tag-after/ai-tag-suggestion.gjs
+++ b/assets/javascripts/discourse/connectors/split-new-topic-tag-after/ai-tag-suggestion.gjs
@@ -4,8 +4,8 @@ import AiSplitTopicSuggester from "../../components/ai-split-topic-suggester";
 import { showPostAIHelper } from "../../lib/show-ai-helper";
 
 export default class AiTagSuggestion extends Component {
-  static shouldRender(outletArgs, helper) {
-    return showPostAIHelper(outletArgs, helper);
+  static shouldRender(args, context) {
+    return showPostAIHelper(args, context);
   }
 
   @service siteSettings;
diff --git a/assets/javascripts/discourse/connectors/split-new-topic-title-after/ai-title-suggestion.gjs b/assets/javascripts/discourse/connectors/split-new-topic-title-after/ai-title-suggestion.gjs
index c5049b53..18680045 100644
--- a/assets/javascripts/discourse/connectors/split-new-topic-title-after/ai-title-suggestion.gjs
+++ b/assets/javascripts/discourse/connectors/split-new-topic-title-after/ai-title-suggestion.gjs
@@ -3,8 +3,8 @@ import AiSplitTopicSuggester from "../../components/ai-split-topic-suggester";
 import { showPostAIHelper } from "../../lib/show-ai-helper";
 
 export default class AiTitleSuggestion extends Component {
-  static shouldRender(outletArgs, helper) {
-    return showPostAIHelper(outletArgs, helper);
+  static shouldRender(args, context) {
+    return showPostAIHelper(args, context);
   }
 
   <template>
diff --git a/assets/javascripts/discourse/connectors/topic-list-before-category/ai-topic-gist-placement.gjs b/assets/javascripts/discourse/connectors/topic-list-before-category/ai-topic-gist-placement.gjs
index e7ddaf78..b56f81b5 100644
--- a/assets/javascripts/discourse/connectors/topic-list-before-category/ai-topic-gist-placement.gjs
+++ b/assets/javascripts/discourse/connectors/topic-list-before-category/ai-topic-gist-placement.gjs
@@ -2,8 +2,8 @@ import Component from "@glimmer/component";
 import AiTopicGist from "../../components/ai-topic-gist";
 
 export default class AiTopicGistPlacement extends Component {
-  static shouldRender(_outletArgs, helper) {
-    const settings = helper.siteSettings;
+  static shouldRender(args, context) {
+    const settings = context.siteSettings;
     return settings.discourse_ai_enabled && settings.ai_summarization_enabled;
   }
 
diff --git a/assets/javascripts/discourse/connectors/user-preferences-nav/ai-preferences.gjs b/assets/javascripts/discourse/connectors/user-preferences-nav/ai-preferences.gjs
index ffbeee11..0adea845 100644
--- a/assets/javascripts/discourse/connectors/user-preferences-nav/ai-preferences.gjs
+++ b/assets/javascripts/discourse/connectors/user-preferences-nav/ai-preferences.gjs
@@ -4,8 +4,8 @@ import dIcon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class AutoImageCaptionSetting extends Component {
-  static shouldRender(outletArgs, helper) {
-    return helper.siteSettings.discourse_ai_enabled;
+  static shouldRender(args, context) {
+    return context.siteSettings.discourse_ai_enabled;
   }
 
   <template>
diff --git a/assets/javascripts/discourse/lib/show-ai-helper.js b/assets/javascripts/discourse/lib/show-ai-helper.js
index b05934e1..137fe8a1 100644
--- a/assets/javascripts/discourse/lib/show-ai-helper.js
+++ b/assets/javascripts/discourse/lib/show-ai-helper.js
@@ -17,10 +17,10 @@ export function showComposerAiHelper(
   return enableHelper && enableAssistant && enableFeature;
 }
 
-export function showPostAIHelper(outletArgs, helper) {
+export function showPostAIHelper(outletArgs, context) {
   return (
-    _helperEnabled(helper.siteSettings) &&
-    helper.currentUser?.can_use_assistant_in_post
+    _helperEnabled(context.siteSettings) &&
+    context.currentUser?.can_use_assistant_in_post
   );
 }