Make orchestration merge failures repairable by using plan DAG context, conflict bundles, planner-mediated repair, and bounded retry.
/goal GOAL: Complete DAG-Aware Semantic Merge Repair for an agent orchestration task: Make orchestration merge failures repairable by using plan DAG context, conflict bundles, planner-mediated repair, and bounded retry. CONTEXT: - Before editing, read the nearest AGENTS.md/CLAUDE.md, current issue or PLAN.md, and any failing logs already in the repo. - Inspect plans, worktrees, subtask ownership, PRs, and coordination notes. - Establish a baseline by running or locating evidence for: `DAG smoke, repair smoke, refusal smoke, cargo build/test/clippy/fmt`. CONSTRAINTS: - Keep the scope limited to this goal; do not expand into unrelated cleanup. - Do not weaken tests, delete assertions, or mask errors to make verification pass. - Respect the repository's AGENTS.md/CLAUDE.md instructions and existing patterns. - Keep subtask ownership explicit and avoid overlapping write scopes. - Do not merge or deploy automatically unless the goal explicitly allows it. DONE WHEN: - The implementation or documentation directly satisfies: Make orchestration merge failures repairable by using plan DAG context, conflict bundles, planner-mediated repair, and bounded retry. - The verification command or evidence path succeeds: `DAG smoke, repair smoke, refusal smoke, cargo build/test/clippy/fmt`. - The final diff is scoped to the relevant files and has no unrelated formatting churn. VERIFY: - Run `DAG smoke, repair smoke, refusal smoke, cargo build/test/clippy/fmt` or the closest repo-local equivalent if the exact command is not available. - Capture before/after evidence for the behavior, metric, report, or artifact involved. - If verification cannot run locally, stop and report the missing dependency instead of guessing success. OUTPUT: - Summarize changed files, key decisions, verification output, and remaining risks. - Include any follow-up that is required for production rollout or human review. STOP RULES: - Pause if secrets, production access, stakeholder decisions, or destructive data operations are required. - Pause after three failed fix attempts on the same symptom and challenge the root-cause hypothesis. - Do not mark the goal complete until the current repository state has been audited against DONE WHEN.
原始来源: deadreckon goal corpus
证据摘要: Land DAG-aware merge plus automatic planner-mediated repair for true conflicts; source: deadreckon goal corpus; type: third-party-project; verification: DAG smoke, repair smoke, refusal smoke, cargo build/test/clippy/fmt