test(engine): pin hazard-first merge refusal

[ahcrm-core]

What

Strengthen test_merge_stray_dirt_escalates_with_clear_message so it pins the hazard-first outer wording and rejects the superseded merge-mechanism wording.

Closes #683

Why

The existing assertions remained green if the message regressed to saying that a merge or squash would fold the dirt into the story commit. The new assertions protect the distinction established by #618 without changing runtime behavior.

Testing

• Baseline targeted test: passed.
• Ablation before the test change: restoring the old would fold them wording still passed, confirming the coverage gap.
• Ablation after the test change: the same restoration failed on the new hazard-first assertion.
• Restored the current implementation.
• uv run pytest -q tests/test_engine_worktree.py: 287 passed.
• uv run ruff format --check tests/test_engine_worktree.py: passed.
• uv run ruff check tests/test_engine_worktree.py: passed.
• uv run pyright: 0 errors, 0 warnings.

Test-only change; no production behavior changed.

[coderabbitai]

Warning

Review limit reached

Next included review available in 35 minutes.

Check out review usage here.

View limit details

Limit details: You’ve used all 2 included reviews currently available.

You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository.

Learn how review limits work.

Review configuration:

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Advanced

Run ID: a600cc47-547c-4ded-856e-473244c3c9d5

📥 Commits

Reviewing files that changed from the base of the PR and between b755a0f and 62522cb.

📒 Files selected for processing (1)

• tests/test_engine_worktree.py

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}