diff --git a/src/agents/builtin-agents/available-skills.test.ts b/src/agents/builtin-agents/available-skills.test.ts
new file mode 100644
index 000000000..2505af5bb
--- /dev/null
+++ b/src/agents/builtin-agents/available-skills.test.ts
@@ -0,0 +1,27 @@
+import { describe, expect, test } from "bun:test"
+
+import { buildAvailableSkills } from "./available-skills"
+
+describe("buildAvailableSkills", () => {
+  test("includes team-mode when team mode is enabled", () => {
+    // given
+    const discoveredSkills = []
+
+    // when
+    const availableSkills = buildAvailableSkills(discoveredSkills, undefined, undefined, true)
+
+    // then
+    expect(availableSkills.some((skill) => skill.name === "team-mode")).toBe(true)
+  })
+
+  test("excludes team-mode when team mode is disabled", () => {
+    // given
+    const discoveredSkills = []
+
+    // when
+    const availableSkills = buildAvailableSkills(discoveredSkills, undefined, undefined, false)
+
+    // then
+    expect(availableSkills.some((skill) => skill.name === "team-mode")).toBe(false)
+  })
+})
diff --git a/src/agents/builtin-agents/available-skills.ts b/src/agents/builtin-agents/available-skills.ts
index 27ed5d698..d6aafa8cd 100644
--- a/src/agents/builtin-agents/available-skills.ts
+++ b/src/agents/builtin-agents/available-skills.ts
@@ -12,9 +12,10 @@ function mapScopeToLocation(scope: SkillScope): AvailableSkill["location"] {
 export function buildAvailableSkills(
   discoveredSkills: LoadedSkill[],
   browserProvider?: BrowserAutomationProvider,
-  disabledSkills?: Set<string>
+  disabledSkills?: Set<string>,
+  teamModeEnabled?: boolean,
 ): AvailableSkill[] {
-  const builtinSkills = createBuiltinSkills({ browserProvider, disabledSkills })
+  const builtinSkills = createBuiltinSkills({ browserProvider, disabledSkills, teamModeEnabled })
   const builtinSkillNames = new Set(builtinSkills.map(s => s.name))
 
   const builtinAvailable: AvailableSkill[] = builtinSkills.map((skill) => ({