Skip to content

Fix: error from merge for fs read #2225

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
dingfeli merged 1 commit into from
Jul 3, 2025
Merged

Fix: error from merge for fs read #2225

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
2 changes: 1 addition & 1 deletion crates/chat-cli/src/cli/agent.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ impl Agent {
}
}

#[derive(Debug)]
#[derive(Debug, PartialEq)]
pub enum PermissionEvalResult {
Allow,
Ask,
Expand Down
215 changes: 115 additions & 100 deletions crates/chat-cli/src/cli/chat/tools/fs_read.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,121 @@ impl FsRead {
}
}

pub fn eval_perm(&self, agent: &Agent) -> PermissionEvalResult {
#[derive(Debug, Deserialize)]
#[serde(rename_all = "camelCase")]
struct Settings {
#[serde(default)]
allowed_paths: Vec<String>,
#[serde(default)]
denied_paths: Vec<String>,
#[serde(default = "default_allow_read_only")]
allow_read_only: bool,
}

fn default_allow_read_only() -> bool {
true
}

let is_in_allowlist = agent.allowed_tools.contains("fs_read");
match agent.tools_settings.get("fs_read") {
Some(settings) if is_in_allowlist => {
let Settings {
allowed_paths,
denied_paths,
allow_read_only,
} = match serde_json::from_value::<Settings>(settings.clone()) {
Ok(settings) => settings,
Err(e) => {
error!("Failed to deserialize tool settings for fs_read: {:?}", e);
return PermissionEvalResult::Ask;
},
};
let allow_set = {
let mut builder = GlobSetBuilder::new();
for path in &allowed_paths {
if let Ok(glob) = Glob::new(path) {
builder.add(glob);
} else {
warn!("Failed to create glob from path given: {path}. Ignoring.");
}
}
builder.build()
};

let deny_set = {
let mut builder = GlobSetBuilder::new();
for path in &denied_paths {
if let Ok(glob) = Glob::new(path) {
builder.add(glob);
} else {
warn!("Failed to create glob from path given: {path}. Ignoring.");
}
}
builder.build()
};

match (allow_set, deny_set) {
(Ok(allow_set), Ok(deny_set)) => {
let eval_res = self
.operations
.iter()
.map(|op| {
match op {
FsReadOperation::Line(FsLine { path, .. })
| FsReadOperation::Directory(FsDirectory { path, .. })
| FsReadOperation::Search(FsSearch { path, .. }) => {
if deny_set.is_match(path) {
return PermissionEvalResult::Deny;
}
if allow_set.is_match(path) {
return PermissionEvalResult::Allow;
}
},
FsReadOperation::Image(fs_image) => {
let paths = &fs_image.image_paths;
if paths.iter().any(|path| deny_set.is_match(path)) {
return PermissionEvalResult::Deny;
}
if paths.iter().all(|path| allow_set.is_match(path)) {
return PermissionEvalResult::Allow;
}
},
}

if allow_read_only {
PermissionEvalResult::Allow
} else {
PermissionEvalResult::Ask
}
})
.collect::<Vec<_>>();

if eval_res.contains(&PermissionEvalResult::Deny) {
PermissionEvalResult::Deny
} else if eval_res.contains(&PermissionEvalResult::Ask) {
PermissionEvalResult::Ask
} else {
PermissionEvalResult::Allow
}
},
(allow_res, deny_res) => {
if let Err(e) = allow_res {
warn!("fs_read failed to build allow set: {:?}", e);
}
if let Err(e) = deny_res {
warn!("fs_read failed to build deny set: {:?}", e);
}
warn!("One or more detailed args failed to parse, falling back to ask");
PermissionEvalResult::Ask
},
}
},
None if is_in_allowlist => PermissionEvalResult::Allow,
_ => PermissionEvalResult::Ask,
}
}

pub async fn invoke(&self, os: &Os, updates: &mut impl Write) -> Result<InvokeOutput> {
if self.operations.len() == 1 {
// Single operation - return result directly
Expand Down Expand Up @@ -218,106 +333,6 @@ impl FsReadOperation {
FsReadOperation::Image(fs_image) => fs_image.invoke(updates).await,
}
}

pub fn eval_perm(&self, agent: &Agent) -> PermissionEvalResult {
#[derive(Debug, Deserialize)]
#[serde(rename_all = "camelCase")]
struct Settings {
#[serde(default)]
allowed_paths: Vec<String>,
#[serde(default)]
denied_paths: Vec<String>,
#[serde(default = "default_allow_read_only")]
allow_read_only: bool,
}

fn default_allow_read_only() -> bool {
true
}

let is_in_allowlist = agent.allowed_tools.contains("fs_read");
match agent.tools_settings.get("fs_read") {
Some(settings) if is_in_allowlist => {
let Settings {
allowed_paths,
denied_paths,
allow_read_only,
} = match serde_json::from_value::<Settings>(settings.clone()) {
Ok(settings) => settings,
Err(e) => {
error!("Failed to deserialize tool settings for fs_read: {:?}", e);
return PermissionEvalResult::Ask;
},
};
let allow_set = {
let mut builder = GlobSetBuilder::new();
for path in &allowed_paths {
if let Ok(glob) = Glob::new(path) {
builder.add(glob);
} else {
warn!("Failed to create glob from path given: {path}. Ignoring.");
}
}
builder.build()
};

let deny_set = {
let mut builder = GlobSetBuilder::new();
for path in &denied_paths {
if let Ok(glob) = Glob::new(path) {
builder.add(glob);
} else {
warn!("Failed to create glob from path given: {path}. Ignoring.");
}
}
builder.build()
};

match (allow_set, deny_set) {
(Ok(allow_set), Ok(deny_set)) => {
match self {
Self::Line(FsLine { path, .. })
| Self::Directory(FsDirectory { path, .. })
| Self::Search(FsSearch { path, .. }) => {
if deny_set.is_match(path) {
return PermissionEvalResult::Deny;
}
if allow_set.is_match(path) {
return PermissionEvalResult::Allow;
}
},
Self::Image(fs_image) => {
let paths = &fs_image.image_paths;
if paths.iter().any(|path| deny_set.is_match(path)) {
return PermissionEvalResult::Deny;
}
if paths.iter().all(|path| allow_set.is_match(path)) {
return PermissionEvalResult::Allow;
}
},
}
if allow_read_only {
PermissionEvalResult::Allow
} else {
PermissionEvalResult::Ask
}
},
(allow_res, deny_res) => {
if let Err(e) = allow_res {
warn!("fs_read failed to build allow set: {:?}", e);
}
if let Err(e) = deny_res {
warn!("fs_read failed to build deny set: {:?}", e);
}
warn!("One or more detailed args failed to parse, falling back to ask");
PermissionEvalResult::Ask
},
}
},
None if is_in_allowlist => PermissionEvalResult::Allow,
_ => PermissionEvalResult::Ask,
}
}
}

/// Read images from given paths.
Expand Down
Loading