Skip to content

docs: TRAC-1236 unify integration-branch sync into one /sync-integration-branch skill#3127

Merged
chanceaclark merged 1 commit into
canaryfrom
chancellorclark/ltrac-1297-sync-b2b-makeswift-skill
Jul 24, 2026
Merged

docs: TRAC-1236 unify integration-branch sync into one /sync-integration-branch skill#3127
chanceaclark merged 1 commit into
canaryfrom
chancellorclark/ltrac-1297-sync-b2b-makeswift-skill

Conversation

@chanceaclark

@chanceaclark chanceaclark commented Jul 22, 2026

Copy link
Copy Markdown
Contributor

Jira: TRAC-1236

What/Why?

Replaces the branch-specific /sync-makeswift skill (and the earlier proposed /sync-b2b-makeswift skill this PR originally added) with a single parameterized /sync-integration-branch skill.

The two per-branch skills were ~90% identical — same four-phase flow (merge → PR → rebase → cleanup), differing only in which branches, package name, and integration files were involved. That duplication meant every fix (e.g. the recent catalyst.ref clobbering guard) had to be applied twice and could drift.

Structure (progressive disclosure):

  • SKILL.md holds the generic flow and the conflict rules common to every integration branch (package name/version, nested catalyst.ref, .changeset/config.json baseBranch, prevent-invalid-changesets targeting, shared changesets-release.yml, lockfile handling, one-time catch-up).
  • Each supported branch has a reference file under references/references/makeswift.md, references/b2b-makeswift.md — holding only that branch's specifics: upstream (merge source), package identity, sync-branch name, merge-base pair, integration surface, and branch-only caveats.
  • Phase 0 resolves the target argument, validates it, then reads the matching reference file and fills the SKILL.md placeholders from it. Adding a future integrations/* branch = a new reference file plus one table row.

Argument handling:

  • Accepts the full ref (integrations/b2b-makeswift) or a shorthand (b2b-makeswift, makeswift).
  • No argument, or an unknown / origin-absent branch (validated with git ls-remote --heads origin) → the skill lists the valid integrations/* targets and asks the user to pick one.

release-catalyst skill updated to invoke /sync-integration-branch integrations/makeswift.

Rollout/Rollback

Local tooling only (.claude/skills/), no runtime/app impact. Rollback = revert the commit.

Note: the literal /sync-makeswift slash command is removed; natural-language "sync makeswift" still routes here via the skill description.

Testing

Skill markdown only. Verified the net diff vs canary is: delete sync-makeswift/SKILL.md, add sync-integration-branch/SKILL.md + two references/*.md, one-line release-catalyst reference update. No code paths exercised.

@vercel

vercel Bot commented Jul 22, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
catalyst Ready Ready Preview, Comment Jul 24, 2026 4:14pm

Request Review

@changeset-bot

changeset-bot Bot commented Jul 22, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: 6482e12

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@chanceaclark
chanceaclark marked this pull request as ready for review July 22, 2026 21:01
@chanceaclark
chanceaclark requested a review from a team as a code owner July 22, 2026 21:01
@github-actions

github-actions Bot commented Jul 22, 2026

Copy link
Copy Markdown
Contributor

Bundle Size Report

Comparing against baseline from 759b491 (2026-07-24).

No bundle size changes detected.

@github-actions

github-actions Bot commented Jul 22, 2026

Copy link
Copy Markdown
Contributor

Unlighthouse Performance Comparison — Vercel

Comparing PR preview deployment Unlighthouse scores vs production Unlighthouse scores.

Summary Score

Aggregate score across all categories as reported by Unlighthouse.

Prod Desktop Prod Mobile Preview Desktop Preview Mobile
Score 90 92 92 94

Category Scores

Category Prod Desktop Prod Mobile Preview Desktop Preview Mobile
Performance 73 80 72 88
Accessibility 95 92 95 92
Best Practices 100 100 100 100
SEO 88 86 100 100

Core Web Vitals

Metric Prod Desktop Prod Mobile Preview Desktop Preview Mobile
LCP 4.0 s 5.2 s 4.3 s 3.9 s
CLS 0.037 0 0.039 0
FCP 1.2 s 1.5 s 1.2 s 1.2 s
TBT 10 ms 0 ms 0 ms 20 ms
Max Potential FID 60 ms 50 ms 40 ms 90 ms
Time to Interactive 4.0 s 5.2 s 4.3 s 4.4 s

Full Unlighthouse report →

@chanceaclark
chanceaclark force-pushed the chancellorclark/ltrac-1297-sync-b2b-makeswift-skill branch from 64184c1 to 193b51c Compare July 24, 2026 15:31
@chanceaclark
chanceaclark force-pushed the chancellorclark/ltrac-1297-sync-b2b-makeswift-skill branch from 193b51c to afe9cb4 Compare July 24, 2026 15:59
@chanceaclark chanceaclark changed the title docs: TRAC-1236 add /sync-b2b-makeswift skill docs: TRAC-1236 unify integration-branch sync into one /sync-integration-branch skill Jul 24, 2026
Replace the branch-specific /sync-makeswift skill (and the proposed
/sync-b2b-makeswift skill) with a single parameterized
/sync-integration-branch skill. The target integration branch is passed
as an argument; SKILL.md holds the generic sync flow, and each supported
branch has a reference file (references/<name>.md) with its upstream,
package identity, integration surface, and branch-specific caveats.
Phase 0 resolves the target and loads the matching reference. When no
branch is given, or the branch is unknown or absent on origin, the skill
lists the valid integrations/* targets and asks the user to pick one.

Point the release-catalyst skill at the new skill name.

Refs TRAC-1236
Co-Authored-By: Claude <noreply@anthropic.com>
@chanceaclark
chanceaclark force-pushed the chancellorclark/ltrac-1297-sync-b2b-makeswift-skill branch from afe9cb4 to 6482e12 Compare July 24, 2026 16:13

@parthshahp parthshahp left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

DRY Skills 🙏

@chanceaclark
chanceaclark added this pull request to the merge queue Jul 24, 2026
Merged via the queue into canary with commit 3603e5b Jul 24, 2026
18 of 19 checks passed
@chanceaclark
chanceaclark deleted the chancellorclark/ltrac-1297-sync-b2b-makeswift-skill branch July 24, 2026 19:24
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.

2 participants