mirror of
https://github.com/openai/codex.git
synced 2026-11-21 22:50:37 +00:00
Let required hooks block continuation on failure (#62831)
## Why A required hook check can fail to run or return a usable result. Continuing after that failure can let an action proceed without a completed check. ## What changed Add per-handler `onFailure` for command and MCP tool hooks. The default `continue` preserves existing behavior. On supported synchronous hooks, `block` applies the event's blocking behavior and reports the reason while preserving failure diagnostics. For example, a failed `PreToolUse` check prevents the tool from running, while a failed `PostToolUse` check withholds the result of a tool that already ran. Expose the policy in the app-server's `configRequirements/read` response. ## Testing Add tests for command and MCP failures under both policies, and scenario coverage for blocked tool execution, withheld results, and completion after a `Stop` hook recovers. GitOrigin-RevId: 20d6ebda0094382fe052bbf34338edb994cc7bd3
This commit is contained in:
@@ -738,6 +738,14 @@ pub struct ConfiguredHookMatcherGroup {
|
||||
pub hooks: Vec<ConfiguredHookHandler>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, JsonSchema, TS)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
#[ts(rename_all = "camelCase", export_to = "v2/")]
|
||||
pub enum ConfiguredHookFailurePolicy {
|
||||
Continue,
|
||||
Block,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
|
||||
#[serde(tag = "type")]
|
||||
#[ts(tag = "type", export_to = "v2/")]
|
||||
@@ -756,6 +764,9 @@ pub enum ConfiguredHookHandler {
|
||||
#[serde(rename = "statusMessage")]
|
||||
#[ts(rename = "statusMessage")]
|
||||
status_message: Option<String>,
|
||||
#[serde(rename = "onFailure")]
|
||||
#[ts(rename = "onFailure")]
|
||||
on_failure: Option<ConfiguredHookFailurePolicy>,
|
||||
/// Approximate token threshold for spilling this hook's `additionalContext` to disk.
|
||||
/// `null` uses 2,500 tokens; `0` disables spilling for this hook. The threshold is
|
||||
/// evaluated against the original context; a spilled preview also includes recovery
|
||||
@@ -776,6 +787,9 @@ pub enum ConfiguredHookHandler {
|
||||
#[serde(rename = "statusMessage")]
|
||||
#[ts(rename = "statusMessage")]
|
||||
status_message: Option<String>,
|
||||
#[serde(rename = "onFailure")]
|
||||
#[ts(rename = "onFailure")]
|
||||
on_failure: Option<ConfiguredHookFailurePolicy>,
|
||||
},
|
||||
#[serde(rename = "prompt")]
|
||||
#[ts(rename = "prompt")]
|
||||
|
||||
Reference in New Issue
Block a user