diff --git a/src/create-hooks.ts b/src/create-hooks.ts
index 0e40ad480..827913754 100644
--- a/src/create-hooks.ts
+++ b/src/create-hooks.ts
@@ -8,6 +8,8 @@ import type { ModelCacheState } from "./plugin-state"
 import { createCoreHooks } from "./plugin/hooks/create-core-hooks"
 import { createContinuationHooks } from "./plugin/hooks/create-continuation-hooks"
 import { createSkillHooks } from "./plugin/hooks/create-skill-hooks"
+import { createClaudeCodeHooksHook } from "./hooks/claude-code-hooks"
+import { safeCreateHook } from "./shared/safe-create-hook"
 
 export type CreatedHooks = ReturnType<typeof createHooks>
 
@@ -78,10 +80,17 @@ export function createHooks(args: {
     availableSkills,
   })
 
+  const claudeCodeHooks = isHookEnabled("claude-code-hooks")
+    ? safeHookEnabled
+      ? safeCreateHook("claude-code-hooks", () => createClaudeCodeHooksHook(ctx, {}), { enabled: true })
+      : createClaudeCodeHooksHook(ctx, {})
+    : null
+
   const hooks = {
     ...core,
     ...continuation,
     ...skill,
+    claudeCodeHooks,
   }
 
   return {