update skills

Author: GiggleLiu

.claude/skills/add-rule/SKILL.md

@@ -172,9 +172,12 @@ Checklist: notation self-contained, complexity cited, overhead consistent, examp
 ```bash
 cargo run --example export_graph    # Generate reduction_graph.json for docs/paper builds
 cargo run --example export_schemas  # Generate problem schemas for docs/paper builds
+make regenerate-fixtures            # Regenerate example_db/fixtures/examples.json (slow, needs ILP)
 make test clippy                    # Must pass
 ```
 
+`make regenerate-fixtures` is required so the paper can load the new rule's example data from `src/example_db/fixtures/examples.json`. Without it, the `reduction-rule` entry in Step 5 will reference missing fixture data.
+
 Structural and quality review is handled by the `review-pipeline` stage, not here. The run stage just needs to produce working code.
 
 ## Solver Rules

.claude/skills/review-pipeline/SKILL.md

@@ -74,33 +74,19 @@ For explicit `PR` runs, STOP after reporting.
 
 If no candidate is both open and ready for review, STOP with `No Review pool PRs are currently ready for review-pipeline processing.`
 
-### 0b. Create Worktree and Generate Reports
+### 0b. Generate Review-Pipeline Report, Create Worktree, Generate Implementation Report
 
-Only after Step 0a has identified a review-ready PR should you create a worktree and spend the expensive context packets.
+Only after Step 0a has identified a review-ready PR should you spend the expensive context packets.
 
-**Create worktree and check out the PR branch:**
+**Generate review-pipeline context** (from the repo root, before entering the worktree — this queries GitHub APIs only):
 
 ```bash
 REPO_ROOT=$(pwd)
-WORKTREE_JSON=$(python3 scripts/pipeline_worktree.py enter --name "review-pr-$PR" --format json)
-WORKTREE_DIR=$(printf '%s\n' "$WORKTREE_JSON" | python3 -c "import sys,json; print(json.load(sys.stdin)['worktree_dir'])")
-cd "$WORKTREE_DIR"
-gh pr checkout "$PR"
-```
-
-**Generate both reports** (inside the worktree):
 
-The two expensive context calls are allowed exactly once each per top-level `review-pipeline` invocation:
-
-```bash
 # 1. Review-pipeline context (selection, comments, CI, linked issue)
 set -- python3 scripts/pipeline_skill_context.py review-pipeline --repo "$REPO" --pr "$PR" --format text
 REPORT=$("$@")
 printf '%s\n' "$REPORT"
-
-# 2. Review-implementation context (scope, checklists, diff, issue compliance)
-IMPL_REPORT=$(python3 scripts/pipeline_skill_context.py review-implementation --repo-root . --format text)
-printf '%s\n' "$IMPL_REPORT"
 ```
 
 The review-pipeline report should already include:
@@ -111,14 +97,30 @@ The review-pipeline report should already include:
 - PR head branch
 - Linked Issue Context
 
+**Create worktree and check out the PR branch:**
+
+```bash
+WORKTREE_JSON=$(python3 scripts/pipeline_worktree.py enter --name "review-pr-$PR" --format json)
+WORKTREE_DIR=$(printf '%s\n' "$WORKTREE_JSON" | python3 -c "import sys,json; print(json.load(sys.stdin)['worktree_dir'])")
+cd "$WORKTREE_DIR"
+gh pr checkout "$PR"
+```
+
+**Generate review-implementation context** (inside the worktree — needs git diff against main):
+
+```bash
+# 2. Review-implementation context (scope, checklists, diff)
+IMPL_REPORT=$(python3 scripts/pipeline_skill_context.py review-implementation --repo-root . --format text)
+printf '%s\n' "$IMPL_REPORT"
+```
+
 The review-implementation report should already include:
 - Review Range: base SHA, head SHA
 - Scope: review type (model/rule/generic), subject metadata
 - Deterministic Checks: whitelist + completeness status
 - Changed Files and Diff Stat
-- Linked Issue Context
 
-Both reports are reused for the rest of the skill — do not regenerate either.
+The two expensive context calls are allowed exactly once each per top-level `review-pipeline` invocation. Both reports are reused for the rest of the skill — do not regenerate either.
 
 Branch from the review-pipeline report:
 - `Bundle status: empty` => the selected PR is no longer eligible; run `cd "$REPO_ROOT" && python3 scripts/pipeline_worktree.py cleanup --worktree "$WORKTREE_DIR"`, then for untargeted runs return to Step 0a, for explicit `PR` runs STOP

scripts/pipeline_skill_context.py

@@ -10,10 +10,15 @@
 from pathlib import Path
 from typing import Callable
 
-import pipeline_board
-import pipeline_checks
-import pipeline_pr
-import pipeline_worktree
+# Ensure sibling modules are importable regardless of how this file is invoked
+# (as a script, as ``python3 scripts/pipeline_skill_context.py``, or via
+# ``from scripts.pipeline_skill_context import ...``).
+sys.path.insert(0, str(Path(__file__).resolve().parent))
+
+import pipeline_board  # noqa: E402
+import pipeline_checks  # noqa: E402
+import pipeline_pr  # noqa: E402
+import pipeline_worktree  # noqa: E402
 
 
 PROJECT_BOARD_NUMBER = 8
@@ -426,8 +431,6 @@ def render_review_implementation_text(result: dict) -> str:
     review_context = result.get("review_context") or {}
     scope = review_context.get("scope") or {}
     subject = review_context.get("subject") or {}
-    current_pr = result.get("current_pr") or {}
-
     lines = [
         "# Review Implementation Packet",
         "",
@@ -486,24 +489,6 @@ def render_review_implementation_text(result: dict) -> str:
     if diff_stat:
         lines.extend(["", "## Diff Stat", "```text", diff_stat, "```"])
 
-    lines.extend(["", "## Current PR"])
-    if current_pr:
-        lines.append(f"- Repo: {current_pr.get('repo')}")
-        if current_pr.get("pr_number") is not None:
-            lines.append(f"- PR: #{current_pr['pr_number']}")
-        if current_pr.get("title"):
-            lines.append(f"- Title: {current_pr['title']}")
-        if current_pr.get("url"):
-            lines.append(f"- URL: {current_pr['url']}")
-        if current_pr.get("linked_issue_number") is not None:
-            lines.append(f"- Linked issue: #{current_pr['linked_issue_number']}")
-    else:
-        lines.append("- No current PR detected for this branch.")
-
-    issue_context_text = current_pr.get("issue_context_text")
-    if issue_context_text:
-        lines.extend(["", "## Linked Issue Context", issue_context_text])
-
     return "\n".join(lines) + "\n"
 
 
@@ -813,26 +798,6 @@ def default_review_implementation_context_builder(
     )
 
 
-def fetch_current_review_implementation_pr() -> dict | None:
-    try:
-        repo = pipeline_pr.fetch_current_repo()
-        current = pipeline_pr.fetch_current_pr_data_for_repo(repo)
-        pr_number = current.get("number")
-        if pr_number is None:
-            return None
-        pr_context = pipeline_pr.build_pr_context(repo, int(pr_number))
-        return {
-            "repo": repo,
-            "pr_number": int(pr_number),
-            "title": pr_context.get("title"),
-            "url": pr_context.get("url"),
-            "head_ref_name": pr_context.get("head_ref_name"),
-            "linked_issue_number": pr_context.get("linked_issue_number"),
-            "issue_context_text": pr_context.get("issue_context_text"),
-        }
-    except Exception:
-        return None
-
 
 def build_review_implementation_context(
     *,
@@ -846,7 +811,6 @@ def build_review_implementation_context(
     diff_stat_getter: Callable[[Path, str, str], str] | None = None,
     changed_files_getter: Callable[[Path, str, str], list[str]] | None = None,
     added_files_getter: Callable[[Path, str, str], list[str]] | None = None,
-    current_pr_fetcher: Callable[[], dict | None] | None = None,
     review_context_builder: Callable[..., dict] | None = None,
 ) -> dict:
     merge_base_getter = merge_base_getter or (
@@ -880,15 +844,13 @@ def build_review_implementation_context(
             f"{base_sha}..{head_sha}",
         )
     )
-    current_pr_fetcher = current_pr_fetcher or fetch_current_review_implementation_pr
     review_context_builder = review_context_builder or default_review_implementation_context_builder
 
     base_sha = merge_base_getter(repo_root)
     head_sha = head_sha_getter(repo_root)
     diff_stat = diff_stat_getter(repo_root, base_sha, head_sha)
     changed_files = changed_files_getter(repo_root, base_sha, head_sha)
     added_files = added_files_getter(repo_root, base_sha, head_sha)
-    current_pr = current_pr_fetcher()
     review_context = review_context_builder(
         repo_root,
         diff_stat=diff_stat,
@@ -909,7 +871,6 @@ def build_review_implementation_context(
             "head_sha": head_sha,
         },
         "review_context": review_context,
-        "current_pr": current_pr,
     }
 
 

scripts/pipeline_worktree.py

@@ -343,10 +343,13 @@ def cleanup_worktree(*, worktree: str | Path) -> dict:
     worktree = Path(worktree).resolve()
     # Determine repo root before cleanup — if the worktree is already gone,
     # fall back to the parent .worktrees directory's repo.
-    try:
-        repo_root = repo_root_from(worktree)
-    except Exception:
-        # Worktree dir may already be deleted; derive repo root from parent.
+    if worktree.is_dir():
+        try:
+            repo_root = repo_root_from(worktree)
+        except Exception:
+            repo_root = worktree.parent.parent
+    else:
+        # Worktree dir already deleted; derive repo root from parent.
         repo_root = worktree.parent.parent  # .worktrees/<branch> -> repo root
     repo_root = Path(repo_root).resolve()