Add agent instructions for managing worktrees#404
Merged
Conversation
7aa99ac to
7c1c71b
Compare
kieran-osgood-shopify
approved these changes
Jul 6, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changes are you making?
Makes a fresh git worktree usable without manual setup by auto-seeding it from the main checkout during
dev up.A fresh worktree is a clean checkout without the gitignored root
.env, so sample-app setup can't regenerate its nested config. This wires that copy intodev upso it just happens.scripts/copy_worktree_env+dev copy-env— copies the repo-root.env(and any other root-level machine-local config) from the main checkout into the current worktree, sodev up'ssetup_storefront_envcan regenerate all nested sample config (Android.env, SwiftStorefront.xcconfig, RN sample.env) from it. It locates the main checkout viagit rev-parse --git-common-dir, so it works regardless of where the worktree lives — sibling, nested,~/.ae/worktrees, etc. No-ops from the main checkout, and prints paths/status only — never config values.dev.yml—dev upnow auto-detects a worktree and runs the copy before workspace setup, via amet?/meetstep.copy_worktree_env --checkreports whether a copy is needed without performing it; the copy itself is idempotent, so it only does work on a fresh worktree.How to test
dev upfrom a fresh worktree now seeds.envautomatically — no separate step, wherever the worktree lives:The copy is also available standalone and is a friendly no-op from the main checkout:
dev copy-env # from main checkout => Already in the main checkout (...); nothing to copy.Before you merge
Important
platforms/swift/README.mdand/orplatforms/android/README.md)Releasing a new Swift version?
ShopifyCheckoutKit.podspecplatforms/swift/Sources/ShopifyCheckoutKit/ShopifyCheckoutKit.swiftplatforms/swift/README.md(major version only)Releasing a new Embedded Checkout Protocol version?
embeddedCheckoutProtocolAndroidinplatforms/android/gradle/libs.versions.tomlprotocol/languages/kotlin/embedded-checkout-protocol/api/embedded-checkout-protocol.apiif the public API changedReleasing a new Android version?
checkoutKitAndroidinplatforms/android/gradle/libs.versions.tomlplatforms/android/README.mdTip
See the Contributing documentation for the full release process per platform.