mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
bb7d19bc24
## Summary - Follow-up to #25330 and #26417 - Add `--json` output for `codex plugin add` and `codex plugin remove` - Add `--json` output for `codex plugin marketplace add/list/upgrade/remove` - Keep existing human-readable output unchanged - Keep existing error handling/stderr behavior unchanged; `--json` changes successful stdout output only - Align marketplace add/remove JSON field names with the existing app-server protocol shape - Add CLI coverage for plugin and marketplace JSON outputs ## Validation - `just fmt` - `just fix -p codex-cli` - `just test -p codex-cli`
156 lines
4.6 KiB
Rust
156 lines
4.6 KiB
Rust
use anyhow::Result;
|
|
use codex_config::CONFIG_TOML_FILE;
|
|
use codex_core_plugins::installed_marketplaces::marketplace_install_root;
|
|
use codex_utils_absolute_path::AbsolutePathBuf;
|
|
use predicates::str::contains;
|
|
use pretty_assertions::assert_eq;
|
|
use serde_json::json;
|
|
use std::path::Path;
|
|
use tempfile::TempDir;
|
|
|
|
fn codex_command(codex_home: &Path) -> Result<assert_cmd::Command> {
|
|
let mut cmd = assert_cmd::Command::new(codex_utils_cargo_bin::cargo_bin("codex")?);
|
|
cmd.env("CODEX_HOME", codex_home);
|
|
Ok(cmd)
|
|
}
|
|
|
|
fn write_marketplace_source(source: &Path, marker: &str) -> Result<()> {
|
|
std::fs::create_dir_all(source.join(".agents/plugins"))?;
|
|
std::fs::create_dir_all(source.join("plugins/sample/.codex-plugin"))?;
|
|
std::fs::write(
|
|
source.join(".agents/plugins/marketplace.json"),
|
|
r#"{
|
|
"name": "debug",
|
|
"plugins": [
|
|
{
|
|
"name": "sample",
|
|
"source": {
|
|
"source": "local",
|
|
"path": "./plugins/sample"
|
|
}
|
|
}
|
|
]
|
|
}"#,
|
|
)?;
|
|
std::fs::write(
|
|
source.join("plugins/sample/.codex-plugin/plugin.json"),
|
|
r#"{"name":"sample"}"#,
|
|
)?;
|
|
std::fs::write(source.join("plugins/sample/marker.txt"), marker)?;
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn marketplace_add_local_directory_source() -> Result<()> {
|
|
let codex_home = TempDir::new()?;
|
|
let source = TempDir::new()?;
|
|
write_marketplace_source(source.path(), "local ref")?;
|
|
let source_parent = source.path().parent().unwrap();
|
|
let source_arg = format!("./{}", source.path().file_name().unwrap().to_string_lossy());
|
|
|
|
codex_command(codex_home.path())?
|
|
.current_dir(source_parent)
|
|
.args(["plugin", "marketplace", "add", source_arg.as_str()])
|
|
.assert()
|
|
.success();
|
|
|
|
let installed_root = marketplace_install_root(codex_home.path()).join("debug");
|
|
assert!(!installed_root.exists());
|
|
|
|
let config = std::fs::read_to_string(codex_home.path().join(CONFIG_TOML_FILE))?;
|
|
let config: toml::Value = toml::from_str(&config)?;
|
|
let expected_source = source.path().canonicalize()?.display().to_string();
|
|
assert_eq!(
|
|
config["marketplaces"]["debug"]["source_type"].as_str(),
|
|
Some("local")
|
|
);
|
|
assert_eq!(
|
|
config["marketplaces"]["debug"]["source"].as_str(),
|
|
Some(expected_source.as_str())
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn marketplace_add_json_prints_add_outcome() -> Result<()> {
|
|
let codex_home = TempDir::new()?;
|
|
let source = TempDir::new()?;
|
|
write_marketplace_source(source.path(), "local ref")?;
|
|
let source_parent = source.path().parent().unwrap();
|
|
let source_arg = format!("./{}", source.path().file_name().unwrap().to_string_lossy());
|
|
|
|
let assert = codex_command(codex_home.path())?
|
|
.current_dir(source_parent)
|
|
.args([
|
|
"plugin",
|
|
"marketplace",
|
|
"add",
|
|
source_arg.as_str(),
|
|
"--json",
|
|
])
|
|
.assert()
|
|
.success();
|
|
let stdout = assert.get_output().stdout.as_slice();
|
|
let actual: serde_json::Value = serde_json::from_slice(stdout)?;
|
|
let expected_installed_root = AbsolutePathBuf::try_from(source.path().canonicalize()?)?;
|
|
|
|
assert_eq!(
|
|
actual,
|
|
json!({
|
|
"marketplaceName": "debug",
|
|
"installedRoot": expected_installed_root.as_path().display().to_string(),
|
|
"alreadyAdded": false,
|
|
})
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn marketplace_add_rejects_local_manifest_file_source() -> Result<()> {
|
|
let codex_home = TempDir::new()?;
|
|
let source = TempDir::new()?;
|
|
write_marketplace_source(source.path(), "local ref")?;
|
|
let manifest_path = source.path().join(".agents/plugins/marketplace.json");
|
|
|
|
codex_command(codex_home.path())?
|
|
.args([
|
|
"plugin",
|
|
"marketplace",
|
|
"add",
|
|
manifest_path.to_str().unwrap(),
|
|
])
|
|
.assert()
|
|
.failure()
|
|
.stderr(contains(
|
|
"local marketplace source must be a directory, not a file",
|
|
));
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn marketplace_add_rejects_sparse_for_local_directory_source() -> Result<()> {
|
|
let codex_home = TempDir::new()?;
|
|
let source = TempDir::new()?;
|
|
write_marketplace_source(source.path(), "local ref")?;
|
|
|
|
codex_command(codex_home.path())?
|
|
.args([
|
|
"plugin",
|
|
"marketplace",
|
|
"add",
|
|
"--sparse",
|
|
".agents",
|
|
source.path().to_str().unwrap(),
|
|
])
|
|
.assert()
|
|
.failure()
|
|
.stderr(contains(
|
|
"--sparse is only supported for git marketplace sources",
|
|
));
|
|
|
|
Ok(())
|
|
}
|