@@ -9,10 +9,10 @@ use std::path::{Path, PathBuf};
99use anyhow:: { anyhow, bail, Context , Result } ;
1010use serde_json:: { json, Map , Value } ;
1111
12- use crate :: services:: checkout;
1312use crate :: services:: hooks:: codex:: bash_policy:: {
1413 bash_command_from_tool_input, evaluate_codex_bash_policy, CodexBashPolicyDecision ,
1514} ;
15+ use crate :: services:: mutation_trace:: runtime:: resolve_git_dir;
1616use crate :: services:: observability:: traits:: Logger ;
1717
1818use boundary_lock:: { AdapterBoundaryLock , DEFAULT_BOUNDARY_LOCK_TIMEOUT } ;
@@ -311,7 +311,7 @@ pub(crate) fn run_codex_mutation_scope_from_payload(
311311 stdin_payload : & str ,
312312 logger : Option < & dyn Logger > ,
313313) -> Result < String > {
314- let resolve_git_dir_fn = |cwd : & str | checkout :: resolve_git_dir ( Path :: new ( cwd) ) ;
314+ let resolve_git_dir_fn = |cwd : & str | resolve_git_dir ( Path :: new ( cwd) ) ;
315315 let seam_fn = |repository_root : & Path , payload : & str , logger : Option < & dyn Logger > | {
316316 super :: mutation_scope:: run_mutation_scope_from_payload ( repository_root, payload, logger)
317317 } ;
@@ -334,7 +334,7 @@ fn run_codex_mutation_scope_from_payload_at_state_root(
334334 stdin_payload : & str ,
335335 logger : Option < & dyn Logger > ,
336336) -> Result < String > {
337- let resolve_git_dir_fn = |cwd : & str | checkout :: resolve_git_dir ( Path :: new ( cwd) ) ;
337+ let resolve_git_dir_fn = |cwd : & str | resolve_git_dir ( Path :: new ( cwd) ) ;
338338 let seam_fn = |repository_root : & Path , payload : & str , logger : Option < & dyn Logger > | {
339339 super :: mutation_scope:: run_mutation_scope_from_payload_at_state_root (
340340 repository_root,
@@ -3547,7 +3547,7 @@ mod tests {
35473547 use crate :: services:: agent_trace_storage:: {
35483548 resolve_agent_trace_storage_at_state_root, AgentTraceStorageContext ,
35493549 } ;
3550- use crate :: services:: checkout :: { get_or_create_checkout_id , resolve_git_dir } ;
3550+ use crate :: services:: mutation_trace :: runtime :: { resolve_git_dir , resolve_worktree_id } ;
35513551 use crate :: services:: mutation_trace:: store:: decode_revision;
35523552
35533553 const PROBE01_APPLY_PATCH_POST : & str = include_str ! (
@@ -3713,8 +3713,9 @@ mod tests {
37133713 }
37143714
37153715 fn worktree_id_at ( root : & Path ) -> String {
3716- get_or_create_checkout_id ( & Self :: git_dir_at ( root) )
3717- . expect ( "checkout id should resolve" )
3716+ resolve_worktree_id ( root)
3717+ . expect ( "worktree id should resolve" )
3718+ . 0
37183719 }
37193720
37203721 fn worktree_id ( & self ) -> String {
0 commit comments