diff --git a/src/hooks/auto-slash-command/executor.ts b/src/hooks/auto-slash-command/executor.ts
index cd06ee78d..4a42dd74d 100644
--- a/src/hooks/auto-slash-command/executor.ts
+++ b/src/hooks/auto-slash-command/executor.ts
@@ -102,6 +102,7 @@ export interface ExecutorOptions {
   skills?: LoadedSkill[]
   pluginsEnabled?: boolean
   enabledPluginsOverride?: Record<string, boolean>
+  startWorkConfig?: { worktree?: boolean }
 }
 
 function discoverPluginCommands(options?: ExecutorOptions): CommandInfo[] {
@@ -132,7 +133,7 @@ async function discoverAllCommands(options?: ExecutorOptions): Promise<CommandIn
   const opencodeGlobalCommands = discoverCommandsFromDir(opencodeGlobalDir, "opencode")
   const projectCommands = discoverCommandsFromDir(projectCommandsDir, "project")
   const opencodeProjectCommands = discoverCommandsFromDir(opencodeProjectDir, "opencode-project")
-  const builtinCommandsMap = loadBuiltinCommands()
+  const builtinCommandsMap = loadBuiltinCommands(undefined, options?.startWorkConfig)
   const builtinCommands: CommandInfo[] = Object.values(builtinCommandsMap).map(cmd => ({
     name: cmd.name,
     metadata: {
diff --git a/src/hooks/auto-slash-command/hook.ts b/src/hooks/auto-slash-command/hook.ts
index c9f2caf2a..92bd89e2e 100644
--- a/src/hooks/auto-slash-command/hook.ts
+++ b/src/hooks/auto-slash-command/hook.ts
@@ -24,6 +24,7 @@ export interface AutoSlashCommandHookOptions {
   skills?: LoadedSkill[]
   pluginsEnabled?: boolean
   enabledPluginsOverride?: Record<string, boolean>
+  startWorkConfig?: { worktree?: boolean }
 }
 
 export function createAutoSlashCommandHook(options?: AutoSlashCommandHookOptions) {
@@ -31,6 +32,7 @@ export function createAutoSlashCommandHook(options?: AutoSlashCommandHookOptions
     skills: options?.skills,
     pluginsEnabled: options?.pluginsEnabled,
     enabledPluginsOverride: options?.enabledPluginsOverride,
+    startWorkConfig: options?.startWorkConfig,
   }
 
   return {
diff --git a/src/plugin/hooks/create-skill-hooks.ts b/src/plugin/hooks/create-skill-hooks.ts
index b0514d583..d086bc3d2 100644
--- a/src/plugin/hooks/create-skill-hooks.ts
+++ b/src/plugin/hooks/create-skill-hooks.ts
@@ -42,6 +42,7 @@ export function createSkillHooks(args: {
           skills: mergedSkills,
           pluginsEnabled: pluginConfig.claude_code?.plugins ?? true,
           enabledPluginsOverride: pluginConfig.claude_code?.plugins_override,
+          startWorkConfig: pluginConfig.start_work,
         }))
     : null