Skip to content

Commit 78b6865

Browse files
codex: fix CI failure on PR #15211
1 parent bf1c38a commit 78b6865

File tree

2 files changed

+14
-38
lines changed

2 files changed

+14
-38
lines changed

codex-rs/hooks/src/events/pre_tool_use.rs

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,20 @@ pub(crate) async fn run(
7474
};
7575
}
7676

77-
let input_json = match serde_json::to_string(&PreToolUseCommandInput::new(
78-
request.session_id.to_string(),
79-
request.turn_id.clone(),
80-
request.transcript_path.clone(),
81-
request.cwd.display().to_string(),
82-
request.model.clone(),
83-
request.permission_mode.clone(),
84-
request.tool_use_id.clone(),
85-
request.command.clone(),
86-
)) {
77+
let input_json = match serde_json::to_string(&PreToolUseCommandInput {
78+
session_id: request.session_id.to_string(),
79+
turn_id: request.turn_id.clone(),
80+
transcript_path: crate::schema::NullableString::from_path(request.transcript_path.clone()),
81+
cwd: request.cwd.display().to_string(),
82+
hook_event_name: "PreToolUse".to_string(),
83+
model: request.model.clone(),
84+
permission_mode: request.permission_mode.clone(),
85+
tool_name: "Bash".to_string(),
86+
tool_input: crate::schema::PreToolUseToolInput {
87+
command: request.command.clone(),
88+
},
89+
tool_use_id: request.tool_use_id.clone(),
90+
}) {
8791
Ok(input_json) => input_json,
8892
Err(error) => {
8993
return serialization_failure_outcome(common::serialization_failure_hook_events(

codex-rs/hooks/src/schema.rs

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -138,34 +138,6 @@ pub(crate) struct PreToolUseCommandInput {
138138
pub tool_use_id: String,
139139
}
140140

141-
impl PreToolUseCommandInput {
142-
pub(crate) fn new(
143-
session_id: impl Into<String>,
144-
turn_id: impl Into<String>,
145-
transcript_path: Option<PathBuf>,
146-
cwd: impl Into<String>,
147-
model: impl Into<String>,
148-
permission_mode: impl Into<String>,
149-
tool_use_id: impl Into<String>,
150-
command: impl Into<String>,
151-
) -> Self {
152-
Self {
153-
session_id: session_id.into(),
154-
turn_id: turn_id.into(),
155-
transcript_path: NullableString::from_path(transcript_path),
156-
cwd: cwd.into(),
157-
hook_event_name: "PreToolUse".to_string(),
158-
model: model.into(),
159-
permission_mode: permission_mode.into(),
160-
tool_name: "Bash".to_string(),
161-
tool_input: PreToolUseToolInput {
162-
command: command.into(),
163-
},
164-
tool_use_id: tool_use_id.into(),
165-
}
166-
}
167-
}
168-
169141
#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
170142
#[serde(rename_all = "camelCase")]
171143
#[serde(deny_unknown_fields)]

0 commit comments

Comments
 (0)