mirror of
https://github.com/openai/codex.git
synced 2026-09-13 11:47:17 +00:00
codex: fix lint regressions in capability extraction
Co-authored-by: Codex <noreply@openai.com>
This commit is contained in:
@@ -1146,7 +1146,6 @@ impl PluginsManager {
|
||||
config_persister,
|
||||
);
|
||||
|
||||
let request = request.clone();
|
||||
let manager = Arc::clone(self);
|
||||
tokio::spawn(async move {
|
||||
let auth = auth_manager.auth().await;
|
||||
|
||||
@@ -6,6 +6,7 @@ use crate::plugins::test_support::write_file;
|
||||
use crate::plugins::test_support::write_openai_curated_marketplace;
|
||||
use crate::plugins::test_support::write_plugins_feature_config;
|
||||
use crate::tools::discoverable::DiscoverablePluginInfo;
|
||||
use codex_capabilities::plugins::curated_plugins_repo_path;
|
||||
use codex_utils_absolute_path::AbsolutePathBuf;
|
||||
use pretty_assertions::assert_eq;
|
||||
use tempfile::tempdir;
|
||||
@@ -13,7 +14,7 @@ use tempfile::tempdir;
|
||||
#[tokio::test]
|
||||
async fn list_tool_suggest_discoverable_plugins_returns_uninstalled_curated_plugins() {
|
||||
let codex_home = tempdir().expect("tempdir should succeed");
|
||||
let curated_root = crate::plugins::curated_plugins_repo_path(codex_home.path());
|
||||
let curated_root = curated_plugins_repo_path(codex_home.path());
|
||||
write_openai_curated_marketplace(&curated_root, &["sample", "slack"]);
|
||||
write_plugins_feature_config(codex_home.path());
|
||||
|
||||
@@ -42,7 +43,7 @@ async fn list_tool_suggest_discoverable_plugins_returns_uninstalled_curated_plug
|
||||
#[tokio::test]
|
||||
async fn list_tool_suggest_discoverable_plugins_returns_empty_when_plugins_feature_disabled() {
|
||||
let codex_home = tempdir().expect("tempdir should succeed");
|
||||
let curated_root = crate::plugins::curated_plugins_repo_path(codex_home.path());
|
||||
let curated_root = curated_plugins_repo_path(codex_home.path());
|
||||
write_openai_curated_marketplace(&curated_root, &["slack"]);
|
||||
|
||||
let config = load_plugins_config(codex_home.path()).await;
|
||||
@@ -58,7 +59,7 @@ async fn list_tool_suggest_discoverable_plugins_returns_empty_when_plugins_featu
|
||||
#[tokio::test]
|
||||
async fn list_tool_suggest_discoverable_plugins_normalizes_description() {
|
||||
let codex_home = tempdir().expect("tempdir should succeed");
|
||||
let curated_root = crate::plugins::curated_plugins_repo_path(codex_home.path());
|
||||
let curated_root = curated_plugins_repo_path(codex_home.path());
|
||||
write_openai_curated_marketplace(&curated_root, &["slack"]);
|
||||
write_plugins_feature_config(codex_home.path());
|
||||
write_file(
|
||||
@@ -92,7 +93,7 @@ async fn list_tool_suggest_discoverable_plugins_normalizes_description() {
|
||||
#[tokio::test]
|
||||
async fn list_tool_suggest_discoverable_plugins_omits_installed_curated_plugins() {
|
||||
let codex_home = tempdir().expect("tempdir should succeed");
|
||||
let curated_root = crate::plugins::curated_plugins_repo_path(codex_home.path());
|
||||
let curated_root = curated_plugins_repo_path(codex_home.path());
|
||||
write_openai_curated_marketplace(&curated_root, &["slack"]);
|
||||
write_curated_plugin_sha(codex_home.path());
|
||||
write_plugins_feature_config(codex_home.path());
|
||||
|
||||
@@ -42,7 +42,6 @@ pub use codex_capabilities::plugins::RemotePluginSyncResult;
|
||||
pub use codex_capabilities::plugins::installed_plugin_telemetry_metadata;
|
||||
pub use codex_capabilities::plugins::load_plugin_apps;
|
||||
pub use codex_capabilities::plugins::load_plugin_mcp_servers;
|
||||
pub(crate) use codex_capabilities::plugins::plugin_namespace_for_skill_path;
|
||||
pub use codex_capabilities::plugins::plugin_telemetry_metadata_from_root;
|
||||
|
||||
pub struct PluginsManager {
|
||||
|
||||
@@ -13,6 +13,8 @@ use crate::plugins::test_support::write_curated_plugin_sha_with as write_curated
|
||||
use crate::plugins::test_support::write_file;
|
||||
use crate::plugins::test_support::write_openai_curated_marketplace;
|
||||
use codex_app_server_protocol::ConfigLayerSource;
|
||||
use codex_capabilities::plugins::curated_plugins_repo_path;
|
||||
use codex_capabilities::plugins::plugin_namespace_for_skill_path;
|
||||
use pretty_assertions::assert_eq;
|
||||
use std::collections::HashMap;
|
||||
use std::fs;
|
||||
|
||||
@@ -12,14 +12,9 @@ pub use codex_capabilities::plugins::MarketplacePluginPolicy;
|
||||
pub use codex_capabilities::plugins::MarketplacePluginSource;
|
||||
pub use codex_capabilities::plugins::PluginId;
|
||||
pub use codex_capabilities::plugins::PluginManifestInterface;
|
||||
pub(crate) use codex_capabilities::plugins::PluginManifestPaths;
|
||||
pub use codex_capabilities::plugins::RemotePluginFetchError;
|
||||
pub use codex_capabilities::plugins::collect_plugin_enabled_candidates;
|
||||
pub(crate) use codex_capabilities::plugins::curated_plugins_repo_path;
|
||||
pub use codex_capabilities::plugins::fetch_remote_featured_plugin_ids;
|
||||
pub(crate) use codex_capabilities::plugins::load_plugin_manifest;
|
||||
pub(crate) use codex_capabilities::plugins::read_curated_plugins_sha;
|
||||
pub(crate) use codex_capabilities::plugins::sync_openai_plugins_repo;
|
||||
pub(crate) use discoverable::list_tool_suggest_discoverable_plugins;
|
||||
pub(crate) use injection::build_plugin_injections;
|
||||
pub use manager::AppConnectorId;
|
||||
@@ -43,7 +38,6 @@ pub use manager::RemotePluginSyncResult;
|
||||
pub use manager::installed_plugin_telemetry_metadata;
|
||||
pub use manager::load_plugin_apps;
|
||||
pub use manager::load_plugin_mcp_servers;
|
||||
pub(crate) use manager::plugin_namespace_for_skill_path;
|
||||
pub use manager::plugin_telemetry_metadata_from_root;
|
||||
pub(crate) use render::render_explicit_plugin_instructions;
|
||||
pub(crate) use render::render_plugins_section;
|
||||
|
||||
@@ -13,7 +13,6 @@ pub(crate) use env_var_dependencies::resolve_skill_dependencies_for_turn;
|
||||
pub(crate) use injection::SkillInjections;
|
||||
pub(crate) use injection::build_skill_injections;
|
||||
pub(crate) use injection::collect_explicit_skill_mentions;
|
||||
pub(crate) use invocation_utils::build_implicit_skill_path_indexes;
|
||||
pub(crate) use invocation_utils::maybe_emit_implicit_skill_invocation;
|
||||
pub use manager::SkillsManager;
|
||||
pub use model::SkillError;
|
||||
|
||||
@@ -8,6 +8,7 @@ use crate::plugins::test_support::write_plugins_feature_config;
|
||||
use crate::tools::discoverable::DiscoverablePluginInfo;
|
||||
use crate::tools::discoverable::filter_tool_suggest_discoverable_tools_for_client;
|
||||
use codex_app_server_protocol::AppInfo;
|
||||
use codex_capabilities::plugins::curated_plugins_repo_path;
|
||||
use codex_utils_absolute_path::AbsolutePathBuf;
|
||||
use pretty_assertions::assert_eq;
|
||||
use serde_json::json;
|
||||
@@ -238,7 +239,7 @@ fn verified_connector_suggestion_completed_requires_accessible_connector() {
|
||||
#[tokio::test]
|
||||
async fn verified_plugin_suggestion_completed_requires_installed_plugin() {
|
||||
let codex_home = tempdir().expect("tempdir should succeed");
|
||||
let curated_root = crate::plugins::curated_plugins_repo_path(codex_home.path());
|
||||
let curated_root = curated_plugins_repo_path(codex_home.path());
|
||||
write_openai_curated_marketplace(&curated_root, &["sample"]);
|
||||
write_curated_plugin_sha(codex_home.path());
|
||||
write_plugins_feature_config(codex_home.path());
|
||||
|
||||
Reference in New Issue
Block a user