Skip to content

Commit ac15441

Browse files
committed
style: rustfmt-style wrapping in daemon and shared modules
1 parent eaf499c commit ac15441

13 files changed

Lines changed: 115 additions & 110 deletions

File tree

src-tauri/src/bin/codex_monitor_daemon/rpc/codex.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,11 @@ pub(super) async fn try_handle(
262262
};
263263
let cursor = parse_optional_string(params, "cursor");
264264
let limit = parse_optional_u32(params, "limit");
265-
Some(state.experimental_feature_list(workspace_id, cursor, limit).await)
265+
Some(
266+
state
267+
.experimental_feature_list(workspace_id, cursor, limit)
268+
.await,
269+
)
266270
}
267271
"collaboration_mode_list" => {
268272
let workspace_id = match parse_string(params, "workspaceId") {

src-tauri/src/bin/codex_monitor_daemon/rpc/workspace.rs

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,10 @@ pub(super) async fn try_handle(
7070
match method {
7171
"list_workspaces" => Some(serialize_value(state.list_workspaces().await)),
7272
"is_workspace_path_dir" => {
73-
let request =
74-
parse_request_or_err!(params, workspace_rpc::IsWorkspacePathDirRequest);
75-
Some(serialize_value(state.is_workspace_path_dir(request.path).await))
73+
let request = parse_request_or_err!(params, workspace_rpc::IsWorkspacePathDirRequest);
74+
Some(serialize_value(
75+
state.is_workspace_path_dir(request.path).await,
76+
))
7677
}
7778
"add_workspace" => {
7879
let request = parse_request_or_err!(params, workspace_rpc::AddWorkspaceRequest);
@@ -123,10 +124,7 @@ pub(super) async fn try_handle(
123124
"connect_workspace" => {
124125
let request = parse_request_or_err!(params, workspace_rpc::IdRequest);
125126
Some(
126-
serialize_ok(
127-
state.connect_workspace(request.id, client_version.to_string()),
128-
)
129-
.await,
127+
serialize_ok(state.connect_workspace(request.id, client_version.to_string())).await,
130128
)
131129
}
132130
"set_workspace_runtime_codex_args" => {
@@ -188,11 +186,8 @@ pub(super) async fn try_handle(
188186
let request =
189187
parse_request_or_err!(params, workspace_rpc::UpdateWorkspaceCodexBinRequest);
190188
Some(
191-
serialize_result(state.update_workspace_codex_bin(
192-
request.id,
193-
request.codex_bin,
194-
))
195-
.await,
189+
serialize_result(state.update_workspace_codex_bin(request.id, request.codex_bin))
190+
.await,
196191
)
197192
}
198193
"list_workspace_files" => {
@@ -224,8 +219,12 @@ pub(super) async fn try_handle(
224219
Err(err) => return Some(Err(err)),
225220
};
226221
Some(
227-
serialize_result(state.file_read(request.scope, request.kind, request.workspace_id))
228-
.await,
222+
serialize_result(state.file_read(
223+
request.scope,
224+
request.kind,
225+
request.workspace_id,
226+
))
227+
.await,
229228
)
230229
}
231230
"file_write" => {

src-tauri/src/codex/mod.rs

Lines changed: 19 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,7 @@ use crate::shared::codex_core;
1818
use crate::state::AppState;
1919
use crate::types::WorkspaceEntry;
2020

21-
fn emit_thread_live_event(
22-
app: &AppHandle,
23-
workspace_id: &str,
24-
method: &str,
25-
params: Value,
26-
) {
21+
fn emit_thread_live_event(app: &AppHandle, workspace_id: &str, method: &str, params: Value) {
2722
let _ = app.emit(
2823
"app-server-event",
2924
AppServerEvent {
@@ -132,8 +127,12 @@ pub(crate) async fn thread_live_subscribe(
132127
.await;
133128
}
134129

135-
codex_core::thread_live_subscribe_core(&state.sessions, workspace_id.clone(), thread_id.clone())
136-
.await?;
130+
codex_core::thread_live_subscribe_core(
131+
&state.sessions,
132+
workspace_id.clone(),
133+
thread_id.clone(),
134+
)
135+
.await?;
137136
let subscription_id = format!("{}:{}", workspace_id, thread_id);
138137
emit_thread_live_event(
139138
&app,
@@ -233,8 +232,7 @@ pub(crate) async fn list_threads(
233232
.await;
234233
}
235234

236-
codex_core::list_threads_core(&state.sessions, workspace_id, cursor, limit, sort_key, cwd)
237-
.await
235+
codex_core::list_threads_core(&state.sessions, workspace_id, cursor, limit, sort_key, cwd).await
238236
}
239237

240238
#[tauri::command]
@@ -565,8 +563,8 @@ pub(crate) async fn get_agents_settings(
565563
app: AppHandle,
566564
) -> Result<agents_config_core::AgentsSettingsDto, String> {
567565
if remote_backend::is_remote_mode(&*state).await {
568-
let response = remote_backend::call_remote(&*state, app, "get_agents_settings", json!({}))
569-
.await?;
566+
let response =
567+
remote_backend::call_remote(&*state, app, "get_agents_settings", json!({})).await?;
570568
return serde_json::from_value(response).map_err(|err| err.to_string());
571569
}
572570

@@ -600,13 +598,9 @@ pub(crate) async fn create_agent(
600598
app: AppHandle,
601599
) -> Result<agents_config_core::AgentsSettingsDto, String> {
602600
if remote_backend::is_remote_mode(&*state).await {
603-
let response = remote_backend::call_remote(
604-
&*state,
605-
app,
606-
"create_agent",
607-
json!({ "input": input }),
608-
)
609-
.await?;
601+
let response =
602+
remote_backend::call_remote(&*state, app, "create_agent", json!({ "input": input }))
603+
.await?;
610604
return serde_json::from_value(response).map_err(|err| err.to_string());
611605
}
612606

@@ -620,13 +614,9 @@ pub(crate) async fn update_agent(
620614
app: AppHandle,
621615
) -> Result<agents_config_core::AgentsSettingsDto, String> {
622616
if remote_backend::is_remote_mode(&*state).await {
623-
let response = remote_backend::call_remote(
624-
&*state,
625-
app,
626-
"update_agent",
627-
json!({ "input": input }),
628-
)
629-
.await?;
617+
let response =
618+
remote_backend::call_remote(&*state, app, "update_agent", json!({ "input": input }))
619+
.await?;
630620
return serde_json::from_value(response).map_err(|err| err.to_string());
631621
}
632622

@@ -640,13 +630,9 @@ pub(crate) async fn delete_agent(
640630
app: AppHandle,
641631
) -> Result<agents_config_core::AgentsSettingsDto, String> {
642632
if remote_backend::is_remote_mode(&*state).await {
643-
let response = remote_backend::call_remote(
644-
&*state,
645-
app,
646-
"delete_agent",
647-
json!({ "input": input }),
648-
)
649-
.await?;
633+
let response =
634+
remote_backend::call_remote(&*state, app, "delete_agent", json!({ "input": input }))
635+
.await?;
650636
return serde_json::from_value(response).map_err(|err| err.to_string());
651637
}
652638

src-tauri/src/shared/agents_config_core.rs

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,14 @@ pub(crate) fn update_agent_core(input: UpdateAgentInput) -> Result<AgentsSetting
193193
if let Some(old_relative_path) = managed_relative_path_from_config(old_value) {
194194
let new_relative_path = managed_relative_config_for_name(&name);
195195
if old_relative_path != new_relative_path {
196-
let old_abs_path =
197-
resolve_safe_managed_abs_path_for_read(&codex_home, &old_relative_path)?;
198-
let new_abs_path =
199-
resolve_safe_managed_abs_path_for_write(&codex_home, &new_relative_path)?;
196+
let old_abs_path = resolve_safe_managed_abs_path_for_read(
197+
&codex_home,
198+
&old_relative_path,
199+
)?;
200+
let new_abs_path = resolve_safe_managed_abs_path_for_write(
201+
&codex_home,
202+
&new_relative_path,
203+
)?;
200204
if new_abs_path.exists() {
201205
return Err(format!(
202206
"target config file already exists: {}",
@@ -316,8 +320,9 @@ pub(crate) fn delete_agent_core(input: DeleteAgentInput) -> Result<AgentsSetting
316320
if let Some(relative_path) = managed_relative_path_from_config(config_file.as_str()) {
317321
let target = resolve_safe_managed_abs_path_for_read(&codex_home, &relative_path)?;
318322
if target.exists() {
319-
let backup = std::fs::read(&target)
320-
.map_err(|err| format!("Failed to read agent config file before delete: {err}"))?;
323+
let backup = std::fs::read(&target).map_err(|err| {
324+
format!("Failed to read agent config file before delete: {err}")
325+
})?;
321326
std::fs::remove_file(&target)
322327
.map_err(|err| format!("Failed to delete agent config file: {err}"))?;
323328
deleted_config_backup = Some((target, backup));
@@ -326,7 +331,9 @@ pub(crate) fn delete_agent_core(input: DeleteAgentInput) -> Result<AgentsSetting
326331
}
327332
}
328333

329-
if let Err(persist_error) = config_toml_core::persist_global_config_document(&codex_home, &document) {
334+
if let Err(persist_error) =
335+
config_toml_core::persist_global_config_document(&codex_home, &document)
336+
{
330337
if let Some((path, backup)) = deleted_config_backup {
331338
if let Err(restore_error) = std::fs::write(&path, backup) {
332339
return Err(format!(
@@ -600,7 +607,9 @@ fn managed_relative_path_from_config(raw_path: &str) -> Option<PathBuf> {
600607
}
601608
}
602609

603-
fn resolve_managed_agent_config_relative_path(agent_name: &str) -> Result<(PathBuf, PathBuf), String> {
610+
fn resolve_managed_agent_config_relative_path(
611+
agent_name: &str,
612+
) -> Result<(PathBuf, PathBuf), String> {
604613
let name = normalize_agent_lookup_name(agent_name)?;
605614
let codex_home = resolve_codex_home()?;
606615
let (_, document) = config_toml_core::load_global_config_document(&codex_home)?;
@@ -803,7 +812,10 @@ mod tests {
803812
fn normalize_agent_name_accepts_expected_shape() {
804813
assert_eq!(normalize_agent_name("explorer").expect("valid"), "explorer");
805814
assert_eq!(normalize_agent_name("a-1_b").expect("valid"), "a-1_b");
806-
assert_eq!(normalize_agent_name(" Explorer ").expect("valid"), "explorer");
815+
assert_eq!(
816+
normalize_agent_name(" Explorer ").expect("valid"),
817+
"explorer"
818+
);
807819
assert_eq!(normalize_agent_name("A-1_B").expect("valid"), "a-1_b");
808820
assert_eq!(
809821
normalize_agent_name("Hello world").expect("valid"),
@@ -825,13 +837,11 @@ mod tests {
825837
#[test]
826838
fn managed_path_detection_accepts_agents_prefix() {
827839
assert_eq!(
828-
managed_relative_path_from_config("./agents/researcher.toml")
829-
.expect("managed path"),
840+
managed_relative_path_from_config("./agents/researcher.toml").expect("managed path"),
830841
PathBuf::from("agents/researcher.toml")
831842
);
832843
assert_eq!(
833-
managed_relative_path_from_config("agents/researcher.toml")
834-
.expect("managed path"),
844+
managed_relative_path_from_config("agents/researcher.toml").expect("managed path"),
835845
PathBuf::from("agents/researcher.toml")
836846
);
837847
}
@@ -857,10 +867,7 @@ mod tests {
857867
let mut role = clone_role_table(role_item).expect("clone role");
858868
role["description"] = value("New");
859869

860-
assert_eq!(
861-
role.get("custom_key").and_then(Item::as_str),
862-
Some("keep")
863-
);
870+
assert_eq!(role.get("custom_key").and_then(Item::as_str), Some("keep"));
864871
assert_eq!(role.get("description").and_then(Item::as_str), Some("New"));
865872
}
866873

@@ -910,8 +917,7 @@ mod tests {
910917

911918
#[test]
912919
fn build_template_content_uses_provided_model_and_reasoning() {
913-
let content =
914-
build_template_content(Some("blank"), Some("gpt-5.1"), Some("high"), None);
920+
let content = build_template_content(Some("blank"), Some("gpt-5.1"), Some("high"), None);
915921
assert!(content.contains("model = \"gpt-5.1\""));
916922
assert!(content.contains("model_reasoning_effort = \"high\""));
917923
}

src-tauri/src/shared/codex_aux_core.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ use crate::backend::app_server::{
1313
use crate::shared::process_core::tokio_command;
1414
use crate::types::AppSettings;
1515

16-
const DEFAULT_COMMIT_MESSAGE_PROMPT: &str = "Generate a concise git commit message for the following changes. \
16+
const DEFAULT_COMMIT_MESSAGE_PROMPT: &str =
17+
"Generate a concise git commit message for the following changes. \
1718
Follow conventional commit format (e.g., feat:, fix:, refactor:, docs:, etc.). \
1819
Keep the summary line under 72 characters. \
1920
Only output the commit message, nothing else.\n\n\
@@ -629,7 +630,8 @@ where
629630
#[cfg(test)]
630631
mod tests {
631632
use super::{
632-
build_commit_message_prompt_for_diff, parse_agent_description_value, parse_run_metadata_value,
633+
build_commit_message_prompt_for_diff, parse_agent_description_value,
634+
parse_run_metadata_value,
633635
};
634636

635637
#[test]
@@ -643,7 +645,8 @@ mod tests {
643645

644646
#[test]
645647
fn parse_run_metadata_value_normalizes_worktree_name_alias() {
646-
let raw = r#"{"title":"Fix Login Redirect Loop","worktree_name":"fix-login-redirect-loop"}"#;
648+
let raw =
649+
r#"{"title":"Fix Login Redirect Loop","worktree_name":"fix-login-redirect-loop"}"#;
647650
let parsed = parse_run_metadata_value(raw).expect("parse metadata");
648651
assert_eq!(parsed["title"], "Fix Login Redirect Loop");
649652
assert_eq!(parsed["worktreeName"], "fix/login-redirect-loop");

src-tauri/src/shared/codex_core.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,9 @@ pub(crate) async fn experimental_feature_list_core(
368368
) -> Result<Value, String> {
369369
let session = get_session_clone(sessions, &workspace_id).await?;
370370
let params = json!({ "cursor": cursor, "limit": limit });
371-
session.send_request("experimentalFeature/list", params).await
371+
session
372+
.send_request("experimentalFeature/list", params)
373+
.await
372374
}
373375

374376
pub(crate) async fn account_rate_limits_core(

src-tauri/src/shared/codex_update_core.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -197,13 +197,7 @@ pub(crate) async fn codex_update_core(
197197
ok,
198198
)
199199
} else {
200-
(
201-
"unknown".to_string(),
202-
None,
203-
false,
204-
String::new(),
205-
false,
206-
)
200+
("unknown".to_string(), None, false, String::new(), false)
207201
};
208202

209203
let after_version = if method == "unknown" {

src-tauri/src/shared/git_ui_core/commands.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,12 @@ fn count_effective_dir_entries(root: &Path) -> Result<usize, String> {
8282
let entries = fs::read_dir(root).map_err(|err| format!("Failed to read directory: {err}"))?;
8383
let mut count = 0usize;
8484
for entry in entries {
85-
let entry =
86-
entry.map_err(|err| format!("Failed to read directory entry in {}: {err}", root.display()))?;
85+
let entry = entry.map_err(|err| {
86+
format!(
87+
"Failed to read directory entry in {}: {err}",
88+
root.display()
89+
)
90+
})?;
8791
let name = entry.file_name();
8892
let name = name.to_string_lossy();
8993
if name == ".git" || name == ".DS_Store" || name == "Thumbs.db" {
@@ -169,8 +173,7 @@ pub(super) fn validate_normalized_repo_name(value: &str) -> Result<String, Strin
169173
let normalized = normalize_repo_full_name(value);
170174
if normalized.is_empty() {
171175
return Err(
172-
"Repository name is empty after normalization. Use 'repo' or 'owner/repo'."
173-
.to_string(),
176+
"Repository name is empty after normalization. Use 'repo' or 'owner/repo'.".to_string(),
174177
);
175178
}
176179
Ok(normalized)

src-tauri/src/shared/git_ui_core/tests.rs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,10 @@ fn github_repo_names_match_normalizes_and_ignores_case() {
7676
"https://github.com/Owner/Repo.git",
7777
"owner/repo"
7878
));
79-
assert!(commands::github_repo_names_match("OWNER/REPO", "owner/repo"));
79+
assert!(commands::github_repo_names_match(
80+
"OWNER/REPO",
81+
"owner/repo"
82+
));
8083
}
8184

8285
#[test]
@@ -91,11 +94,15 @@ fn github_repo_names_match_detects_mismatch() {
9194
fn validate_normalized_repo_name_rejects_empty_slug_after_normalization() {
9295
assert_eq!(
9396
commands::validate_normalized_repo_name(".git"),
94-
Err("Repository name is empty after normalization. Use 'repo' or 'owner/repo'.".to_string())
97+
Err(
98+
"Repository name is empty after normalization. Use 'repo' or 'owner/repo'.".to_string()
99+
)
95100
);
96101
assert_eq!(
97102
commands::validate_normalized_repo_name("git@github.com:.git"),
98-
Err("Repository name is empty after normalization. Use 'repo' or 'owner/repo'.".to_string())
103+
Err(
104+
"Repository name is empty after normalization. Use 'repo' or 'owner/repo'.".to_string()
105+
)
99106
);
100107
}
101108

0 commit comments

Comments
 (0)