oh-my-codex 0.18.2 → 0.18.3

package/dist/config/deep-interview.js

@@ -0,0 +1,151 @@
+import { existsSync, readFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+import { parse as parseToml } from '@iarna/toml';
+import { findGitLayout } from '../utils/git-layout.js';
+const DEFAULT_PROFILE = 'standard';
+const DEFAULT_ENABLE_CHALLENGE_MODES = true;
+const PROFILE_SPECS = {
+    quick: {
+        thresholdKey: 'quickThreshold',
+        maxRoundsKey: 'quickMaxRounds',
+        defaults: { threshold: 0.30, maxRounds: 5 },
+    },
+    standard: {
+        thresholdKey: 'standardThreshold',
+        maxRoundsKey: 'standardMaxRounds',
+        defaults: { threshold: 0.20, maxRounds: 12 },
+    },
+    deep: {
+        thresholdKey: 'deepThreshold',
+        maxRoundsKey: 'deepMaxRounds',
+        defaults: { threshold: 0.15, maxRounds: 20 },
+    },
+};
+const DEEP_INTERVIEW_INVOCATION_PATTERN = /(?:^|\s)(?:\$(?:[A-Za-z0-9_-]+:)?deep-interview|deep[-\s]interview)(?=\s|$)/i;
+const PROFILE_FLAG_TOKEN_PATTERN = /^--(quick|standard|deep)$/i;
+function isRecord(value) {
+    return Boolean(value && typeof value === 'object' && !Array.isArray(value));
+}
+function normalizeProfile(value) {
+    if (typeof value !== 'string')
+        return undefined;
+    const normalized = value.toLowerCase();
+    return normalized === 'quick' || normalized === 'standard' || normalized === 'deep'
+        ? normalized
+        : undefined;
+}
+function normalizeFiniteNumber(value) {
+    return typeof value === 'number' && Number.isFinite(value) ? value : undefined;
+}
+function normalizeThreshold(value) {
+    const normalized = normalizeFiniteNumber(value);
+    return normalized !== undefined && normalized > 0 && normalized <= 1 ? normalized : undefined;
+}
+function normalizeMaxRounds(value) {
+    const normalized = normalizeFiniteNumber(value);
+    return normalized !== undefined && Number.isInteger(normalized) && normalized > 0 ? normalized : undefined;
+}
+function warnMalformedConfig(configPath, error) {
+    const message = error instanceof Error ? error.message : String(error);
+    console.warn(`[omx] warning: ignoring malformed deep-interview config at ${configPath}: ${message}`);
+}
+function extractDeepInterviewTable(parsed) {
+    if (!isRecord(parsed) || !isRecord(parsed.omx) || !isRecord(parsed.omx.deepInterview))
+        return null;
+    return parsed.omx.deepInterview;
+}
+function readDeepInterviewConfigTable(configPath) {
+    if (!existsSync(configPath))
+        return { status: 'missing' };
+    try {
+        const table = extractDeepInterviewTable(parseToml(readFileSync(configPath, 'utf-8')));
+        return table ? { status: 'table', table } : { status: 'no-table' };
+    }
+    catch (error) {
+        warnMalformedConfig(configPath, error);
+        return { status: 'malformed' };
+    }
+}
+function resolveProfile(table, text) {
+    return parseDeepInterviewProfileFromText(text)
+        ?? normalizeProfile(table.defaultProfile)
+        ?? DEFAULT_PROFILE;
+}
+function resolveProfileConfig(table, profile) {
+    const spec = PROFILE_SPECS[profile];
+    return {
+        threshold: normalizeThreshold(table[spec.thresholdKey]) ?? spec.defaults.threshold,
+        maxRounds: normalizeMaxRounds(table[spec.maxRoundsKey]) ?? spec.defaults.maxRounds,
+    };
+}
+function resolveEnableChallengeModes(table) {
+    return typeof table.enableChallengeModes === 'boolean'
+        ? table.enableChallengeModes
+        : DEFAULT_ENABLE_CHALLENGE_MODES;
+}
+function buildRuntimeConfig(candidate, table, options) {
+    const profile = resolveProfile(table, options.text);
+    return {
+        profile,
+        ...resolveProfileConfig(table, profile),
+        enableChallengeModes: resolveEnableChallengeModes(table),
+        sourcePath: candidate.path,
+    };
+}
+export function parseDeepInterviewProfileFromText(text) {
+    const input = text ?? '';
+    const invocationMatch = DEEP_INTERVIEW_INVOCATION_PATTERN.exec(input);
+    if (!invocationMatch)
+        return undefined;
+    const afterInvocation = input.slice((invocationMatch.index ?? 0) + invocationMatch[0].length).trimStart();
+    for (const token of afterInvocation.split(/\s+/)) {
+        if (!token)
+            continue;
+        if (!token.startsWith('--'))
+            return undefined;
+        const profile = normalizeProfile(PROFILE_FLAG_TOKEN_PATTERN.exec(token)?.[1]);
+        if (profile)
+            return profile;
+    }
+    return undefined;
+}
+export function getDeepInterviewConfigCandidatePaths(options) {
+    const home = options.homeDir || homedir();
+    const projectRoot = findGitLayout(options.cwd)?.worktreeRoot ?? options.cwd;
+    return [
+        { path: join(projectRoot, '.omx', 'config.toml'), precedence: 'project-omx' },
+        { path: join(projectRoot, 'omx.toml'), precedence: 'project-root' },
+        { path: join(home, '.omx', 'config.toml'), precedence: 'user' },
+    ];
+}
+export function resolveDeepInterviewRuntimeConfig(options) {
+    for (const candidate of getDeepInterviewConfigCandidatePaths(options)) {
+        const result = readDeepInterviewConfigTable(candidate.path);
+        if (result.status === 'malformed' || result.status === 'no-table')
+            return null;
+        if (result.status === 'table')
+            return buildRuntimeConfig(candidate, result.table, options);
+    }
+    return null;
+}
+export function buildDeepInterviewConfigStateFields(config) {
+    if (!config)
+        return {};
+    const deepInterviewConfig = {
+        profile: config.profile,
+        threshold: config.threshold,
+        maxRounds: config.maxRounds,
+        enableChallengeModes: config.enableChallengeModes,
+        sourcePath: config.sourcePath,
+    };
+    return {
+        deep_interview_config: deepInterviewConfig,
+        profile: deepInterviewConfig.profile,
+        threshold: deepInterviewConfig.threshold,
+        max_rounds: deepInterviewConfig.maxRounds,
+        enable_challenge_modes: deepInterviewConfig.enableChallengeModes,
+        config_source: deepInterviewConfig.sourcePath,
+    };
+}
+//# sourceMappingURL=deep-interview.js.map

package/dist/config/deep-interview.js.map

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

package/dist/config/generator.d.ts

@@ -11,7 +11,7 @@
  */
 import type { UnifiedMcpRegistryServer } from "./mcp-registry.js";
 import { type CodexHookFeatureFlag } from "./codex-feature-flags.js";
-import { type ManagedCodexHookOptions } from "./codex-hooks.js";
+import { type ManagedCodexHookTrustState, type ManagedCodexHookOptions } from "./codex-hooks.js";
 import type { HudPreset } from "../hud/types.js";
 interface MergeOptions {
     includeTui?: boolean;
@@ -71,7 +71,10 @@ export declare function stripOmxTopLevelKeys(config: string): string;
  * ignoring Codex's NUX counters or other ephemeral runtime-only writes.
  */
 export declare function syncProjectScopeTrustStateFromRuntime(projectConfig: string, runtimeConfig: string, projectHooksPath: string): string;
-export declare function stripManagedCodexHookTrustState(config: string): string;
+type ManagedCodexHookTrustStateMap = Record<string, ManagedCodexHookTrustState>;
+export declare function stripManagedCodexHookTrustState(config: string, options?: {
+    managedTrustState?: ManagedCodexHookTrustStateMap;
+}): string;
 export declare function upsertManagedCodexHookTrustState(config: string, pkgRoot: string, codexHooksFile: string | undefined, options?: ManagedCodexHookOptions): string;
 export declare function upsertPluginModeRuntimeFeatureFlags(config: string, codexHookFeatureFlag?: CodexHookFeatureFlag, options?: {
     pluginScopedHooks?: boolean;

package/dist/config/generator.d.ts.map

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

package/dist/config/generator.js

@@ -17,7 +17,7 @@ import { AGENT_DEFINITIONS } from "../agents/definitions.js";
 import { DEFAULT_FRONTIER_MODEL } from "./models.js";
 import { DEFAULT_CODEX_HOOK_FEATURE_FLAG, CODEX_HOOK_FEATURE_FLAGS, CODEX_PLUGIN_SCOPED_HOOKS_FEATURE_FLAG, formatCodexHookFeatureFlagLine, normalizeCodexHookFeatureFlag, } from "./codex-feature-flags.js";
 import { OMX_FIRST_PARTY_MCP_SERVER_NAMES, getOmxFirstPartySetupMcpServers, } from "./omx-first-party-mcp.js";
-import { buildManagedCodexHookTrustToml, escapeTomlBasicString, } from "./codex-hooks.js";
+import { buildManagedCodexHookTrustState, escapeTomlBasicString, } from "./codex-hooks.js";
 function escapeTomlString(value) {
     return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
 }
@@ -677,59 +677,126 @@ export function syncProjectScopeTrustStateFromRuntime(projectConfig, runtimeConf
         return block;
     return `${stripped}\n\n${block}`;
 }
-export function stripManagedCodexHookTrustState(config) {
+function decodeTomlBasicString(raw) {
+    try {
+        const parsed = TOML.parse(`value = "${raw}"`);
+        return typeof parsed.value === "string" ? parsed.value : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function parseHooksStateHeader(line) {
+    const match = line.match(/^\s*\[hooks\.state\."((?:\\.|[^"\\])*)"\]\s*(#.*)?$/);
+    if (!match)
+        return undefined;
+    const key = decodeTomlBasicString(match[1] ?? "");
+    if (key === undefined)
+        return undefined;
+    return { key, hasInlineComment: match[2] !== undefined };
+}
+function isTomlTableHeader(line) {
+    return /^\s*\[\[?[^\]]+\]?\]\s*(?:#.*)?$/.test(line);
+}
+function isExactlyManagedHookTrustBody(bodyLines, expectedHash) {
+    const nonBlank = bodyLines.filter((line) => line.trim().length > 0);
+    if (nonBlank.length !== 1)
+        return false;
+    const expected = expectedHash.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    return new RegExp(`^\\s*trusted_hash\\s*=\\s*"${expected}"\\s*$`).test(nonBlank[0] ?? "");
+}
+function stripProofManagedCodexHookTrustStateTables(config, managedTrustState) {
+    if (Object.keys(managedTrustState).length === 0) {
+        return { config, preservedConflictKeys: new Set() };
+    }
     const lines = config.split(/\r?\n/);
     const kept = [];
+    const preservedConflictKeys = new Set();
     for (let i = 0; i < lines.length;) {
-        const trimmed = lines[i].trim();
-        if (trimmed !== OMX_HOOK_TRUST_START_MARKER) {
+        const header = parseHooksStateHeader(lines[i] ?? "");
+        if (!header) {
             kept.push(lines[i]);
             i += 1;
             continue;
         }
-        const nextEndIdx = lines.findIndex((line, index) => index > i && line.trim() === OMX_HOOK_TRUST_END_MARKER);
-        const nextStartIdx = lines.findIndex((line, index) => index > i && line.trim() === OMX_HOOK_TRUST_START_MARKER);
-        if (nextEndIdx === -1 || (nextStartIdx !== -1 && nextStartIdx < nextEndIdx)) {
-            kept.push(lines[i]);
-            i += 1;
+        let tableEnd = lines.length;
+        for (let next = i + 1; next < lines.length; next += 1) {
+            if (isTomlTableHeader(lines[next] ?? "")) {
+                tableEnd = next;
+                break;
+            }
+        }
+        const expectedState = managedTrustState[header.key];
+        const removable = expectedState !== undefined &&
+            !header.hasInlineComment &&
+            isExactlyManagedHookTrustBody(lines.slice(i + 1, tableEnd), expectedState.trusted_hash);
+        if (removable) {
+            i = tableEnd;
             continue;
         }
-        i = nextEndIdx + 1;
-    }
-    return kept.join("\n").replace(/\n{3,}/g, "\n\n").trimEnd();
-}
-function managedCodexHookTrustStateHeaders(hookTrustToml) {
-    const headers = new Set();
-    for (const line of hookTrustToml.split(/\r?\n/)) {
-        const trimmed = line.trim();
-        if (/^\[hooks\.state\./.test(trimmed)) {
-            headers.add(trimmed);
+        if (expectedState !== undefined) {
+            preservedConflictKeys.add(header.key);
         }
+        kept.push(...lines.slice(i, tableEnd));
+        i = tableEnd;
     }
-    return headers;
+    return { config: kept.join("\n"), preservedConflictKeys };
 }
-function stripUnfencedManagedCodexHookTrustState(config, hookTrustToml) {
-    const managedHeaders = managedCodexHookTrustStateHeaders(hookTrustToml);
-    if (managedHeaders.size === 0)
-        return config;
+function stripManagedCodexHookTrustStateWithResult(config, options = {}) {
     const lines = config.split(/\r?\n/);
     const kept = [];
     for (let i = 0; i < lines.length;) {
-        if (!managedHeaders.has(lines[i].trim())) {
+        const trimmed = lines[i].trim();
+        if (trimmed !== OMX_HOOK_TRUST_START_MARKER) {
             kept.push(lines[i]);
             i += 1;
             continue;
         }
-        i += 1;
-        while (i < lines.length && !TOML_TABLE_HEADER_PATTERN.test(lines[i])) {
+        const nextEndIdx = lines.findIndex((line, index) => index > i && line.trim() === OMX_HOOK_TRUST_END_MARKER);
+        const nextStartIdx = lines.findIndex((line, index) => index > i && line.trim() === OMX_HOOK_TRUST_START_MARKER);
+        if (nextEndIdx === -1 || (nextStartIdx !== -1 && nextStartIdx < nextEndIdx)) {
+            kept.push(lines[i]);
             i += 1;
+            continue;
         }
+        i = nextEndIdx + 1;
     }
-    return kept.join("\n").replace(/\n{3,}/g, "\n\n").trimEnd();
+    const withoutFenced = kept.join("\n");
+    const proofStripped = options.managedTrustState
+        ? stripProofManagedCodexHookTrustStateTables(withoutFenced, options.managedTrustState)
+        : { config: withoutFenced, preservedConflictKeys: new Set() };
+    return {
+        config: proofStripped.config.replace(/\n{3,}/g, "\n\n").trimEnd(),
+        preservedConflictKeys: proofStripped.preservedConflictKeys,
+    };
+}
+export function stripManagedCodexHookTrustState(config, options = {}) {
+    return stripManagedCodexHookTrustStateWithResult(config, options).config;
+}
+function renderManagedCodexHookTrustToml(managedTrustState, excludedKeys = new Set()) {
+    return Object.entries(managedTrustState)
+        .filter(([key]) => !excludedKeys.has(key))
+        .sort(([left], [right]) => left.localeCompare(right))
+        .flatMap(([key, hookState]) => [
+        `[hooks.state."${escapeTomlBasicString(key)}"]`,
+        `trusted_hash = "${escapeTomlBasicString(hookState.trusted_hash)}"`,
+        "",
+    ])
+        .join("\n")
+        .trimEnd();
+}
+function buildManagedCodexHookTrustStateForConfig(codexHooksFile, pkgRoot, options = {}) {
+    if (!codexHooksFile)
+        return {};
+    return buildManagedCodexHookTrustState(codexHooksFile, pkgRoot, options);
 }
 export function upsertManagedCodexHookTrustState(config, pkgRoot, codexHooksFile, options = {}) {
-    const hookTrustToml = buildManagedCodexHookTrustToml(codexHooksFile, pkgRoot, options);
-    const stripped = stripUnfencedManagedCodexHookTrustState(stripManagedCodexHookTrustState(config), hookTrustToml);
+    const managedTrustState = buildManagedCodexHookTrustStateForConfig(codexHooksFile, pkgRoot, options);
+    const strippedResult = stripManagedCodexHookTrustStateWithResult(config, {
+        managedTrustState,
+    });
+    const stripped = strippedResult.config;
+    const hookTrustToml = renderManagedCodexHookTrustToml(managedTrustState, strippedResult.preservedConflictKeys);
     if (!hookTrustToml)
         return `${stripped}\n`;
     return [
@@ -1560,7 +1627,7 @@ export function mergeSharedMcpRegistryBlock(config, servers, sourcePath) {
  * OMX table-section block (MCP servers, TUI).
  * Contains ONLY [table] sections — no bare keys.
  */
-function getOmxTablesBlock(pkgRoot, includeTui = true, statusLinePreset = DEFAULT_STATUS_LINE_PRESET, codexHooksFile, hookOptions = {}, includeFirstPartyMcp = false) {
+function getOmxTablesBlock(pkgRoot, includeTui = true, statusLinePreset = DEFAULT_STATUS_LINE_PRESET, codexHooksFile, hookOptions = {}, includeFirstPartyMcp = false, excludedHookTrustStateKeys = new Set()) {
     const lines = [
         "",
         "# ============================================================",
@@ -1583,7 +1650,7 @@ function getOmxTablesBlock(pkgRoot, includeTui = true, statusLinePreset = DEFAUL
             }
         }
     }
-    const hookTrustToml = buildManagedCodexHookTrustToml(codexHooksFile, pkgRoot, hookOptions);
+    const hookTrustToml = renderManagedCodexHookTrustToml(buildManagedCodexHookTrustStateForConfig(codexHooksFile, pkgRoot, hookOptions), excludedHookTrustStateKeys);
     if (hookTrustToml) {
         lines.push("");
         lines.push("# OMX-owned Codex hook trust state");
@@ -1649,11 +1716,14 @@ export function buildMergedConfig(existingConfig, pkgRoot, options = {}) {
         existing = `${`notify = ${formatTomlStringArray(userNotifyToPreserve)}`}\n${existing.trimStart()}`;
     }
     existing = stripOrphanedManagedNotify(existing, pkgRoot);
-    existing = stripManagedCodexHookTrustState(existing);
-    existing = stripUnfencedManagedCodexHookTrustState(existing, buildManagedCodexHookTrustToml(options.codexHooksFile, pkgRoot, {
+    const managedTrustState = buildManagedCodexHookTrustStateForConfig(options.codexHooksFile, pkgRoot, {
         codexHomeDir: options.codexHomeDir,
         platform: options.hookCommandPlatform,
-    }));
+    });
+    const hookTrustStrip = stripManagedCodexHookTrustStateWithResult(existing, {
+        managedTrustState,
+    });
+    existing = hookTrustStrip.config;
     if (options.modelOverride) {
         existing = stripRootLevelKeys(existing, ["model"]);
     }
@@ -1676,7 +1746,7 @@ export function buildMergedConfig(existingConfig, pkgRoot, options = {}) {
     const tablesBlock = getOmxTablesBlock(pkgRoot, includeTui && !tuiUpsert.hadExistingTui, statusLinePreset, options.codexHooksFile, {
         codexHomeDir: options.codexHomeDir,
         platform: options.hookCommandPlatform,
-    }, options.includeFirstPartyMcp === true);
+    }, options.includeFirstPartyMcp === true, hookTrustStrip.preservedConflictKeys);
     const sharedRegistryBlock = getSharedMcpRegistryBlock(options.sharedMcpServers ?? [], options.sharedMcpRegistrySource, existing);
     let body = existing.trimEnd();
     if (sharedRegistryBlock) {