oh-my-codex 0.20.1 → 0.20.3

package/dist/cli/setup-preferences.d.ts

@@ -1,3 +1,4 @@
+import { mkdir, rename, rm, writeFile } from "fs/promises";
 import { type SetupTeamMode } from "../config/team-mode.js";
 export declare const SETUP_SCOPES: readonly ["user", "project"];
 export type SetupScope = (typeof SETUP_SCOPES)[number];
@@ -10,12 +11,22 @@ export interface PersistedSetupScope {
     installMode?: SetupInstallMode;
     mcpMode?: SetupMcpMode;
     teamMode?: SetupTeamMode;
+    mergeAgents?: boolean;
 }
 export type PartialPersistedSetupScope = Partial<PersistedSetupScope>;
 export declare function isSetupScope(value: string): value is SetupScope;
 export declare function isSetupInstallMode(value: string): value is SetupInstallMode;
 export declare function isSetupMcpMode(value: string): value is SetupMcpMode;
 export declare function getSetupScopeFilePath(projectRoot: string): string;
+export declare function resolvePersistedSetupMergeAgents(preferences: PartialPersistedSetupScope | undefined, scope: SetupScope): boolean | undefined;
+export interface WritePersistedSetupPreferencesDependencies {
+    mkdir?: typeof mkdir;
+    writeFile?: typeof writeFile;
+    rename?: typeof rename;
+    rm?: typeof rm;
+    createTempName?: () => string;
+}
+export declare function writePersistedSetupPreferences(projectRoot: string, preferences: PersistedSetupScope, dependencies?: WritePersistedSetupPreferencesDependencies): Promise<void>;
 export declare function readPersistedSetupPreferences(projectRoot: string, options?: {
     warnOnLegacyScope?: boolean;
 }): Promise<PartialPersistedSetupScope | undefined>;

package/dist/cli/setup-preferences.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-preferences.d.ts","sourceRoot":"","sources":["../../src/cli/setup-preferences.ts"],"names":[],"mappings":"AAGA,OAAO,EAEN,KAAK,aAAa,EAClB,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,YAAY,8BAA+B,CAAC;AACzD,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;AAEvD,eAAO,MAAM,mBAAmB,+BAAgC,CAAC;AACjE,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,mBAAmB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEpE,eAAO,MAAM,eAAe,6BAA8B,CAAC;AAC3D,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAE5D,MAAM,WAAW,mBAAmB;IACnC,KAAK,EAAE,UAAU,CAAC;IAClB,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAC/B,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,QAAQ,CAAC,EAAE,aAAa,CAAC;CACzB;AAED,MAAM,MAAM,0BAA0B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAMtE,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,UAAU,CAE/D;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,gBAAgB,CAE3E;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,YAAY,CAEnE;AAED,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAEjE;AA2CD,wBAAsB,6BAA6B,CAClD,WAAW,EAAE,MAAM,EACnB,OAAO,GAAE;IAAE,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAAO,GAC3C,OAAO,CAAC,0BAA0B,GAAG,SAAS,CAAC,CAmBjD;AAED,wBAAgB,iCAAiC,CAChD,WAAW,EAAE,MAAM,EACnB,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAO,GACrC,0BAA0B,GAAG,SAAS,CAWxC;AAED,wBAAgB,2BAA2B,CAC1C,WAAW,EAAE,MAAM,GACjB,UAAU,GAAG,SAAS,CAExB"}
+{"version":3,"file":"setup-preferences.d.ts","sourceRoot":"","sources":["../../src/cli/setup-preferences.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE3D,OAAO,EAEN,KAAK,aAAa,EAClB,MAAM,wBAAwB,CAAC;AAEhC,eAAO,MAAM,YAAY,YAAI,MAAM,EAAE,SAAS,CAAU,CAAC;AACzD,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;AAEvD,eAAO,MAAM,mBAAmB,YAAI,QAAQ,EAAE,QAAQ,CAAU,CAAC;AACjE,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,mBAAmB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEpE,eAAO,MAAM,eAAe,YAAI,MAAM,EAAE,QAAQ,CAAU,CAAC;AAC3D,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAE5D,MAAM,WAAW,mBAAmB;IACnC,KAAK,EAAE,UAAU,CAAC;IAClB,WAAW,CAAC,EAAE,gBAAgB,CAAC;IAC/B,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,MAAM,0BAA0B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAMtE,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,UAAU,CAE/D;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,gBAAgB,CAE3E;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,YAAY,CAEnE;AAED,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAEjE;AAED,wBAAgB,gCAAgC,CAC/C,WAAW,EAAE,0BAA0B,GAAG,SAAS,EACnD,KAAK,EAAE,UAAU,GACf,OAAO,GAAG,SAAS,CAIrB;AAED,MAAM,WAAW,0CAA0C;IAC1D,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B,MAAM,CAAC,EAAE,OAAO,MAAM,CAAC;IACvB,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,MAAM,CAAC;CAC9B;AAED,wBAAsB,8BAA8B,CACnD,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,mBAAmB,EAChC,YAAY,GAAE,0CAA+C,GAC3D,OAAO,CAAC,IAAI,CAAC,CAuBf;AAgDD,wBAAsB,6BAA6B,CAClD,WAAW,EAAE,MAAM,EACnB,OAAO,GAAE;IAAE,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAAO,GAC3C,OAAO,CAAC,0BAA0B,GAAG,SAAS,CAAC,CAmBjD;AAED,wBAAgB,iCAAiC,CAChD,WAAW,EAAE,MAAM,EACnB,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAO,GACrC,0BAA0B,GAAG,SAAS,CAWxC;AAED,wBAAgB,2BAA2B,CAC1C,WAAW,EAAE,MAAM,GACjB,UAAU,GAAG,SAAS,CAExB"}

package/dist/cli/setup-preferences.js

@@ -1,5 +1,6 @@
 import { existsSync, readFileSync } from "fs";
 import { readFile } from "fs/promises";
+import { mkdir, rename, rm, writeFile } from "fs/promises";
 import { join } from "path";
 import { isSetupTeamMode, } from "../config/team-mode.js";
 export const SETUP_SCOPES = ["user", "project"];
@@ -20,6 +21,34 @@ export function isSetupMcpMode(value) {
 export function getSetupScopeFilePath(projectRoot) {
     return join(projectRoot, ".omx", "setup-scope.json");
 }
+export function resolvePersistedSetupMergeAgents(preferences, scope) {
+    return preferences?.scope === scope && typeof preferences.mergeAgents === "boolean"
+        ? preferences.mergeAgents
+        : undefined;
+}
+export async function writePersistedSetupPreferences(projectRoot, preferences, dependencies = {}) {
+    const scopePath = getSetupScopeFilePath(projectRoot);
+    const directory = join(projectRoot, ".omx");
+    const tempPath = join(directory, `.setup-scope-${dependencies.createTempName?.() ?? `${process.pid}-${Date.now()}-${Math.random().toString(16).slice(2)}`}.tmp`);
+    const mkdirFn = dependencies.mkdir ?? mkdir;
+    const writeFileFn = dependencies.writeFile ?? writeFile;
+    const renameFn = dependencies.rename ?? rename;
+    const rmFn = dependencies.rm ?? rm;
+    try {
+        await mkdirFn(directory, { recursive: true });
+        await writeFileFn(tempPath, JSON.stringify(preferences, null, 2) + "\n");
+        await renameFn(tempPath, scopePath);
+    }
+    catch (error) {
+        try {
+            await rmFn(tempPath, { force: true });
+        }
+        catch {
+            // Preserve the original persistence error.
+        }
+        throw error;
+    }
+}
 function parsePersistedSetupPreferences(raw, onLegacyScope) {
     const parsed = JSON.parse(raw);
     const persisted = {};
@@ -43,6 +72,9 @@ function parsePersistedSetupPreferences(raw, onLegacyScope) {
     if (typeof parsed.teamMode === "string" && isSetupTeamMode(parsed.teamMode)) {
         persisted.teamMode = parsed.teamMode;
     }
+    if (persisted.scope && typeof parsed.mergeAgents === "boolean") {
+        persisted.mergeAgents = parsed.mergeAgents;
+    }
     return Object.keys(persisted).length > 0 ? persisted : undefined;
 }
 export async function readPersistedSetupPreferences(projectRoot, options = {}) {

package/dist/cli/setup-preferences.js.map

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

package/dist/cli/setup.d.ts

@@ -2,6 +2,7 @@
  * omx setup - Automated installation of oh-my-codex
  * Installs skills, prompts, MCP servers config, and AGENTS.md
  */
+import { type NativeHookClaimJournalDurability } from "./native-hook-claim-journal.js";
 import { type SetupTeamMode } from "../config/team-mode.js";
 import { SETUP_INSTALL_MODES, SETUP_MCP_MODES, SETUP_SCOPES, type PersistedSetupScope, type SetupInstallMode, type SetupMcpMode, type SetupScope } from "./setup-preferences.js";
 interface SetupOptions {
@@ -9,6 +10,12 @@ interface SetupOptions {
     codexVersionProbe?: () => string | null;
     force?: boolean;
     mergeAgents?: boolean;
+    mergeAgentsPolicy?: {
+        kind: "set";
+        value: boolean;
+    } | {
+        kind: "clear";
+    };
     dryRun?: boolean;
     installMode?: SetupInstallMode;
     mcpMode?: SetupMcpMode;
@@ -53,6 +60,57 @@ export interface SkillFrontmatterMetadata {
     description: string;
 }
 type PersistedSetupReviewDecision = "keep" | "review" | "reset";
+type NativeHookTransactionArtifactKind = "shim" | "hooks" | "config" | "metadata";
+type NativeHookTransactionFailureStage = "before_precondition" | "before_backup" | "before_temp_write" | "before_rename" | "after_final_rename_validation" | "after_rename" | "before_remove" | "after_final_remove_validation" | "after_remove" | "before_readback" | "before_rollback" | "before_rollback_rename" | "after_final_restore_validation" | "before_rollback_remove" | "before_staged_cleanup" | "after_staged_cleanup";
+type NativeHookTransactionTopology = {
+    kind: "absent";
+} | {
+    kind: "regular_file";
+    mode: number;
+};
+interface NativeHookTransactionArtifactSnapshot {
+    bytes: Buffer | null;
+    topology: NativeHookTransactionTopology;
+    device?: number;
+    inode?: number;
+    links?: number;
+}
+interface NativeHookTransactionArtifact {
+    kind: NativeHookTransactionArtifactKind;
+    path: string;
+    label: string;
+    before: NativeHookTransactionArtifactSnapshot;
+    after: Buffer | null;
+    afterTopology: NativeHookTransactionTopology;
+    hookPlatform?: NodeJS.Platform;
+}
+interface NativeHookTransactionPrecondition {
+    kind: NativeHookTransactionArtifactKind;
+    path: string;
+    label: string;
+    before: NativeHookTransactionArtifactSnapshot;
+}
+/** @internal Test seam for deterministic atomic-write and rollback coverage. */
+export declare function setNativeHookTransactionFailureInjectorForTest(injector: ((stage: NativeHookTransactionFailureStage, target: NativeHookTransactionArtifact | NativeHookTransactionPrecondition) => void) | undefined): () => void;
+/** @internal Test seam proving native artifacts commit only after later setup phases. */
+export declare function setSetupLatePhaseFailureInjectorForTest(injector: (() => void) | undefined): () => void;
+/** @internal Test seam for deterministic Windows transaction coverage. */
+export declare function setNativeHookTransactionPlatformForTest(platform: NodeJS.Platform | undefined): () => void;
+/** @internal Test seam for deterministic native transaction temporary-path coverage. */
+export declare function setNativeHookTransactionTemporaryPathForTest(resolver: ((path: string, purpose: "write" | "delete") => string) | undefined): () => void;
+/** @internal Test seam for deterministic regular-file fsync coverage. */
+export declare function setNativeHookTransactionRegularFileSyncForTest(sync: ((platform: NodeJS.Platform) => Promise<void>) | undefined): () => void;
+/** @internal Test seam for deterministic claim-journal durability coverage. */
+export declare function setNativeHookClaimJournalDurabilityForTest(durability: NativeHookClaimJournalDurability | undefined): () => void;
+type WindowsNativeHookShimReferenceDecision = "not_referenced" | "referenced" | "ambiguous";
+/**
+ * Decides whether a proof-owned Windows shim must remain after a hooks.json
+ * transition. JSON is strictly validated and decoded before inspection so
+ * escaped paths are handled semantically. Unknown future event members are
+ * scanned only through the established executable group/command shape; prompt
+ * and agent payloads remain inert metadata.
+ */
+export declare function decideWindowsNativeHookShimReference(finalHooksContent: string | null, shimPath: string): WindowsNativeHookShimReferenceDecision;
 export declare function parseSkillFrontmatter(content: string, filePath?: string): SkillFrontmatterMetadata;
 export declare function validateSkillFile(skillMdPath: string): Promise<void>;
 export declare function resolveScopeDirectories(scope: SetupScope, projectRoot: string): ScopeDirectories;

package/dist/cli/setup.d.ts.map

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