@nolrm/contextkit 0.8.4 → 0.9.4

package/README.md

@@ -111,13 +111,17 @@ Each platform generates bridge files that the AI tool auto-reads. If a bridge fi
 
 ## Use it in your tool
 
-**Cursor** — rules auto-load from `.cursor/rules/`
+**Cursor** — rules auto-load from `.cursor/rules/`, slash commands in `.cursor/prompts/`
 ```
-@.contextkit/commands/analyze.md
+/analyze    # scan codebase and generate standards
+/review     # code review with checklist
+/fix        # diagnose and fix bugs
 ```
 
-**Claude Code** — reads `CLAUDE.md` + `.claude/rules/` automatically
+**Claude Code** — reads `CLAUDE.md` + `.claude/rules/`, slash commands in `.claude/commands/`
 ```bash
+/analyze    # scan codebase and generate standards
+/review     # code review with checklist
 claude "create checkout flow for customer"
 ```
 
@@ -133,20 +137,56 @@ codex "create checkout flow for customer"
 
 **CLI** (Chat with AI)
 ```bash
-ck ai "create checkout flow for customer"
+ck ai "create a button"
 ```
 
 ---
 
-## Git Hooks
+## Slash Commands
 
-ContextKit can optionally install Git hooks during `ck install`:
+ContextKit installs reusable slash commands for supported platforms:
+
+| Command | What it does |
+|---------|-------------|
+| `/analyze` | Scan codebase and generate standards content |
+| `/review` | Code review with checklist |
+| `/fix` | Diagnose and fix bugs |
+| `/refactor` | Refactor code with safety checks |
+| `/test` | Generate comprehensive tests |
+| `/doc` | Add documentation |
+
+**Claude Code** — available as `/analyze`, `/review`, etc. in `.claude/commands/`
+**Cursor** — available as slash commands in Chat via `.cursor/prompts/`
+
+Both platforms delegate to the universal command files in `.contextkit/commands/`, so you maintain one set of workflows.
+
+---
+
+## Git Hooks & Quality Gates
+
+ContextKit can optionally install Git hooks during `ck install`. Uses `git config core.hooksPath` to point Git at `.contextkit/hooks/` — no external dependencies like Husky required. Works in any git repo, not just Node.js projects.
+
+For **Node.js projects**, a `prepare` script is automatically added to `package.json` so hooks activate for all developers after `npm install` — no need for everyone to run `ck install`.
 
 | Hook | What it does |
 |------|-------------|
-| **pre-push** | Runs tests, linting, and type checks before pushing |
+| **pre-push** | **Quality Gates** — auto-detects your project framework and runs the appropriate checks |
 | **commit-msg** | Enforces [Conventional Commits](https://www.conventionalcommits.org/) format |
 
+### Framework-Aware Quality Gates
+
+The pre-push hook detects your project type and runs the right quality checks automatically. All gates skip gracefully when tools aren't installed.
+
+| Framework | Checks |
+|-----------|--------|
+| **Node.js** | TypeScript, ESLint, Prettier, build, test (auto-detects npm/yarn/pnpm/bun) |
+| **Python** | ruff/flake8, mypy, black/ruff format, pytest |
+| **Rust** | cargo check, clippy, cargo test |
+| **Go** | go vet, golangci-lint, go test |
+| **PHP** | PHPStan, PHPUnit |
+| **Ruby** | RuboCop, RSpec/rake test |
+| **Java** | Maven verify / Gradle check |
+
 ### Commit Message Format
 
 When the `commit-msg` hook is enabled, all commits must follow this format:

package/lib/commands/install.js

@@ -178,20 +178,21 @@ class InstallCommand {
       return { prePush: false, commitMsg: false };
     }
 
-    if (!await fs.pathExists('package.json')) {
-      console.log(chalk.yellow('⚠️  Skipping Git hooks setup (no package.json found)'));
+    if (!await fs.pathExists('.git')) {
+      console.log(chalk.yellow('⚠️  Skipping Git hooks setup (not a git repository)'));
       return { prePush: false, commitMsg: false };
     }
 
     console.log('');
     console.log('──────────────────────────────────────────────');
-    console.log(chalk.blue('⚙️  Git Hooks Setup'));
+    console.log(chalk.blue('⚙️  Quality Gates — Git Hooks'));
     console.log('──────────────────────────────────────────────');
     console.log('');
 
     // Ask about pre-push hook
-    console.log(chalk.bold('Pre-push hook'));
-    console.log(chalk.dim('Runs tests, linting, and type checks before pushing.'));
+    console.log(chalk.bold('Pre-push Quality Gates'));
+    console.log(chalk.dim('Auto-detects your framework (Node, Python, Rust, Go, etc.)'));
+    console.log(chalk.dim('and runs the right checks before pushing.'));
     console.log('');
     const { prePush } = await inquirer.prompt([
       {
@@ -514,12 +515,20 @@ Run \`ck analyze\` to generate this content, or manually add your API pattern be
 
       // Download commands
       await this.downloadManager.downloadFile(
-        `${this.repoUrl}/commands/create-feature.md`,
-        '.contextkit/commands/create-feature.md'
+        `${this.repoUrl}/commands/analyze.md`,
+        '.contextkit/commands/analyze.md'
       );
       await this.downloadManager.downloadFile(
-        `${this.repoUrl}/commands/create-component.md`,
-        '.contextkit/commands/create-component.md'
+        `${this.repoUrl}/commands/review.md`,
+        '.contextkit/commands/review.md'
+      );
+      await this.downloadManager.downloadFile(
+        `${this.repoUrl}/commands/fix.md`,
+        '.contextkit/commands/fix.md'
+      );
+      await this.downloadManager.downloadFile(
+        `${this.repoUrl}/commands/refactor.md`,
+        '.contextkit/commands/refactor.md'
       );
       await this.downloadManager.downloadFile(
         `${this.repoUrl}/commands/run-tests.md`,
@@ -534,18 +543,22 @@ Run \`ck analyze\` to generate this content, or manually add your API pattern be
         '.contextkit/commands/quality-check.md'
       );
       await this.downloadManager.downloadFile(
-        `${this.repoUrl}/commands/analyze.md`,
-        '.contextkit/commands/analyze.md'
+        `${this.repoUrl}/commands/create-feature.md`,
+        '.contextkit/commands/create-feature.md'
+      );
+      await this.downloadManager.downloadFile(
+        `${this.repoUrl}/commands/create-component.md`,
+        '.contextkit/commands/create-component.md'
       );
 
       // Download hooks (pre-push and commit-msg only, no pre-commit)
       await this.downloadManager.downloadFile(
-        `${this.repoUrl}/hooks/pre-push.sh`,
-        '.contextkit/hooks/pre-push.sh'
+        `${this.repoUrl}/hooks/pre-push`,
+        '.contextkit/hooks/pre-push'
       );
       await this.downloadManager.downloadFile(
-        `${this.repoUrl}/hooks/commit-msg.sh`,
-        '.contextkit/hooks/commit-msg.sh'
+        `${this.repoUrl}/hooks/commit-msg`,
+        '.contextkit/hooks/commit-msg'
       );
       await this.downloadManager.downloadFile(
         `${this.repoUrl}/hooks/setup-hooks.sh`,
@@ -580,8 +593,8 @@ Run \`ck analyze\` to generate this content, or manually add your API pattern be
       );
 
       // Make scripts executable
-      await fs.chmod('.contextkit/hooks/pre-push.sh', '755');
-      await fs.chmod('.contextkit/hooks/commit-msg.sh', '755');
+      await fs.chmod('.contextkit/hooks/pre-push', '755');
+      await fs.chmod('.contextkit/hooks/commit-msg', '755');
       await fs.chmod('.contextkit/hooks/setup-hooks.sh', '755');
       await fs.chmod('.contextkit/types/type-check.sh', '755');
       await fs.chmod('.contextkit/scripts/update.sh', '755');
@@ -682,11 +695,14 @@ claude "read .contextkit/context.md to see available standards, then create a bu
 
 ### Commands
 - \`.contextkit/commands/analyze.md\` - Analyze & customize standards
+- \`.contextkit/commands/review.md\` - Code review
+- \`.contextkit/commands/fix.md\` - Diagnose and fix bugs
+- \`.contextkit/commands/refactor.md\` - Refactor code structure
+- \`.contextkit/commands/run-tests.md\` - Generate or run tests
+- \`.contextkit/commands/add-documentation.md\` - Add documentation
+- \`.contextkit/commands/quality-check.md\` - Quality checks
 - \`.contextkit/commands/create-component.md\` - Create component
 - \`.contextkit/commands/create-feature.md\` - Create feature
-- \`.contextkit/commands/run-tests.md\` - Run tests
-- \`.contextkit/commands/quality-check.md\` - Quality checks
-- \`.contextkit/commands/add-documentation.md\` - Add documentation
 
 ### Instructions
 - \`.contextkit/instructions/meta/pre-flight.md\` - Pre-flight checks
@@ -805,12 +821,15 @@ esac
         docs: 'docs'
       },
       commands: {
-        create_component: '@.contextkit/commands/create-component.md',
-        create_feature: '@.contextkit/commands/create-feature.md',
+        analyze: '@.contextkit/commands/analyze.md',
+        review: '@.contextkit/commands/review.md',
+        fix: '@.contextkit/commands/fix.md',
+        refactor: '@.contextkit/commands/refactor.md',
         run_tests: '@.contextkit/commands/run-tests.md',
         add_docs: '@.contextkit/commands/add-documentation.md',
         quality_check: '@.contextkit/commands/quality-check.md',
-        analyze: '@.contextkit/commands/analyze.md'
+        create_component: '@.contextkit/commands/create-component.md',
+        create_feature: '@.contextkit/commands/create-feature.md'
       }
     };
 

package/lib/commands/update.js

@@ -213,12 +213,20 @@ class UpdateCommand {
 
       // Download commands
       await this.downloadManager.downloadFile(
-        `${this.repoUrl}/commands/create-feature.md`,
-        '.contextkit/commands/create-feature.md'
+        `${this.repoUrl}/commands/analyze.md`,
+        '.contextkit/commands/analyze.md'
       );
       await this.downloadManager.downloadFile(
-        `${this.repoUrl}/commands/create-component.md`,
-        '.contextkit/commands/create-component.md'
+        `${this.repoUrl}/commands/review.md`,
+        '.contextkit/commands/review.md'
+      );
+      await this.downloadManager.downloadFile(
+        `${this.repoUrl}/commands/fix.md`,
+        '.contextkit/commands/fix.md'
+      );
+      await this.downloadManager.downloadFile(
+        `${this.repoUrl}/commands/refactor.md`,
+        '.contextkit/commands/refactor.md'
       );
       await this.downloadManager.downloadFile(
         `${this.repoUrl}/commands/run-tests.md`,
@@ -233,18 +241,22 @@ class UpdateCommand {
         '.contextkit/commands/quality-check.md'
       );
       await this.downloadManager.downloadFile(
-        `${this.repoUrl}/commands/analyze.md`,
-        '.contextkit/commands/analyze.md'
+        `${this.repoUrl}/commands/create-feature.md`,
+        '.contextkit/commands/create-feature.md'
+      );
+      await this.downloadManager.downloadFile(
+        `${this.repoUrl}/commands/create-component.md`,
+        '.contextkit/commands/create-component.md'
       );
 
       // Download hooks (pre-push and commit-msg only, no pre-commit)
       await this.downloadManager.downloadFile(
-        `${this.repoUrl}/hooks/pre-push.sh`,
-        '.contextkit/hooks/pre-push.sh'
+        `${this.repoUrl}/hooks/pre-push`,
+        '.contextkit/hooks/pre-push'
       );
       await this.downloadManager.downloadFile(
-        `${this.repoUrl}/hooks/commit-msg.sh`,
-        '.contextkit/hooks/commit-msg.sh'
+        `${this.repoUrl}/hooks/commit-msg`,
+        '.contextkit/hooks/commit-msg'
       );
       await this.downloadManager.downloadFile(
         `${this.repoUrl}/hooks/setup-hooks.sh`,
@@ -278,8 +290,8 @@ class UpdateCommand {
       );
 
       // Make scripts executable
-      await fs.chmod('.contextkit/hooks/pre-push.sh', '755');
-      await fs.chmod('.contextkit/hooks/commit-msg.sh', '755');
+      await fs.chmod('.contextkit/hooks/pre-push', '755');
+      await fs.chmod('.contextkit/hooks/commit-msg', '755');
       await fs.chmod('.contextkit/hooks/setup-hooks.sh', '755');
       await fs.chmod('.contextkit/types/type-check.sh', '755');
       await fs.chmod('.contextkit/scripts/update.sh', '755');
@@ -317,12 +329,15 @@ paths:
 
 # Commands
 commands:
-  create_component: "${config.commands?.create_component || '@.contextkit/commands/create-component.md'}"
-  create_feature: "${config.commands?.create_feature || '@.contextkit/commands/create-feature.md'}"
+  analyze: "${config.commands?.analyze || '@.contextkit/commands/analyze.md'}"
+  review: "${config.commands?.review || '@.contextkit/commands/review.md'}"
+  fix: "${config.commands?.fix || '@.contextkit/commands/fix.md'}"
+  refactor: "${config.commands?.refactor || '@.contextkit/commands/refactor.md'}"
   run_tests: "${config.commands?.run_tests || '@.contextkit/commands/run-tests.md'}"
   add_docs: "${config.commands?.add_docs || '@.contextkit/commands/add-documentation.md'}"
   quality_check: "${config.commands?.quality_check || '@.contextkit/commands/quality-check.md'}"
-  analyze: "${config.commands?.analyze || '@.contextkit/commands/analyze.md'}"
+  create_component: "${config.commands?.create_component || '@.contextkit/commands/create-component.md'}"
+  create_feature: "${config.commands?.create_feature || '@.contextkit/commands/create-feature.md'}"
 `;
 
     await fs.writeFile('.contextkit/config.yml', configContent);

package/lib/integrations/claude-integration.js

@@ -12,6 +12,11 @@ class ClaudeIntegration extends BaseIntegration {
       '.claude/rules/contextkit-testing.md',
       '.claude/rules/contextkit-code-style.md',
       '.claude/commands/analyze.md',
+      '.claude/commands/review.md',
+      '.claude/commands/fix.md',
+      '.claude/commands/refactor.md',
+      '.claude/commands/test.md',
+      '.claude/commands/doc.md',
     ];
     this.platformDir = '.claude/rules';
   }
@@ -112,14 +117,48 @@ When writing or modifying source code, follow:
 `;
     await this.writeGeneratedFile('.claude/rules/contextkit-code-style.md', codeStyleRule);
 
-    // Command: analyze
-    const analyzeCommand = `# Analyze Project
+    // Slash commands — thin wrappers that delegate to .contextkit/commands/
+    await this.writeGeneratedFile('.claude/commands/analyze.md', `# Analyze Project
 
 Read \`.contextkit/commands/analyze.md\` and execute the analysis workflow for this project.
 
 Scan the codebase structure, detect frameworks and patterns, then generate customized standards files in \`.contextkit/standards/\`.
-`;
-    await this.writeGeneratedFile('.claude/commands/analyze.md', analyzeCommand);
+`);
+
+    await this.writeGeneratedFile('.claude/commands/review.md', `# Code Review
+
+Read \`.contextkit/commands/review.md\` and execute the review workflow.
+
+Review current changes for correctness, standards compliance, and potential issues.
+`);
+
+    await this.writeGeneratedFile('.claude/commands/fix.md', `# Fix Bug
+
+Read \`.contextkit/commands/fix.md\` and execute the bug fix workflow.
+
+Diagnose the root cause, implement the minimal fix, and add a regression test.
+`);
+
+    await this.writeGeneratedFile('.claude/commands/refactor.md', `# Refactor
+
+Read \`.contextkit/commands/refactor.md\` and execute the refactoring workflow.
+
+Improve code structure without changing behavior, keeping tests green at every step.
+`);
+
+    await this.writeGeneratedFile('.claude/commands/test.md', `# Run Tests
+
+Read \`.contextkit/commands/run-tests.md\` and execute the testing workflow.
+
+Generate or run tests for the specified code, covering happy paths, edge cases, and errors.
+`);
+
+    await this.writeGeneratedFile('.claude/commands/doc.md', `# Add Documentation
+
+Read \`.contextkit/commands/add-documentation.md\` and execute the documentation workflow.
+
+Add inline docs, README sections, and usage examples for the specified code.
+`);
   }
 
   showUsage() {
@@ -127,14 +166,14 @@ Scan the codebase structure, detect frameworks and patterns, then generate custo
     console.log(chalk.bold('  Claude Code Usage:'));
     console.log('    CLAUDE.md is auto-loaded every session');
     console.log('    .claude/rules/ are loaded based on file context');
-    console.log('    Use /analyze slash command for project analysis');
     console.log('');
-    console.log(chalk.dim('  Files created:'));
-    console.log(chalk.dim('    CLAUDE.md (bridge - auto-loaded)'));
-    console.log(chalk.dim('    .claude/rules/contextkit-standards.md (always apply)'));
-    console.log(chalk.dim('    .claude/rules/contextkit-testing.md (test files)'));
-    console.log(chalk.dim('    .claude/rules/contextkit-code-style.md (source files)'));
-    console.log(chalk.dim('    .claude/commands/analyze.md (slash command)'));
+    console.log(chalk.dim('  Slash commands:'));
+    console.log(chalk.dim('    /analyze  — Analyze project and generate standards'));
+    console.log(chalk.dim('    /review   — Review current changes'));
+    console.log(chalk.dim('    /fix      — Diagnose and fix a bug'));
+    console.log(chalk.dim('    /refactor — Refactor code structure'));
+    console.log(chalk.dim('    /test     — Generate or run tests'));
+    console.log(chalk.dim('    /doc      — Add documentation'));
   }
 }
 

package/lib/integrations/cursor-integration.js

@@ -12,6 +12,12 @@ class CursorIntegration extends BaseIntegration {
       '.cursor/rules/contextkit-testing.mdc',
       '.cursor/rules/contextkit-components.mdc',
       '.cursor/rules/contextkit-api.mdc',
+      '.cursor/prompts/analyze.md',
+      '.cursor/prompts/review.md',
+      '.cursor/prompts/fix.md',
+      '.cursor/prompts/refactor.md',
+      '.cursor/prompts/test.md',
+      '.cursor/prompts/doc.md',
     ];
     this.bridgeFiles = [];
     this.platformDir = '.cursor/rules';
@@ -19,6 +25,7 @@ class CursorIntegration extends BaseIntegration {
 
   async install() {
     await super.install();
+    await fs.ensureDir('.cursor/prompts');
     // Remove old monolithic rule file if present
     await this.removeLegacyFiles();
   }
@@ -142,20 +149,63 @@ Reference: @.contextkit/standards/architecture.md
 - @.contextkit/commands/create-feature.md — Create feature workflow
 `;
     await this.writeGeneratedFile('.cursor/rules/contextkit-api.mdc', apiRule);
+
+    // Cursor prompts — reusable slash commands in Cursor Chat
+    await this.writeGeneratedFile('.cursor/prompts/analyze.md', `# Analyze Project
+
+Read \`.contextkit/commands/analyze.md\` and execute the analysis workflow for this project.
+
+Scan the codebase structure, detect frameworks and patterns, then generate customized standards files in \`.contextkit/standards/\`.
+`);
+
+    await this.writeGeneratedFile('.cursor/prompts/review.md', `# Code Review
+
+Read \`.contextkit/commands/review.md\` and execute the review workflow.
+
+Review current changes for correctness, standards compliance, and potential issues. Flag bugs, security concerns, and standards violations.
+`);
+
+    await this.writeGeneratedFile('.cursor/prompts/fix.md', `# Fix Bug
+
+Read \`.contextkit/commands/fix.md\` and execute the bug fix workflow.
+
+Diagnose the root cause, implement the minimal fix, and add a regression test.
+`);
+
+    await this.writeGeneratedFile('.cursor/prompts/refactor.md', `# Refactor
+
+Read \`.contextkit/commands/refactor.md\` and execute the refactoring workflow.
+
+Improve code structure without changing behavior, keeping tests green at every step.
+`);
+
+    await this.writeGeneratedFile('.cursor/prompts/test.md', `# Run Tests
+
+Read \`.contextkit/commands/run-tests.md\` and execute the testing workflow.
+
+Generate or run tests for the specified code, covering happy paths, edge cases, and errors.
+`);
+
+    await this.writeGeneratedFile('.cursor/prompts/doc.md', `# Add Documentation
+
+Read \`.contextkit/commands/add-documentation.md\` and execute the documentation workflow.
+
+Add inline docs, README sections, and usage examples for the specified code.
+`);
   }
 
   showUsage() {
     console.log('');
     console.log(chalk.bold('  Cursor Usage:'));
     console.log('    Rules auto-load based on file context');
-    console.log('    In Cursor Chat: @.contextkit/commands/analyze.md');
-    console.log('    Or: @.contextkit Create a button component');
     console.log('');
-    console.log(chalk.dim('  Files created:'));
-    console.log(chalk.dim('    .cursor/rules/contextkit-standards.mdc (always apply)'));
-    console.log(chalk.dim('    .cursor/rules/contextkit-testing.mdc (test files)'));
-    console.log(chalk.dim('    .cursor/rules/contextkit-components.mdc (components)'));
-    console.log(chalk.dim('    .cursor/rules/contextkit-api.mdc (API/services)'));
+    console.log(chalk.dim('  Slash commands (in Cursor Chat):'));
+    console.log(chalk.dim('    /analyze  — Analyze project and generate standards'));
+    console.log(chalk.dim('    /review   — Review current changes'));
+    console.log(chalk.dim('    /fix      — Diagnose and fix a bug'));
+    console.log(chalk.dim('    /refactor — Refactor code structure'));
+    console.log(chalk.dim('    /test     — Generate or run tests'));
+    console.log(chalk.dim('    /doc      — Add documentation'));
   }
 }
 

package/lib/utils/git-hooks.js

@@ -4,27 +4,40 @@ const chalk = require('chalk');
 
 class GitHooksManager {
   constructor() {
-    this.hooksDir = '.husky';
+    this.hooksPath = '.contextkit/hooks';
   }
 
   async installHooks(packageManager, hookChoices = { prePush: true, commitMsg: true }) {
     console.log(chalk.yellow('🪝 Setting up Git hooks...'));
 
-    // Check if Node.js is available
-    if (!this.checkCommandExists('node')) {
-      console.log(chalk.yellow('⚠️  Node.js not found, skipping Git hooks setup'));
+    // Check if this is a git repo
+    if (!fs.existsSync('.git')) {
+      console.log(chalk.yellow('⚠️  Not a git repository, skipping Git hooks setup'));
       return;
     }
 
     try {
-      // Install Husky based on package manager
-      await this.installHusky(packageManager);
+      // Clean up legacy Husky directory if present
+      await this.cleanupLegacyHusky();
 
-      // Initialize Husky
-      await this.initializeHusky(packageManager);
+      // Clean up legacy .git/hooks/ files from previous ContextKit versions
+      await this.cleanupLegacyGitHooks();
 
-      // Add hooks
-      await this.addHooks(packageManager, hookChoices);
+      // Remove hooks the user didn't select
+      await this.removeUnselectedHooks(hookChoices);
+
+      // Set core.hooksPath so git uses .contextkit/hooks/ directly
+      execSync(`git config core.hooksPath ${this.hooksPath}`, { stdio: 'pipe' });
+      console.log(chalk.green(`✅ Git hooks path set to ${this.hooksPath}`));
+
+      // Add prepare script to package.json for automatic setup on npm install
+      await this.addPrepareScript();
+
+      // Show non-Node setup hint if no package.json
+      if (!fs.existsSync('package.json')) {
+        console.log(chalk.dim('   💡 For other developers, add to your setup:'));
+        console.log(chalk.dim(`      git config core.hooksPath ${this.hooksPath}`));
+      }
 
       console.log(chalk.green('✅ Git hooks setup complete'));
 
@@ -34,200 +47,128 @@ class GitHooksManager {
     }
   }
 
-  async installHusky(packageManager) {
-    const huskyInstalled = await this.checkHuskyInstalled(packageManager);
-    
-    if (!huskyInstalled) {
-      console.log(chalk.blue(`📦 Installing Husky with ${packageManager}...`));
-      
-      try {
-        switch (packageManager) {
-          case 'yarn':
-            execSync('yarn add --dev husky', { stdio: 'inherit' });
-            break;
-          case 'pnpm':
-            execSync('pnpm add --save-dev husky', { stdio: 'inherit' });
-            break;
-          case 'npm':
-          default:
-            execSync('npm install --save-dev husky', { stdio: 'inherit' });
-            break;
-        }
-        console.log(chalk.green(`✅ Husky installed with ${packageManager}`));
-      } catch (error) {
-        console.log(chalk.yellow(`⚠️  Failed to install Husky with ${packageManager}, trying fallback...`));
-        // Fallback to npm if the detected package manager fails
-        if (packageManager !== 'npm') {
-          try {
-            execSync('npm install --save-dev husky', { stdio: 'inherit' });
-            console.log(chalk.green('✅ Husky installed with npm (fallback)'));
-          } catch (fallbackError) {
-            console.log(chalk.red('❌ Failed to install Husky with any package manager'));
-            throw new Error(`Failed to install Husky: ${fallbackError.message}`);
-          }
-        } else {
-          throw error;
-        }
+  async removeUnselectedHooks(hookChoices) {
+    // If user didn't select a hook, remove it from .contextkit/hooks/
+    // so core.hooksPath doesn't run hooks they didn't want
+    if (!hookChoices.prePush) {
+      const hookPath = `${this.hooksPath}/pre-push`;
+      if (fs.existsSync(hookPath)) {
+        await fs.remove(hookPath);
+      }
+    }
+    if (!hookChoices.commitMsg) {
+      const hookPath = `${this.hooksPath}/commit-msg`;
+      if (fs.existsSync(hookPath)) {
+        await fs.remove(hookPath);
       }
-    } else {
-      console.log(chalk.green('✅ Husky already installed'));
     }
   }
 
-  async checkHuskyInstalled(packageManager) {
+  async addPrepareScript() {
+    if (!fs.existsSync('package.json')) return;
+
     try {
-      // Check if husky is in package.json dependencies
-      const packageJson = await fs.readJson('package.json').catch(() => ({}));
-      const allDeps = {
-        ...packageJson.dependencies,
-        ...packageJson.devDependencies,
-        ...packageJson.peerDependencies
-      };
-      
-      if (allDeps.husky) {
-        return true;
+      const pkg = await fs.readJson('package.json');
+      const prepareCmd = `git config core.hooksPath ${this.hooksPath}`;
+
+      if (!pkg.scripts) pkg.scripts = {};
+
+      // Don't overwrite if prepare already has our command
+      if (pkg.scripts.prepare && pkg.scripts.prepare.includes('core.hooksPath')) {
+        return;
       }
-      
-      // Fallback: try package manager specific commands
-      switch (packageManager) {
-        case 'yarn':
-          execSync('yarn list --pattern husky', { stdio: 'pipe' });
-          return true;
-        case 'pnpm':
-          execSync('pnpm list husky', { stdio: 'pipe' });
-          return true;
-        case 'npm':
-        default:
-          execSync('npm list husky', { stdio: 'pipe' });
-          return true;
+
+      // Append to existing prepare script or create new one
+      if (pkg.scripts.prepare) {
+        pkg.scripts.prepare = `${pkg.scripts.prepare} && ${prepareCmd}`;
+      } else {
+        pkg.scripts.prepare = prepareCmd;
       }
+
+      await fs.writeJson('package.json', pkg, { spaces: 2 });
+      console.log(chalk.green('✅ Added prepare script to package.json'));
     } catch (error) {
-      return false;
+      console.log(chalk.yellow('⚠️  Could not update package.json prepare script'));
     }
   }
 
-  async initializeHusky(packageManager) {
-    // Modern Husky doesn't need explicit initialization
-    // Just ensure .husky directory exists
-    await fs.ensureDir(this.hooksDir);
-    
-    // Create husky.sh if it doesn't exist (for compatibility)
-    const huskyShPath = `${this.hooksDir}/_/husky.sh`;
-    if (!await fs.pathExists(huskyShPath)) {
-      await fs.ensureDir(`${this.hooksDir}/_`);
-      const huskyShContent = `#!/usr/bin/env sh
-if [ -z "$husky_skip_init" ]; then
-  debug () {
-    if [ "$HUSKY_DEBUG" = "1" ]; then
-      echo "husky (debug) - $1"
-    fi
-  }
+  async cleanupLegacyHusky() {
+    if (!fs.existsSync('.husky')) return;
 
-  readonly hook_name="$(basename -- "$0")"
-  debug "starting $hook_name..."
-
-  if [ "$HUSKY" = "0" ]; then
-    debug "HUSKY env variable is set to 0, skipping hook"
-    exit 0
-  fi
-
-  if [ -f ~/.huskyrc ]; then
-    debug "sourcing ~/.huskyrc"
-    . ~/.huskyrc
-  fi
-
-  readonly husky_skip_init=1
-  export husky_skip_init
-  sh -e "$0" "$@"
-fi
-`;
-      await fs.writeFile(huskyShPath, huskyShContent);
-      await fs.chmod(huskyShPath, '755');
-    }
-    
-    console.log(chalk.green('✅ Husky initialized'));
-  }
+    // Check if the .husky dir contains ContextKit/Vibe Kit markers
+    const huskyHooks = ['pre-push', 'commit-msg', 'pre-commit'];
+    let hasContextKitHooks = false;
 
-  async addHooks(packageManager, hookChoices = { prePush: true, commitMsg: true }) {
-    // Backup existing hooks
-    await this.backupExistingHooks();
-
-    // Remove legacy pre-commit hook if it exists (replaced by pre-push)
-    const legacyPreCommitHook = `${this.hooksDir}/pre-commit`;
-    if (fs.existsSync(legacyPreCommitHook)) {
-      const content = await fs.readFile(legacyPreCommitHook, 'utf8');
-      if (content.includes('.contextkit/') || content.includes('.vibe-kit/')) {
-        await fs.remove(legacyPreCommitHook);
-        console.log(chalk.yellow('🧹 Removed legacy pre-commit hook (replaced by pre-push)'));
+    for (const hook of huskyHooks) {
+      const hookPath = `.husky/${hook}`;
+      if (fs.existsSync(hookPath)) {
+        const content = await fs.readFile(hookPath, 'utf8');
+        if (content.includes('.contextkit/') || content.includes('.vibe-kit/')) {
+          hasContextKitHooks = true;
+          break;
+        }
       }
     }
 
-    // Add selected hooks
-    if (hookChoices.prePush) {
-      await this.addHook(packageManager, 'pre-push', '.contextkit/hooks/pre-push.sh');
-    }
-    if (hookChoices.commitMsg) {
-      await this.addHook(packageManager, 'commit-msg', '.contextkit/hooks/commit-msg.sh');
+    if (hasContextKitHooks) {
+      await fs.remove('.husky');
+      console.log(chalk.yellow('🧹 Removed legacy .husky/ directory'));
+      console.log(chalk.dim('   💡 You can also run: npm uninstall husky'));
     }
   }
 
-  async addHook(packageManager, hookName, scriptPath) {
-    const hookPath = `${this.hooksDir}/${hookName}`;
-    
-    // Ensure .husky directory exists
-    await fs.ensureDir(this.hooksDir);
-    
-    // Create hook file directly (modern Husky approach)
-    const hookContent = `#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-${scriptPath} "$@"
-`;
-    
-    await fs.writeFile(hookPath, hookContent);
-    await fs.chmod(hookPath, '755');
-    
-    console.log(chalk.green(`✅ Created hook: ${hookName}`));
-  }
-
-  async backupExistingHooks() {
+  async cleanupLegacyGitHooks() {
+    // Remove wrapper hooks from .git/hooks/ left by previous ContextKit versions
     const hooks = ['pre-push', 'commit-msg'];
-
     for (const hook of hooks) {
-      const hookPath = `${this.hooksDir}/${hook}`;
+      const hookPath = `.git/hooks/${hook}`;
       if (fs.existsSync(hookPath)) {
-        const backupPath = `${hookPath}.backup`;
-        await fs.copy(hookPath, backupPath);
-        console.log(chalk.yellow(`📦 Backed up existing hook: ${hook}`));
+        const content = await fs.readFile(hookPath, 'utf8');
+        if (content.includes('ContextKit managed hook')) {
+          await fs.remove(hookPath);
+        }
       }
     }
   }
 
-  checkCommandExists(command) {
+  async uninstallHooks() {
+    console.log(chalk.yellow('🪝 Removing Git hooks...'));
+
+    // Unset core.hooksPath
     try {
-      execSync(`which ${command}`, { stdio: 'pipe' });
-      return true;
+      execSync('git config --unset core.hooksPath', { stdio: 'pipe' });
+      console.log(chalk.green('✅ Removed core.hooksPath config'));
     } catch (error) {
-      return false;
+      // Already unset, that's fine
     }
+
+    // Remove prepare script from package.json
+    await this.removePrepareScript();
+
+    console.log(chalk.green('✅ Git hooks removed'));
   }
 
-  async uninstallHooks() {
-    console.log(chalk.yellow('🪝 Removing Git hooks...'));
-    
-    const hooks = ['pre-push', 'commit-msg'];
+  async removePrepareScript() {
+    if (!fs.existsSync('package.json')) return;
 
-    for (const hook of hooks) {
-      const hookPath = `${this.hooksDir}/${hook}`;
-      const backupPath = `${hookPath}.backup`;
-      
-      if (fs.existsSync(backupPath)) {
-        await fs.move(backupPath, hookPath);
-        console.log(chalk.green(`✅ Restored original hook: ${hook}`));
-      } else if (fs.existsSync(hookPath)) {
-        await fs.remove(hookPath);
-        console.log(chalk.green(`✅ Removed hook: ${hook}`));
+    try {
+      const pkg = await fs.readJson('package.json');
+      if (!pkg.scripts?.prepare) return;
+
+      const prepareCmd = `git config core.hooksPath ${this.hooksPath}`;
+
+      if (pkg.scripts.prepare === prepareCmd) {
+        delete pkg.scripts.prepare;
+      } else if (pkg.scripts.prepare.includes(prepareCmd)) {
+        // Remove our command from a chained prepare script
+        pkg.scripts.prepare = pkg.scripts.prepare
+          .replace(` && ${prepareCmd}`, '')
+          .replace(`${prepareCmd} && `, '');
       }
+
+      await fs.writeJson('package.json', pkg, { spaces: 2 });
+    } catch (error) {
+      // Best effort
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nolrm/contextkit",
-  "version": "0.8.4",
+  "version": "0.9.4",
   "description": "ContextKit - Context Engineering for AI Development. Provide rich context to AI through structured MD files with standards, code guides, and documentation. Works with Cursor, Claude, Aider, VS Code Copilot, and more.",
   "main": "lib/index.js",
   "bin": {