@pennyfarthing/core 11.2.1 → 11.3.1

package/packages/core/dist/cli/utils/settings-hook-migration.test.js

@@ -0,0 +1,382 @@
+/**
+ * Tests for Story 117-2: Generate hook commands with pf.sh wrapper path, not bare pf
+ *
+ * Bug: migrateHookPaths() only migrates .sh file hooks to pf.sh commands.
+ * It does NOT migrate bare `pf hooks X` commands to `pf.sh hooks X`.
+ * Additionally, mergeSettingsLocalJson() detects bare `pf hooks X` as
+ * "already configured" and skips them, leaving broken commands in place.
+ *
+ * Acceptance Criteria:
+ * AC1: Hook generation uses $CLAUDE_PROJECT_DIR/.pennyfarthing/scripts/core/pf.sh wrapper path
+ * AC2: Generated settings.local.json hooks work without pf being in PATH
+ * AC3: Existing hook functionality preserved
+ *
+ * Run with: cd packages/core && npm run build && npm test
+ */
+import { describe, it, beforeEach, afterEach } from 'node:test';
+import assert from 'node:assert';
+import { existsSync, mkdirSync, writeFileSync, rmSync, readFileSync, } from 'fs';
+import { join } from 'path';
+import { tmpdir } from 'os';
+import { migrateHookPaths, mergeSettingsLocalJson, LEGACY_HOOK_MIGRATIONS, } from './settings.js';
+// =============================================================================
+// Helpers
+// =============================================================================
+const PF_SH_PREFIX = '"$CLAUDE_PROJECT_DIR"/.pennyfarthing/scripts/core/pf.sh';
+function makeHookEntry(command, matcher) {
+    return {
+        ...(matcher !== undefined ? { matcher } : {}),
+        hooks: [{ type: 'command', command }],
+    };
+}
+// =============================================================================
+// AC1: PF_SH constant and template use wrapper path
+// =============================================================================
+describe('117-2 AC1: Hook generation uses pf.sh wrapper path', () => {
+    it('should have PF_SH prefix in all LEGACY_HOOK_MIGRATIONS values', () => {
+        for (const [shName, pfCommand] of Object.entries(LEGACY_HOOK_MIGRATIONS)) {
+            assert.ok(pfCommand.includes('.pennyfarthing/scripts/core/pf.sh'), `Migration for ${shName} should use pf.sh wrapper, got: ${pfCommand}`);
+        }
+    });
+    it('should use $CLAUDE_PROJECT_DIR in all LEGACY_HOOK_MIGRATIONS values', () => {
+        for (const [shName, pfCommand] of Object.entries(LEGACY_HOOK_MIGRATIONS)) {
+            assert.ok(pfCommand.includes('$CLAUDE_PROJECT_DIR'), `Migration for ${shName} should use $CLAUDE_PROJECT_DIR, got: ${pfCommand}`);
+        }
+    });
+});
+// =============================================================================
+// AC2: migrateHookPaths migrates bare `pf` to `pf.sh` wrapper
+// =============================================================================
+describe('117-2 AC2: migrateHookPaths migrates bare pf commands', () => {
+    it('should migrate bare "pf hooks session-start" to pf.sh wrapper', () => {
+        const hooks = [
+            makeHookEntry('pf hooks session-start'),
+        ];
+        const migrated = migrateHookPaths(hooks);
+        assert.ok(migrated, 'Should report migration occurred');
+        assert.ok(hooks[0].hooks[0].command.includes('pf.sh hooks session-start'), `Should migrate to pf.sh wrapper, got: ${hooks[0].hooks[0].command}`);
+        assert.ok(hooks[0].hooks[0].command.includes('$CLAUDE_PROJECT_DIR'), `Should include $CLAUDE_PROJECT_DIR, got: ${hooks[0].hooks[0].command}`);
+    });
+    it('should migrate bare "pf hooks reflector-check" to pf.sh wrapper', () => {
+        const hooks = [
+            makeHookEntry('pf hooks reflector-check'),
+        ];
+        const migrated = migrateHookPaths(hooks);
+        assert.ok(migrated, 'Should report migration occurred');
+        assert.strictEqual(hooks[0].hooks[0].command, `${PF_SH_PREFIX} hooks reflector-check`, 'Should use full pf.sh wrapper path');
+    });
+    it('should migrate bare "pf hooks bell-mode" to pf.sh wrapper', () => {
+        const hooks = [
+            makeHookEntry('pf hooks bell-mode'),
+        ];
+        const migrated = migrateHookPaths(hooks);
+        assert.ok(migrated, 'Should report migration occurred');
+        assert.strictEqual(hooks[0].hooks[0].command, `${PF_SH_PREFIX} hooks bell-mode`);
+    });
+    it('should migrate bare "pf hooks context-breaker" to pf.sh wrapper', () => {
+        const hooks = [
+            makeHookEntry('pf hooks context-breaker'),
+        ];
+        const migrated = migrateHookPaths(hooks);
+        assert.ok(migrated, 'Should report migration occurred');
+        assert.strictEqual(hooks[0].hooks[0].command, `${PF_SH_PREFIX} hooks context-breaker`);
+    });
+    it('should migrate bare "pf hooks statusline" to pf.sh wrapper', () => {
+        const hooks = [
+            makeHookEntry('pf hooks statusline'),
+        ];
+        const migrated = migrateHookPaths(hooks);
+        assert.ok(migrated, 'Should report migration occurred');
+        assert.strictEqual(hooks[0].hooks[0].command, `${PF_SH_PREFIX} hooks statusline`);
+    });
+    it('should migrate all known bare pf hook commands', () => {
+        const bareCommands = [
+            'pf hooks session-start',
+            'pf hooks session-stop',
+            'pf hooks reflector-check',
+            'pf hooks pre-edit-check',
+            'pf hooks context-warning',
+            'pf hooks context-breaker',
+            'pf hooks cyclist-pretooluse',
+            'pf hooks schema-validation',
+            'pf hooks bell-mode',
+            'pf hooks sprint-yaml',
+            'pf hooks statusline',
+        ];
+        for (const bareCmd of bareCommands) {
+            const hooks = [makeHookEntry(bareCmd)];
+            const migrated = migrateHookPaths(hooks);
+            const subcommand = bareCmd.replace('pf hooks ', '');
+            assert.ok(migrated, `Should migrate "${bareCmd}"`);
+            assert.strictEqual(hooks[0].hooks[0].command, `${PF_SH_PREFIX} hooks ${subcommand}`, `"${bareCmd}" should become "${PF_SH_PREFIX} hooks ${subcommand}"`);
+        }
+    });
+    it('should migrate multiple bare pf commands in same hook array', () => {
+        const hooks = [
+            makeHookEntry('pf hooks session-start'),
+            makeHookEntry('pf hooks bell-mode'),
+            makeHookEntry('pf hooks context-breaker'),
+        ];
+        const migrated = migrateHookPaths(hooks);
+        assert.ok(migrated, 'Should report migration occurred');
+        assert.strictEqual(hooks[0].hooks[0].command, `${PF_SH_PREFIX} hooks session-start`);
+        assert.strictEqual(hooks[1].hooks[0].command, `${PF_SH_PREFIX} hooks bell-mode`);
+        assert.strictEqual(hooks[2].hooks[0].command, `${PF_SH_PREFIX} hooks context-breaker`);
+    });
+    it('should NOT migrate commands that already use pf.sh wrapper', () => {
+        const hooks = [
+            makeHookEntry(`${PF_SH_PREFIX} hooks session-start`),
+        ];
+        const migrated = migrateHookPaths(hooks);
+        assert.ok(!migrated, 'Should NOT report migration for already-correct commands');
+        assert.strictEqual(hooks[0].hooks[0].command, `${PF_SH_PREFIX} hooks session-start`, 'Should leave correct commands unchanged');
+    });
+    it('should NOT migrate non-pf commands', () => {
+        const hooks = [
+            makeHookEntry('custom-hook.sh'),
+            makeHookEntry('.pennyfarthing/project/hooks/setup-env.sh'),
+        ];
+        const migrated = migrateHookPaths(hooks);
+        assert.ok(!migrated, 'Should NOT migrate non-pf commands');
+        assert.strictEqual(hooks[0].hooks[0].command, 'custom-hook.sh');
+        assert.strictEqual(hooks[1].hooks[0].command, '.pennyfarthing/project/hooks/setup-env.sh');
+    });
+    it('should preserve matcher when migrating bare pf commands', () => {
+        const hooks = [
+            makeHookEntry('pf hooks sprint-yaml', 'Edit|Write'),
+        ];
+        const migrated = migrateHookPaths(hooks);
+        assert.ok(migrated, 'Should report migration occurred');
+        assert.strictEqual(hooks[0].matcher, 'Edit|Write', 'Should preserve matcher');
+        assert.strictEqual(hooks[0].hooks[0].command, `${PF_SH_PREFIX} hooks sprint-yaml`);
+    });
+});
+// =============================================================================
+// AC2: mergeSettingsLocalJson replaces bare pf commands during merge
+// =============================================================================
+describe('117-2 AC2: mergeSettingsLocalJson fixes bare pf commands', () => {
+    let testDir;
+    let assetsPath;
+    beforeEach(() => {
+        testDir = join(tmpdir(), `pf-hook-migration-test-${Date.now()}-${Math.random().toString(36).slice(2)}`);
+        const pennyfarthingDir = join(testDir, '.pennyfarthing');
+        assetsPath = join(testDir, 'assets');
+        mkdirSync(join(testDir, '.claude'), { recursive: true });
+        mkdirSync(pennyfarthingDir, { recursive: true });
+        mkdirSync(join(assetsPath, 'templates'), { recursive: true });
+        // Template with correct pf.sh wrapper paths
+        writeFileSync(join(assetsPath, 'templates/settings.local.json.template'), JSON.stringify({
+            hooks: {
+                SessionStart: [
+                    {
+                        hooks: [{
+                                type: 'command',
+                                command: `${PF_SH_PREFIX} hooks session-start`,
+                            }],
+                    },
+                ],
+                Stop: [
+                    {
+                        hooks: [{
+                                type: 'command',
+                                command: `${PF_SH_PREFIX} hooks reflector-check`,
+                            }],
+                    },
+                ],
+                PostToolUse: [
+                    {
+                        hooks: [{
+                                type: 'command',
+                                command: `${PF_SH_PREFIX} hooks bell-mode`,
+                            }],
+                    },
+                ],
+                PreToolUse: [
+                    {
+                        matcher: 'Edit|Write|Bash|Task',
+                        hooks: [{
+                                type: 'command',
+                                command: `${PF_SH_PREFIX} hooks context-breaker`,
+                            }],
+                    },
+                ],
+            },
+            statusLine: {
+                type: 'command',
+                command: `${PF_SH_PREFIX} hooks statusline`,
+            },
+        }, null, 2));
+    });
+    afterEach(() => {
+        if (existsSync(testDir)) {
+            rmSync(testDir, { recursive: true, force: true });
+        }
+    });
+    it('should migrate bare pf SessionStart hooks to pf.sh wrapper during merge', async () => {
+        // Consumer has bare `pf hooks` commands from old installation
+        const existingSettings = {
+            hooks: {
+                SessionStart: [
+                    {
+                        hooks: [{
+                                type: 'command',
+                                command: 'pf hooks session-start',
+                            }],
+                    },
+                ],
+            },
+        };
+        writeFileSync(join(testDir, '.pennyfarthing/settings.local.json'), JSON.stringify(existingSettings, null, 2));
+        await mergeSettingsLocalJson(testDir, assetsPath, {});
+        const result = JSON.parse(readFileSync(join(testDir, '.pennyfarthing/settings.local.json'), 'utf8'));
+        // The bare `pf hooks session-start` should be migrated to use pf.sh wrapper
+        const sessionStartCommands = result.hooks.SessionStart
+            .flatMap((e) => e.hooks?.map(h => h.command) ?? []);
+        const hasBareCommand = sessionStartCommands.some((cmd) => cmd === 'pf hooks session-start');
+        const hasWrapperCommand = sessionStartCommands.some((cmd) => cmd.includes('pf.sh hooks session-start'));
+        assert.ok(!hasBareCommand, 'Bare "pf hooks session-start" should be migrated away');
+        assert.ok(hasWrapperCommand, 'Should have pf.sh wrapper command after migration');
+    });
+    it('should migrate bare pf PostToolUse hooks during merge', async () => {
+        const existingSettings = {
+            hooks: {
+                PostToolUse: [
+                    {
+                        matcher: '',
+                        hooks: [{
+                                type: 'command',
+                                command: 'pf hooks bell-mode',
+                            }],
+                    },
+                ],
+            },
+        };
+        writeFileSync(join(testDir, '.pennyfarthing/settings.local.json'), JSON.stringify(existingSettings, null, 2));
+        await mergeSettingsLocalJson(testDir, assetsPath, {});
+        const result = JSON.parse(readFileSync(join(testDir, '.pennyfarthing/settings.local.json'), 'utf8'));
+        const bellModeCommands = result.hooks.PostToolUse
+            .flatMap((e) => e.hooks?.map(h => h.command) ?? []);
+        const hasBareCommand = bellModeCommands.some((cmd) => cmd === 'pf hooks bell-mode');
+        assert.ok(!hasBareCommand, 'Bare "pf hooks bell-mode" should be migrated');
+    });
+    it('should migrate bare pf Stop hooks during merge', async () => {
+        const existingSettings = {
+            hooks: {
+                Stop: [
+                    {
+                        hooks: [{
+                                type: 'command',
+                                command: 'pf hooks reflector-check',
+                            }],
+                    },
+                    {
+                        hooks: [{
+                                type: 'command',
+                                command: 'pf hooks session-stop',
+                            }],
+                    },
+                ],
+            },
+        };
+        writeFileSync(join(testDir, '.pennyfarthing/settings.local.json'), JSON.stringify(existingSettings, null, 2));
+        await mergeSettingsLocalJson(testDir, assetsPath, {});
+        const result = JSON.parse(readFileSync(join(testDir, '.pennyfarthing/settings.local.json'), 'utf8'));
+        const stopCommands = result.hooks.Stop
+            .flatMap((e) => e.hooks?.map(h => h.command) ?? []);
+        const hasBareCommand = stopCommands.some((cmd) => cmd.startsWith('pf hooks') && !cmd.includes('pf.sh'));
+        assert.ok(!hasBareCommand, 'All bare "pf hooks" Stop commands should be migrated');
+    });
+    it('should migrate bare pf PreToolUse hooks during merge', async () => {
+        const existingSettings = {
+            hooks: {
+                PreToolUse: [
+                    {
+                        matcher: 'Edit|Write',
+                        hooks: [{
+                                type: 'command',
+                                command: 'pf hooks pre-edit-check',
+                            }],
+                    },
+                    {
+                        matcher: 'Edit|Write|Bash|Task',
+                        hooks: [{
+                                type: 'command',
+                                command: 'pf hooks context-breaker',
+                            }],
+                    },
+                ],
+            },
+        };
+        writeFileSync(join(testDir, '.pennyfarthing/settings.local.json'), JSON.stringify(existingSettings, null, 2));
+        await mergeSettingsLocalJson(testDir, assetsPath, {});
+        const result = JSON.parse(readFileSync(join(testDir, '.pennyfarthing/settings.local.json'), 'utf8'));
+        const preToolUseCommands = result.hooks.PreToolUse
+            .flatMap((e) => e.hooks?.map(h => h.command) ?? []);
+        const hasBareCommand = preToolUseCommands.some((cmd) => cmd.startsWith('pf hooks') && !cmd.includes('pf.sh'));
+        assert.ok(!hasBareCommand, 'All bare "pf hooks" PreToolUse commands should be migrated');
+    });
+    it('should migrate bare pf statusLine command during merge', async () => {
+        const existingSettings = {
+            hooks: {},
+            statusLine: {
+                type: 'command',
+                command: 'pf hooks statusline',
+            },
+        };
+        writeFileSync(join(testDir, '.pennyfarthing/settings.local.json'), JSON.stringify(existingSettings, null, 2));
+        await mergeSettingsLocalJson(testDir, assetsPath, {});
+        const result = JSON.parse(readFileSync(join(testDir, '.pennyfarthing/settings.local.json'), 'utf8'));
+        assert.ok(result.statusLine.command.includes('pf.sh hooks statusline'), `statusLine should use pf.sh wrapper, got: ${result.statusLine.command}`);
+        assert.ok(result.statusLine.command !== 'pf hooks statusline', 'Bare "pf hooks statusline" should be migrated');
+    });
+});
+// =============================================================================
+// AC3: Existing hook functionality preserved
+// =============================================================================
+describe('117-2 AC3: Existing hook functionality preserved', () => {
+    it('should still migrate .sh file hooks to pf.sh wrapper (legacy migration)', () => {
+        const hooks = [
+            makeHookEntry('session-start.sh'),
+            makeHookEntry('bell-mode-hook.sh'),
+        ];
+        const migrated = migrateHookPaths(hooks);
+        assert.ok(migrated, 'Should migrate .sh hooks');
+        assert.strictEqual(hooks[0].hooks[0].command, `${PF_SH_PREFIX} hooks session-start`, '.sh file should migrate to pf.sh wrapper');
+        assert.strictEqual(hooks[1].hooks[0].command, `${PF_SH_PREFIX} hooks bell-mode`, '.sh file should migrate to pf.sh wrapper');
+    });
+    it('should still migrate legacy directory paths', () => {
+        const hooks = [
+            makeHookEntry('.claude/pennyfarthing/scripts/custom-script.sh'),
+        ];
+        const migrated = migrateHookPaths(hooks);
+        assert.ok(migrated, 'Should migrate legacy paths');
+        assert.strictEqual(hooks[0].hooks[0].command, '.pennyfarthing/scripts/custom-script.sh', 'Legacy directory path should be migrated');
+    });
+    it('should handle mixed .sh, bare pf, and pf.sh commands in same array', () => {
+        const hooks = [
+            makeHookEntry('session-start.sh'), // legacy .sh
+            makeHookEntry('pf hooks bell-mode'), // bare pf
+            makeHookEntry(`${PF_SH_PREFIX} hooks context-breaker`), // already correct
+            makeHookEntry('.pennyfarthing/project/hooks/setup-env.sh'), // custom, leave alone
+        ];
+        const migrated = migrateHookPaths(hooks);
+        assert.ok(migrated, 'Should report migration for .sh and bare pf');
+        assert.strictEqual(hooks[0].hooks[0].command, `${PF_SH_PREFIX} hooks session-start`, '.sh file migrated');
+        assert.strictEqual(hooks[1].hooks[0].command, `${PF_SH_PREFIX} hooks bell-mode`, 'bare pf migrated');
+        assert.strictEqual(hooks[2].hooks[0].command, `${PF_SH_PREFIX} hooks context-breaker`, 'already correct left alone');
+        assert.strictEqual(hooks[3].hooks[0].command, '.pennyfarthing/project/hooks/setup-env.sh', 'custom hook left alone');
+    });
+    it('should not produce duplicate hooks after migration', () => {
+        // Consumer has BOTH bare pf and pf.sh for the same hook
+        const hooks = [
+            makeHookEntry('pf hooks session-start'),
+            makeHookEntry(`${PF_SH_PREFIX} hooks session-start`),
+        ];
+        migrateHookPaths(hooks);
+        // After migration, both should point to the same command
+        // The deduplication happens at a higher level, but migration should still work
+        assert.strictEqual(hooks[0].hooks[0].command, `${PF_SH_PREFIX} hooks session-start`);
+        assert.strictEqual(hooks[1].hooks[0].command, `${PF_SH_PREFIX} hooks session-start`);
+    });
+});
+//# sourceMappingURL=settings-hook-migration.test.js.map

package/packages/core/dist/cli/utils/settings-hook-migration.test.js.map

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

package/packages/core/dist/cli/utils/settings.d.ts

@@ -6,10 +6,6 @@
  * Get list of installed skill names from the skills directory
  */
 export declare function getInstalledSkillNames(projectRoot: string): string[];
-/**
- * Map of legacy .sh hook commands to their `pf hooks` replacements.
- * Used during init/update/doctor to migrate existing settings.
- */
 export declare const LEGACY_HOOK_MIGRATIONS: Record<string, string>;
 /**
  * Migrate hook paths from legacy locations to .pennyfarthing/scripts/

package/packages/core/dist/cli/utils/settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/settings.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAeH;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,CAqBpE;AA+BD;;;GAGG;AACH,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAazD,CAAC;AAoBF;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,OAAO,EAAE,GAAG,OAAO,CAyC9D;AAED;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,GACtD,OAAO,CAAC,OAAO,CAAC,CA4PlB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAkB/D;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CA8B7D"}
+{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/settings.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAeH;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,CAqBpE;AAyCD,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAazD,CAAC;AAoBF;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,OAAO,EAAE,GAAG,OAAO,CAiD9D;AAED;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,GACtD,OAAO,CAAC,OAAO,CAAC,CAiQlB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAkB/D;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CA8B7D"}

package/packages/core/dist/cli/utils/settings.js

@@ -65,19 +65,24 @@ const LEGACY_PROJECT_HOOK_PATHS = [
  * Map of legacy .sh hook commands to their `pf hooks` replacements.
  * Used during init/update/doctor to migrate existing settings.
  */
+/**
+ * Canonical hook command prefix — uses pf.sh wrapper (no global pf install needed).
+ * $CLAUDE_PROJECT_DIR is set by Claude Code for hook execution contexts.
+ */
+const PF_SH = '"$CLAUDE_PROJECT_DIR"/.pennyfarthing/scripts/core/pf.sh';
 export const LEGACY_HOOK_MIGRATIONS = {
-    'session-start.sh': 'pf hooks session-start',
-    'welcome-hook.sh': 'pf hooks session-start',
-    'question-reflector-check.sh': 'pf hooks reflector-check',
-    'session-stop.sh': 'pf hooks session-stop',
-    'pre-edit-check.sh': 'pf hooks pre-edit-check',
-    'context-warning.sh': 'pf hooks context-warning',
-    'context-circuit-breaker.sh': 'pf hooks context-breaker',
-    'cyclist-pretooluse-hook.sh': 'pf hooks cyclist-pretooluse',
-    'schema-validation.sh': 'pf hooks schema-validation',
-    'bell-mode-hook.sh': 'pf hooks bell-mode',
-    'sprint-yaml-validation.sh': 'pf hooks sprint-yaml',
-    'statusline.sh': 'pf hooks statusline',
+    'session-start.sh': `${PF_SH} hooks session-start`,
+    'welcome-hook.sh': `${PF_SH} hooks session-start`,
+    'question-reflector-check.sh': `${PF_SH} hooks reflector-check`,
+    'session-stop.sh': `${PF_SH} hooks session-stop`,
+    'pre-edit-check.sh': `${PF_SH} hooks pre-edit-check`,
+    'context-warning.sh': `${PF_SH} hooks context-warning`,
+    'context-circuit-breaker.sh': `${PF_SH} hooks context-breaker`,
+    'cyclist-pretooluse-hook.sh': `${PF_SH} hooks cyclist-pretooluse`,
+    'schema-validation.sh': `${PF_SH} hooks schema-validation`,
+    'bell-mode-hook.sh': `${PF_SH} hooks bell-mode`,
+    'sprint-yaml-validation.sh': `${PF_SH} hooks sprint-yaml`,
+    'statusline.sh': `${PF_SH} hooks statusline`,
 };
 /**
  * Check if a hook entry contains a specific hook by command substring
@@ -120,6 +125,13 @@ export function migrateHookPaths(hookArray) {
                         }
                         if (shMigrated)
                             continue;
+                        // Migrate bare `pf hooks X` commands to pf.sh wrapper path
+                        if (h.command.startsWith('pf hooks ') && !h.command.includes('pf.sh')) {
+                            const subcommand = h.command.replace('pf hooks ', '');
+                            h.command = `${PF_SH} hooks ${subcommand}`;
+                            migrated = true;
+                            continue;
+                        }
                         // Legacy directory path migrations (for non-hook scripts)
                         for (const legacyPath of LEGACY_SCRIPT_PATHS) {
                             if (h.command.includes(legacyPath)) {
@@ -206,9 +218,9 @@ export async function mergeSettingsLocalJson(projectRoot, assetsPath, options) {
         logger.info('Added missing SessionStart hooks');
     }
     else if (Array.isArray(hooks.SessionStart)) {
-        const hasSessionStartHook = hooks.SessionStart.some((entry) => hookEntryContains(entry, 'session-start.sh') || hookEntryContains(entry, 'pf hooks session-start'));
+        const hasSessionStartHook = hooks.SessionStart.some((entry) => hookEntryContains(entry, 'session-start.sh') || hookEntryContains(entry, 'pf.sh hooks session-start') || hookEntryContains(entry, 'pf hooks session-start'));
         if (!hasSessionStartHook && templateContent.hooks?.SessionStart) {
-            const sessionStartEntry = findHookEntry(templateContent.hooks.SessionStart, 'pf hooks session-start');
+            const sessionStartEntry = findHookEntry(templateContent.hooks.SessionStart, 'pf.sh hooks session-start');
             if (sessionStartEntry) {
                 hooks.SessionStart = [sessionStartEntry, ...hooks.SessionStart];
                 modified = true;
@@ -239,9 +251,9 @@ export async function mergeSettingsLocalJson(projectRoot, assetsPath, options) {
         logger.info('Added missing Stop hooks');
     }
     else if (Array.isArray(hooks.Stop)) {
-        const hasReflectorHook = hooks.Stop.some((entry) => hookEntryContains(entry, 'question-reflector-check') || hookEntryContains(entry, 'pf hooks reflector-check'));
+        const hasReflectorHook = hooks.Stop.some((entry) => hookEntryContains(entry, 'question-reflector-check') || hookEntryContains(entry, 'pf.sh hooks reflector-check') || hookEntryContains(entry, 'pf hooks reflector-check'));
         if (!hasReflectorHook && templateContent.hooks?.Stop) {
-            const reflectorEntry = findHookEntry(templateContent.hooks.Stop, 'pf hooks reflector-check');
+            const reflectorEntry = findHookEntry(templateContent.hooks.Stop, 'pf.sh hooks reflector-check');
             if (reflectorEntry) {
                 hooks.Stop = [reflectorEntry, ...hooks.Stop];
                 modified = true;
@@ -256,9 +268,9 @@ export async function mergeSettingsLocalJson(projectRoot, assetsPath, options) {
         logger.info('Added missing PostToolUse hooks');
     }
     else if (Array.isArray(hooks.PostToolUse)) {
-        const hasBellModeHook = hooks.PostToolUse.some((entry) => hookEntryContains(entry, 'bell-mode-hook') || hookEntryContains(entry, 'pf hooks bell-mode'));
+        const hasBellModeHook = hooks.PostToolUse.some((entry) => hookEntryContains(entry, 'bell-mode-hook') || hookEntryContains(entry, 'pf.sh hooks bell-mode') || hookEntryContains(entry, 'pf hooks bell-mode'));
         if (!hasBellModeHook && templateContent.hooks?.PostToolUse) {
-            const bellModeEntry = findHookEntry(templateContent.hooks.PostToolUse, 'pf hooks bell-mode');
+            const bellModeEntry = findHookEntry(templateContent.hooks.PostToolUse, 'pf.sh hooks bell-mode');
             if (bellModeEntry) {
                 hooks.PostToolUse = [bellModeEntry, ...hooks.PostToolUse];
                 modified = true;
@@ -274,9 +286,9 @@ export async function mergeSettingsLocalJson(projectRoot, assetsPath, options) {
     }
     else if (Array.isArray(hooks.PreToolUse)) {
         // Check for context-circuit-breaker / context-breaker
-        const hasCircuitBreaker = hooks.PreToolUse.some((entry) => hookEntryContains(entry, 'context-circuit-breaker') || hookEntryContains(entry, 'pf hooks context-breaker'));
+        const hasCircuitBreaker = hooks.PreToolUse.some((entry) => hookEntryContains(entry, 'context-circuit-breaker') || hookEntryContains(entry, 'pf.sh hooks context-breaker') || hookEntryContains(entry, 'pf hooks context-breaker'));
         if (!hasCircuitBreaker && templateContent.hooks?.PreToolUse) {
-            const circuitBreakerEntry = findHookEntry(templateContent.hooks.PreToolUse, 'pf hooks context-breaker');
+            const circuitBreakerEntry = findHookEntry(templateContent.hooks.PreToolUse, 'pf.sh hooks context-breaker');
             if (circuitBreakerEntry) {
                 hooks.PreToolUse = [...hooks.PreToolUse, circuitBreakerEntry];
                 modified = true;
@@ -286,7 +298,7 @@ export async function mergeSettingsLocalJson(projectRoot, assetsPath, options) {
         // Check for schema-validation hook
         const hasSchemaValidation = hooks.PreToolUse.some((entry) => hookEntryContains(entry, 'schema-validation'));
         if (!hasSchemaValidation && templateContent.hooks?.PreToolUse) {
-            const schemaValidationEntry = findHookEntry(templateContent.hooks.PreToolUse, 'pf hooks schema-validation');
+            const schemaValidationEntry = findHookEntry(templateContent.hooks.PreToolUse, 'pf.sh hooks schema-validation');
             if (schemaValidationEntry) {
                 hooks.PreToolUse = [...hooks.PreToolUse, schemaValidationEntry];
                 modified = true;
@@ -294,9 +306,9 @@ export async function mergeSettingsLocalJson(projectRoot, assetsPath, options) {
             }
         }
         // Check for cyclist-pretooluse hook (Cyclist permissions integration)
-        const hasCyclistPreToolUse = hooks.PreToolUse.some((entry) => hookEntryContains(entry, 'cyclist-pretooluse') || hookEntryContains(entry, 'pf hooks cyclist-pretooluse'));
+        const hasCyclistPreToolUse = hooks.PreToolUse.some((entry) => hookEntryContains(entry, 'cyclist-pretooluse') || hookEntryContains(entry, 'pf.sh hooks cyclist-pretooluse') || hookEntryContains(entry, 'pf hooks cyclist-pretooluse'));
         if (!hasCyclistPreToolUse && templateContent.hooks?.PreToolUse) {
-            const cyclistEntry = findHookEntry(templateContent.hooks.PreToolUse, 'pf hooks cyclist-pretooluse');
+            const cyclistEntry = findHookEntry(templateContent.hooks.PreToolUse, 'pf.sh hooks cyclist-pretooluse');
             if (cyclistEntry) {
                 hooks.PreToolUse = [...hooks.PreToolUse, cyclistEntry];
                 modified = true;
@@ -312,13 +324,19 @@ export async function mergeSettingsLocalJson(projectRoot, assetsPath, options) {
         logger.info('Added missing statusLine configuration');
     }
     else if (statusLine.command && typeof statusLine.command === 'string') {
-        // Migrate from any legacy .sh path to pf hooks statusline
-        if (statusLine.command !== 'pf hooks statusline') {
+        // Migrate bare `pf hooks statusline` to pf.sh wrapper path
+        if (statusLine.command === 'pf hooks statusline') {
+            statusLine.command = `${PF_SH} hooks statusline`;
+            modified = true;
+            logger.info('Migrated statusLine from bare pf to pf.sh wrapper');
+        }
+        else if (!statusLine.command.includes('pf.sh hooks statusline')) {
+            // Migrate from any legacy .sh path to pf.sh hooks statusline
             for (const legacyPath of LEGACY_STATUSLINE_PATHS) {
                 if (statusLine.command.includes(legacyPath)) {
-                    statusLine.command = 'pf hooks statusline';
+                    statusLine.command = `${PF_SH} hooks statusline`;
                     modified = true;
-                    logger.info('Migrated statusLine from .sh to pf hooks statusline');
+                    logger.info('Migrated statusLine to pf.sh hooks statusline');
                     break;
                 }
             }