mirror of
https://github.com/openai/codex.git
synced 2026-11-22 07:13:50 +00:00
Migrate Cursor-managed skills into Codex (#36361)
## What changed - Discover and import home-level Cursor skills from both `skills` and `skills-cursor`. - Keep repository-level Cursor migration scoped to `skills`. - Deduplicate skill names when reporting migration candidates from multiple source directories. ## Testing - Add coverage for detecting and importing user and Cursor-managed skills. - Verify repository detection continues to use the `skills` directory. GitOrigin-RevId: 7b5e96a0d9c5ca14c61230e336728f2e4930a3b0
This commit is contained in:
1 parent
385fe95ce1
commit
da2c7ca8d1
5 files changed
+174
-22
No files matched your search
@@ -69,6 +69,91 @@ async fn detect_home_lists_config_skills_and_agents_md() {
|
||||
assert_eq!(items, expected);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn detect_cursor_home_lists_user_and_managed_skills() {
|
||||
let root = TempDir::new().expect("create tempdir");
|
||||
let external_agent_home = root.path().join(".cursor");
|
||||
let codex_home = root.path().join(".codex");
|
||||
let user_skills = external_agent_home.join("skills");
|
||||
let managed_skills = external_agent_home.join("skills-cursor");
|
||||
let target_skills = codex_home
|
||||
.parent()
|
||||
.map(|parent| parent.join(".agents").join("skills"))
|
||||
.unwrap_or_else(|| PathBuf::from(".agents").join("skills"));
|
||||
fs::create_dir_all(user_skills.join("user-skill")).expect("create user skill");
|
||||
fs::create_dir_all(managed_skills.join("managed-skill")).expect("create managed skill");
|
||||
let mut service = service_for_paths(external_agent_home, codex_home);
|
||||
service.source = ExternalAgentSource::Cur;
|
||||
|
||||
let items = service
|
||||
.detect(ExternalAgentConfigDetectOptions {
|
||||
include_home: true,
|
||||
include_memory: false,
|
||||
cwds: None,
|
||||
})
|
||||
.await
|
||||
.expect("detect");
|
||||
|
||||
assert_eq!(
|
||||
items,
|
||||
vec![ExternalAgentConfigMigrationItem {
|
||||
item_type: ExternalAgentConfigMigrationItemType::Skills,
|
||||
description: format!(
|
||||
"Migrate skills from {}, {} to {}",
|
||||
user_skills.display(),
|
||||
managed_skills.display(),
|
||||
target_skills.display()
|
||||
),
|
||||
cwd: None,
|
||||
details: Some(MigrationDetails {
|
||||
skills: named_migrations(vec![
|
||||
"managed-skill".to_string(),
|
||||
"user-skill".to_string()
|
||||
]),
|
||||
..Default::default()
|
||||
}),
|
||||
}]
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn detect_cursor_repo_lists_skills_from_skills() {
|
||||
let root = TempDir::new().expect("create tempdir");
|
||||
let repo_root = root.path().join("repo");
|
||||
let codex_home = root.path().join(".codex");
|
||||
let source_skills = repo_root.join(".cursor").join("skills");
|
||||
fs::create_dir_all(repo_root.join(".git")).expect("create git dir");
|
||||
fs::create_dir_all(source_skills.join("skill-a")).expect("create repo skill");
|
||||
let mut service = service_for_paths(root.path().join(".cursor"), codex_home);
|
||||
service.source = ExternalAgentSource::Cur;
|
||||
|
||||
let items = service
|
||||
.detect(ExternalAgentConfigDetectOptions {
|
||||
include_home: false,
|
||||
include_memory: false,
|
||||
cwds: Some(vec![repo_root.clone()]),
|
||||
})
|
||||
.await
|
||||
.expect("detect");
|
||||
|
||||
assert_eq!(
|
||||
items,
|
||||
vec![ExternalAgentConfigMigrationItem {
|
||||
item_type: ExternalAgentConfigMigrationItemType::Skills,
|
||||
description: format!(
|
||||
"Migrate skills from {} to {}",
|
||||
source_skills.display(),
|
||||
repo_root.join(".agents").join("skills").display()
|
||||
),
|
||||
cwd: Some(repo_root),
|
||||
details: Some(MigrationDetails {
|
||||
skills: named_migrations(vec!["skill-a".to_string()]),
|
||||
..Default::default()
|
||||
}),
|
||||
}]
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn detect_home_lists_recent_sessions() {
|
||||
let (root, external_agent_home, codex_home) = fixture_paths();
|
||||
|
||||
@@ -710,3 +710,43 @@ fn import_skills_returns_only_new_skill_directory_names() {
|
||||
|
||||
assert_eq!(copied_names, vec!["skill-b".to_string()]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn import_cursor_skills_reads_user_and_managed_directories() {
|
||||
let root = TempDir::new().expect("create tempdir");
|
||||
let external_agent_home = root.path().join(".cursor");
|
||||
let codex_home = root.path().join(".codex");
|
||||
let user_skill = external_agent_home.join("skills").join("user-skill");
|
||||
let managed_skill = external_agent_home
|
||||
.join("skills-cursor")
|
||||
.join("managed-skill");
|
||||
let target_skills = codex_home
|
||||
.parent()
|
||||
.map(|parent| parent.join(".agents").join("skills"))
|
||||
.unwrap_or_else(|| PathBuf::from(".agents").join("skills"));
|
||||
fs::create_dir_all(&user_skill).expect("create user skill");
|
||||
fs::create_dir_all(&managed_skill).expect("create managed skill");
|
||||
fs::write(user_skill.join("SKILL.md"), "# Imported user skill").expect("write user skill");
|
||||
fs::write(managed_skill.join("SKILL.md"), "# Imported managed skill")
|
||||
.expect("write managed skill");
|
||||
let mut service = service_for_paths(external_agent_home, codex_home);
|
||||
service.source = ExternalAgentSource::Cur;
|
||||
|
||||
let mut copied_names = service.import_skills(/*cwd*/ None).expect("import skills");
|
||||
copied_names.sort();
|
||||
|
||||
assert_eq!(
|
||||
copied_names,
|
||||
vec!["managed-skill".to_string(), "user-skill".to_string()]
|
||||
);
|
||||
assert_eq!(
|
||||
fs::read_to_string(target_skills.join("user-skill").join("SKILL.md"))
|
||||
.expect("read user skill"),
|
||||
"# Imported user skill"
|
||||
);
|
||||
assert_eq!(
|
||||
fs::read_to_string(target_skills.join("managed-skill").join("SKILL.md"))
|
||||
.expect("read managed skill"),
|
||||
"# Imported managed skill"
|
||||
);
|
||||
}
|
||||
Reference in new issue
Block a user