task: pr-agent - resolve merge conflicts and outstanding review feedback across LS-4214 stack #3437

Task Summary

Get the LS-4214 pr-agent consolidation PR stack (#3400 → #3401 → #3403) conflict-free, mergeable, and clear of outstanding CodeRabbit review feedback, then merge in order.

Linked Stories/Tasks

Related epic: LS-4214
Related pull requests: #3400, #3401, #3403

Milestones & Timeline

No fixed deadline — should be resolved before any further work stacks on top of #3403.

Acceptance Criteria

• All three PRs (aiops: pr-agent - plan consolidation spec, fix initial identity and lint config bugs #3400, refactor: pr-agent - restructure 6 skills into Agent Skills specification shape #3401, fix: pr-agent - correct branch-validation prefix lists, complete the pr-creation-agent merge #3403) show mergeable/CI-green status
• All unresolved CodeRabbit threads on aiops: pr-agent - plan consolidation spec, fix initial identity and lint config bugs #3400 and refactor: pr-agent - restructure 6 skills into Agent Skills specification shape #3401 are addressed or explicitly dismissed with reasoning
• fix: pr-agent - correct branch-validation prefix lists, complete the pr-creation-agent merge #3403's merge conflicts with its base are resolved
• CodeRabbit review is re-triggered on fix: pr-agent - correct branch-validation prefix lists, complete the pr-creation-agent merge #3403 and any findings addressed
• Stack merged in order: aiops: pr-agent - plan consolidation spec, fix initial identity and lint config bugs #3400 → refactor: pr-agent - restructure 6 skills into Agent Skills specification shape #3401 → fix: pr-agent - correct branch-validation prefix lists, complete the pr-creation-agent merge #3403
• Labels/types match org standards

Steps / Checklist

Stack status

• aiops: pr-agent - plan consolidation spec, fix initial identity and lint config bugs #3400 aiops/pr-agent-consolidation-portability → base develop — CLEAN, mergeable
• refactor: pr-agent - restructure 6 skills into Agent Skills specification shape #3401 refactor/pr-agent-skills-restructure → base aiops: pr-agent - plan consolidation spec, fix initial identity and lint config bugs #3400's branch — UNSTABLE ("Mergify Merge Protections" pending)
• fix: pr-agent - correct branch-validation prefix lists, complete the pr-creation-agent merge #3403 fix/pr-agent-branch-name-validation → base refactor: pr-agent - restructure 6 skills into Agent Skills specification shape #3401's branch — DIRTY / CONFLICTING (base branch was force-pushed, diverging fix: pr-agent - correct branch-validation prefix lists, complete the pr-creation-agent merge #3403)

Merge conflicts (#3403 vs its base)

• .github/specs/015-pr-agent-consolidation/quickstart.md — divergent edits to the Scenario 1 verification steps
• CHANGELOG.md — both branches added an entry at the same insertion point (README-Regen Noise Fixed vs. PR Agent Branch-Validation Prefix Lists) — keep both, correctly ordered

Outstanding CodeRabbit feedback — #3400 (5 unresolved threads)

• Make the Create/Update precondition scope explicit — pr-agent-invocation.md: Update flow must also backfill labels/assignee; FR-012 applies to both create and update
• Define how branch roles are discovered — pr-agent-invocation.md: no deterministic rule for identifying "production"/"integration" branches without hardcoding main/develop, despite FR-006 prohibiting that
• Use a base-aware diff for the locked-file check — quickstart.md: git diff with no base ref can silently pass even when a locked file changed
• Make the forbidden-directory check return failure — quickstart.md: test -d ... && echo FAIL always exits 0, so scripted validation can't detect FAIL
• Correct the Scenario 1 check count — quickstart.md: says "four checks" but only three are defined

Outstanding CodeRabbit feedback — #3401 (3 unresolved threads)

• Make the usage example valid — validate-and-apply-labels/SKILL.md: example omits required templateFile when branchType is set, so it throws as written
• Align the branch-validation contract with the canonical strategy — validate-branch-name/SKILL.md: lists forbidden claude/bot/automated and is missing task/doc/aiops/automation/epic from allowed types. Note: this is the same bug fix: pr-agent - correct branch-validation prefix lists, complete the pr-creation-agent merge #3403 fixes at the implementation level — confirm whether fix: pr-agent - correct branch-validation prefix lists, complete the pr-creation-agent merge #3403 also updates this SKILL.md's spec text, or if a separate doc fix is needed
• Document the branch-specific output fields for all four skills — validate-and-apply-labels/SKILL.md: Output sections for validateAndApplyLabels, handlePrErrors, routePrTemplate, submitPr are missing documented result-shape variants

#3403 — no CodeRabbit review posted yet

• Re-trigger CodeRabbit review after rebase (prior run reported "Review rate limited")

Dependencies

• Blocks any further PRs stacking on top of fix: pr-agent - correct branch-validation prefix lists, complete the pr-creation-agent merge #3403 for LS-4214 Stories 2-4
• refactor: pr-agent - restructure 6 skills into Agent Skills specification shape #3401 depends on aiops: pr-agent - plan consolidation spec, fix initial identity and lint config bugs #3400 merging or being confirmed stable
• fix: pr-agent - correct branch-validation prefix lists, complete the pr-creation-agent merge #3403 depends on refactor: pr-agent - restructure 6 skills into Agent Skills specification shape #3401's branch being stable before rebasing

Additional Context

Root cause of #3403's conflict: refactor/pr-agent-skills-restructure (the branch backing #3401) was force-pushed (74bb256eec...1f0baa643d), rewriting history underneath #3403 and leaving it diverged from its base.

Definition of Ready (DoR)

• Task described and scoped
• Estimate added if relevant

Definition of Done (DoD)

• Task completed and documented
• Changelog entry prepared for PR (if this task itself needs a PR — likely not, as it only tracks fixes to the existing stack) — meta:no-changelog applies to this tracking issue itself
• PR uses correct branch prefix (task/) if any direct commits are needed
• Documentation/changelog updated if needed
• Branch deleted after merge
• Linked issue(s) updated with latest status and closed after merge
• The related epic (LS-4214) should not be closed, instead updated with a comment reflecting this issue's closure