diff --git a/src/plugin/messages-transform.ts b/src/plugin/messages-transform.ts
index 99f926cfb..1eaef3eba 100644
--- a/src/plugin/messages-transform.ts
+++ b/src/plugin/messages-transform.ts
@@ -44,6 +44,24 @@ export function createMessagesTransformHandler(args: {
       output,
     )
 
+    await runMessagesTransformHookSafely(
+      "teamModeStatusInjector",
+      args.hooks.teamModeStatusInjector?.[
+        "experimental.chat.messages.transform"
+      ],
+      input,
+      output,
+    )
+
+    await runMessagesTransformHookSafely(
+      "teamMailboxInjector",
+      args.hooks.teamMailboxInjector?.[
+        "experimental.chat.messages.transform"
+      ],
+      input,
+      output,
+    )
+
     await runMessagesTransformHookSafely(
       "thinkingBlockValidator",
       args.hooks.thinkingBlockValidator?.[
diff --git a/src/plugin/skill-context.ts b/src/plugin/skill-context.ts
index 6af00117a..7783a1109 100644
--- a/src/plugin/skill-context.ts
+++ b/src/plugin/skill-context.ts
@@ -62,6 +62,7 @@ export async function createSkillContext(args: {
   const builtinSkills = createBuiltinSkills({
     browserProvider,
     disabledSkills,
+    teamModeEnabled: pluginConfig.team_mode?.enabled ?? false,
   }).filter((skill) => {
     if (skill.mcpConfig) {
       for (const mcpName of Object.keys(skill.mcpConfig)) {