mirror of
https://github.com/openai/codex.git
synced 2026-11-15 21:50:46 +00:00
## Why Listing hooks by working directory alone omits hooks supplied by a thread's selected execution environments, including hooks that can block a turn. ## What changed - Add `threadId` to `hooks/list` to return a loaded thread's current hook inventory, including selected, ready environments. Reject requests that also specify `cwds`. - Expose `environmentId` in hook metadata and have the TUI hooks browser query the current thread and label environment-owned hooks. Keep working-directory lookup for startup review. - Represent environment hook source paths with `PathUri` and use `LegacyAppPathString` in hook run summaries to preserve native path conventions. ## Testing Add coverage for listing a blocking environment hook and removing it after environment failure, delivering prompt input and reporting exit status in PowerShell and Bash, and running `PreToolUse` hooks only on the command's owning executor. Extend remote network tests to verify that environment hooks use the command's network policy while retaining their filesystem access. GitOrigin-RevId: 97229e22793df51f4bd502c1f9e19f0c52fb2305
45 lines
1.3 KiB
Rust
45 lines
1.3 KiB
Rust
use super::ChatWidget;
|
|
use crate::app_event::AppEvent;
|
|
use crate::bottom_pane::HooksBrowserView;
|
|
use crate::hooks_rpc::HooksListTarget;
|
|
use codex_app_server_protocol::HooksListEntry;
|
|
|
|
impl ChatWidget {
|
|
pub(crate) fn add_hooks_output(&mut self) {
|
|
self.app_event_tx.send(AppEvent::FetchHooksList {
|
|
target: self.hooks_list_target(),
|
|
});
|
|
}
|
|
|
|
pub(crate) fn on_hooks_loaded(
|
|
&mut self,
|
|
target: HooksListTarget,
|
|
result: Result<HooksListEntry, String>,
|
|
) {
|
|
if self.hooks_list_target() != target {
|
|
return;
|
|
}
|
|
|
|
match result {
|
|
Ok(entry) => self.open_hooks_browser(entry),
|
|
Err(err) => self.add_error_message(format!("Failed to load hooks: {err}")),
|
|
}
|
|
}
|
|
|
|
fn hooks_list_target(&self) -> HooksListTarget {
|
|
self.thread_id()
|
|
.map(HooksListTarget::Thread)
|
|
.unwrap_or_else(|| HooksListTarget::Cwd(self.config.cwd.to_path_buf()))
|
|
}
|
|
|
|
pub(crate) fn open_hooks_browser(&mut self, entry: HooksListEntry) {
|
|
self.bottom_pane
|
|
.show_view(Box::new(HooksBrowserView::from_entry(
|
|
entry,
|
|
self.app_event_tx.clone(),
|
|
self.bottom_pane.list_keymap(),
|
|
)));
|
|
self.request_redraw();
|
|
}
|
|
}
|