Added support for live updates to skills and AGENTS #9985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

etraut-openai wants to merge 22 commits into main from etraut/live_skill_update

+1,058 −62

AGENTS.md

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,6 @@ In the codex-rs folder where the rust code lives: @@
     - Use method references over closures when possible per https://rust-lang.github.io/rust-clippy/master/index.html#redundant_closure_for_method_calls
     - When possible, make `match` statements exhaustive and avoid wildcard arms.
     - When writing tests, prefer comparing the equality of entire objects over fields one by one.
-    - When making a change that adds or changes an API, ensure that the documentation in the `docs/` folder is up to date if applicable.
     - If you change `ConfigToml` or nested config types, run `just write-config-schema` to update `codex-rs/core/config.schema.json`.
     Run `just fmt` (in `codex-rs` directory) automatically after you have finished making Rust code changes; do not ask for approval to run it. Additionally, run the tests:
@@ Expand Down @@

codex-rs/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

codex-rs/app-server-protocol/src/protocol/common.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -704,6 +704,7 @@ server_notification_definitions! { @@
         ContextCompacted => "thread/compacted" (v2::ContextCompactedNotification),
         DeprecationNotice => "deprecationNotice" (v2::DeprecationNoticeNotification),
         ConfigWarning => "configWarning" (v2::ConfigWarningNotification),
+        SkillsListUpdated => "skills/list/updated" (v2::SkillsListUpdatedNotification),
         /// Notifies the user of world-writable directories on Windows, which cannot be protected by the sandbox.
         WindowsWorldWritableWarning => "windows/worldWritableWarning" (v2::WindowsWorldWritableWarningNotification),
@@ Expand Down @@

codex-rs/app-server-protocol/src/protocol/v2.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -2635,6 +2635,11 @@ pub struct ContextCompactedNotification { @@
         pub turn_id: String,
     }
+    #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)]
+    #[serde(rename_all = "camelCase")]
+    #[ts(export_to = "v2/")]
+    pub struct SkillsListUpdatedNotification {}
     #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
     #[serde(rename_all = "camelCase")]
     #[ts(export_to = "v2/")]
@@ Expand Down @@

codex-rs/app-server/src/message_processor.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -28,8 +28,10 @@ use codex_app_server_protocol::JSONRPCResponse; @@
     use codex_app_server_protocol::RequestId;
     use codex_app_server_protocol::ServerNotification;
     use codex_app_server_protocol::ServerRequestPayload;
+    use codex_app_server_protocol::SkillsListUpdatedNotification;
     use codex_app_server_protocol::experimental_required_message;
     use codex_core::AuthManager;
+    use codex_core::FileWatcherEvent;
     use codex_core::ThreadManager;
     use codex_core::auth::ExternalAuthRefreshContext;
     use codex_core::auth::ExternalAuthRefreshReason;
@@ Expand Down Expand Up / @@ -111,6 +113,7 @@ pub(crate) struct MessageProcessor { @@
         config_api: ConfigApi,
         config: Arc<Config>,
         initialized: bool,
+        initialized_flag: Arc<AtomicBool>,
         experimental_api_enabled: Arc<AtomicBool>,
         config_warnings: Vec<ConfigWarningNotification>,
     }
@@ Expand Down Expand Up / @@ -156,6 +159,31 @@ impl MessageProcessor { @@
                 auth_manager.clone(),
                 SessionSource::VSCode,
             ));
+            // Watch for on-disk skill changes and reinject the updated skills into
+            // subsequent requests.
+            let initialized_flag = Arc::new(AtomicBool::new(false));
+            let mut skills_updates_rx = thread_manager.subscribe_file_watcher();
+            let outgoing_for_skills = Arc::clone(&outgoing);
+            let initialized_for_skills = Arc::clone(&initialized_flag);
+            tokio::spawn(async move {
+                loop {
+                    match skills_updates_rx.recv().await {
+                        Ok(FileWatcherEvent::SkillsChanged { .. }) => {
+                            if !initialized_for_skills.load(Ordering::SeqCst) {
+                                continue;
+                            }
+                            outgoing_for_skills
+                                .send_server_notification(ServerNotification::SkillsListUpdated(
+                                    SkillsListUpdatedNotification {},
+                                ))
+                                .await;
+                        }
+                        Ok(FileWatcherEvent::AgentsChanged { .. }) => {}
+                        Err(broadcast::error::RecvError::Closed) => break,
+                        Err(broadcast::error::RecvError::Lagged(_)) => continue,
+                    }
+                }
+            });
             let codex_message_processor = CodexMessageProcessor::new(CodexMessageProcessorArgs {
                 auth_manager,
                 thread_manager,
@@ Expand All / @@ -179,6 +207,7 @@ impl MessageProcessor { @@
                 config_api,
                 config,
                 initialized: false,
+                initialized_flag,
                 experimental_api_enabled,
                 config_warnings,
             }
@@ Expand Down Expand Up / @@ -268,6 +297,7 @@ impl MessageProcessor { @@
                         self.outgoing.send_response(request_id, response).await;
                         self.initialized = true;
+                        self.initialized_flag.store(true, Ordering::SeqCst);
                         if !self.config_warnings.is_empty() {
                             for notification in self.config_warnings.drain(..) {
                                 self.outgoing
@@ Expand Down @@

codex-rs/core/Cargo.toml

-Original file line number
+Diff line change
@@ Expand Up / @@ -57,6 +57,7 @@ indexmap = { workspace = true } @@
     indoc = { workspace = true }
     keyring = { workspace = true, features = ["crypto-rust"] }
     libc = { workspace = true }
+    notify = { workspace = true }
     multimap = { workspace = true }
     once_cell = { workspace = true }
     os_info = { workspace = true }
@@ Expand Down @@

codex-rs/core/config.schema.json

-Original file line number
+Diff line change
@@ Expand Up / @@ -190,6 +190,12 @@ @@
                 "include_apply_patch_tool": {
                   "type": "boolean"
                 },
+                "live_agents_reload": {
+                  "type": "boolean"
+                },
+                "live_skills_reload": {
+                  "type": "boolean"
+                },
                 "personality": {
                   "type": "boolean"
                 },
@@ Expand Down Expand Up / @@ -1218,6 +1224,12 @@ @@
             "include_apply_patch_tool": {
               "type": "boolean"
             },
+            "live_agents_reload": {
+              "type": "boolean"
+            },
+            "live_skills_reload": {
+              "type": "boolean"
+            },
             "personality": {
               "type": "boolean"
             },
@@ Expand Down Expand Up / @@ -1569,4 +1581,4 @@ @@
       },
       "title": "ConfigToml",
       "type": "object"
-    }
+    }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added support for live updates to skills and AGENTS #9985

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Added support for live updates to skills and AGENTS #9985

Are you sure you want to change the base?

Added support for live updates to skills and AGENTS #9985

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!