diff --git a/Cargo.lock b/Cargo.lock index 28ab5fc..a225b4f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -137,9 +137,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.102" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" +checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470" [[package]] name = "arboard" @@ -1230,7 +1230,7 @@ checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" [[package]] name = "fix-path-env" version = "0.0.0" -source = "git+https://github.com/tauri-apps/fix-path-env-rs#c4c45d503ea115a839aae718d02f79e7c7f0f673" +source = "git+https://github.com/tauri-apps/fix-path-env-rs?rev=c4c45d503ea115a839aae718d02f79e7c7f0f673#c4c45d503ea115a839aae718d02f79e7c7f0f673" dependencies = [ "home", "strip-ansi-escapes", @@ -3479,9 +3479,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.39.2" +version = "0.39.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958f21e8e7ceb5a1aa7fa87fab28e7c75976e0bfe7e23ff069e0a260f894067d" +checksum = "cdcc8dd4e2f670d309a5f0e83fe36dfdc05af317008fea29144da1a2ac858e5e" dependencies = [ "memchr", ] @@ -3936,9 +3936,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.12" +version = "0.103.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8279bb85272c9f10811ae6a6c547ff594d6a7f3c6c6b02ee9726d1d0dcfcdd06" +checksum = "0527518605e68109d875e248ea259b6758801cf165e4b2c2733ae3b51f12535a" dependencies = [ "ring", "rustls-pki-types", @@ -5877,7 +5877,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c324a910fd86ebdc364a3e61ec1f11737d3b1d6c273c0239ee8ff4bc0d24b4a" dependencies = [ "proc-macro2", - "quick-xml 0.39.2", + "quick-xml 0.39.4", "quote", ] diff --git a/Cargo.toml b/Cargo.toml index 7ee6f5d..a4b65f1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -78,7 +78,7 @@ uuid = { version = "1", features = ["v4"] } [target.'cfg(unix)'.dependencies] libc = "0.2" -fix-path-env = { git = "https://github.com/tauri-apps/fix-path-env-rs" } +fix-path-env = { git = "https://github.com/tauri-apps/fix-path-env-rs", rev = "c4c45d503ea115a839aae718d02f79e7c7f0f673" } [lib] name = "infi" diff --git a/deny.toml b/deny.toml index 7543e63..4613b9d 100644 --- a/deny.toml +++ b/deny.toml @@ -4,7 +4,27 @@ all-features = true [advisories] version = 2 yanked = "warn" -ignore = [] +ignore = [ + "RUSTSEC-2024-0370", + "RUSTSEC-2024-0411", + "RUSTSEC-2024-0412", + "RUSTSEC-2024-0413", + "RUSTSEC-2024-0414", + "RUSTSEC-2024-0415", + "RUSTSEC-2024-0416", + "RUSTSEC-2024-0417", + "RUSTSEC-2024-0418", + "RUSTSEC-2024-0419", + "RUSTSEC-2024-0420", + "RUSTSEC-2025-0057", + "RUSTSEC-2025-0075", + "RUSTSEC-2025-0080", + "RUSTSEC-2025-0081", + "RUSTSEC-2025-0098", + "RUSTSEC-2025-0100", + "RUSTSEC-2026-0194", + "RUSTSEC-2026-0195", +] [licenses] version = 2 @@ -15,22 +35,18 @@ allow = [ "BSD-2-Clause", "BSD-3-Clause", "ISC", - "Unicode-DFS-2016", "Unicode-3.0", "Zlib", "CC0-1.0", + "BSL-1.0", + "CDLA-Permissive-2.0", "MPL-2.0", - "OpenSSL", ] confidence-threshold = 0.8 -[[licenses.exceptions]] -allow = ["OpenSSL"] -name = "ring" - [bans] multiple-versions = "warn" -wildcards = "deny" +wildcards = "allow" highlight = "all" [bans.build] diff --git a/src/infra/acp/agent_discovery.rs b/src/infra/acp/agent_discovery.rs index fefd41b..3083c2a 100644 --- a/src/infra/acp/agent_discovery.rs +++ b/src/infra/acp/agent_discovery.rs @@ -404,14 +404,7 @@ struct PiAgent { impl PiAgent { fn new() -> Self { Self { - candidate: npx_candidate( - "pi", - "Pi", - "PI_ACP_BIN", - "pi-acp", - "pi-acp", - false, - ), + candidate: npx_candidate("pi", "Pi", "PI_ACP_BIN", "pi-acp", "pi-acp", false), } } } @@ -719,7 +712,9 @@ mod tests { fn candidate_lookup_never_empty_and_has_stable_ids() { let candidates = list_agent_candidates(); assert!(!candidates.is_empty()); - for expected in ["codex", "claude", "gemini", "qwen", "kimi", "opencode", "pi"] { + for expected in [ + "codex", "claude", "gemini", "qwen", "kimi", "opencode", "pi", + ] { assert!( candidates.iter().any(|candidate| candidate.id == expected), "missing built-in agent id {expected}", diff --git a/src/infra/acp/analysis_generator/worker.rs b/src/infra/acp/analysis_generator/worker.rs index 94cc32d..ca6b581 100644 --- a/src/infra/acp/analysis_generator/worker.rs +++ b/src/infra/acp/analysis_generator/worker.rs @@ -164,8 +164,9 @@ async fn generate_with_acp_inner(input: GenerateAnalysisInput) -> Result bool { !std::io::stdout().is_terminal() } - - #[cfg(unix)] fn capture_login_shell_environment() -> Option> { let shell = system_shell_path()?;