diff --git a/src/tools/index.ts b/src/tools/index.ts
index 9d9bd9c04..fee18f604 100644
--- a/src/tools/index.ts
+++ b/src/tools/index.ts
@@ -44,6 +44,7 @@ export {
   createTaskUpdateTool,
 } from "./task"
 export { createHashlineEditTool } from "./hashline-edit"
+export { createTeamSendMessageTool } from "../features/team-mode/tools/messaging"
 
 export function createBackgroundTools(manager: BackgroundManager, client: OpencodeClient): Record<string, ToolDefinition> {
   const outputManager: BackgroundOutputManager = manager
diff --git a/src/tools/skill/tools.ts b/src/tools/skill/tools.ts
index 81bb14485..daece0351 100644
--- a/src/tools/skill/tools.ts
+++ b/src/tools/skill/tools.ts
@@ -36,6 +36,7 @@ export function createSkillTool(options: SkillLoadOptions = {}): ToolDefinition
     const discovered = (await getAllSkills({
       disabledSkills: options?.disabledSkills,
       browserProvider: options?.browserProvider,
+      teamModeEnabled: options?.teamModeEnabled,
     })) ?? []
     const allSkills = options.skills ? [...options.skills] : discovered
 
diff --git a/src/tools/skill/types.ts b/src/tools/skill/types.ts
index c5ae02540..3152a0141 100644
--- a/src/tools/skill/types.ts
+++ b/src/tools/skill/types.ts
@@ -35,6 +35,8 @@ export interface SkillLoadOptions {
   disabledSkills?: Set<string>
   /** Browser automation provider for provider-gated skill filtering */
   browserProvider?: BrowserAutomationProvider
+  /** Whether team mode built-in docs should be exposed */
+  teamModeEnabled?: boolean
   /** Include Claude marketplace plugin commands in discovery (default: true) */
   pluginsEnabled?: boolean
   /** Override plugin enablement from Claude settings by plugin key */