diff --git a/src/plugin/tool-registry.ts b/src/plugin/tool-registry.ts
index f58053801..63016da72 100644
--- a/src/plugin/tool-registry.ts
+++ b/src/plugin/tool-registry.ts
@@ -105,6 +105,7 @@ export function createToolRegistry(args: {
   const commands = discoverCommandsSync(ctx.directory, {
     pluginsEnabled: pluginConfig.claude_code?.plugins ?? true,
     enabledPluginsOverride: pluginConfig.claude_code?.plugins_override,
+    startWorkConfig: pluginConfig.start_work,
   })
   const skillTool = createSkillTool({
     commands,
@@ -112,6 +113,7 @@ export function createToolRegistry(args: {
     mcpManager: managers.skillMcpManager,
     getSessionID: getSessionIDForMcp,
     gitMasterConfig: pluginConfig.git_master,
+    startWorkConfig: pluginConfig.start_work,
   })
 
   const taskSystemEnabled = pluginConfig.experimental?.task_system ?? false
diff --git a/src/tools/skill/tools.ts b/src/tools/skill/tools.ts
index 4bdfb42a0..325b6fb1c 100644
--- a/src/tools/skill/tools.ts
+++ b/src/tools/skill/tools.ts
@@ -199,6 +199,7 @@ export function createSkillTool(options: SkillLoadOptions = {}): ToolDefinition
     cachedCommands = discoverCommandsSync(undefined, {
       pluginsEnabled: options.pluginsEnabled,
       enabledPluginsOverride: options.enabledPluginsOverride,
+      startWorkConfig: options.startWorkConfig,
     })
     return cachedCommands
   }
diff --git a/src/tools/skill/types.ts b/src/tools/skill/types.ts
index 579eb69cc..b402fde33 100644
--- a/src/tools/skill/types.ts
+++ b/src/tools/skill/types.ts
@@ -37,4 +37,6 @@ export interface SkillLoadOptions {
   pluginsEnabled?: boolean
   /** Override plugin enablement from Claude settings by plugin key */
   enabledPluginsOverride?: Record<string, boolean>
+  /** start-work command configuration, controls worktree instructions in /start-work template */
+  startWorkConfig?: { worktree?: boolean }
 }