mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
## Why The app-server watcher relocation leaves the generic filesystem watcher as the last watcher-specific implementation still living inside `codex-core`. Moving that code to a small crate keeps `codex-core` focused on thread execution and lets app-server depend on the watcher without reaching back into core for filesystem watching primitives. This PR is stacked on #21287. ## What changed - Added a new `codex-file-watcher` crate containing the existing watcher implementation and its unit tests. - Updated app-server `fs_watch`, `skills_watcher`, and listener state to import watcher types from `codex-file-watcher`. - Removed the `file_watcher` module and `notify` dependency from `codex-core`. - Updated Cargo workspace metadata and `Cargo.lock` for the new internal crate. ## Validation - `cargo check -p codex-file-watcher -p codex-core -p codex-app-server` - `cargo test -p codex-file-watcher` - `cargo test -p codex-app-server skills_changed_notification_is_emitted_after_skill_change` - `just bazel-lock-update` - `just bazel-lock-check` - `just fix -p codex-file-watcher` - `just fix -p codex-core` - `just fix -p codex-app-server`
113 lines
3.9 KiB
Rust
113 lines
3.9 KiB
Rust
use std::sync::Arc;
|
|
use std::time::Duration;
|
|
|
|
use crate::outgoing_message::OutgoingMessageSender;
|
|
use codex_app_server_protocol::ServerNotification;
|
|
use codex_app_server_protocol::SkillsChangedNotification;
|
|
use codex_core::ThreadManager;
|
|
use codex_core::config::Config;
|
|
use codex_core::skills::SkillsLoadInput;
|
|
use codex_core::skills::SkillsManager;
|
|
use codex_file_watcher::FileWatcher;
|
|
use codex_file_watcher::FileWatcherSubscriber;
|
|
use codex_file_watcher::Receiver;
|
|
use codex_file_watcher::ThrottledWatchReceiver;
|
|
use codex_file_watcher::WatchPath;
|
|
use codex_file_watcher::WatchRegistration;
|
|
use codex_protocol::protocol::TurnEnvironmentSelection;
|
|
use tracing::warn;
|
|
|
|
#[cfg(not(test))]
|
|
const WATCHER_THROTTLE_INTERVAL: Duration = Duration::from_secs(10);
|
|
#[cfg(test)]
|
|
const WATCHER_THROTTLE_INTERVAL: Duration = Duration::from_millis(50);
|
|
|
|
pub(crate) struct SkillsWatcher {
|
|
subscriber: FileWatcherSubscriber,
|
|
}
|
|
|
|
impl SkillsWatcher {
|
|
pub(crate) fn new(
|
|
skills_manager: Arc<SkillsManager>,
|
|
outgoing: Arc<OutgoingMessageSender>,
|
|
) -> Arc<Self> {
|
|
let file_watcher = match FileWatcher::new() {
|
|
Ok(file_watcher) => Arc::new(file_watcher),
|
|
Err(err) => {
|
|
warn!("failed to initialize skills file watcher: {err}");
|
|
Arc::new(FileWatcher::noop())
|
|
}
|
|
};
|
|
let (subscriber, rx) = file_watcher.add_subscriber();
|
|
Self::spawn_event_loop(rx, skills_manager, outgoing);
|
|
Arc::new(Self { subscriber })
|
|
}
|
|
|
|
pub(crate) async fn register_thread_config(
|
|
&self,
|
|
config: &Config,
|
|
thread_manager: &ThreadManager,
|
|
environments: &[TurnEnvironmentSelection],
|
|
) -> WatchRegistration {
|
|
let Some(environment_selection) = environments.first() else {
|
|
return WatchRegistration::default();
|
|
};
|
|
let Some(environment) = thread_manager
|
|
.environment_manager()
|
|
.get_environment(&environment_selection.environment_id)
|
|
else {
|
|
warn!(
|
|
"failed to register skills watcher for unknown environment `{}`",
|
|
environment_selection.environment_id
|
|
);
|
|
return WatchRegistration::default();
|
|
};
|
|
if environment.is_remote() {
|
|
return WatchRegistration::default();
|
|
}
|
|
|
|
let plugins_input = config.plugins_config_input();
|
|
let plugins_manager = thread_manager.plugins_manager();
|
|
let plugin_outcome = plugins_manager.plugins_for_config(&plugins_input).await;
|
|
let skills_input = SkillsLoadInput::new(
|
|
config.cwd.clone(),
|
|
plugin_outcome.effective_plugin_skill_roots(),
|
|
config.config_layer_stack.clone(),
|
|
config.bundled_skills_enabled(),
|
|
);
|
|
let roots = thread_manager
|
|
.skills_manager()
|
|
.skill_roots_for_config(&skills_input, Some(environment.get_filesystem()))
|
|
.await
|
|
.into_iter()
|
|
.map(|root| WatchPath {
|
|
path: root.path.into_path_buf(),
|
|
recursive: true,
|
|
})
|
|
.collect();
|
|
self.subscriber.register_paths(roots)
|
|
}
|
|
|
|
fn spawn_event_loop(
|
|
rx: Receiver,
|
|
skills_manager: Arc<SkillsManager>,
|
|
outgoing: Arc<OutgoingMessageSender>,
|
|
) {
|
|
let mut rx = ThrottledWatchReceiver::new(rx, WATCHER_THROTTLE_INTERVAL);
|
|
let Ok(handle) = tokio::runtime::Handle::try_current() else {
|
|
warn!("skills watcher listener skipped: no Tokio runtime available");
|
|
return;
|
|
};
|
|
handle.spawn(async move {
|
|
while rx.recv().await.is_some() {
|
|
skills_manager.clear_cache();
|
|
outgoing
|
|
.send_server_notification(ServerNotification::SkillsChanged(
|
|
SkillsChangedNotification {},
|
|
))
|
|
.await;
|
|
}
|
|
});
|
|
}
|
|
}
|