|
|
@@ -5,7 +5,11 @@
|
|
|
* @module @deepseek-ai/dsh-hooks-codex/config
|
|
|
*/
|
|
|
|
|
|
-import { matcherDiagnostic, type MatcherGroup } from '@deepseek-ai/dsh-hook-protocol'
|
|
|
+import {
|
|
|
+ compileMatchers,
|
|
|
+ type CompiledMatchers,
|
|
|
+ type MatcherGroup,
|
|
|
+} from '@deepseek-ai/dsh-hook-protocol'
|
|
|
|
|
|
/** The five Codex hook points this bridge supports. */
|
|
|
export const CODEX_EVENTS = ['PreToolUse', 'PostToolUse', 'SessionStart', 'UserPromptSubmit', 'Stop'] as const
|
|
|
@@ -23,6 +27,8 @@ export interface SkippedHook {
|
|
|
export interface ParsedCodexConfig {
|
|
|
config: CodexHookConfig
|
|
|
skipped: SkippedHook[]
|
|
|
+ /** Config-scoped matcher registry; the caller owns and must dispose it. */
|
|
|
+ matchers: CompiledMatchers
|
|
|
}
|
|
|
|
|
|
function asObject(value: unknown): Record<string, unknown> | undefined {
|
|
|
@@ -36,7 +42,8 @@ function asObject(value: unknown): Record<string, unknown> | undefined {
|
|
|
* than failing boot; unsupported or asynchronous hooks are returned in `skipped`. Matcher fields on
|
|
|
* UserPromptSubmit and Stop are discarded because those events have no matcher subject. A
|
|
|
* matcher-bearing runnable group with an invalid regex throws a `SyntaxError`, allowing the bridge
|
|
|
- * to reject the complete config before listener registration.
|
|
|
+ * to reject the complete config before listener registration. Validation and runtime matching
|
|
|
+ * share the returned compiled registry; its caller must dispose it.
|
|
|
* @param raw - the parsed JSON config: a `{ hooks: … }` wrapper or the bare event map.
|
|
|
* @returns the runnable per-event groups plus the skipped hooks with their reasons.
|
|
|
*/
|
|
|
@@ -45,42 +52,51 @@ export function parseCodexConfig(raw: unknown): ParsedCodexConfig {
|
|
|
const skipped: SkippedHook[] = []
|
|
|
const root = asObject(raw)
|
|
|
const hooksMap = root ? asObject(root.hooks) ?? root : undefined
|
|
|
- if (!hooksMap) return { config, skipped }
|
|
|
-
|
|
|
- for (const event of CODEX_EVENTS) {
|
|
|
- const rawGroups = hooksMap[event]
|
|
|
- // Matcher-group parsing remains dialect-local because the supported hook
|
|
|
- // shapes and skip reasons differ from Claude Code's.
|
|
|
- /* jscpd:ignore-start */
|
|
|
- if (!Array.isArray(rawGroups)) continue
|
|
|
- const groups: MatcherGroup[] = []
|
|
|
- for (const rawGroup of rawGroups) {
|
|
|
- const group = asObject(rawGroup)
|
|
|
- if (!group || !Array.isArray(group.hooks)) continue
|
|
|
- const commands: MatcherGroup['hooks'] = []
|
|
|
- for (const rawHook of group.hooks) {
|
|
|
- const hook = asObject(rawHook)
|
|
|
- if (!hook) continue
|
|
|
- const type = typeof hook.type === 'string' ? hook.type : 'command'
|
|
|
- if (type !== 'command') { skipped.push({ event, reason: `unsupported "${type}" hook` }); continue }
|
|
|
- /* jscpd:ignore-end */
|
|
|
- if (hook.async === true) { skipped.push({ event, reason: 'async hook' }); continue }
|
|
|
- if (typeof hook.command !== 'string') continue
|
|
|
- // Codex accepts `timeout` or the `timeoutSec` alias.
|
|
|
- const timeout = typeof hook.timeout === 'number' ? hook.timeout
|
|
|
- : typeof hook.timeoutSec === 'number' ? hook.timeoutSec : undefined
|
|
|
- commands.push({ command: hook.command, ...timeout !== undefined ? { timeoutSec: timeout } : {} })
|
|
|
+ if (hooksMap) {
|
|
|
+ for (const event of CODEX_EVENTS) {
|
|
|
+ const rawGroups = hooksMap[event]
|
|
|
+ // Matcher-group parsing remains dialect-local because the supported hook
|
|
|
+ // shapes and skip reasons differ from Claude Code's.
|
|
|
+ /* jscpd:ignore-start */
|
|
|
+ if (!Array.isArray(rawGroups)) continue
|
|
|
+ const groups: MatcherGroup[] = []
|
|
|
+ for (const rawGroup of rawGroups) {
|
|
|
+ const group = asObject(rawGroup)
|
|
|
+ if (!group || !Array.isArray(group.hooks)) continue
|
|
|
+ const commands: MatcherGroup['hooks'] = []
|
|
|
+ for (const rawHook of group.hooks) {
|
|
|
+ const hook = asObject(rawHook)
|
|
|
+ if (!hook) continue
|
|
|
+ const type = typeof hook.type === 'string' ? hook.type : 'command'
|
|
|
+ if (type !== 'command') { skipped.push({ event, reason: `unsupported "${type}" hook` }); continue }
|
|
|
+ /* jscpd:ignore-end */
|
|
|
+ if (hook.async === true) { skipped.push({ event, reason: 'async hook' }); continue }
|
|
|
+ if (typeof hook.command !== 'string') continue
|
|
|
+ // Codex accepts `timeout` or the `timeoutSec` alias.
|
|
|
+ const timeout = typeof hook.timeout === 'number' ? hook.timeout
|
|
|
+ : typeof hook.timeoutSec === 'number' ? hook.timeoutSec : undefined
|
|
|
+ commands.push({ command: hook.command, ...timeout !== undefined ? { timeoutSec: timeout } : {} })
|
|
|
+ }
|
|
|
+ if (commands.length === 0) continue
|
|
|
+ const matcher = event === 'UserPromptSubmit' || event === 'Stop'
|
|
|
+ ? undefined
|
|
|
+ : typeof group.matcher === 'string' ? group.matcher : undefined
|
|
|
+ groups.push({ ...matcher !== undefined ? { matcher } : {}, hooks: commands })
|
|
|
}
|
|
|
- if (commands.length === 0) continue
|
|
|
- const matcher = event === 'UserPromptSubmit' || event === 'Stop'
|
|
|
- ? undefined
|
|
|
- : typeof group.matcher === 'string' ? group.matcher : undefined
|
|
|
- const diagnostic = matcherDiagnostic(matcher, 'codex')
|
|
|
- if (diagnostic !== undefined) throw new SyntaxError(`${diagnostic} on event ${JSON.stringify(event)}`)
|
|
|
- groups.push({ ...matcher !== undefined ? { matcher } : {}, hooks: commands })
|
|
|
+ if (groups.length > 0) config[event] = groups
|
|
|
}
|
|
|
- if (groups.length > 0) config[event] = groups
|
|
|
}
|
|
|
|
|
|
- return { config, skipped }
|
|
|
+ const entries = Object.entries(config).flatMap(([event, groups]) => (
|
|
|
+ groups.map(group => ({ event, matcher: group.matcher }))
|
|
|
+ ))
|
|
|
+ const matchers = compileMatchers(new Set(entries.map(entry => entry.matcher)), 'codex')
|
|
|
+ for (const { event, matcher } of entries) {
|
|
|
+ const diagnostic = matchers.diagnostic(matcher)
|
|
|
+ if (diagnostic === undefined) continue
|
|
|
+ matchers.dispose()
|
|
|
+ throw new SyntaxError(`${diagnostic} on event ${JSON.stringify(event)}`)
|
|
|
+ }
|
|
|
+
|
|
|
+ return { config, skipped, matchers }
|
|
|
}
|