Skip to content

LOCAL: tell Codex and Tenki to review only the fork's lines on an upstream sync PR - #26

Merged
kiwidream merged 2 commits into
swaplabs/mainfrom
fork-review/sync-pr-review-scope
Sep 29, 2026
Merged

kiwidream merged 2 commits into
swaplabs/mainfrom
fork-review/sync-pr-review-scope

Conversation

@kiwidream

@kiwidream kiwidream commented Sep 29, 2026 •

Copy link
Copy Markdown
Files Added Deleted Net
Test 0 0 0 0
Prod 1 $\color{#1a7f37}{\Huge{\mathbf{+}}}$​13 0 $\color{#1a7f37}{\Huge{\mathbf{+}}}$​13

ELI5

The daily sync PR pulls hundreds of upstream commits into the fork at once. Codex and Tenki review every line of it and leave findings on upstream's code, which the fork deliberately doesn't change. This adds a rule to AGENTS.md, which both reviewers read: on a sync PR, review only the fork's own lines and its conflict resolutions.

What Changed

  • Before: on sync: upstream 31012aeb09 into swaplabs/main #22, all 3 open Codex findings were on upstream lines, which the fork can't act on (release-policy.yml, release-policy.mjs, github-release-update-source.ts, all unchanged from upstream 31012aeb09).

  • After: AGENTS.md gains a # SwapLabs Fork → ## Code Review Rules section. Codex looks for that heading, and Tenki applies the whole file. The rule covers PRs into swaplabs/main whose head is main or sync/upstream-*. On those, it asks for review of only:

    • lines that differ from the upstream commit being merged;
    • the sync branch's conflict resolutions (git show --remerge-diff).

    Every other PR is reviewed as before.

  • The section sits between two upstream sections, not at the end of the file, to keep sync conflicts unlikely. Upstream has edited AGENTS.md 3 times in its recent history.

Why

  • Neither reviewer can skip PRs by branch or label. Codex's automatic review is on or off per repository, and branch filtering was declined in Feature request: Limit Codex auto code review to default branch (or configurable branch allowlist) openai/codex#13597. Tenki's settings are per repository or per author, and sync PRs come from the operator's own account. AGENTS.md is the only lever either reviewer offers that lives in the repo.
  • It is a soft limit, and it reaches only sync/upstream-* heads, because a main head carries upstream's AGENTS.md. Every thread on a main-headed PR is upstream-owned anyway. The hard rule is in the orca-fork-ops auto-sync procedure (SwapLabsInc/SwapLabs#137): the automation classifies each thread by owner, fixes the fork's, and logs upstream's for the operator.

Linked Issue

None. Fork-only; follows #22 and SwapLabsInc/SwapLabs#137.

Visual Proof

N/A. Reviewer instructions only; no app change.

Testing

  • I manually tested these changes locally
  • Automated tests added/updated, or explained why not below

This is documentation only, so there is nothing to unit-test. The real test is the next sync PR on a sync/upstream-* head: fewer findings on upstream lines.

AI Disclosure

Written by Claude Opus 5.5 (Claude Code).

Agent skill upstream boundary

  • Not applicable, or this change follows docs/reference/agent-skill-sharing-upstream-boundary.md and copies or mechanically translates no upstream skill-installer source, tests, fixtures, registry entries, path tables, comments, or documentation.

Checklist

  • This PR is small and focused
  • I explained what changed and why (ELI5, the user-facing before/after, the mechanism, and why over the alternatives)
  • Before/after screenshots or videos attached for UI changes, or N/A with reason
  • Self-reviewed for correctness, security, and performance
  • Cross-platform, SSH/remote, and path/shortcut impact considered (or N/A)
  • pnpm lint, pnpm typecheck, pnpm test, and pnpm build pass (or CI will cover; local preferred)

Deferred follow-ups

  • Add a sentence for a main-headed sync PR: its merge base with main is the head itself, so it has no fork lines to review. The current wording already implies this.

🤖 Generated with Claude Code


View with [code]smith Autofix with [code]smith
Need help on this PR? Tag @codesmith-bot with what you need. Autofix is disabled.

…tream sync PR

Both reviewers read review rules from AGENTS.md, and neither offers a
per-branch or per-label skip. A sync PR's diff is almost all upstream code
that the fork leaves unchanged, so most of their findings on it cannot be
acted on here.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@tenki-reviewer

tenki-reviewer Bot commented Sep 29, 2026 •

Copy link
Copy Markdown

Review complete. No issues found — approved ✅.


Documentation-only change to AGENTS.md; no code or runtime behavior affected.

Reviewed commit: 0ac49cb

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Sep 29, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-09-29T16:01:46.697259Z fac8094 New commits
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

tenki-reviewer[bot]
tenki-reviewer Bot previously approved these changes Sep 29, 2026

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 0ac49cb6d0

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread AGENTS.md Outdated
…or review

A reviewer could read "merge base with main" against the integration branch. Name the second parent, and say which main is meant.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: fac8094914

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread AGENTS.md
@kiwidream

Copy link
Copy Markdown
Author

@tenki-reviewer

@tenki-reviewer

tenki-reviewer Bot commented Sep 29, 2026 •

Copy link
Copy Markdown

Review complete. No issues found — approved ✅.


Adds a SwapLabs fork section to AGENTS.md documenting how to scope code review of upstream-sync pull requests.

Reviewed commit: fac8094

@tenki-reviewer
tenki-reviewer Bot dismissed their stale review September 29, 2026 17:14

Superseded by a newer Tenki approval on this pull request.

@kiwidream
kiwidream merged commit fe04949 into swaplabs/main Sep 29, 2026
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant