Skip to content

Commit cbfa625

Browse files
authored
runtime: use mutation trace worktree identity after rebase
1 parent daf5266 commit cbfa625

3 files changed

Lines changed: 14 additions & 15 deletions

File tree

  • cli/src/services

‎cli/src/services/hooks/claude_mutation_scope/mod.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use std::path::{Path, PathBuf};
77
use anyhow::{anyhow, bail, Context, Result};
88
use serde_json::{json, Map, Value};
99

10+
use crate::services::mutation_trace::runtime::resolve_git_dir;
1011
use crate::services::observability::traits::Logger;
1112

1213
const HOOK_EVENT_NAME_FIELD: &str = "hook_event_name";
@@ -354,8 +355,7 @@ pub(crate) fn run_claude_mutation_scope_from_payload(
354355
stdin_payload: &str,
355356
logger: Option<&dyn Logger>,
356357
) -> Result<String> {
357-
let resolve_git_dir_fn =
358-
|cwd: &str| crate::services::mutation_trace::runtime::resolve_git_dir(Path::new(cwd));
358+
let resolve_git_dir_fn = |cwd: &str| resolve_git_dir(Path::new(cwd));
359359
let seam_fn = |repository_root: &Path, payload: &str, logger: Option<&dyn Logger>| {
360360
super::mutation_scope::run_mutation_scope_from_payload(repository_root, payload, logger)
361361
};
@@ -374,8 +374,7 @@ fn run_claude_mutation_scope_from_payload_at_state_root(
374374
stdin_payload: &str,
375375
logger: Option<&dyn Logger>,
376376
) -> Result<String> {
377-
let resolve_git_dir_fn =
378-
|cwd: &str| crate::services::mutation_trace::runtime::resolve_git_dir(Path::new(cwd));
377+
let resolve_git_dir_fn = |cwd: &str| resolve_git_dir(Path::new(cwd));
379378
let seam_fn = |repository_root: &Path, payload: &str, logger: Option<&dyn Logger>| {
380379
super::mutation_scope::run_mutation_scope_from_payload_at_state_root(
381380
repository_root,

‎cli/src/services/hooks/codex_mutation_scope/mod.rs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ use std::path::{Path, PathBuf};
99
use anyhow::{anyhow, bail, Context, Result};
1010
use serde_json::{json, Map, Value};
1111

12-
use crate::services::checkout;
1312
use 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;
1616
use crate::services::observability::traits::Logger;
1717

1818
use 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 {

‎cli/src/services/mutation_trace/runtime/tests.rs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use crate::services::mutation_trace::store::{
1111
};
1212
use crate::services::mutation_trace::types::{
1313
boundary_event_key, boundary_scope, ActorKind, AttemptId, Attribution, Boundary, EventId,
14-
FailureKind, ScopeId, ScopeStatus, WorktreeId,
14+
FailureKind, ScopeId, ScopeStatus,
1515
};
1616
use crate::services::patch::{parse_patch, ParsedPatch};
1717

@@ -2316,9 +2316,8 @@ fn drive_codex_overlap_transition(
23162316
closing_actor: ActorKind,
23172317
) -> (Attribution, ParsedPatch, ParsedPatch) {
23182318
let repo = TestRepo::new(label);
2319-
let git_dir = resolve_git_dir(&repo.repo_root).expect("git dir should resolve");
2320-
let checkout_id =
2321-
get_or_create_checkout_id(&git_dir).expect("checkout identity should resolve");
2319+
let worktree_id =
2320+
resolve_worktree_id(&repo.repo_root).expect("worktree identity should resolve");
23222321
let snapshot =
23232322
GitSnapshotService::new(&repo.repo_root).expect("a snapshot service should build");
23242323
let ok_db = || repo.open_db();
@@ -2384,7 +2383,7 @@ fn drive_codex_overlap_transition(
23842383
let attribution = resolve_bounded_mutation_attribution(
23852384
&store,
23862385
&snapshot,
2387-
&WorktreeId(checkout_id),
2386+
&worktree_id,
23882387
&ParsedPatch { files: Vec::new() },
23892388
&committed,
23902389
&after,

0 commit comments

Comments
 (0)