Skip to content

feat(cli): add agent-facing config and diagnose commands #595

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.

Sign up for GitHub

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

Merged
kaizhou-lab merged 1 commit into from
Jul 9, 2026
Merged

feat(cli): add agent-facing config and diagnose commands #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 67 additions & 7 deletions crates/aionui-ai-agent/src/factory/acp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,9 +506,12 @@ fn session_server_supported_by_capabilities(server: &SessionMcpServer, capabilit
mod tests {
use super::*;
use aionui_realtime::BroadcastEventBus;
use aionui_runtime::init as init_runtime;
use aionui_runtime::{ManagedResourcesMode, init as init_runtime, set_managed_resources_mode};
use std::sync::OnceLock;
use std::{mem, path::PathBuf};
use std::{
mem,
path::{Path, PathBuf},
};

fn make_row(
name: &str,
Expand Down Expand Up @@ -574,7 +577,7 @@ mod tests {
use std::os::unix::fs::PermissionsExt;

let tmp = tempfile::tempdir().expect("tempdir");
let runtime_root = tmp.path().join("node").join("node-v24.11.0-darwin-arm64");
let runtime_root = tmp.path().join("node").join(current_node_runtime_directory_name());
let bin = runtime_root.join("bin");
std::fs::create_dir_all(&bin).expect("create bin");

Expand All @@ -589,13 +592,66 @@ mod tests {
tmp
}

#[cfg(all(target_os = "macos", target_arch = "aarch64"))]
fn current_node_runtime_directory_name() -> &'static str {
"node-v24.11.0-darwin-arm64"
}

#[cfg(all(target_os = "macos", target_arch = "x86_64"))]
fn current_node_runtime_directory_name() -> &'static str {
"node-v24.11.0-darwin-x64"
}

#[cfg(all(target_os = "linux", target_arch = "aarch64"))]
fn current_node_runtime_directory_name() -> &'static str {
"node-v24.11.0-linux-arm64"
}

#[cfg(all(target_os = "linux", target_arch = "x86_64"))]
fn current_node_runtime_directory_name() -> &'static str {
"node-v24.11.0-linux-x64"
}

#[cfg(all(
unix,
not(any(
all(target_os = "macos", target_arch = "aarch64"),
all(target_os = "macos", target_arch = "x86_64"),
all(target_os = "linux", target_arch = "aarch64"),
all(target_os = "linux", target_arch = "x86_64")
))
))]
fn current_node_runtime_directory_name() -> &'static str {
panic!("unsupported managed Node runtime test platform")
}

#[cfg(unix)]
struct BundledRuntimeModeGuard;

#[cfg(unix)]
impl BundledRuntimeModeGuard {
fn install(root: &Path) -> Self {
unsafe { std::env::set_var("AIONUI_BUNDLED_MANAGED_RESOURCES", root) };
set_managed_resources_mode(ManagedResourcesMode::Bundled);
Self
}
}

#[cfg(unix)]
impl Drop for BundledRuntimeModeGuard {
fn drop(&mut self) {
unsafe { std::env::remove_var("AIONUI_BUNDLED_MANAGED_RESOURCES") };
set_managed_resources_mode(ManagedResourcesMode::Download);
}
}

#[cfg(unix)]
#[tokio::test]
async fn row_to_sdk_stdio_flattens_resolved_npx_command() {
let _lock = path_test_lock().lock().await;
let runtime = install_fake_bundled_runtime();
let _runtime_data_dir = test_runtime_data_dir();
unsafe { std::env::set_var("AIONUI_BUNDLED_MANAGED_RESOURCES", runtime.path()) };
let _runtime_mode = BundledRuntimeModeGuard::install(runtime.path());

let row = make_row(
"ctx7",
Expand All @@ -606,7 +662,6 @@ mod tests {
);

let server = row_to_sdk_mcp_server(&row).await.expect("convert");
unsafe { std::env::remove_var("AIONUI_BUNDLED_MANAGED_RESOURCES") };
match server {
McpServer::Stdio(s) => {
let command = s.command.to_string_lossy();
Expand All @@ -624,7 +679,7 @@ mod tests {
let _lock = path_test_lock().lock().await;
let runtime = install_fake_bundled_runtime();
let _runtime_data_dir = test_runtime_data_dir();
unsafe { std::env::set_var("AIONUI_BUNDLED_MANAGED_RESOURCES", runtime.path()) };
let _runtime_mode = BundledRuntimeModeGuard::install(runtime.path());

let meta = aionui_api_types::AgentMetadata {
id: "agent-1".into(),
Expand Down Expand Up @@ -676,7 +731,6 @@ mod tests {
.await
.expect("resolved command spec");

unsafe { std::env::remove_var("AIONUI_BUNDLED_MANAGED_RESOURCES") };
let command = spec.command.to_string_lossy();
assert_ne!(command, "npx");
assert!(command.ends_with("/npx"), "unexpected stdio command path: {command}");
Expand All @@ -685,8 +739,14 @@ mod tests {
assert_eq!(spec.cwd.as_deref(), Some("/tmp/workspace"));
}

#[cfg(unix)]
#[tokio::test]
async fn row_to_sdk_stdio_roundtrip() {
let _lock = path_test_lock().lock().await;
let runtime = install_fake_bundled_runtime();
let _runtime_data_dir = test_runtime_data_dir();
let _runtime_mode = BundledRuntimeModeGuard::install(runtime.path());

let row = make_row(
"ctx7",
"stdio",
Expand Down
65 changes: 60 additions & 5 deletions crates/aionui-ai-agent/src/factory/aionrs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,9 +623,12 @@ fn team_mcp_to_config(cfg: &TeamMcpStdioConfig) -> HashMap<String, McpServerConf
mod tests {
use super::*;
use aionui_realtime::BroadcastEventBus;
use aionui_runtime::init as init_runtime;
use aionui_runtime::{ManagedResourcesMode, init as init_runtime, set_managed_resources_mode};
use std::sync::OnceLock;
use std::{mem, path::PathBuf};
use std::{
mem,
path::{Path, PathBuf},
};

fn path_test_lock() -> &'static tokio::sync::Mutex<()> {
static LOCK: OnceLock<tokio::sync::Mutex<()>> = OnceLock::new();
Expand All @@ -649,7 +652,7 @@ mod tests {
use std::os::unix::fs::PermissionsExt;

let tmp = tempfile::tempdir().expect("tempdir");
let runtime_root = tmp.path().join("node").join("node-v24.11.0-darwin-arm64");
let runtime_root = tmp.path().join("node").join(current_node_runtime_directory_name());
let bin = runtime_root.join("bin");
std::fs::create_dir_all(&bin).expect("create bin");

Expand All @@ -664,6 +667,59 @@ mod tests {
tmp
}

#[cfg(all(target_os = "macos", target_arch = "aarch64"))]
fn current_node_runtime_directory_name() -> &'static str {
"node-v24.11.0-darwin-arm64"
}

#[cfg(all(target_os = "macos", target_arch = "x86_64"))]
fn current_node_runtime_directory_name() -> &'static str {
"node-v24.11.0-darwin-x64"
}

#[cfg(all(target_os = "linux", target_arch = "aarch64"))]
fn current_node_runtime_directory_name() -> &'static str {
"node-v24.11.0-linux-arm64"
}

#[cfg(all(target_os = "linux", target_arch = "x86_64"))]
fn current_node_runtime_directory_name() -> &'static str {
"node-v24.11.0-linux-x64"
}

#[cfg(all(
unix,
not(any(
all(target_os = "macos", target_arch = "aarch64"),
all(target_os = "macos", target_arch = "x86_64"),
all(target_os = "linux", target_arch = "aarch64"),
all(target_os = "linux", target_arch = "x86_64")
))
))]
fn current_node_runtime_directory_name() -> &'static str {
panic!("unsupported managed Node runtime test platform")
}

#[cfg(unix)]
struct BundledRuntimeModeGuard;

#[cfg(unix)]
impl BundledRuntimeModeGuard {
fn install(root: &Path) -> Self {
unsafe { std::env::set_var("AIONUI_BUNDLED_MANAGED_RESOURCES", root) };
set_managed_resources_mode(ManagedResourcesMode::Bundled);
Self
}
}

#[cfg(unix)]
impl Drop for BundledRuntimeModeGuard {
fn drop(&mut self) {
unsafe { std::env::remove_var("AIONUI_BUNDLED_MANAGED_RESOURCES") };
set_managed_resources_mode(ManagedResourcesMode::Download);
}
}

fn make_row(
name: &str,
transport_type: &str,
Expand Down Expand Up @@ -777,7 +833,7 @@ mod tests {
let _lock = path_test_lock().lock().await;
let runtime = install_fake_bundled_runtime();
let _runtime_data_dir = test_runtime_data_dir();
unsafe { std::env::set_var("AIONUI_BUNDLED_MANAGED_RESOURCES", runtime.path()) };
let _runtime_mode = BundledRuntimeModeGuard::install(runtime.path());

let row = make_row(
"ctx7",
Expand All @@ -790,7 +846,6 @@ mod tests {
let config = row_to_mcp_server_config(&row, "conv-row", test_broadcaster())
.await
.expect("convert");
unsafe { std::env::remove_var("AIONUI_BUNDLED_MANAGED_RESOURCES") };
let command = config.command.as_deref().expect("resolved command");
assert_ne!(command, "npx");
assert!(command.ends_with("/npx"), "unexpected stdio command path: {command}");
Expand Down
Loading
Loading