@pennyfarthing/core 10.4.0 → 11.0.0

package/packages/core/dist/cli/commands/hook-chaining.test.js

@@ -0,0 +1,386 @@
+/**
+ * Tests for Story 98-12: Git hook chaining with .d/ dispatcher pattern
+ *
+ * These tests verify that git hooks use a .d/ dispatcher pattern allowing
+ * multiple hook scripts to coexist without conflicts.
+ *
+ * Acceptance Criteria:
+ * AC1: .d/ dispatcher architecture — hooks installed via dispatcher + .d/ directory
+ * AC2: Hooks can be extended and composed without conflicts
+ * AC3: Support pre-commit, pre-push, and post-merge hooks
+ * AC4: Integrate with the framework's install/upgrade flow
+ * AC5: Maintain backward compatibility with existing hooks
+ *
+ * Run with: cd packages/core && pnpm build && pnpm test
+ */
+import { describe, it, beforeEach, afterEach } from 'node:test';
+import assert from 'node:assert';
+import { existsSync, mkdirSync, writeFileSync, rmSync, readFileSync, readdirSync, statSync, } from 'fs';
+import { join } from 'path';
+import { tmpdir } from 'os';
+import { execSync } from 'child_process';
+import { installGitHooks } from './init.js';
+// Marker string used by pennyfarthing to identify its own hooks
+const PF_MARKER = 'pennyfarthing';
+// Dispatcher marker to identify the dispatcher script
+const DISPATCHER_MARKER = 'pennyfarthing-dispatcher';
+describe('Story 98-12: Git hook chaining with .d/ dispatcher pattern', () => {
+    let testDir;
+    let gitDir;
+    let gitHooksDir;
+    let nodeModulesPath;
+    let hooksSourceDir;
+    beforeEach(() => {
+        testDir = join(tmpdir(), `pf-hook-chaining-${Date.now()}-${Math.random().toString(36).slice(2)}`);
+        gitDir = join(testDir, '.git');
+        gitHooksDir = join(gitDir, 'hooks');
+        nodeModulesPath = join(testDir, 'node_modules/@pennyfarthing/core/pennyfarthing-dist');
+        hooksSourceDir = join(nodeModulesPath, 'scripts/hooks');
+        // Create directory structure
+        mkdirSync(gitHooksDir, { recursive: true });
+        mkdirSync(hooksSourceDir, { recursive: true });
+        // Create dispatcher template (shared source of truth)
+        writeFileSync(join(hooksSourceDir, 'dispatcher-template.sh'), '#!/bin/bash\n' +
+            '# pennyfarthing-dispatcher: Git hook dispatcher for __HOOK_NAME__\n' +
+            '# Runs all executable scripts in __HOOK_NAME__.d/ in sorted order.\n' +
+            '# Installed by pennyfarthing — do not edit manually.\n' +
+            '\n' +
+            'set -uo pipefail\n' +
+            '\n' +
+            'HOOK_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"\n' +
+            'HOOK_NAME="__HOOK_NAME__"\n' +
+            'D_DIR="${HOOK_DIR}/${HOOK_NAME}.d"\n' +
+            '\n' +
+            '# If .d/ directory doesn\'t exist or is empty, exit successfully\n' +
+            'if [[ ! -d "${D_DIR}" ]]; then\n' +
+            '  exit 0\n' +
+            'fi\n' +
+            '\n' +
+            '# Capture stdin for hooks that receive input (e.g., pre-push)\n' +
+            'STDIN_DATA=""\n' +
+            'if [[ ! -t 0 ]]; then\n' +
+            '  STDIN_DATA="$(cat /dev/stdin)"\n' +
+            'fi\n' +
+            '\n' +
+            '# Run each executable script in sorted order\n' +
+            'for hook_script in $(ls "${D_DIR}/" 2>/dev/null | sort); do\n' +
+            '  script_path="${D_DIR}/${hook_script}"\n' +
+            '\n' +
+            '  # Skip non-executable files\n' +
+            '  if [[ ! -x "${script_path}" ]]; then\n' +
+            '    continue\n' +
+            '  fi\n' +
+            '\n' +
+            '  # Run the hook, forwarding arguments and stdin\n' +
+            '  if [[ -n "${STDIN_DATA}" ]]; then\n' +
+            '    echo "${STDIN_DATA}" | "${script_path}" "$@"\n' +
+            '  else\n' +
+            '    "${script_path}" "$@"\n' +
+            '  fi\n' +
+            '\n' +
+            '  exit_code=$?\n' +
+            '  if [[ ${exit_code} -ne 0 ]]; then\n' +
+            '    exit ${exit_code}\n' +
+            '  fi\n' +
+            'done\n' +
+            '\n' +
+            'exit 0\n');
+        // Create source hook files (mimicking pennyfarthing-dist/scripts/hooks/)
+        writeFileSync(join(hooksSourceDir, 'pre-commit.sh'), '#!/bin/bash\n# pennyfarthing pre-commit hook\necho "pre-commit check"\nexit 0\n');
+        writeFileSync(join(hooksSourceDir, 'pre-push.sh'), '#!/bin/bash\n# pennyfarthing pre-push hook\necho "pre-push check"\nexit 0\n');
+        writeFileSync(join(hooksSourceDir, 'post-merge.sh'), '#!/bin/bash\n# pennyfarthing post-merge hook\necho "post-merge check"\nexit 0\n');
+    });
+    afterEach(() => {
+        if (existsSync(testDir)) {
+            rmSync(testDir, { recursive: true, force: true });
+        }
+    });
+    // ─── AC1: .d/ dispatcher architecture ──────────────────────────────
+    describe('AC1: Dispatcher architecture with .d/ directories', () => {
+        it('should create .d/ directory for each hook type', async () => {
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            assert.ok(existsSync(join(gitHooksDir, 'pre-commit.d')), 'pre-commit.d/ directory should be created');
+            assert.ok(existsSync(join(gitHooksDir, 'pre-push.d')), 'pre-push.d/ directory should be created');
+            assert.ok(existsSync(join(gitHooksDir, 'post-merge.d')), 'post-merge.d/ directory should be created');
+        });
+        it('should install dispatcher script at .git/hooks/{hook}', async () => {
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            const dispatcherPath = join(gitHooksDir, 'pre-commit');
+            assert.ok(existsSync(dispatcherPath), 'Dispatcher should exist at .git/hooks/pre-commit');
+            const content = readFileSync(dispatcherPath, 'utf8');
+            assert.ok(content.includes(DISPATCHER_MARKER), `Dispatcher should contain '${DISPATCHER_MARKER}' marker, got:\n${content.slice(0, 200)}`);
+        });
+        it('should install pennyfarthing hook into .d/ directory', async () => {
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            const dDir = join(gitHooksDir, 'pre-commit.d');
+            assert.ok(existsSync(dDir), 'pre-commit.d/ should exist');
+            const files = readdirSync(dDir);
+            const pfHook = files.find((f) => f.includes('pennyfarthing'));
+            assert.ok(pfHook, `Should have a pennyfarthing hook in pre-commit.d/, found: [${files.join(', ')}]`);
+            const hookContent = readFileSync(join(dDir, pfHook), 'utf8');
+            assert.ok(hookContent.includes(PF_MARKER), 'Hook in .d/ should contain pennyfarthing marker');
+        });
+        it('dispatcher should iterate and run all scripts in .d/ directory', async () => {
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            const dispatcherContent = readFileSync(join(gitHooksDir, 'pre-commit'), 'utf8');
+            // Dispatcher must reference the .d/ directory
+            assert.ok(dispatcherContent.includes('pre-commit.d') || dispatcherContent.includes('.d/') || dispatcherContent.includes('${HOOK_NAME}.d'), 'Dispatcher should reference the .d/ directory for script iteration');
+            // Dispatcher should have loop logic to run scripts
+            assert.ok(dispatcherContent.includes('for ') || dispatcherContent.includes('find '), 'Dispatcher should iterate over scripts in .d/ directory');
+        });
+        it('dispatcher should be executable', async () => {
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            const dispatcherPath = join(gitHooksDir, 'pre-commit');
+            const stat = statSync(dispatcherPath);
+            const isExecutable = (stat.mode & 0o111) !== 0;
+            assert.ok(isExecutable, 'Dispatcher script should be executable');
+        });
+    });
+    // ─── AC2: Hooks can be extended and composed without conflicts ─────
+    describe('AC2: Extension and composition without conflicts', () => {
+        it('should preserve user hooks already in .d/ directory', async () => {
+            // Pre-create a user hook in .d/
+            const dDir = join(gitHooksDir, 'pre-commit.d');
+            mkdirSync(dDir, { recursive: true });
+            const userHookContent = '#!/bin/bash\necho "user hook"\nexit 0\n';
+            writeFileSync(join(dDir, '99-user-lint.sh'), userHookContent);
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            // User hook should still be there
+            assert.ok(existsSync(join(dDir, '99-user-lint.sh')), 'User hook in .d/ should be preserved');
+            assert.strictEqual(readFileSync(join(dDir, '99-user-lint.sh'), 'utf8'), userHookContent, 'User hook content should be unchanged');
+        });
+        it('should not duplicate pennyfarthing hook on re-install', async () => {
+            // Install twice
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            const dDir = join(gitHooksDir, 'pre-commit.d');
+            const files = readdirSync(dDir);
+            const pfHooks = files.filter((f) => f.includes('pennyfarthing'));
+            assert.strictEqual(pfHooks.length, 1, `Should have exactly 1 pennyfarthing hook after re-install, found ${pfHooks.length}: [${pfHooks.join(', ')}]`);
+        });
+        it('should update stale pennyfarthing hook in .d/ directory', async () => {
+            // First install
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            // Update the source hook
+            const updatedContent = '#!/bin/bash\n# pennyfarthing pre-commit hook v2\necho "updated"\nexit 0\n';
+            writeFileSync(join(hooksSourceDir, 'pre-commit.sh'), updatedContent);
+            // Re-install
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            const dDir = join(gitHooksDir, 'pre-commit.d');
+            const files = readdirSync(dDir);
+            const pfHook = files.find((f) => f.includes('pennyfarthing'));
+            const installedContent = readFileSync(join(dDir, pfHook), 'utf8');
+            assert.strictEqual(installedContent, updatedContent, 'Pennyfarthing hook in .d/ should be updated with new content');
+        });
+        it('should allow multiple tools to add hooks to .d/', async () => {
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            // Simulate another tool adding a hook
+            const dDir = join(gitHooksDir, 'pre-commit.d');
+            writeFileSync(join(dDir, '50-husky-lint-staged.sh'), '#!/bin/bash\nnpx lint-staged\n');
+            // Re-install pennyfarthing — should not disturb other tool's hook
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            assert.ok(existsSync(join(dDir, '50-husky-lint-staged.sh')), 'Third-party tool hook should survive pennyfarthing re-install');
+            const files = readdirSync(dDir);
+            assert.ok(files.length >= 2, `Should have at least 2 hooks (pennyfarthing + husky), found: [${files.join(', ')}]`);
+        });
+    });
+    // ─── AC3: Support all three hook types ─────────────────────────────
+    describe('AC3: Support pre-commit, pre-push, and post-merge hooks', () => {
+        it('should install dispatcher + .d/ for pre-commit', async () => {
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            assert.ok(existsSync(join(gitHooksDir, 'pre-commit')), 'pre-commit dispatcher exists');
+            assert.ok(existsSync(join(gitHooksDir, 'pre-commit.d')), 'pre-commit.d/ exists');
+            const files = readdirSync(join(gitHooksDir, 'pre-commit.d'));
+            assert.ok(files.length > 0, 'pre-commit.d/ should have at least one hook');
+        });
+        it('should install dispatcher + .d/ for pre-push', async () => {
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            assert.ok(existsSync(join(gitHooksDir, 'pre-push')), 'pre-push dispatcher exists');
+            assert.ok(existsSync(join(gitHooksDir, 'pre-push.d')), 'pre-push.d/ exists');
+            const files = readdirSync(join(gitHooksDir, 'pre-push.d'));
+            assert.ok(files.length > 0, 'pre-push.d/ should have at least one hook');
+        });
+        it('should install dispatcher + .d/ for post-merge', async () => {
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            assert.ok(existsSync(join(gitHooksDir, 'post-merge')), 'post-merge dispatcher exists');
+            assert.ok(existsSync(join(gitHooksDir, 'post-merge.d')), 'post-merge.d/ exists');
+            const files = readdirSync(join(gitHooksDir, 'post-merge.d'));
+            assert.ok(files.length > 0, 'post-merge.d/ should have at least one hook');
+        });
+        it('should pass arguments through to hooks in .d/', async () => {
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            const dispatcherContent = readFileSync(join(gitHooksDir, 'pre-push'), 'utf8');
+            // pre-push receives remote name and URL as args — dispatcher must forward them
+            assert.ok(dispatcherContent.includes('"$@"') || dispatcherContent.includes('$@'), 'Dispatcher should forward arguments to hook scripts');
+        });
+        it('should pass stdin through to hooks in .d/ (for pre-push)', async () => {
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            const dispatcherContent = readFileSync(join(gitHooksDir, 'pre-push'), 'utf8');
+            // pre-push receives ref info on stdin — dispatcher should handle stdin
+            assert.ok(dispatcherContent.includes('stdin') ||
+                dispatcherContent.includes('tee') ||
+                dispatcherContent.includes('/dev/stdin') ||
+                dispatcherContent.includes('STDIN'), 'Dispatcher should handle stdin forwarding for hooks like pre-push');
+        });
+    });
+    // ─── AC4: Integration with install/upgrade flow ────────────────────
+    describe('AC4: Integration with install/upgrade flow', () => {
+        it('should create dispatcher from a template or generate it', async () => {
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            // Dispatcher should exist and be a proper bash script
+            const dispatcherPath = join(gitHooksDir, 'pre-commit');
+            const content = readFileSync(dispatcherPath, 'utf8');
+            assert.ok(content.startsWith('#!/bin/bash') || content.startsWith('#!/usr/bin/env bash'), 'Dispatcher should start with bash shebang');
+        });
+        it('dry-run should not create .d/ directories or dispatcher', async () => {
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: true });
+            assert.ok(!existsSync(join(gitHooksDir, 'pre-commit.d')), '.d/ directory should not be created in dry-run mode');
+            // If a dispatcher was placed, it should not exist in dry-run
+            // (unless it was pre-existing — but our test starts clean)
+            if (existsSync(join(gitHooksDir, 'pre-commit'))) {
+                const content = readFileSync(join(gitHooksDir, 'pre-commit'), 'utf8');
+                assert.ok(!content.includes(DISPATCHER_MARKER), 'Dispatcher should not be installed in dry-run mode');
+            }
+        });
+        it('should handle missing source hooks gracefully', async () => {
+            // Remove one source hook
+            rmSync(join(hooksSourceDir, 'pre-push.sh'));
+            // Should not throw
+            await assert.doesNotReject(async () => installGitHooks(testDir, nodeModulesPath, { dryRun: false }), 'Should handle missing source hooks without throwing');
+            // The other hooks should still be installed
+            assert.ok(existsSync(join(gitHooksDir, 'pre-commit.d')), 'pre-commit.d/ should still be created for available hooks');
+        });
+        it('should handle non-git repos gracefully', async () => {
+            // Remove .git directory
+            rmSync(gitDir, { recursive: true, force: true });
+            // Should not throw
+            await assert.doesNotReject(async () => installGitHooks(testDir, nodeModulesPath, { dryRun: false }), 'Should handle non-git repos without throwing');
+        });
+    });
+    // ─── AC5: Backward compatibility ───────────────────────────────────
+    describe('AC5: Backward compatibility with existing hooks', () => {
+        it('should migrate existing single-file pennyfarthing hook into .d/', async () => {
+            // Pre-existing pennyfarthing hook at old location (single file)
+            const oldHookContent = '#!/bin/bash\n# pennyfarthing pre-commit hook\necho "old hook"\nexit 0\n';
+            writeFileSync(join(gitHooksDir, 'pre-commit'), oldHookContent, { mode: 0o755 });
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            // Old single-file hook should be replaced by dispatcher
+            const dispatcherContent = readFileSync(join(gitHooksDir, 'pre-commit'), 'utf8');
+            assert.ok(dispatcherContent.includes(DISPATCHER_MARKER), 'Old pennyfarthing hook should be replaced by dispatcher');
+            // Pennyfarthing hook content should be in .d/ directory (updated from source)
+            const dDir = join(gitHooksDir, 'pre-commit.d');
+            assert.ok(existsSync(dDir), 'pre-commit.d/ should be created during migration');
+            const files = readdirSync(dDir);
+            const pfHook = files.find((f) => f.includes('pennyfarthing'));
+            assert.ok(pfHook, 'Pennyfarthing hook should be in .d/ directory');
+        });
+        it('should migrate existing non-pennyfarthing hook into .d/', async () => {
+            // Pre-existing user/third-party hook
+            const userHookContent = '#!/bin/bash\n# my custom linter\neslint .\nexit 0\n';
+            writeFileSync(join(gitHooksDir, 'pre-commit'), userHookContent, { mode: 0o755 });
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            // Dispatcher should be installed
+            const dispatcherContent = readFileSync(join(gitHooksDir, 'pre-commit'), 'utf8');
+            assert.ok(dispatcherContent.includes(DISPATCHER_MARKER), 'Dispatcher should replace the user hook');
+            // User hook should be moved into .d/ directory
+            const dDir = join(gitHooksDir, 'pre-commit.d');
+            const files = readdirSync(dDir);
+            // Should have both: user's original hook + pennyfarthing hook
+            assert.ok(files.length >= 2, `Should have at least 2 hooks in .d/ (user + pennyfarthing), found: [${files.join(', ')}]`);
+            // Find the migrated user hook
+            const userHook = files.find((f) => !f.includes('pennyfarthing') && !f.startsWith('.'));
+            assert.ok(userHook, `User hook should be migrated to .d/, found: [${files.join(', ')}]`);
+            const migratedContent = readFileSync(join(dDir, userHook), 'utf8');
+            assert.strictEqual(migratedContent, userHookContent, 'Migrated user hook content should be preserved');
+        });
+        it('should not migrate an existing dispatcher (idempotent upgrade)', async () => {
+            // First install — creates dispatcher
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            const firstDispatcher = readFileSync(join(gitHooksDir, 'pre-commit'), 'utf8');
+            // Second install — should recognize dispatcher and not re-migrate
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            const secondDispatcher = readFileSync(join(gitHooksDir, 'pre-commit'), 'utf8');
+            assert.strictEqual(firstDispatcher, secondDispatcher, 'Dispatcher should be stable across re-installs');
+            // No duplicates in .d/
+            const files = readdirSync(join(gitHooksDir, 'pre-commit.d'));
+            const pfHooks = files.filter((f) => f.includes('pennyfarthing'));
+            assert.strictEqual(pfHooks.length, 1, 'Should not duplicate pennyfarthing hook on upgrade');
+        });
+        it('should handle existing .backup files gracefully', async () => {
+            // Simulate a previous installation that left .backup files
+            writeFileSync(join(gitHooksDir, 'pre-commit.backup'), '#!/bin/bash\necho "old backup"\n');
+            // Current non-pennyfarthing hook
+            writeFileSync(join(gitHooksDir, 'pre-commit'), '#!/bin/bash\necho "current user hook"\nexit 0\n', { mode: 0o755 });
+            // Should not throw and should handle gracefully
+            await assert.doesNotReject(async () => installGitHooks(testDir, nodeModulesPath, { dryRun: false }), 'Should handle existing .backup files gracefully');
+            // Dispatcher should be installed
+            assert.ok(existsSync(join(gitHooksDir, 'pre-commit')), 'Dispatcher should be installed');
+        });
+    });
+    // ─── Dispatcher execution behavior ─────────────────────────────────
+    describe('Dispatcher execution behavior', () => {
+        it('dispatcher should propagate failure exit codes', async () => {
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            const dispatcherContent = readFileSync(join(gitHooksDir, 'pre-commit'), 'utf8');
+            // Dispatcher should check exit codes and fail fast
+            assert.ok(dispatcherContent.includes('exit') &&
+                (dispatcherContent.includes('$?') || dispatcherContent.includes('||')), 'Dispatcher should propagate non-zero exit codes from hook scripts');
+        });
+        it('dispatcher should skip non-executable files in .d/', async () => {
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            const dispatcherContent = readFileSync(join(gitHooksDir, 'pre-commit'), 'utf8');
+            // Dispatcher should check for executable permission
+            assert.ok(dispatcherContent.includes('-x') || dispatcherContent.includes('executable'), 'Dispatcher should only run executable files in .d/ directory');
+        });
+        it('dispatcher should run hooks in sorted order', async () => {
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            const dispatcherContent = readFileSync(join(gitHooksDir, 'pre-commit'), 'utf8');
+            // Dispatcher should sort scripts (ls or sort)
+            assert.ok(dispatcherContent.includes('sort') || dispatcherContent.includes('ls'), 'Dispatcher should run hooks in sorted order for deterministic execution');
+        });
+        it('dispatcher should handle empty .d/ directory gracefully', async () => {
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            // Remove all hooks from .d/ to simulate empty directory
+            const dDir = join(gitHooksDir, 'pre-commit.d');
+            for (const f of readdirSync(dDir)) {
+                rmSync(join(dDir, f));
+            }
+            // Running the dispatcher should not fail
+            const dispatcherPath = join(gitHooksDir, 'pre-commit');
+            try {
+                execSync(`bash "${dispatcherPath}"`, {
+                    cwd: testDir,
+                    timeout: 5000,
+                    encoding: 'utf8',
+                });
+            }
+            catch (err) {
+                const execErr = err;
+                assert.fail(`Dispatcher should succeed with empty .d/ directory, but got exit code ${execErr.status}: ${execErr.stderr}`);
+            }
+        });
+    });
+    // ─── Pennyfarthing hook naming convention ──────────────────────────
+    describe('Hook naming conventions in .d/', () => {
+        it('pennyfarthing hook should use numeric prefix for ordering', async () => {
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            const dDir = join(gitHooksDir, 'pre-commit.d');
+            const files = readdirSync(dDir);
+            const pfHook = files.find((f) => f.includes('pennyfarthing'));
+            assert.ok(pfHook, 'Pennyfarthing hook should exist');
+            // Should have numeric prefix like "10-pennyfarthing-pre-commit.sh"
+            assert.match(pfHook, /^\d+-/, `Pennyfarthing hook should have numeric prefix for ordering, got: ${pfHook}`);
+        });
+        it('migrated user hooks should have numeric prefix', async () => {
+            // Pre-existing user hook
+            writeFileSync(join(gitHooksDir, 'pre-commit'), '#!/bin/bash\necho "user hook"\nexit 0\n', { mode: 0o755 });
+            await installGitHooks(testDir, nodeModulesPath, { dryRun: false });
+            const dDir = join(gitHooksDir, 'pre-commit.d');
+            const files = readdirSync(dDir);
+            const userHook = files.find((f) => !f.includes('pennyfarthing') && !f.startsWith('.'));
+            assert.ok(userHook, 'Migrated user hook should exist');
+            assert.match(userHook, /^\d+-/, `Migrated user hook should have numeric prefix, got: ${userHook}`);
+        });
+    });
+});
+//# sourceMappingURL=hook-chaining.test.js.map

package/packages/core/dist/cli/commands/hook-chaining.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hook-chaining.test.js","sourceRoot":"","sources":["../../../src/cli/commands/hook-chaining.test.ts"],"names":[],"mappings":"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"}

package/packages/core/dist/cli/commands/init.d.ts

@@ -5,7 +5,12 @@ interface InitOptions {
 }
 export declare function initCommand(projectName: string | undefined, options: InitOptions): Promise<void>;
 /**
- * Install git hooks from pennyfarthing-dist to .git/hooks
+ * Install git hooks using .d/ dispatcher pattern.
+ * Creates a dispatcher script at .git/hooks/{hook} that runs all
+ * executable scripts in .git/hooks/{hook}.d/ in sorted order.
+ * Pennyfarthing hooks are placed in the .d/ directory with numeric prefixes.
+ * Existing hooks are migrated into .d/ to preserve user customizations.
+ *
  * Installs: pre-commit, pre-push, post-merge
  */
 export declare function installGitHooks(projectRoot: string, nodeModulesPath: string, options: {

package/packages/core/dist/cli/commands/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/init.ts"],"names":[],"mappings":"AAgCA,UAAU,WAAW;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,wBAAsB,WAAW,CAC/B,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC,CA8Nf;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GAC5B,OAAO,CAAC,IAAI,CAAC,CAmEf"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/init.ts"],"names":[],"mappings":"AAgCA,UAAU,WAAW;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,wBAAsB,WAAW,CAC/B,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC,CA8Nf;AAUD;;;;;;;;GAQG;AACH,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GAC5B,OAAO,CAAC,IAAI,CAAC,CAyGf"}

package/packages/core/dist/cli/commands/init.js

@@ -1,4 +1,4 @@
-import { readFileSync, writeFileSync } from 'fs';
+import { readFileSync, writeFileSync, mkdirSync } from 'fs';
 import { join, relative, basename } from 'path';
 import fsExtra from 'fs-extra';
 const { ensureDirSync, removeSync } = fsExtra;
@@ -7,7 +7,7 @@ import { prompts } from '../utils/prompts.js';
 import { manifestExists, readManifest, writeManifest, createManifest } from '../utils/manifest.js';
 import { pathExists, isDirectory, ensureDir } from '../utils/files.js';
 import { getPackageVersion, getAssetsPath } from '../utils/version.js';
-import { createDirectorySymlink, copyCommandsDirectory, copySkillsDirectory, removeSymlinkOrDirectory } from '../utils/symlinks.js';
+import { createDirectorySymlink, createCommandsDirectory, createSkillsDirectory, removeSymlinkOrDirectory } from '../utils/symlinks.js';
 import { findNodeModulesPath } from '../utils/node-modules.js';
 import { CORE_AGENTS, DIRECTORY_SYMLINKS } from '../utils/constants.js';
 import { mergeSettingsLocalJson, ensureSettingsSymlink } from '../utils/settings.js';
@@ -125,14 +125,14 @@ export async function initCommand(projectName, options) {
             logger.warning(`Could not symlink ${name} to ${link}`);
         }
     }
-    // Copy commands directory (allows user commands alongside built-in)
+    // Link commands directory (allows user commands alongside built-in)
     const builtInCommandsPath = join(nodeModulesPath, 'commands');
     const projectCommandsPath = join(projectRoot, '.pennyfarthing/project/commands');
-    copyCommandsDirectory(projectRoot, builtInCommandsPath, projectCommandsPath, dryRun || false);
-    // Copy skills directory (allows user skills alongside built-in)
+    createCommandsDirectory(projectRoot, builtInCommandsPath, projectCommandsPath, dryRun || false);
+    // Link skills directory (allows user skills alongside built-in)
     const builtInSkillsPath = join(nodeModulesPath, 'skills');
     const projectSkillsPath = join(projectRoot, '.pennyfarthing/project/skills');
-    copySkillsDirectory(projectRoot, builtInSkillsPath, projectSkillsPath, dryRun || false);
+    createSkillsDirectory(projectRoot, builtInSkillsPath, projectSkillsPath, dryRun || false);
     // 8. Create agent sidecars if not exist
     logger.newline();
     logger.info('Creating agent sidecars...');
@@ -202,7 +202,19 @@ export async function initCommand(projectName, options) {
     logger.info('  - Run `pennyfarthing doctor` to verify installation');
 }
 /**
- * Install git hooks from pennyfarthing-dist to .git/hooks
+ * Generate a dispatcher script for a given hook name by substituting
+ * __HOOK_NAME__ in the shared template.
+ */
+function generateDispatcher(hookName, template) {
+    return template.replace(/__HOOK_NAME__/g, hookName);
+}
+/**
+ * Install git hooks using .d/ dispatcher pattern.
+ * Creates a dispatcher script at .git/hooks/{hook} that runs all
+ * executable scripts in .git/hooks/{hook}.d/ in sorted order.
+ * Pennyfarthing hooks are placed in the .d/ directory with numeric prefixes.
+ * Existing hooks are migrated into .d/ to preserve user customizations.
+ *
  * Installs: pre-commit, pre-push, post-merge
  */
 export async function installGitHooks(projectRoot, nodeModulesPath, options) {
@@ -218,48 +230,89 @@ export async function installGitHooks(projectRoot, nodeModulesPath, options) {
     if (!pathExists(gitHooksDir) && !options.dryRun) {
         ensureDir(gitHooksDir, { dryRun: options.dryRun });
     }
+    const DISPATCHER_MARKER = 'pennyfarthing-dispatcher';
+    const PF_MARKER = 'pennyfarthing';
+    const PF_PREFIX = '10';
+    const MIGRATED_PREFIX = '50';
+    // Load shared dispatcher template
+    const dispatcherTemplatePath = join(nodeModulesPath, 'scripts/hooks/dispatcher-template.sh');
+    const dispatcherTemplate = readFileSync(dispatcherTemplatePath, 'utf8');
     // Define hooks to install
     const hooks = [
-        { source: 'pre-commit.sh', dest: 'pre-commit', marker: 'pennyfarthing' },
-        { source: 'pre-push.sh', dest: 'pre-push', marker: 'pennyfarthing' },
-        { source: 'post-merge.sh', dest: 'post-merge', marker: 'pennyfarthing' },
+        { source: 'pre-commit.sh', dest: 'pre-commit' },
+        { source: 'pre-push.sh', dest: 'pre-push' },
+        { source: 'post-merge.sh', dest: 'post-merge' },
     ];
     for (const hook of hooks) {
         const sourcePath = join(nodeModulesPath, 'scripts/hooks', hook.source);
         const destPath = join(gitHooksDir, hook.dest);
+        const dDir = join(gitHooksDir, `${hook.dest}.d`);
+        const pfHookName = `${PF_PREFIX}-pennyfarthing-${hook.dest}.sh`;
+        const pfHookPath = join(dDir, pfHookName);
         if (!pathExists(sourcePath)) {
             logger.warning(`${hook.source} not found, skipping`);
             continue;
         }
         const sourceContent = readFileSync(sourcePath, 'utf8');
-        // Check if hook already exists
+        if (options.dryRun) {
+            logger.info(`Would install .git/hooks/${hook.dest} dispatcher + .d/`);
+            continue;
+        }
+        // Create .d/ directory
+        if (!pathExists(dDir)) {
+            mkdirSync(dDir, { recursive: true });
+        }
+        // Migrate existing hook if present
         if (pathExists(destPath)) {
             const existingContent = readFileSync(destPath, 'utf8');
-            if (existingContent.includes(hook.marker)) {
-                // Our hook — check if content matches (refresh stale copies)
-                if (existingContent === sourceContent) {
-                    logger.skipped(`.git/hooks/${hook.dest}`, 'already installed');
-                    continue;
+            if (existingContent.includes(DISPATCHER_MARKER)) {
+                // Already a dispatcher — update it if content changed
+                const newDispatcher = generateDispatcher(hook.dest, dispatcherTemplate);
+                if (existingContent !== newDispatcher) {
+                    writeFileSync(destPath, newDispatcher, { mode: 0o755 });
+                    logger.updated(`.git/hooks/${hook.dest} dispatcher`);
                 }
-                // Content differs — update in place
-                if (!options.dryRun) {
-                    writeFileSync(destPath, sourceContent, { mode: 0o755 });
+                else {
+                    logger.skipped(`.git/hooks/${hook.dest} dispatcher`, 'already installed');
                 }
-                logger.updated(`.git/hooks/${hook.dest}`);
-                continue;
             }
-            // Existing non-pennyfarthing hook - backup and replace
-            if (!options.dryRun) {
-                const backupPath = `${destPath}.backup`;
-                writeFileSync(backupPath, existingContent, 'utf8');
-                logger.info(`Backed up existing hook to ${backupPath}`);
+            else if (existingContent.includes(PF_MARKER)) {
+                // Old-style single-file pennyfarthing hook — replace with dispatcher
+                writeFileSync(destPath, generateDispatcher(hook.dest, dispatcherTemplate), { mode: 0o755 });
+                logger.updated(`.git/hooks/${hook.dest} → dispatcher`);
             }
+            else {
+                // Non-pennyfarthing hook — migrate into .d/ then install dispatcher
+                const migratedName = `${MIGRATED_PREFIX}-migrated-${hook.dest}.sh`;
+                const migratedPath = join(dDir, migratedName);
+                if (!pathExists(migratedPath)) {
+                    writeFileSync(migratedPath, existingContent, { mode: 0o755 });
+                    logger.info(`Migrated existing ${hook.dest} hook to ${hook.dest}.d/${migratedName}`);
+                }
+                writeFileSync(destPath, generateDispatcher(hook.dest, dispatcherTemplate), { mode: 0o755 });
+                logger.created(`.git/hooks/${hook.dest} dispatcher`);
+            }
+        }
+        else {
+            // No existing hook — install fresh dispatcher
+            writeFileSync(destPath, generateDispatcher(hook.dest, dispatcherTemplate), { mode: 0o755 });
+            logger.created(`.git/hooks/${hook.dest} dispatcher`);
         }
-        // Copy the hook
-        if (!options.dryRun) {
-            writeFileSync(destPath, sourceContent, { mode: 0o755 });
+        // Install/update pennyfarthing hook in .d/
+        if (pathExists(pfHookPath)) {
+            const existingPf = readFileSync(pfHookPath, 'utf8');
+            if (existingPf === sourceContent) {
+                logger.skipped(`.git/hooks/${hook.dest}.d/${pfHookName}`, 'already installed');
+            }
+            else {
+                writeFileSync(pfHookPath, sourceContent, { mode: 0o755 });
+                logger.updated(`.git/hooks/${hook.dest}.d/${pfHookName}`);
+            }
+        }
+        else {
+            writeFileSync(pfHookPath, sourceContent, { mode: 0o755 });
+            logger.created(`.git/hooks/${hook.dest}.d/${pfHookName}`);
         }
-        logger.created(`.git/hooks/${hook.dest}`);
     }
 }
 /**