Skip to content

docs(agents): capture the fork's upstream sync workflow as a skill - #10

Merged
yordis merged 1 commit into
mainfrom
yordis/docs-sync-upstream-skill
Jul 29, 2026
Merged

docs(agents): capture the fork's upstream sync workflow as a skill#10
yordis merged 1 commit into
mainfrom
yordis/docs-sync-upstream-skill

Conversation

@yordis

@yordis yordis commented Jul 29, 2026

Copy link
Copy Markdown
Member
  • Every upstream sync so far re-derived the same guardrails (merge-not-rebase, merge-commit PR merges, ledger-aware conflict resolution, reserved migration id blocks) from git history, which is slow and easy to get wrong.
  • Encoding the workflow as an agent skill makes syncs repeatable and protects the fork's divergences from being silently regressed by an uninformed merge.
  • The directory name carries a trogonstack- prefix so fork-only skills read as fork-only on sight and can never collide with a skill name upstream adds, mirroring the Migrations/fork and docs/fork conventions.

The sync workflow existed only as git history patterns, so every sync
re-derived the same guardrails from scratch. Encoding them as a skill
makes each sync repeatable and protects the fork's divergences,
migration id blocks, and merge-based history from being regressed by
an uninformed merge.

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@cursor

cursor Bot commented Jul 29, 2026

Copy link
Copy Markdown

PR Summary

Low Risk
Documentation-only change with no runtime, migration, or application code impact.

Overview
Adds a new fork-only agent skill at .agents/skills/trogonstack-sync-upstream/SKILL.md that documents how to merge pingdotgg/t3code upstream/main into TrogonStack without regressing tracked divergences.

The skill encodes the repeatable sync workflow: merge-not-rebase, branch naming, reading docs/fork/ before resolving conflicts, ledger-aware conflict rules (including .repos/ via vpr sync:repos), reserved fork migration ids under Migrations/fork/, full vp verification, and opening/merging the sync PR with a merge commit (not squash).

Reviewed by Cursor Bugbot for commit d1aaa7a. Bugbot is set up for automated code reviews on this repo. Configure here.

@github-actions github-actions Bot added size:M vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. labels Jul 29, 2026
@yordis
yordis merged commit 24b23f5 into main Jul 29, 2026
8 of 13 checks passed
@coderabbitai

coderabbitai Bot commented Jul 29, 2026

Copy link
Copy Markdown

Review Change Stack

Caution

Review failed

The pull request is closed.

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 09896cc2-f0e5-4002-bae5-eda4c8eb8df1

📥 Commits

Reviewing files that changed from the base of the PR and between 0c59d11 and d1aaa7a.

📒 Files selected for processing (1)
  • .agents/skills/trogonstack-sync-upstream/SKILL.md

Walkthrough

Adds a skill document describing how to merge upstream main into TrogonStack, resolve special conflicts, handle migrations, run verification, and complete the required merge-based PR workflow.

Changes

Upstream synchronization workflow

Layer / File(s) Summary
Documented upstream sync process
.agents/skills/trogonstack-sync-upstream/SKILL.md
Defines branch preparation, conflict resolution rules, migration constraints, verification commands, DCO sign-off, and merge-only PR requirements.

Estimated code review effort: 1 (Trivial) | ~3 minutes

Poem

A rabbit reads the sync decree,
Upstream hops across the tree.
Conflicts sorted, ledgers neat,
Migrations march on steady feet.
Tests and merges, clear and bright—
TrogonStack is set just right.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch yordis/docs-sync-upstream-skill

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:M vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant