promptvc 0.1.6 → 0.1.8

package/README.md

@@ -5,15 +5,17 @@ Local-first, prompt-by-prompt diff tracking for AI coding sessions.
 ## Requirements
 
 - Node.js 22+ (use nvm: `nvm install 22 && nvm use 22`)
+- npm 11.5.1 (set `PROMPTVC_EXPECTED_NPM_VERSION` to override)
 - Git
-- Codex CLI
-- jq (required for per-prompt capture)
+- Codex CLI 0.80.0 (set `PROMPTVC_EXPECTED_CODEX_VERSION` to override)
+- Claude Code (for Claude session capture)
+- jq (optional; legacy hook fallback)
 - macOS/Linux
 - Windows: Git Bash required (run `promptvc` + `codex` in Git Bash)
 
 ### Windows notes
 
-Install `jq` (pick one):
+If the legacy shell hook fallback is used, install `jq` (pick one):
 
 ```bash
 winget install jqlang.jq
@@ -39,15 +41,20 @@ npm install -g promptvc
 promptvc config
 ```
 
-This command finds the installed notify hook and updates `~/.codex/config.toml`. If it cannot edit the file, it prints a ready-to-paste snippet.
+This command finds the installed notify hooks, verifies Codex/npm versions, and updates `~/.codex/config.toml` plus `~/.claude/settings.json`. If it cannot edit a file, it prints a ready-to-paste snippet.
+
+If you need to bypass the version guard, set:
+
+```bash
+PROMPTVC_ALLOW_VERSION_MISMATCH=1
+```
 
 ### Manual setup
 
 Add to `~/.codex/config.toml`:
 
 ```toml
-[hooks]
-notify = "/absolute/path/to/promptvc/hooks/codex-notify.sh"
+notify = ["/absolute/path/to/promptvc/hooks/codex-notify.sh"]
 ```
 
 If installed globally via npm, the hook is typically at:
@@ -56,6 +63,49 @@ If installed globally via npm, the hook is typically at:
 $(npm root -g)/promptvc/hooks/codex-notify.sh
 ```
 
+Add (or merge) into `~/.claude/settings.json`:
+
+```json
+{
+  "hooks": {
+    "SessionEnd": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "/absolute/path/to/promptvc/hooks/claude-notify.sh"
+          }
+        ]
+      }
+    ],
+    "Stop": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "/absolute/path/to/promptvc/hooks/claude-notify.sh"
+          }
+        ]
+      }
+    ]
+  }
+}
+```
+
+If installed globally via npm, the hook is typically at:
+
+```bash
+$(npm root -g)/promptvc/hooks/claude-notify.sh
+```
+
+## Version guard
+
+PromptVC checks Codex and npm versions during `promptvc config` and `promptvc init`.
+
+- Expected Codex: `0.80.0` (override with `PROMPTVC_EXPECTED_CODEX_VERSION`)
+- Expected npm: `11.5.1` (override with `PROMPTVC_EXPECTED_NPM_VERSION`)
+- Bypass the guard: `PROMPTVC_ALLOW_VERSION_MISMATCH=1`
+
 ## Usage
 
 Initialize a repo:
@@ -92,4 +142,4 @@ promptvc-codex
 ## Troubleshooting
 
 - If `promptvc` resolves to a Python shim, run `which promptvc` and ensure your npm global bin is ahead of pyenv on PATH.
-- Ensure `jq` is installed and available on PATH.
+- If you’re using the legacy shell hook fallback, ensure `jq` is installed and available on PATH.

package/dist/codexVersion.d.ts

@@ -0,0 +1,16 @@
+export type CodexVersionInfo = {
+    version: string | null;
+    raw: string | null;
+    binaryPath: string | null;
+};
+export declare const EXPECTED_CODEX_VERSION = "0.80.0";
+export declare const NOTIFY_ARRAY_MIN_VERSION = "0.80.0";
+export declare function getCodexVersionInfo(): CodexVersionInfo;
+export declare function compareSemver(a: string, b: string): number;
+export declare function getNotifyConfigLine(hookPath: string, codexVersion: string | null): {
+    line: string;
+    usesArray: boolean;
+    useHooksSection: boolean;
+};
+export declare function getCodexVersionWarnings(codexVersion: string | null): string[];
+//# sourceMappingURL=codexVersion.d.ts.map

package/dist/codexVersion.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"codexVersion.d.ts","sourceRoot":"","sources":["../src/codexVersion.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,sBAAsB,WAAW,CAAC;AAC/C,eAAO,MAAM,wBAAwB,WAAW,CAAC;AAkBjD,wBAAgB,mBAAmB,IAAI,gBAAgB,CAkBtD;AASD,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAU1D;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,GAAG;IAClF,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,OAAO,CAAC;CAC1B,CAQA;AAED,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,EAAE,CAW7E"}

package/dist/codexVersion.js

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NOTIFY_ARRAY_MIN_VERSION = exports.EXPECTED_CODEX_VERSION = void 0;
+exports.getCodexVersionInfo = getCodexVersionInfo;
+exports.compareSemver = compareSemver;
+exports.getNotifyConfigLine = getNotifyConfigLine;
+exports.getCodexVersionWarnings = getCodexVersionWarnings;
+const child_process_1 = require("child_process");
+exports.EXPECTED_CODEX_VERSION = '0.80.0';
+exports.NOTIFY_ARRAY_MIN_VERSION = '0.80.0';
+const VERSION_PATTERN = /\b(\d+\.\d+\.\d+)\b/;
+function parseVersion(raw) {
+    const match = raw.match(VERSION_PATTERN);
+    return match ? match[1] : null;
+}
+function getCodexBinaryPath() {
+    const command = process.platform === 'win32' ? 'where' : 'which';
+    const result = (0, child_process_1.spawnSync)(command, ['codex'], { encoding: 'utf8' });
+    if (result.status !== 0)
+        return null;
+    const output = (result.stdout || '').trim();
+    if (!output)
+        return null;
+    return output.split(/\r?\n/)[0] || null;
+}
+function getCodexVersionInfo() {
+    const commands = [['--version'], ['version']];
+    let raw = null;
+    for (const args of commands) {
+        const result = (0, child_process_1.spawnSync)('codex', args, { encoding: 'utf8' });
+        if (result.status !== 0)
+            continue;
+        const output = ((result.stdout || '') + (result.stderr || '')).trim();
+        if (output) {
+            raw = output;
+            break;
+        }
+    }
+    const version = raw ? parseVersion(raw) : null;
+    return {
+        version,
+        raw,
+        binaryPath: getCodexBinaryPath(),
+    };
+}
+function toSemverParts(version) {
+    return version.split('.').map((part) => {
+        const value = Number.parseInt(part, 10);
+        return Number.isFinite(value) ? value : 0;
+    });
+}
+function compareSemver(a, b) {
+    const aParts = toSemverParts(a);
+    const bParts = toSemverParts(b);
+    const maxLen = Math.max(aParts.length, bParts.length);
+    for (let i = 0; i < maxLen; i += 1) {
+        const left = aParts[i] ?? 0;
+        const right = bParts[i] ?? 0;
+        if (left !== right)
+            return left > right ? 1 : -1;
+    }
+    return 0;
+}
+function getNotifyConfigLine(hookPath, codexVersion) {
+    const isLegacy = codexVersion ? compareSemver(codexVersion, exports.NOTIFY_ARRAY_MIN_VERSION) < 0 : false;
+    const useArray = !isLegacy;
+    return {
+        line: useArray ? `notify = ["${hookPath}"]` : `notify = "${hookPath}"`,
+        usesArray: useArray,
+        useHooksSection: isLegacy,
+    };
+}
+function getCodexVersionWarnings(codexVersion) {
+    if (!codexVersion) {
+        return ['Codex version not detected. Run `codex --version` to verify your installation.'];
+    }
+    if (codexVersion !== exports.EXPECTED_CODEX_VERSION) {
+        return [
+            `PromptVC is tested with Codex ${exports.EXPECTED_CODEX_VERSION}, detected ${codexVersion}.`,
+            'If hooks do not fire, install the tested version.',
+        ];
+    }
+    return [];
+}
+//# sourceMappingURL=codexVersion.js.map

package/dist/codexVersion.js.map

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

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AA8GA,eAAO,MAAM,gBAAgB,QAAa,OAAO,CAAC,IAAI,CAsFrD,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AA0SA,eAAO,MAAM,gBAAgB,QAAa,OAAO,CAAC,IAAI,CAmPrD,CAAC"}

package/dist/config.js

@@ -1,37 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -41,13 +8,17 @@ const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const child_process_1 = require("child_process");
-const readline = __importStar(require("readline/promises"));
 const kleur_1 = __importDefault(require("kleur"));
 const branding_1 = require("./branding");
+const toolVersions_1 = require("./toolVersions");
+const prompt_1 = require("./prompt");
 const getCodexConfigPath = () => path_1.default.join(os_1.default.homedir(), '.codex', 'config.toml');
 const getCodexDir = () => path_1.default.join(os_1.default.homedir(), '.codex');
 const getNotifyHookPath = () => path_1.default.resolve(__dirname, '..', 'hooks', 'codex-notify.sh');
 const isWindows = process.platform === 'win32';
+const getClaudeSettingsPath = () => path_1.default.join(os_1.default.homedir(), '.claude', 'settings.json');
+const getClaudeDir = () => path_1.default.join(os_1.default.homedir(), '.claude');
+const getClaudeHookPath = () => path_1.default.resolve(__dirname, '..', 'hooks', 'claude-notify.sh');
 const isCodexInstalled = () => {
     const codexDir = getCodexDir();
     return fs_1.default.existsSync(codexDir);
@@ -83,33 +54,154 @@ const normalizeHookPathForToml = (hookPath) => {
     }
     return hookPath.replace(/\\/g, '/');
 };
-const hasJq = () => {
-    const result = (0, child_process_1.spawnSync)('jq', ['--version'], { stdio: 'ignore' });
-    if (result.error) {
+const normalizeHookPathForCommand = (hookPath) => {
+    if (!isWindows) {
+        return hookPath;
+    }
+    return hookPath.replace(/\\/g, '/');
+};
+const isClaudeInstalled = () => {
+    const claudeDir = getClaudeDir();
+    return fs_1.default.existsSync(claudeDir);
+};
+const hasClaudeConfig = () => {
+    const configPath = getClaudeSettingsPath();
+    return fs_1.default.existsSync(configPath);
+};
+const isClaudeMatcherEntry = (entry) => {
+    if (!entry || typeof entry !== 'object') {
         return false;
     }
-    return result.status === 0;
+    return 'matcher' in entry || 'hooks' in entry;
+};
+const isClaudeHookEntry = (entry) => {
+    if (!entry || typeof entry !== 'object') {
+        return false;
+    }
+    return 'type' in entry || 'command' in entry;
 };
-const promptYesNo = async (message) => {
-    if (!process.stdin.isTTY) {
+const hasClaudeHook = (settings, eventName, hookPath) => {
+    const hooks = settings?.hooks?.[eventName];
+    if (!Array.isArray(hooks)) {
         return false;
     }
-    const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout,
+    return hooks.some((entry) => {
+        if (isClaudeMatcherEntry(entry)) {
+            return Array.isArray(entry.hooks)
+                && entry.hooks.some((hook) => hook?.type === 'command' && hook.command === hookPath);
+        }
+        return isClaudeHookEntry(entry) && entry.type === 'command' && entry.command === hookPath;
     });
+};
+const getClaudeHookStatus = (hookPath) => {
+    const configPath = getClaudeSettingsPath();
+    if (!fs_1.default.existsSync(configPath)) {
+        return { stop: false, sessionEnd: false };
+    }
     try {
-        const answer = await rl.question(message);
-        return ['y', 'yes'].includes(answer.trim().toLowerCase());
+        const settings = JSON.parse(fs_1.default.readFileSync(configPath, 'utf-8'));
+        return {
+            stop: hasClaudeHook(settings, 'Stop', hookPath),
+            sessionEnd: hasClaudeHook(settings, 'SessionEnd', hookPath),
+        };
+    }
+    catch {
+        return { stop: false, sessionEnd: false };
     }
-    finally {
-        rl.close();
+};
+const normalizeClaudeEventHooks = (entries) => {
+    const normalized = [];
+    const directHooks = [];
+    let changed = false;
+    for (const entry of entries) {
+        if (isClaudeMatcherEntry(entry)) {
+            const entryHooks = Array.isArray(entry.hooks) ? [...entry.hooks] : [];
+            if (!Array.isArray(entry.hooks)) {
+                changed = true;
+            }
+            normalized.push({ ...entry, hooks: entryHooks });
+            continue;
+        }
+        if (isClaudeHookEntry(entry)) {
+            directHooks.push(entry);
+            continue;
+        }
+        normalized.push(entry);
+    }
+    if (directHooks.length > 0) {
+        let targetIndex = normalized.findIndex((entry) => entry.matcher == null || entry.matcher === '');
+        if (targetIndex === -1) {
+            normalized.push({ hooks: [...directHooks] });
+        }
+        else {
+            const mergedHooks = Array.isArray(normalized[targetIndex].hooks)
+                ? [...normalized[targetIndex].hooks]
+                : [];
+            for (const hook of directHooks) {
+                const exists = mergedHooks.some((existing) => existing?.type === hook?.type && existing?.command === hook?.command);
+                if (!exists) {
+                    mergedHooks.push(hook);
+                }
+            }
+            normalized[targetIndex] = { ...normalized[targetIndex], hooks: mergedHooks };
+        }
+        changed = true;
+    }
+    return { entries: normalized, changed };
+};
+const upsertClaudeEventHook = (settings, eventName, hookPath) => {
+    const updated = settings && typeof settings === 'object' ? { ...settings } : {};
+    const hooks = updated.hooks && typeof updated.hooks === 'object' ? { ...updated.hooks } : {};
+    const existingEntries = Array.isArray(hooks[eventName]) ? [...hooks[eventName]] : [];
+    const normalized = normalizeClaudeEventHooks(existingEntries);
+    const eventEntries = normalized.entries;
+    let changed = normalized.changed;
+    let entryIndex = eventEntries.findIndex((entry) => entry.matcher == null || entry.matcher === '');
+    if (entryIndex === -1) {
+        eventEntries.push({ hooks: [] });
+        entryIndex = eventEntries.length - 1;
+        changed = true;
+    }
+    const entry = { ...eventEntries[entryIndex] };
+    const entryHooks = Array.isArray(entry.hooks) ? [...entry.hooks] : [];
+    const hasHook = entryHooks.some((hook) => hook?.type === 'command' && hook.command === hookPath);
+    if (!hasHook) {
+        entryHooks.push({ type: 'command', command: hookPath });
+        changed = true;
     }
+    entry.hooks = entryHooks;
+    eventEntries[entryIndex] = entry;
+    hooks[eventName] = eventEntries;
+    updated.hooks = hooks;
+    return { updated, changed };
 };
-const upsertNotifyHook = (content, hookPath) => {
+const hasJq = () => {
+    const result = (0, child_process_1.spawnSync)('jq', ['--version'], { stdio: 'ignore' });
+    if (result.error) {
+        return false;
+    }
+    return result.status === 0;
+};
+const upsertNotifyHook = (content, notifyLine) => {
+    const usesCrlf = content.includes('\r\n');
+    const normalized = content.replace(/\r\n/g, '\n');
+    if (!normalized.trim()) {
+        const fresh = `${notifyLine}\n`;
+        return usesCrlf ? fresh.replace(/\n/g, '\r\n') : fresh;
+    }
+    const lines = normalized.split('\n');
+    const filtered = lines.filter((line) => !/^\s*notify\s*=/.test(line));
+    let insertIndex = filtered.findIndex((line) => /^\s*\[/.test(line));
+    if (insertIndex === -1)
+        insertIndex = filtered.length;
+    filtered.splice(insertIndex, 0, notifyLine);
+    let updated = filtered.join('\n');
+    updated = updated.replace(/\n{3,}/g, '\n\n').trimEnd() + '\n';
+    return usesCrlf ? updated.replace(/\n/g, '\r\n') : updated;
+};
+const upsertNotifyHookLegacy = (content, notifyLine) => {
     const usesCrlf = content.includes('\r\n');
     const normalized = content.replace(/\r\n/g, '\n');
-    const notifyLine = `notify = "${hookPath}"`;
     if (!normalized.trim()) {
         const fresh = `[hooks]\n${notifyLine}\n`;
         return usesCrlf ? fresh.replace(/\n/g, '\r\n') : fresh;
@@ -149,7 +241,7 @@ const runConfigCommand = async () => {
         console.log('  - winget install jqlang.jq');
         console.log('  - choco install jq');
         console.log('  - scoop install jq');
-        const shouldInstall = await promptYesNo('Install jq now? (y/N): ');
+        const shouldInstall = await (0, prompt_1.promptYesNo)('Install jq now? (y/N): ');
         if (shouldInstall) {
             console.log('');
             console.log('Run one of the commands above, then re-run `promptvc config`.');
@@ -160,14 +252,49 @@ const runConfigCommand = async () => {
     }
     const hookPath = getNotifyHookPath();
     const hookPathForConfig = normalizeHookPathForToml(hookPath);
+    const claudeHookPath = getClaudeHookPath();
+    const claudeHookPathForConfig = normalizeHookPathForCommand(claudeHookPath);
+    const codexInfo = (0, toolVersions_1.getCodexVersionInfo)();
+    const npmInfo = (0, toolVersions_1.getNpmVersionInfo)();
+    const notifyConfig = (0, toolVersions_1.getNotifyConfigLine)(hookPathForConfig, codexInfo.version);
     const configPath = getCodexConfigPath();
-    const snippet = `[hooks]\nnotify = "${hookPathForConfig}"\n`;
+    const snippet = notifyConfig.useHooksSection
+        ? `[hooks]\n${notifyConfig.line}\n`
+        : `${notifyConfig.line}\n`;
+    const claudeConfigPath = getClaudeSettingsPath();
+    const claudeSnippet = JSON.stringify({
+        hooks: {
+            SessionEnd: [
+                {
+                    hooks: [
+                        {
+                            type: 'command',
+                            command: claudeHookPathForConfig,
+                        },
+                    ],
+                },
+            ],
+            Stop: [
+                {
+                    hooks: [
+                        {
+                            type: 'command',
+                            command: claudeHookPathForConfig,
+                        },
+                    ],
+                },
+            ],
+        },
+    }, null, 2);
     console.log(kleur_1.default.bold().cyan('PromptVC Config'));
     console.log((0, branding_1.renderLogo)());
     console.log('');
     // Check Codex installation status
     const codexInstalled = isCodexInstalled();
     const codexConfigured = isCodexConfigured();
+    const claudeInstalled = isClaudeInstalled();
+    const claudeStatus = getClaudeHookStatus(claudeHookPathForConfig);
+    const claudeConfigured = claudeStatus.stop && claudeStatus.sessionEnd;
     console.log(`${kleur_1.default.bold('Codex status:')}`);
     if (codexInstalled) {
         console.log(`  ${kleur_1.default.green('✓')} Codex is installed (${getCodexDir()} found)`);
@@ -183,18 +310,98 @@ const runConfigCommand = async () => {
     }
     else {
         console.log(`  ${kleur_1.default.red('✗')} Codex not found (${getCodexDir()} does not exist)`);
-        console.log(`  ${kleur_1.default.yellow('→')} Install Codex from: https://www.codex.chat/`);
+        console.log(`  ${kleur_1.default.yellow('→')} Install Codex: npm i -g @openai/codex`);
     }
     console.log('');
-    console.log(`${kleur_1.default.bold('Hook path:')} ${hookPathForConfig}`);
+    console.log(`${kleur_1.default.bold('Codex hook path:')} ${hookPathForConfig}`);
     console.log(`${kleur_1.default.bold('Codex config:')} ${configPath}`);
+    console.log('');
+    console.log(`${kleur_1.default.bold('Claude status:')}`);
+    if (claudeInstalled) {
+        console.log(`  ${kleur_1.default.green('✓')} Claude config directory detected (${getClaudeDir()} found)`);
+        if (claudeConfigured) {
+            console.log(`  ${kleur_1.default.green('✓')} Claude is already configured with PromptVC`);
+        }
+        else if (claudeStatus.stop || claudeStatus.sessionEnd) {
+            console.log(`  ${kleur_1.default.yellow('○')} Claude config partially configured (Stop: ${claudeStatus.stop ? 'yes' : 'no'}, SessionEnd: ${claudeStatus.sessionEnd ? 'yes' : 'no'})`);
+        }
+        else if (hasClaudeConfig()) {
+            console.log(`  ${kleur_1.default.yellow('○')} Claude config exists but PromptVC not configured`);
+        }
+        else {
+            console.log(`  ${kleur_1.default.yellow('○')} Claude config not found, will be created`);
+        }
+    }
+    else {
+        console.log(`  ${kleur_1.default.red('✗')} Claude config directory not found (${getClaudeDir()} does not exist)`);
+        console.log(`  ${kleur_1.default.yellow('→')} Install Claude Code to use this integration`);
+    }
+    console.log('');
+    console.log(`${kleur_1.default.bold('Claude hook path:')} ${claudeHookPathForConfig}`);
+    console.log(`${kleur_1.default.bold('Claude config:')} ${claudeConfigPath}`);
+    if (codexInfo.binaryPath) {
+        console.log(`${kleur_1.default.bold('Codex binary:')} ${codexInfo.binaryPath}`);
+    }
+    if (codexInfo.version) {
+        console.log(`${kleur_1.default.bold('Codex version:')} ${codexInfo.version}`);
+    }
+    else if (codexInfo.raw) {
+        console.log(`${kleur_1.default.bold('Codex version:')} ${codexInfo.raw}`);
+    }
+    if (npmInfo.binaryPath) {
+        console.log(`${kleur_1.default.bold('npm binary:')} ${npmInfo.binaryPath}`);
+    }
+    if (npmInfo.version) {
+        console.log(`${kleur_1.default.bold('npm version:')} ${npmInfo.version}`);
+    }
+    else if (npmInfo.raw) {
+        console.log(`${kleur_1.default.bold('npm version:')} ${npmInfo.raw}`);
+    }
+    const warnings = (0, toolVersions_1.getCodexVersionWarnings)(codexInfo.version);
+    if (warnings.length > 0) {
+        for (const warning of warnings) {
+            console.log(kleur_1.default.yellow(`Warning: ${warning}`));
+        }
+    }
+    const npmWarnings = (0, toolVersions_1.getNpmVersionWarnings)(npmInfo.version);
+    if (npmWarnings.length > 0) {
+        for (const warning of npmWarnings) {
+            console.log(kleur_1.default.yellow(`Warning: ${warning}`));
+        }
+    }
+    if (notifyConfig.useHooksSection) {
+        console.log(kleur_1.default.yellow('Warning: Codex is using the legacy [hooks] notify format; upgrade recommended.'));
+    }
+    console.log('');
+    const codexMismatch = (0, toolVersions_1.isVersionMismatch)(codexInfo.version, toolVersions_1.EXPECTED_CODEX_VERSION);
+    const npmMismatch = (0, toolVersions_1.isVersionMismatch)(npmInfo.version, toolVersions_1.EXPECTED_NPM_VERSION);
+    if ((codexMismatch || npmMismatch) && !(0, toolVersions_1.allowVersionMismatch)()) {
+        const reason = codexMismatch && npmMismatch
+            ? 'Codex and npm versions do not match the expected versions.'
+            : codexMismatch
+                ? 'Codex version does not match the expected version.'
+                : 'npm version does not match the expected version.';
+        console.log(kleur_1.default.yellow(`Warning: ${reason}`));
+        console.log(kleur_1.default.yellow('Set PROMPTVC_ALLOW_VERSION_MISMATCH=1 to bypass this check.'));
+        const shouldContinue = await (0, prompt_1.promptYesNo)('Continue anyway? (y/N): ');
+        if (!shouldContinue) {
+            process.exit(1);
+        }
+        console.log('');
+    }
     if (!fs_1.default.existsSync(hookPath)) {
         console.log(kleur_1.default.yellow('Warning: notify hook not found at this path.'));
     }
+    if (!fs_1.default.existsSync(claudeHookPath)) {
+        console.log(kleur_1.default.yellow('Warning: Claude notify hook not found at this path.'));
+    }
+    let updatedSomething = false;
     try {
         fs_1.default.mkdirSync(path_1.default.dirname(configPath), { recursive: true });
         const existing = fs_1.default.existsSync(configPath) ? fs_1.default.readFileSync(configPath, 'utf-8') : '';
-        const updated = upsertNotifyHook(existing, hookPathForConfig);
+        const updated = notifyConfig.useHooksSection
+            ? upsertNotifyHookLegacy(existing, notifyConfig.line)
+            : upsertNotifyHook(existing, notifyConfig.line);
         fs_1.default.writeFileSync(configPath, updated, 'utf-8');
         console.log('');
         if (codexConfigured) {
@@ -208,7 +415,7 @@ const runConfigCommand = async () => {
             console.log(kleur_1.default.yellow('Note: Codex installation not detected. Install Codex to use this integration.'));
         }
         console.log('');
-        console.log(kleur_1.default.bgBlue('Run "promptvc init" to initialize Prompt Version Control in your repository.'));
+        updatedSomething = true;
     }
     catch (error) {
         console.log('');
@@ -216,6 +423,40 @@ const runConfigCommand = async () => {
         console.log(`Add this to ${configPath}:`);
         console.log(snippet);
     }
+    try {
+        fs_1.default.mkdirSync(path_1.default.dirname(claudeConfigPath), { recursive: true });
+        const existingRaw = fs_1.default.existsSync(claudeConfigPath) ? fs_1.default.readFileSync(claudeConfigPath, 'utf-8') : '';
+        const existing = existingRaw.trim().length === 0 ? '{}' : existingRaw;
+        const parsed = JSON.parse(existing);
+        const stopResult = upsertClaudeEventHook(parsed, 'Stop', claudeHookPathForConfig);
+        const sessionEndResult = upsertClaudeEventHook(stopResult.updated, 'SessionEnd', claudeHookPathForConfig);
+        const claudeChanged = stopResult.changed || sessionEndResult.changed || existing.trim().length === 0;
+        if (claudeChanged) {
+            fs_1.default.writeFileSync(claudeConfigPath, JSON.stringify(sessionEndResult.updated, null, 2) + '\n', 'utf-8');
+        }
+        console.log('');
+        if (claudeConfigured) {
+            console.log(kleur_1.default.green('OK: Claude config verified (already configured).'));
+        }
+        else {
+            console.log(kleur_1.default.green('OK: Claude config updated successfully.'));
+        }
+        if (!claudeInstalled) {
+            console.log('');
+            console.log(kleur_1.default.yellow('Note: Claude installation not detected. Install Claude Code to use this integration.'));
+        }
+        console.log('');
+        updatedSomething = true;
+    }
+    catch (error) {
+        console.log('');
+        console.log(kleur_1.default.yellow('Manual setup required for Claude.'));
+        console.log(`Merge this into ${claudeConfigPath}:`);
+        console.log(claudeSnippet);
+    }
+    if (updatedSomething) {
+        console.log(kleur_1.default.bgBlue('Run "promptvc init" to initialize Prompt Version Control in your repository.'));
+    }
 };
 exports.runConfigCommand = runConfigCommand;
 //# sourceMappingURL=config.js.map