Merge remote-tracking branch 'origin/main' into pakrym/async-fs-trust-migration-pr

# Conflicts:
#	codex-rs/codex-mcp/src/mcp/mod_tests.rs
#	codex-rs/core/src/config/config_tests.rs
#	codex-rs/core/src/config/mod.rs
#	codex-rs/core/src/config_loader/mod.rs
#	codex-rs/core/src/guardian/review_session.rs
#	codex-rs/core/src/original_image_detail_tests.rs
#	codex-rs/core/src/realtime_context_tests.rs
#	codex-rs/core/src/tools/spec_tests.rs
#	codex-rs/exec-server/src/environment.rs
#	codex-rs/exec-server/src/file_system.rs
#	codex-rs/exec-server/src/lib.rs
#	codex-rs/models-manager/src/model_info_tests.rs
#	codex-rs/tui_app_server/src/onboarding/onboarding_screen.rs
#	codex-rs/tui_app_server/src/onboarding/trust_directory.rs

codex-rs/git-utils/src/ghost_commits.rs

@@ -997,7 +997,7 @@ mod tests {
                 OsString::from("show"),
                 OsString::from(format!("{}:ignored.txt", ghost.id())),
             ],
-            None,
+            /*env*/ None,
         )?;
         assert_eq!(cat, ignored_contents.trim());
 
@@ -1049,7 +1049,7 @@ mod tests {
         create_sparse_file(&big, big_size)?;
 
         let (ghost, report) = create_ghost_commit_with_report(
-            &CreateGhostCommitOptions::new(repo).ignore_large_untracked_files(1024),
+            &CreateGhostCommitOptions::new(repo).ignore_large_untracked_files(/*bytes*/ 1024),
         )?;
         assert!(ghost.parent().is_some());
         assert_eq!(
@@ -1183,7 +1183,8 @@ mod tests {
 
         std::fs::write(repo.join("ephemeral.txt"), "temp\n")?;
         restore_ghost_commit_with_options(
-            &RestoreGhostCommitOptions::new(repo).ignore_large_untracked_dirs(0),
+            &RestoreGhostCommitOptions::new(repo)
+                .ignore_large_untracked_dirs(/*file_count*/ 0),
             &ghost,
         )?;
 

codex-rs/git-utils/src/info.rs

@@ -632,9 +632,7 @@ pub async fn resolve_root_git_project_for_trust(cwd: &Path) -> Option<PathBuf> {
     }
 
     let git_dir_path = canonicalize_or_raw(
-        AbsolutePathBuf::resolve_path_against_base(git_dir_rel, &repo_root)
-            .ok()?
-            .into_path_buf(),
+        AbsolutePathBuf::resolve_path_against_base(git_dir_rel, &repo_root).into_path_buf(),
     );
     let worktrees_dir = git_dir_path.parent()?;
     if worktrees_dir.file_name() != Some(OsStr::new("worktrees")) {