Summary

Extend the conflict-resolution workflow so it explicitly consults vigilante logs when rebases or post-rebase validation fail and a human or agent needs the session transcript to diagnose the next safe action.

Problem

• The conflict-resolution skill covers issue comments, rebase handling, validation, and pushing the updated branch, but it does not mention inspecting persisted session logs.
• When a rebase attempt or follow-up validation fails, the session log is often the fastest way to see the exact sequence of git, validation, and recovery steps that already happened.

Context

• Vigilante records per-issue session logs alongside daemon logs.
• Conflict resolution runs inside an existing issue/PR workflow where preserving intent and minimizing scope are important guardrails.
• The workflow already requires concise GitHub issue updates for milestones and blockers.

Desired Outcome

• The conflict-resolution skill should direct the agent to inspect vigilante logs --repo <owner/name> --issue <n> when a rebase or validation failure needs local diagnosis.
• The workflow should use the log as a factual source for understanding the last attempted steps before deciding whether to retry, report a blocker, or stop.
• Non-goal: adding new logging output or changing the recovery algorithm itself.

Implementation Notes

• Update skills/vigilante-conflict-resolution/SKILL.md to include a targeted log-triage step around rebase failures, validation failures, or ambiguous branch state.
• Keep the guidance scoped to conflict-resolution troubleshooting so the workflow does not become noisier than necessary.
• If there is generated prompt text or helper code for this skill, update that path too so runtime prompts stay aligned with the markdown skill.

Acceptance Criteria

• The conflict-resolution skill explicitly references vigilante logs --repo <owner/name> --issue <n> for failure triage.
• The added guidance names the concrete situations where logs should be checked: failed rebase, failed validation, or unclear current session state.
• The workflow still requires GitHub issue comments for user-visible progress and blockers after log inspection.

Testing Expectations

• Add or update tests for generated conflict-resolution prompts if this repository asserts that text.
• Manually verify that the resulting workflow description gives an agent a clear order of operations for diagnose, validate, comment, and push.

Operational / UX Considerations

• The log-inspection guidance should help agents avoid redundant retries when the session transcript already shows the failure mode.
• The wording should preserve the current guardrail of making the smallest safe change.