Skip to content

docs(skills): upstream syncs run in their own worktree - #118

Merged
yordis merged 1 commit into
mainfrom
yordis/docs-sync-upstream-worktree
Oct 19, 2026
Merged

yordis merged 1 commit into
mainfrom
yordis/docs-sync-upstream-worktree

Conversation

@yordis

@yordis yordis commented Oct 19, 2026 •

Copy link
Copy Markdown
Member
  • A sync installs dependencies, rewrites the lockfile, and runs the full suite, which disrupted the main checkout that often serves the live T3 Code session and holds uncommitted work.
  • The last sync had to stash local changes to get a clean tree, and its install rewrote a generated file in the main checkout.

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

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

cursor Bot commented Oct 19, 2026 •

Copy link
Copy Markdown

PR Summary

Low Risk
Documentation-only change to the upstream sync agent skill; no runtime or application code is modified.

Overview
Updates the trogonstack-sync-upstream agent skill so upstream merges never run in the main checkout.

Prepare now requires fetching origin and upstream without stashing or switching branches, uses origin/main..upstream/main to detect whether a sync is needed, and lists fork-only commits against origin/main.

Create the sync branch documents a sibling git worktree, scripts/setup-worktree.ts (with T3CODE_PROJECT_ROOT from the primary worktree), then git merge upstream/main. Branch numbering also checks git worktree list; all later steps—including re-running vp i after lockfile conflicts—run inside that worktree.

After merge, cleanup removes the worktree from the main checkout before deleting the sync branch.

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

@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:S labels Oct 19, 2026
@yordis
yordis merged commit eb9872b into main Oct 19, 2026
26 of 28 checks passed
@yordis
yordis deleted the yordis/docs-sync-upstream-worktree branch October 19, 2026 13:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:S 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