diff --git a/src/features/builtin-skills/skills.ts b/src/features/builtin-skills/skills.ts
index 82be5e974..8c544e186 100644
--- a/src/features/builtin-skills/skills.ts
+++ b/src/features/builtin-skills/skills.ts
@@ -10,15 +10,17 @@ import {
   devBrowserSkill,
   reviewWorkSkill,
   aiSlopRemoverSkill,
+  teamModeSkill,
 } from "./skills/index"
 
 export interface CreateBuiltinSkillsOptions {
   browserProvider?: BrowserAutomationProvider
   disabledSkills?: Set<string>
+  teamModeEnabled?: boolean
 }
 
 export function createBuiltinSkills(options: CreateBuiltinSkillsOptions = {}): BuiltinSkill[] {
-  const { browserProvider = "playwright", disabledSkills } = options
+  const { browserProvider = "playwright", disabledSkills, teamModeEnabled = false } = options
 
   let browserSkill: BuiltinSkill
 	if (browserProvider === "agent-browser") {
@@ -33,6 +35,10 @@ export function createBuiltinSkills(options: CreateBuiltinSkillsOptions = {}): B
 
 	const skills = [browserSkill, frontendUiUxSkill, gitMasterSkill, reviewWorkSkill, aiSlopRemoverSkill]
 
+  if (teamModeEnabled && !disabledSkills?.has("team-mode")) {
+    skills.push(teamModeSkill)
+  }
+
   if (!disabledSkills) {
     return skills
   }
diff --git a/src/features/builtin-skills/skills/index.ts b/src/features/builtin-skills/skills/index.ts
index 414e81002..2990cf178 100644
--- a/src/features/builtin-skills/skills/index.ts
+++ b/src/features/builtin-skills/skills/index.ts
@@ -5,3 +5,4 @@ export { gitMasterSkill } from "./git-master"
 export { devBrowserSkill } from "./dev-browser"
 export { reviewWorkSkill } from "./review-work"
 export { aiSlopRemoverSkill } from "./ai-slop-remover"
+export * from "./team-mode"