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.
This commit is contained in:
bellman
2026-05-14 18:31:47 +09:00
parent d3f8ff9916
commit 607f071ca8

View File

@@ -1503,8 +1503,10 @@ fn run_worker_create(input: WorkerCreateInput) -> Result<String, String> {
let merged_roots: Vec<String> = ConfigLoader::default_for(&input.cwd)
.load()
.ok()
.map(|config| config.trusted_roots_with_overrides(&input.trusted_roots))
.unwrap_or_else(|| input.trusted_roots.clone());
.map_or_else(
|| input.trusted_roots.clone(),
|config| config.trusted_roots_with_overrides(&input.trusted_roots),
);
let worker = global_worker_registry().create(
&input.cwd,
&merged_roots,