Sks Pr Workflow

Shikanime Org PR Workflow

Orchestrator over sks-issue/sks-pr/sks-pr-triage: issue → PR → triage.

Encourage authors to embed a Mermaid diagram in the issue or PR body when a flow or architecture helps the reader — GitHub renders Mermaid inline. The body stays free text; the diagram is optional reinforcement, never a substitute for the prose.

When to Use

• "Run the full PR side: issue → PR → triage."
• "Ensure a PR is properly linked and triaged before work starts."

Procedure

0. Pre-submit isolation & conflict gate (mandatory)

Every PR carries ONLY its own change set. Before opening (step 2), verify:

1. Isolation — change set is exactly the intended files, no foreign/dangling files from parallel agents or interrupted sessions.
   • jj: jj diff -r @ --stat and jj file list -r @; anything outside scope stays in @ / a separate commit, never in this PR.
   • git: git status --porcelain --untracked-files=all and git diff --stat origin/main..HEAD.
2. Conflict-free base — the branch descends from the PR base with no conflict markers.
   • BASE=$(gh pr view <N> --json baseRefOid -q .baseRefOid) (new PR: origin/main).
   • git fetch origin ${BASE:-main} && git merge-base --is-ancestor
"${BASE:-origin/main}" HEAD && echo clean || echo CONFLICT.
   • Rebase onto base (jj rebase -r @ -d main / git rebase origin/main); clean rebase = gate pass.
   • CONFLICTING/DIRTY = real conflict; BLOCKED = pending CI, not conflict.

Do NOT open the PR until both checks pass.

1. Ensure linked issue exists

If #N not provided/converged, load sks-issue (or sks-issue-workflow) and create first. A PR never opens without an issue. Verify match via jj show <commit> before linking.

2. Open the org-repo PR

Load sks-pr. Push to origin (org repo), open --head <org>:<branch>, base main; link Related: <full issue URL>.

3. Triage immediately

Load sks-pr-triage; apply metadata now. Apply only empty/determinable fields; never invent a value the repo lacks.

Gate

Done when opened from origin, links issue, triage set, and the isolation gate passed. Verify:

gh pr view <N> --repo <org>/<repo> --json title,baseRefName,body

# isolation: diff vs base is exactly the intended files, no conflict markers
gh pr diff <N> --repo <org>/<repo> --name-only
git diff --stat "$(gh pr view <N> --repo <org>/<repo> --json baseRefOid -q .baseRefOid)"..HEAD

Verification

gh pr view <N> --repo <org>/<repo> --json title,baseRefName,body
gh pr diff <N> --repo <org>/<repo> --name-only \
  # isolation: exactly the intended files

See also

• sks-issue/sks-issue-workflow — issue to solve.
• sks-pr — create step.
• sks-pr-triage — metadata step.