feat(dev): babysit-prs — orchestrator rewrite + progressive disclosure - #13

#!/bin/bash
set -eu

file="$(fd -t f 'conflict-procedure\.md$' . | head -n 1)"
printf '%s\n' "FILE=$file"
sed -n '120,175p' "$file"
printf '%s\n' '--- command and error-handling context ---'
rg -n -C 3 'git merge|git commit|MERGE_HEAD|set -e|push|WORKTREE_DIR' "$file"

#!/bin/bash
set -eu

skill="$(fd -t f 'SKILL\.md$' plugins/dev/skills/babysit-prs | head -n 1)"
printf '%s\n' "FILE=$skill"
sed -n '1,140p' "$skill"
printf '%s\n' '--- relevant execution rules ---'
rg -n -C 4 'shell|command|exit|failure|error|cleanup|set -e|non-zero|nonzero' "$skill"

#!/bin/bash
set -eu

skill="plugins/dev/skills/babysit-prs/SKILL.md"
sed -n '176,235p' "$skill"
sed -n '228,305p' "$skill"
printf '%s\n' '--- read-only Git state and dry-run commit behavior ---'
git status --short
if git rev-parse -q --verify MERGE_HEAD >/dev/null; then
  echo 'MERGE_HEAD=present'
else
  echo 'MERGE_HEAD=absent'
fi
set +e
git commit --dry-run --no-edit
status=$?
set -e
printf 'git commit --dry-run --no-edit exit=%s\n' "$status"

#!/bin/bash
set -eu
printf '%s\n' '--- conflict procedure ---'
sed -n '1,240p' plugins/dev/skills/babysit-prs/references/conflict-procedure.md
printf '%s\n' '--- ci procedure ---'
sed -n '1,140p' plugins/dev/skills/babysit-prs/references/ci-procedure.md
printf '%s\n' '--- cleanup/reset/worktree guidance ---'
rg -n -C 3 'worktree remove|reset --hard|clean -fd|restore|WORKTREE_DIR' plugins/dev/skills/babysit-prs
printf '%s\n' '--- repository status ---'
git status --short

#!/bin/bash
set -eu
python3 - <<'PY'
from pathlib import Path
import re

files = [
    Path("plugins/dev/skills/babysit-prs/references/conflict-procedure.md"),
    Path("plugins/dev/skills/babysit-prs/references/ci-procedure.md"),
]
for path in files:
    text = path.read_text()
    commands = re.findall(r"^\s+git -C \"\$WORKTREE_DIR\" .+$", text, re.M)
    print(f"--- {path} ---")
    for i, command in enumerate(commands, 1):
        if any(token in command for token in ("add -A", "commit", "push", "clean -fd", "reset --hard", "checkout .", "worktree remove")):
            print(f"{i}: {command.strip()}")
    print("has reset --hard:", "reset --hard" in text)
    print("has checkout .:", "checkout ." in text)
PY
printf '%s\n' '--- git command help ---'
git worktree remove -h 2>&1 | sed -n '1,80p'
git clean -h 2>&1 | sed -n '1,80p'

#!/bin/bash
set -eu
file='plugins/dev/skills/babysit-prs/SKILL.md'
printf '%s\n' '--- target file outline ---'
ast-grep outline "$file" --lang markdown 2>/dev/null || true
printf '%s\n' '--- relevant lines ---'
cat -n "$file" | sed -n '1,190p'
printf '%s\n' '--- variable and repository-context references ---'
rg -n -C 3 'OWNER_REPO|DEFAULT_BRANCH|OWNER\b|REPO\b|gh repo view|graphql|CLAUDE\.md|Step 3' "$file"

#!/bin/bash
set -eu
file='plugins/dev/skills/babysit-prs/SKILL.md'
printf '%s\n' '--- worker prompt and report sections ---'
cat -n "$file" | sed -n '176,270p'
printf '%s\n' '--- all shell-variable-like identifiers ---'
rg -n '\$[A-Z][A-Z0-9_]*|<owner>|<repo>|REPO_ROOT|OWNER_REPO|DEFAULT_BRANCH' "$file"
printf '%s\n' '--- shell behavior probe ---'
bash -c '
  OWNER_REPO=before
  DEFAULT_BRANCH=before
  REPO_ROOT=before
  printf "%s\n" "OWNER_REPO=acme/project" "DEFAULT_BRANCH=trunk"
  printf "%s\n" "/checkout/root"
  printf "after print-only: OWNER_REPO=%q DEFAULT_BRANCH=%q REPO_ROOT=%q\n" "$OWNER_REPO" "$DEFAULT_BRANCH" "$REPO_ROOT"
'
printf '%s\n' '--- literal GraphQL placeholder parse probe ---'
bash -n -c 'gh api graphql -F owner=<owner> -F repo=<repo> -F pr=<pr_number>' 2>&1 || true

#!/bin/bash
set -eu

file="plugins/dev/skills/babysit-prs/SKILL.md"
printf '%s\n' '--- target file ---'
cat -n "$file" | sed -n '1,120p'

printf '%s\n' '--- related path-resolution logic ---'
rg -n -C 4 'SKILL_FILE|SKILL_DIR|babysit-prs/SKILL\.md|references/' . \
  -g '*.md' -g '*.sh' -g '*.bash' -g '*.yml' -g '*.yaml' -g '*.json' || true

printf '%s\n' '--- tracked matching files ---'
git ls-files '*babysit-prs/SKILL.md'

printf '%s\n' '--- source and installed-path assumptions in repository docs ---'
rg -n -C 3 '\.claude/plugins|source checkout|installed plugin|find .*SKILL\.md|git ls-files' . \
  -g '*.md' -g '*.sh' -g '*.bash' -g '*.yml' -g '*.yaml' -g '*.json' || true

#!/bin/bash
set -eu

file="plugins/dev/skills/babysit-prs/SKILL.md"
cat -n "$file" | sed -n '1,120p'
rg -n -C 4 'SKILL_FILE|SKILL_DIR|babysit-prs/SKILL\.md|references/' . \
  -g '*.md' -g '*.sh' -g '*.bash' -g '*.yml' -g '*.yaml' -g '*.json' || true
git ls-files '*babysit-prs/SKILL.md'

#!/bin/bash
set -eu

tmp_home="$(mktemp -d)"
tmp_plugins="$(mktemp -d)"
trap 'rm -rf "$tmp_home" "$tmp_plugins"' EXIT

mkdir -p "$tmp_plugins/z-cache/babysit-prs" "$tmp_plugins/a-cache/babysit-prs"
: > "$tmp_plugins/z-cache/babysit-prs/SKILL.md"
: > "$tmp_plugins/a-cache/babysit-prs/SKILL.md"

printf '%s\n' '--- multiple installed matches: exact resolver ---'
HOME="$tmp_home" bash -c '
  find "$1" -path "*babysit-prs/SKILL.md" 2>/dev/null | head -1
' bash "$tmp_plugins"

printf '%s\n' '--- no installed match: exact fallback ---'
HOME="$tmp_home" bash -c '
  SKILL_FILE=$(find ~/.claude/plugins -path "*babysit-prs/SKILL.md" 2>/dev/null | head -1)
  [ -n "$SKILL_FILE" ] || SKILL_FILE="$(git rev-parse --show-toplevel)/$(git ls-files "*babysit-prs/SKILL.md" | head -1)"
  printf "SKILL_FILE=<%s>\nSKILL_FILE_is_regular=%s\nSKILL_DIR=<%s>\n" \
    "$SKILL_FILE" \
    "$(test -f "$SKILL_FILE" && echo yes || echo no)" \
    "$(dirname "$SKILL_FILE")"
'

printf '%s\n' '--- tracked source matches and regular-file status ---'
matches="$(git ls-files '*babysit-prs/SKILL.md')"
printf '%s\n' "$matches"
printf 'tracked_match_count=%s\n' "$(printf '%s\n' "$matches" | sed '/^$/d' | wc -l)"
printf 'tracked_match_is_regular=%s\n' \
  "$(test -f "$(git rev-parse --show-toplevel)/$matches" && echo yes || echo no)"

#!/bin/bash
set -eu

tmp_home="$(mktemp -d)"
tmp_plugins="$(mktemp -d)"
trap 'rm -rf "$tmp_home" "$tmp_plugins"' EXIT

mkdir -p "$tmp_plugins/z-cache/babysit-prs" "$tmp_plugins/a-cache/babysit-prs"
: > "$tmp_plugins/z-cache/babysit-prs/SKILL.md"
: > "$tmp_plugins/a-cache/babysit-prs/SKILL.md"

HOME="$tmp_home" bash -c '
  find "$1" -path "*babysit-prs/SKILL.md" 2>/dev/null | head -1
' bash "$tmp_plugins"

HOME="$tmp_home" bash -c '
  SKILL_FILE=$(find ~/.claude/plugins -path "*babysit-prs/SKILL.md" 2>/dev/null | head -1)
  [ -n "$SKILL_FILE" ] || SKILL_FILE="$(git rev-parse --show-toplevel)/$(git ls-files "*babysit-prs/SKILL.md" | head -1)"
  printf "SKILL_FILE=<%s>\nSKILL_FILE_is_regular=%s\nSKILL_DIR=<%s>\n" \
    "$SKILL_FILE" \
    "$(test -f "$SKILL_FILE" && echo yes || echo no)" \
    "$(dirname "$SKILL_FILE")"
'

matches="$(git ls-files '*babysit-prs/SKILL.md')"
printf 'tracked_match_count=%s\n' "$(printf '%s\n' "$matches" | sed '/^$/d' | wc -l)"

#!/bin/bash
set -eu

tmp="$(mktemp -d)"
trap 'rm -rf "$tmp"' EXIT
mkdir -p "$tmp/bin" "$tmp/repo"

cat > "$tmp/bin/git" <<'EOF'
#!/bin/sh
case "$1" in
  rev-parse) printf '%s\n' "$FAKE_ROOT" ;;
  ls-files)  : ;;
  *) exit 1 ;;
esac
EOF
chmod +x "$tmp/bin/git"

printf '%s\n' '--- no installed match and no tracked source match ---'
PATH="$tmp/bin:$PATH" HOME="$tmp/home" FAKE_ROOT="$tmp/repo" bash -c '
  SKILL_FILE=$(find ~/.claude/plugins -path "*babysit-prs/SKILL.md" 2>/dev/null | head -1)
  [ -n "$SKILL_FILE" ] || SKILL_FILE="$(git rev-parse --show-toplevel)/$(git ls-files "*babysit-prs/SKILL.md" | head -1)"
  printf "SKILL_FILE=<%s>\nSKILL_FILE_is_regular=%s\nSKILL_DIR=<%s>\n" \
    "$SKILL_FILE" \
    "$(test -f "$SKILL_FILE" && echo yes || echo no)" \
    "$(dirname "$SKILL_FILE")"
'

#!/bin/bash
set -eu

printf '%s\n' '--- SKILL.md relevant sections ---'
sed -n '130,235p' plugins/dev/skills/babysit-prs/SKILL.md

printf '%s\n' '--- ci-procedure.md relevant sections ---'
sed -n '1,110p' plugins/dev/skills/babysit-prs/references/ci-procedure.md

printf '%s\n' '--- conflict-procedure.md relevant sections ---'
sed -n '130,225p' plugins/dev/skills/babysit-prs/references/conflict-procedure.md

printf '%s\n' '--- related evidence and head fields ---'
rg -n -C 3 'fail-bucket|failing-check|unresolved-thread|headRefOid|head SHA|head sha|gh pr checks|conflict procedure|worktree|branch' \
  plugins/dev/skills/babysit-prs

#!/bin/bash
set -eu

printf '%s\n' '--- orchestrator triage and prompt construction ---'
sed -n '28,155p' plugins/dev/skills/babysit-prs/SKILL.md
sed -n '228,290p' plugins/dev/skills/babysit-prs/SKILL.md

printf '%s\n' '--- exact head-related identifiers in babysit-prs files ---'
rg -n -C 4 'headRefOid|headRefName|headRepository|statusCheckRollup|pr checks|fail-bucket|failing checks|triage' \
  plugins/dev/skills/babysit-prs/SKILL.md \
  plugins/dev/skills/babysit-prs/references/ci-procedure.md \
  plugins/dev/skills/babysit-prs/references/conflict-procedure.md

printf '%s\n' '--- conflict procedure opening and head capture ---'
sed -n '1,90p' plugins/dev/skills/babysit-prs/references/conflict-procedure.md

#!/bin/bash
set -eu

python3 - <<'PY'
from pathlib import Path

skill = Path("plugins/dev/skills/babysit-prs/SKILL.md").read_text()
ci = Path("plugins/dev/skills/babysit-prs/references/ci-procedure.md").read_text()

checks = {
    "triage query omits headRefOid": "headRefOid" not in skill.split("## Step 3 — Triage each PR", 1)[0],
    "worker prompt omits headRefOid": "headRefOid" not in skill[skill.index("```text\nYou are babysitting"):skill.index("```\n\nTake each worker's", skill.index("```text\nYou are babysitting"))],
    "worker prompt carries fail JSON": "- Failing checks: <the fail-bucket JSON from triage | none>" in skill,
    "CI refresh is conditional on conflict push": "If the conflict procedure pushed for this PR" in ci,
    "CI procedure has no unconditional head comparison": "headRefOid" not in ci and "current head" not in ci,
    "CI worktree is created from current remote branch ref": 'git worktree add "$WORKTREE_DIR" "origin/<headRefName>"' in ci,
}

for name, result in checks.items():
    print(f"{name}: {'PASS' if result else 'FAIL'}")
PY

sed -n '130,235p' plugins/dev/skills/babysit-prs/SKILL.md
printf '\n--- worker/subagent references ---\n'
rg -n -C 3 'worker|subagent|prompt|title|headRefName|fail-bucket|Agent|Task|babysit' plugins/dev/skills/babysit-prs/SKILL.md

#!/bin/bash
set -eu
printf '%s\n' '--- target files ---'
git ls-files 'plugins/dev/skills/babysit-prs/*' 'plugins/dev/skills/fix-itsm-issue/SKILL.md'
printf '%s\n' '--- babysit-prs structure ---'
ast-grep outline plugins/dev/skills/babysit-prs/SKILL.md 2>/dev/null || true
ast-grep outline plugins/dev/skills/babysit-prs/references/conflict-procedure.md 2>/dev/null || true
ast-grep outline plugins/dev/skills/babysit-prs/references/ci-procedure.md 2>/dev/null || true
printf '%s\n' '--- relevant SKILL.md sections ---'
sed -n '1,260p' plugins/dev/skills/babysit-prs/SKILL.md
printf '%s\n' '--- conflict procedure relevant sections ---'
sed -n '1,210p' plugins/dev/skills/babysit-prs/references/conflict-procedure.md
printf '%s\n' '--- CI procedure relevant sections ---'
sed -n '1,130p' plugins/dev/skills/babysit-prs/references/ci-procedure.md

#!/bin/bash
set -eu
printf '%s\n' '--- remaining Safety and per-PR context ---'
rg -n -A90 -B15 '## Safety|# Safety|headRefName|general-purpose|subagent|Task' \
  plugins/dev/skills/babysit-prs/SKILL.md plugins/dev/skills/babysit-prs/references/*.md \
  plugins/dev/skills/fix-itsm-issue/SKILL.md
printf '%s\n' '--- branch-name behavior ---'
for ref in \
  'feature/$\(id\)' \
  'feature/$(id)' \
  'feature/`id`' \
  'feature/;id' \
  'feature/&&id' \
  'feature/"id' \
  'feature/$(printf injected)' \
  'feature/normal'
do
  if git check-ref-format --branch "$ref" >/tmp/ref-ok 2>/tmp/ref-err; then
    printf 'ACCEPTED: %s\n' "$ref"
  else
    printf 'REJECTED: %s -- %s\n' "$ref" "$(tr '\n' ' ' </tmp/ref-err)"
  fi
done
printf '%s\n' '--- all direct push/ref constructions in babysit-prs ---'
rg -n -C3 'git .*push|origin/<headRefName>|origin/\$|headRefName' \
  plugins/dev/skills/babysit-prs

#!/bin/bash
set -eu
printf '%s\n' '--- git ref validation ---'
for ref in \
  'feature/$\(id\)' \
  'feature/$(id)' \
  'feature/`id`' \
  'feature/;id' \
  'feature/&&id' \
  'feature/"id' \
  'feature/normal'
do
  if git check-ref-format --branch "$ref" >/dev/null 2>/tmp/ref-error; then
    printf 'ACCEPTED: %s\n' "$ref"
  else
    printf 'REJECTED: %s -- %s\n' "$ref" "$(tr '\n' ' ' </tmp/ref-error)"
  fi
done
printf '%s\n' '--- shell expansion in the reviewed command shapes ---'
bash -c '
  git() { printf "git-argv:"; printf "<%s>" "$@"; printf "\n"; }
  git worktree add "/tmp/w" "origin/feature/$(printf INJECTED >&2)"
' 2>/tmp/expansion-stderr
printf 'worktree stderr: %s\n' "$(cat /tmp/expansion-stderr)"
bash -c '
  git() { printf "git-argv:"; printf "<%s>" "$@"; printf "\n"; }
  git push origin HEAD:feature/$(printf INJECTED >&2)
' 2>/tmp/push-expansion-stderr
printf 'push stderr: %s\n' "$(cat /tmp/push-expansion-stderr)"
printf '%s\n' '--- exact affected command lines ---'
rg -n 'origin/<headRefName>|HEAD:<headRefName>|Head branch:' \
  plugins/dev/skills/babysit-prs/SKILL.md \
  plugins/dev/skills/babysit-prs/references/conflict-procedure.md \
  plugins/dev/skills/babysit-prs/references/ci-procedure.md

#!/bin/bash
set -eu
bash -c '
  git() { printf "git-argv:"; printf "<%s>" "$@"; printf "\n"; }
  git push origin HEAD:feature/$(printf INJECTED)
'
bash -c '
  git() { printf "git-argv:"; printf "<%s>" "$@"; printf "\n"; }
  git -C /tmp/w push origin HEAD:feature/$(printf INJECTED)
'