mirror of
https://github.com/openai/codex.git
synced 2026-11-13 06:45:07 +00:00
charlesgong-openai
fcd2273de7
## Why Imported session attribution can identify an MCP server by its configured name instead of the UUID stored in the session manifest. ## What changed Match attributed MCP servers against normalized manifest names without regard to case, while retaining UUID matching. ## Testing Add focused coverage for both name- and UUID-based attribution. GitOrigin-RevId: 827443f9e7f14028e17b5c5775ca372bfe2e217e
75 lines
2.3 KiB
Rust
75 lines
2.3 KiB
Rust
use super::*;
|
|
use pretty_assertions::assert_eq;
|
|
use std::collections::BTreeSet;
|
|
use tempfile::TempDir;
|
|
|
|
#[test]
|
|
fn resolves_attributed_server_name_from_session_manifest() {
|
|
let metadata_root = TempDir::new().expect("tempdir");
|
|
let manifests_root = metadata_root.path().join(SESSION_MANIFESTS_DIR);
|
|
std::fs::create_dir_all(&manifests_root).expect("manifest directory");
|
|
std::fs::write(
|
|
manifests_root.join("session.json"),
|
|
serde_json::json!({
|
|
"cliSessionId": "session-1",
|
|
"remoteMcpServersConfig": [
|
|
{
|
|
"uuid": "c58ac595-58b5-48f8-ac77-d8d01523dede",
|
|
"name": "Figma",
|
|
},
|
|
],
|
|
})
|
|
.to_string(),
|
|
)
|
|
.expect("manifest");
|
|
let attributions = vec![ImportedSessionConnectorAttribution {
|
|
session_id: "session-1".to_string(),
|
|
server_ids: BTreeSet::from(["figma".to_string()]),
|
|
}];
|
|
|
|
let connector_names = detect_imported_cla_session_connectors(
|
|
&attributions,
|
|
&[metadata_root.path().to_path_buf()],
|
|
);
|
|
|
|
assert_eq!(
|
|
connector_names,
|
|
BTreeMap::from([("session-1".to_string(), vec!["Figma".to_string()])])
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn still_resolves_attributed_server_uuid_from_session_manifest() {
|
|
let metadata_root = TempDir::new().expect("tempdir");
|
|
let manifests_root = metadata_root.path().join(SESSION_MANIFESTS_DIR);
|
|
std::fs::create_dir_all(&manifests_root).expect("manifest directory");
|
|
std::fs::write(
|
|
manifests_root.join("session.json"),
|
|
serde_json::json!({
|
|
"cliSessionId": "session-1",
|
|
"remoteMcpServersConfig": [
|
|
{
|
|
"uuid": "c58ac595-58b5-48f8-ac77-d8d01523dede",
|
|
"name": "Figma",
|
|
},
|
|
],
|
|
})
|
|
.to_string(),
|
|
)
|
|
.expect("manifest");
|
|
let attributions = vec![ImportedSessionConnectorAttribution {
|
|
session_id: "session-1".to_string(),
|
|
server_ids: BTreeSet::from(["c58ac595-58b5-48f8-ac77-d8d01523dede".to_string()]),
|
|
}];
|
|
|
|
let connector_names = detect_imported_cla_session_connectors(
|
|
&attributions,
|
|
&[metadata_root.path().to_path_buf()],
|
|
);
|
|
|
|
assert_eq!(
|
|
connector_names,
|
|
BTreeMap::from([("session-1".to_string(), vec!["Figma".to_string()])])
|
|
);
|
|
}
|