* test: codex hooks.state.<key> tables must validate as regular tables (#3285 RED) Drive validateCodexConfigSchema with a fixture containing both [hooks.state] and [[hooks.SessionStart]] entries. Expect the state tables to pass as regular tables. Currently fails — validator over-classifies every hooks.* path as AoT. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(install): treat codex hooks.state as regular table not AoT (#3285) validateCodexConfigSchema was over-classifying every hooks.* section header as an event-handler array-of-tables, rejecting the hooks.state.* namespace that Codex CLI 0.130.0+ uses for per-hook trust persistence. Fix: 1. Section-header check: carve out `hooks.state` and `hooks.state.*` from the AoT-required rule — only paths that are neither of those still require double-bracket form. 2. Parsed-object check: skip the `state` key when iterating Object.entries (parsed.hooks) so the "must be array" guard does not fire for the trust namespace object. All other hooks.<EVENT> validation (SessionStart AoT, handler-field placement) is unchanged. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * changeset: pr=3289 for #3285 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(install): codex hooks.state must be regular-table, reject AoT/scalar (CR finding 1) - migrateCodexHooksMapFormat: exclude hooks.state and hooks.state.* from legacy-map detection so [hooks.state] is never promoted to [[hooks.state]] AoT - validateCodexConfigSchema: reject [[hooks.state]] / [[hooks.state.*]] AoT at section level; reject Array/scalar values at parsed-object level - Accept only plain-object shape for hooks.state and hooks.state.* (Codex CLI 0.130.0+ trust-persistence namespace) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * test: assert codex hooks.state trust entry preserved with original values (CR finding 2) Strengthen post-install preservation assertion to verify the actual trust entry key and its enabled/trusted_hash values survive — not just that hooks.state is an object. Add two validator-reject tests for [[hooks.state]] and [[hooks.state.foo]] AoT forms. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -3336,10 +3336,13 @@ function migrateCodexHooksMapFormat(content) {
|
||||
// Use section.segments (parsed key count) rather than section.path.startsWith() so that
|
||||
// nested handler tables like [hooks.SessionStart.hooks] (3 segments) are not mistakenly
|
||||
// included and re-emitted as an event named "SessionStart.hooks".
|
||||
// Exclude hooks.state and hooks.state.* — these are Codex's persistent hook-trust
|
||||
// namespace (Codex CLI 0.130.0+) and use regular-table shape, never AoT.
|
||||
const legacyMapSections = sections.filter(
|
||||
(section) => !section.array && (
|
||||
section.path === 'hooks' ||
|
||||
(section.path.startsWith('hooks.') && section.segments.length === 2)
|
||||
(section.path.startsWith('hooks.') && section.segments.length === 2 &&
|
||||
section.path !== 'hooks.state' && !section.path.startsWith('hooks.state.'))
|
||||
)
|
||||
);
|
||||
|
||||
@@ -3977,7 +3980,20 @@ function validateCodexConfigSchema(content) {
|
||||
};
|
||||
}
|
||||
|
||||
if (!section.array && section.path.startsWith('hooks.')) {
|
||||
// hooks.state.* is Codex's persistent hook-trust namespace (added in
|
||||
// Codex CLI 0.130.0). It uses regular-table shape, NOT array-of-tables.
|
||||
// [[hooks.state]] or [[hooks.state.<key>]] (AoT) is invalid; reject it.
|
||||
if (section.array && (section.path === 'hooks.state' || section.path.startsWith('hooks.state.'))) {
|
||||
return {
|
||||
ok: false,
|
||||
reason: `[[${section.path}]] is invalid; hooks.state namespace must use regular tables`,
|
||||
};
|
||||
}
|
||||
|
||||
// All other hooks.* paths (event handlers like hooks.SessionStart) require
|
||||
// AoT shape — bare [hooks.<Event>] (single-bracket) is invalid.
|
||||
if (!section.array && section.path.startsWith('hooks.') &&
|
||||
section.path !== 'hooks.state' && !section.path.startsWith('hooks.state.')) {
|
||||
return {
|
||||
ok: false,
|
||||
reason: `bare [${section.path}] table is invalid in current Codex schema (expected [[${section.path}]] array-of-tables)`,
|
||||
@@ -3997,6 +4013,24 @@ function validateCodexConfigSchema(content) {
|
||||
}
|
||||
if (typeof parsed.hooks === 'object' && parsed.hooks !== null) {
|
||||
for (const [event, value] of Object.entries(parsed.hooks)) {
|
||||
// hooks.state is Codex's persistent hook-trust namespace — a regular
|
||||
// object (table), not an array of event-handler tables.
|
||||
// Reject AoT shape (Array) and scalar forms; only plain objects are valid.
|
||||
if (event === 'state') {
|
||||
if (Array.isArray(value)) {
|
||||
return {
|
||||
ok: false,
|
||||
reason: `hooks.state must be a regular table/object, got array-of-tables`,
|
||||
};
|
||||
}
|
||||
if (typeof value !== 'object' || value === null) {
|
||||
return {
|
||||
ok: false,
|
||||
reason: `hooks.state must be a regular table/object, got ${typeof value}`,
|
||||
};
|
||||
}
|
||||
continue;
|
||||
}
|
||||
// Skip the nested .hooks sub-array — it lives under hooks.<Event>[n].hooks
|
||||
// and is validated separately below.
|
||||
if (!Array.isArray(value)) {
|
||||
|
||||
Reference in New Issue
Block a user