@raidiant/notifai 2.0.1 → 2.0.2

package/CHANGELOG.md

@@ -8,6 +8,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 This project follows [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 and [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/).
 
+## [2.0.2](https://github.com/Raidiant-io/notifai/compare/v2.0.1...v2.0.2) (2026-08-14)
+
+
+### Bug Fixes
+
+* **cli:** preserve Codex hook representation ([0c03308](https://github.com/Raidiant-io/notifai/commit/0c03308cdc355bb1a84f8e5ef3daaeba51059fe6))
+
 ## [2.0.1](https://github.com/Raidiant-io/notifai/compare/v2.0.0...v2.0.1) (2026-08-14)
 
 

package/dist/commands.js

@@ -15,7 +15,7 @@ import { renderConfigExplain, renderConfigList, renderConfigPlain, } from './ui/
 import { firstBlocker, } from './readiness.js';
 import { WAITER_CEILING_SECONDS, clearAcknowledgementObligation, handleSessionEnd, handleStop, handleUserPromptSubmit, parseHookInput, pruneAbandonedSessions, readLiveProjectSessionPointers, readMatchingProjectSessionPointer, readProjectSession, readProjectSessionPointer, readSessionState, registerQuestion, } from './hooks.js';
 import { LOG_EVENTS, activeLogPath, archiveLogPaths, logConfigResolved, logSettingsFrom, logsDiskUsage, nullLogger, readLogRecords, renderRecord, } from './logging.js';
-import { BLOCKING_STOP_TIMEOUT_SECONDS, CLAUDE_ASYNC_STOP_TIMEOUT_SECONDS, HARNESSES, applyPlan, buildCursorHookConfig, buildHookConfig, collapseUnusedCodexRepresentation, codexLayerDir, codexLayerPaths, codexRepresentationProblems, codexTrustProblems, codexProjectRoot, detectHarness, detectedHarnesses, findInstallations, handlerEvent, hookDefinitionFiles, inspectCodexLayer, loadCursorSettings, loadSettings, mergeCursorHooks, mergeHooks, removeCursorHooks, removeHooks, settingsFile, } from './install-hooks.js';
+import { BLOCKING_STOP_TIMEOUT_SECONDS, CLAUDE_ASYNC_STOP_TIMEOUT_SECONDS, HARNESSES, applyPlan, buildCursorHookConfig, buildHookConfig, codexLayerDir, codexLayerPaths, codexRepresentationProblems, codexTrustProblems, codexProjectRoot, detectHarness, detectedHarnesses, findInstallations, handlerEvent, hookDefinitionFiles, inspectCodexLayer, loadCursorSettings, loadSettings, mergeCursorHooks, mergeHooks, removeCursorHooks, removeHooks, settingsFile, withCodexLayerTransaction, } from './install-hooks.js';
 import { HARNESS_CAPABILITIES, HARNESS_LABELS } from './harnesses.js';
 import { claudeWakeRoute, inspectClaudeInbox, systemClaudeWakeAdapters, } from './claude-wake.js';
 import { codexWakeRoute, inspectCodexResume, } from './codex-wake.js';
@@ -1817,11 +1817,14 @@ export function hooksInstallCommand(deps, flags) {
             return EXIT.failed;
         }
     }
-    const file = settingsFile(harness, wantGlobal, deps.cwd, deps.env, hookPlatform);
+    const codexPaths = harness === 'codex'
+        ? codexLayerPaths(wantGlobal, deps.cwd, deps.env, hookPlatform)
+        : null;
+    const settingsTarget = codexPaths?.configToml ?? settingsFile(harness, wantGlobal, deps.cwd, deps.env, hookPlatform);
     // OpenCode's adapter is a generated plugin module rather than a handler
     // merged into a settings document, so it owns the whole file.
     if (harness === 'opencode') {
-        return installOpencodePlugin(deps, file, {
+        return installOpencodePlugin(deps, settingsTarget, {
             adapterPath,
             timeoutSeconds: BLOCKING_STOP_TIMEOUT_SECONDS,
             platform: hookPlatform,
@@ -1830,15 +1833,15 @@ export function hooksInstallCommand(deps, flags) {
     }
     if (harness === 'cursor') {
         try {
-            withTargetFileLock(file, () => {
-                const document = loadCursorSettings(file);
+            withTargetFileLock(settingsTarget, () => {
+                const document = loadCursorSettings(settingsTarget);
                 const result = mergeCursorHooks(document, buildCursorHookConfig({
                     adapterPath,
                     harness: 'cursor',
                     platform: hookPlatform,
                     nodePath,
                 }), scriptPath);
-                applyPlan(file, result.document);
+                applyPlan(settingsTarget, result.document);
                 return result;
             });
         }
@@ -1846,27 +1849,27 @@ export function hooksInstallCommand(deps, flags) {
             deps.io.err(String(err));
             return EXIT.failed;
         }
-        printHooksInstallClose(deps, harness, file);
+        printHooksInstallClose(deps, harness, settingsTarget);
         return EXIT.ok;
     }
-    let foreignStopCount = 0;
-    let collapsedFrom = null;
+    const installInto = (file) => {
+        const document = loadSettings(file);
+        const foreignStopCount = foreignStopHandlers(document).length;
+        const result = mergeHooks(document, buildHookConfig({
+            adapterPath,
+            harness,
+            platform: hookPlatform,
+            nodePath,
+        }), scriptPath);
+        applyPlan(file, result.document);
+        return { file, foreignStopCount };
+    };
+    let installed;
     try {
-        withTargetFileLock(file, () => {
-            const document = loadSettings(file);
-            foreignStopCount = foreignStopHandlers(document).length;
-            const result = mergeHooks(document, buildHookConfig({
-                adapterPath,
-                harness,
-                platform: hookPlatform,
-                nodePath,
-            }), scriptPath);
-            applyPlan(file, result.document);
-            return result;
-        });
-        if (harness === 'codex') {
-            collapsedFrom = collapseUnusedCodexRepresentation(file, scriptPath, codexLayerPaths(flags.global ?? false, deps.cwd, deps.env));
-        }
+        installed =
+            codexPaths === null
+                ? withTargetFileLock(settingsTarget, () => installInto(settingsTarget))
+                : withCodexLayerTransaction(codexPaths, (inspection) => installInto(inspection.writeTarget));
     }
     catch (err) {
         deps.io.err(String(err));
@@ -1877,15 +1880,12 @@ export function hooksInstallCommand(deps, flags) {
         if (layer !== null)
             mkdirSync(layer, { recursive: true });
     }
-    printHooksInstallClose(deps, harness, file);
-    if (collapsedFrom !== null) {
-        deps.io.out(`Collapsed ${collapsedFrom} onto ${file} so this layer has one representation.`);
-    }
-    if (foreignStopCount > 0) {
+    printHooksInstallClose(deps, harness, installed.file);
+    if (installed.foreignStopCount > 0) {
         deps.io.out("This layer already has a Stop handler. Codex runs every matching handler, so Notifai's Stop and the existing one will both fire.");
     }
     if (harness === 'codex') {
-        for (const problem of codexRepresentationProblems(deps.cwd, deps.env)) {
+        for (const problem of codexRepresentationProblems(deps.cwd, deps.env, hookPlatform)) {
             deps.io.out(problem);
         }
     }
@@ -1933,7 +1933,11 @@ export function hooksUninstallCommand(deps, flags) {
     if (!harness)
         return EXIT.usage;
     const scriptPath = flags.scriptPath ?? process.argv[1] ?? 'notifai';
-    const file = settingsFile(harness, flags.global ?? false, deps.cwd, deps.env, deps.hookPlatform);
+    const global = flags.global ?? false;
+    const codexPaths = harness === 'codex'
+        ? codexLayerPaths(global, deps.cwd, deps.env, deps.hookPlatform)
+        : null;
+    const file = codexPaths?.configToml ?? settingsFile(harness, global, deps.cwd, deps.env, deps.hookPlatform);
     if (harness === 'opencode') {
         try {
             return withTargetFileLock(file, () => {
@@ -1982,33 +1986,47 @@ export function hooksUninstallCommand(deps, flags) {
             : `No Notifai hooks found in ${file}`);
         return EXIT.ok;
     }
-    const files = hookDefinitionFiles(harness, flags.global ?? false, deps.cwd, deps.env);
-    const existing = files.filter((candidate) => existsSync(candidate));
-    if (existing.length === 0) {
-        deps.io.out(`Nothing to remove: ${file} does not exist.`);
-        return EXIT.ok;
-    }
-    let removedAny = false;
-    try {
+    const removeInstalledHooks = () => {
+        const files = codexPaths === null
+            ? hookDefinitionFiles(harness, global, deps.cwd, deps.env, deps.hookPlatform)
+            : [codexPaths.hooksJson, codexPaths.configToml];
+        const existing = files.filter((candidate) => existsSync(candidate));
+        let removedAny = false;
         for (const candidate of existing) {
-            const stripped = withTargetFileLock(candidate, () => {
+            const removeFromCandidate = () => {
                 const document = loadSettings(candidate);
                 const result = removeHooks(document, scriptPath);
-                applyPlan(candidate, result.document);
+                if (result.replaced.length > 0)
+                    applyPlan(candidate, result.document);
                 return result;
-            });
+            };
+            const stripped = codexPaths === null
+                ? withTargetFileLock(candidate, removeFromCandidate)
+                : removeFromCandidate();
             if (stripped.replaced.length > 0) {
                 removedAny = true;
                 deps.io.out(`Removed Notifai hooks (${stripped.replaced.join(', ')}) from ${candidate}`);
             }
         }
+        return { existing, removedAny };
+    };
+    let result;
+    try {
+        result =
+            codexPaths === null
+                ? removeInstalledHooks()
+                : withCodexLayerTransaction(codexPaths, removeInstalledHooks);
     }
     catch (err) {
         deps.io.err(String(err));
         return EXIT.failed;
     }
-    if (!removedAny) {
-        deps.io.out(`No Notifai hooks found in ${existing.join(', ')}`);
+    if (result.existing.length === 0) {
+        deps.io.out(`Nothing to remove: ${file} does not exist.`);
+        return EXIT.ok;
+    }
+    if (!result.removedAny) {
+        deps.io.out(`No Notifai hooks found in ${result.existing.join(', ')}`);
     }
     return EXIT.ok;
 }
@@ -3936,23 +3954,12 @@ function hookChecks(deps) {
                 .join('; '),
         });
     }
-    const representationProblems = codexRepresentationProblems(deps.cwd, deps.env);
+    const representationProblems = codexRepresentationProblems(deps.cwd, deps.env, deps.hookPlatform);
     if (representationProblems.length > 0) {
-        const collapseCommand = representationProblems.some((problem) => problem.includes('--global'))
-            ? 'notifai hooks install --harness codex --global'
-            : 'notifai hooks install --harness codex';
         checks.push({
             name: 'hooks (codex representation)',
             ok: false,
             detail: representationProblems.join('; '),
-            ...(representationProblems.some((problem) => problem.includes('to collapse onto'))
-                ? {
-                    remedy: {
-                        summary: 'collapse this Codex layer onto a single hook file',
-                        command: collapseCommand,
-                    },
-                }
-                : {}),
         });
     }
     if (active !== null && activeInstallations.length > 0) {