Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
32 changes: 24 additions & 8 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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]
Expand Down
13 changes: 4 additions & 9 deletions src/infra/acp/agent_discovery.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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),
}
}
}
Expand Down Expand Up @@ -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}",
Expand Down
5 changes: 3 additions & 2 deletions src/infra/acp/analysis_generator/worker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,9 @@ async fn generate_with_acp_inner(input: GenerateAnalysisInput) -> Result<Generat
{
let is_batch = {
let p = std::path::Path::new(&agent_command);
p.extension()
.is_some_and(|ext| ext.eq_ignore_ascii_case("cmd") || ext.eq_ignore_ascii_case("bat"))
p.extension().is_some_and(|ext| {
ext.eq_ignore_ascii_case("cmd") || ext.eq_ignore_ascii_case("bat")
})
};
if is_batch {
let mut c = Command::new("cmd");
Expand Down
3 changes: 0 additions & 3 deletions src/infra/shell.rs
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ fn suppress_windows_console_std(_command: &mut std::process::Command) {}
pub fn suppress_windows_console_tokio(_command: &mut tokio::process::Command) {
#[cfg(target_os = "windows")]
{
use std::os::windows::process::CommandExt;
const CREATE_NO_WINDOW: u32 = 0x0800_0000;
#[allow(clippy::used_underscore_binding)]
_command.creation_flags(CREATE_NO_WINDOW);
Expand Down Expand Up @@ -240,8 +239,6 @@ fn should_load_shell_environment() -> bool {
!std::io::stdout().is_terminal()
}



#[cfg(unix)]
fn capture_login_shell_environment() -> Option<HashMap<String, String>> {
let shell = system_shell_path()?;
Expand Down
Loading