style: cargo fmt

This commit is contained in:
晴天
2026-04-02 14:55:27 +08:00
parent d178bffc21
commit d7ea6177e0
2 changed files with 83 additions and 41 deletions

View File

@@ -19,12 +19,60 @@ const AGENT_FILE_ALLOWLIST: &[&str] = &[
];
const WORKSPACE_TEXT_EXTENSIONS: &[&str] = &[
"md", "markdown", "mdx", "txt", "json", "jsonc", "yaml", "yml", "toml", "ini",
"cfg", "conf", "log", "csv", "env", "gitignore", "gitattributes", "editorconfig",
"js", "mjs", "cjs", "ts", "tsx", "jsx", "html", "htm", "css", "scss", "less",
"rs", "py", "sh", "bash", "zsh", "fish", "ps1", "bat", "cmd", "sql", "xml",
"java", "kt", "go", "rb", "php", "c", "cc", "cpp", "h", "hpp", "vue", "svelte",
"lock", "sample",
"md",
"markdown",
"mdx",
"txt",
"json",
"jsonc",
"yaml",
"yml",
"toml",
"ini",
"cfg",
"conf",
"log",
"csv",
"env",
"gitignore",
"gitattributes",
"editorconfig",
"js",
"mjs",
"cjs",
"ts",
"tsx",
"jsx",
"html",
"htm",
"css",
"scss",
"less",
"rs",
"py",
"sh",
"bash",
"zsh",
"fish",
"ps1",
"bat",
"cmd",
"sql",
"xml",
"java",
"kt",
"go",
"rb",
"php",
"c",
"cc",
"cpp",
"h",
"hpp",
"vue",
"svelte",
"lock",
"sample",
];
const WORKSPACE_TEXT_BASENAMES: &[&str] = &[
@@ -401,14 +449,13 @@ pub async fn list_agent_workspace_entries(
.collect();
items.sort_by(|a, b| a.0.cmp(&b.0).then_with(|| a.1.cmp(&b.1)));
Ok(Value::Array(items.into_iter().map(|(_, _, item)| item).collect()))
Ok(Value::Array(
items.into_iter().map(|(_, _, item)| item).collect(),
))
}
#[tauri::command]
pub async fn read_agent_workspace_file(
id: String,
relative_path: String,
) -> Result<Value, String> {
pub async fn read_agent_workspace_file(id: String, relative_path: String) -> Result<Value, String> {
let config = super::config::load_openclaw_json()?;
let workspace_dir = resolve_agent_workspace_path(&id, &config);
let normalized = normalize_workspace_relative_path(&relative_path)?;
@@ -1008,7 +1055,10 @@ fn normalize_workspace_relative_path(raw: &str) -> Result<PathBuf, String> {
Ok(normalized)
}
fn resolve_workspace_target_path(root: &Path, relative_path: Option<&str>) -> Result<PathBuf, String> {
fn resolve_workspace_target_path(
root: &Path,
relative_path: Option<&str>,
) -> Result<PathBuf, String> {
let normalized = normalize_workspace_relative_path(relative_path.unwrap_or_default())?;
Ok(root.join(normalized))
}

View File

@@ -678,19 +678,8 @@ pub fn write_openclaw_config(config: Value) -> Result<(), String> {
}
const CALIBRATION_RESET_INHERIT_KEYS: &[&str] = &[
"agents",
"auth",
"bindings",
"browser",
"channels",
"commands",
"env",
"hooks",
"models",
"plugins",
"session",
"skills",
"wizard",
"agents", "auth", "bindings", "browser", "channels", "commands", "env", "hooks", "models",
"plugins", "session", "skills", "wizard",
];
fn calibration_required_origins() -> Vec<String> {
@@ -772,10 +761,7 @@ fn calibration_richness_score(config: &Value) -> usize {
{
score += 4;
}
if config
.pointer("/agents/defaults")
.is_some()
{
if config.pointer("/agents/defaults").is_some() {
score += 2;
}
if config
@@ -1025,9 +1011,7 @@ fn normalize_calibrated_config(mut config: Value) -> Value {
{
tools_obj.insert("profile".into(), Value::String("full".into()));
}
let sessions = tools_obj
.entry("sessions")
.or_insert_with(|| json!({}));
let sessions = tools_obj.entry("sessions").or_insert_with(|| json!({}));
if !sessions.is_object() {
*sessions = json!({});
}
@@ -1092,9 +1076,7 @@ fn normalize_calibrated_config(mut config: Value) -> Value {
);
}
let control_ui = gateway_obj
.entry("controlUi")
.or_insert_with(|| json!({}));
let control_ui = gateway_obj.entry("controlUi").or_insert_with(|| json!({}));
if !control_ui.is_object() {
*control_ui = json!({});
}
@@ -1173,8 +1155,8 @@ pub fn calibrate_openclaw_config(mode: String) -> Result<Value, String> {
inherited_keys.dedup();
let calibrated = strip_ui_fields(normalize_calibrated_config(calibrated));
let json =
serde_json::to_string_pretty(&calibrated).map_err(|e| format!("序列化校准配置失败: {e}"))?;
let json = serde_json::to_string_pretty(&calibrated)
.map_err(|e| format!("序列化校准配置失败: {e}"))?;
fs::write(&config_path, &json).map_err(|e| format!("写入校准配置失败: {e}"))?;
fs::write(&backup_path, &json).map_err(|e| format!("写入配置备份失败: {e}"))?;
@@ -3477,9 +3459,15 @@ async fn upgrade_openclaw_inner(
.map(|o| o.status.success())
.unwrap_or(false);
if has_pkexec {
let _ = app.emit("upgrade-log", "需要管理员权限,将通过 pkexec 弹出认证窗口...");
let _ = app.emit(
"upgrade-log",
"需要管理员权限,将通过 pkexec 弹出认证窗口...",
);
} else {
let _ = app.emit("upgrade-log", "⚠️ 需要管理员权限但 pkexec 不可用,可能需要手动安装");
let _ = app.emit(
"upgrade-log",
"⚠️ 需要管理员权限但 pkexec 不可用,可能需要手动安装",
);
}
}
}
@@ -3650,7 +3638,9 @@ async fn upgrade_openclaw_inner(
// 安装成功后再卸载旧包(确保 CLI 始终可用)
if need_uninstall_old {
let _ = app.emit("upgrade-log", format!("清理旧版本 ({old_pkg})..."));
let _ = npm_command_elevated().args(["uninstall", "-g", old_pkg]).output();
let _ = npm_command_elevated()
.args(["uninstall", "-g", old_pkg])
.output();
// 清理 standalone 安装目录(不论从 standalone 切走还是切到 standalone
// npm 路径已经安装了新 CLIstandalone 残留会干扰源检测)
@@ -3833,7 +3823,9 @@ async fn uninstall_openclaw_inner(
"openclaw"
};
let _ = app.emit("upgrade-log", format!("清理 {other_pkg}..."));
let _ = npm_command_elevated().args(["uninstall", "-g", other_pkg]).output();
let _ = npm_command_elevated()
.args(["uninstall", "-g", other_pkg])
.output();
let _ = app.emit("upgrade-progress", 80);
// 5. 可选:清理配置目录