Skip to content

Commit 607f071

Browse files
bellmanbellman
authored andcommitted
harden branch recovery reporting
Ensure branch-recovery verification surfaces compile cleanly under focused lint by preserving trusted-root fallback without clippy noise. Constraint: G005 worker task requires verified branch/test awareness and recovery reporting evidence without mutating .omx/ultragoal. Rejected: ignoring focused clippy failure | would leave modified tools surface with avoidable lint noise. Confidence: high Scope-risk: narrow Directive: Keep recovery surfaces machine-readable; do not collapse test hangs back into generic timeouts. Tested: cargo test -p runtime; cargo test -p tools targeted branch/hung/preflight tests; cargo check -p runtime -p tools; cargo clippy -p runtime --all-targets -- -D warnings; cargo clippy -p tools --lib --no-deps -- -D warnings. Not-tested: full cargo test -p tools remains red on pre-existing permission-enforcer expectation failures unrelated to this change.
1 parent d3f8ff9 commit 607f071

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

rust/crates/tools/src/lib.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1503,8 +1503,10 @@ fn run_worker_create(input: WorkerCreateInput) -> Result<String, String> {
15031503
let merged_roots: Vec<String> = ConfigLoader::default_for(&input.cwd)
15041504
.load()
15051505
.ok()
1506-
.map(|config| config.trusted_roots_with_overrides(&input.trusted_roots))
1507-
.unwrap_or_else(|| input.trusted_roots.clone());
1506+
.map_or_else(
1507+
|| input.trusted_roots.clone(),
1508+
|config| config.trusted_roots_with_overrides(&input.trusted_roots),
1509+
);
15081510
let worker = global_worker_registry().create(
15091511
&input.cwd,
15101512
&merged_roots,

0 commit comments

Comments
 (0)