From 7c1c71b87616a583a79348bdd2da5764ec47b1a9 Mon Sep 17 00:00:00 2001
From: Mark Murray <mark.murray@shopify.com>
Date: Fri, 3 Jul 2026 11:41:47 +0100
Subject: [PATCH] Add agent instructions for managing worktrees

---
 dev.yml                   |  8 ++++
 scripts/copy_worktree_env | 79 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+)
 create mode 100755 scripts/copy_worktree_env

diff --git a/dev.yml b/dev.yml
index 1446df79..f8408ae8 100644
--- a/dev.yml
+++ b/dev.yml
@@ -23,6 +23,10 @@ up:
         - protocol
         - platforms/react-native
         - platforms/web
+  - custom:
+      name: Copy root env into worktree
+      met?: ./scripts/copy_worktree_env --check
+      meet: ./scripts/copy_worktree_env
   - custom:
       name: Run Checkout Kit workspace setup
       met?: ./scripts/setup_dev_workspace --check --skip-optional-prompts
@@ -64,6 +68,10 @@ commands:
         *) echo "Usage: dev codegen <kotlin|swift|typescript>"; exit 1 ;;
       esac
 
+  copy-env:
+    desc: Copy the root .env into the current worktree so `dev up` can regenerate sample config
+    run: ./scripts/copy_worktree_env
+
   format:
     desc: Auto-format and apply safe lint autocorrections across supported workspaces
     aliases: [fix]
diff --git a/scripts/copy_worktree_env b/scripts/copy_worktree_env
new file mode 100755
index 00000000..573e0df1
--- /dev/null
+++ b/scripts/copy_worktree_env
@@ -0,0 +1,79 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+# Copies the repo-root .env (and other root-level machine-local config, if
+# present) from the main checkout into the current git worktree, so that a
+# subsequent `dev up` can regenerate all nested sample app configuration from it.
+#
+# Runs automatically as a `dev up` step. With --check it reports (without
+# copying) whether the current worktree is missing any root env files: exit 0
+# when nothing is needed (main checkout, or already seeded) and non-zero when a
+# copy is required, so it can serve as a `dev up` met? probe.
+#
+# This command prints file paths and status only; it never prints configured
+# values.
+
+mode="copy"
+if [[ "${1:-}" == "--check" ]]; then
+  mode="check"
+elif [[ $# -gt 0 ]]; then
+  echo "Usage: scripts/copy_worktree_env [--check]" >&2
+  exit 1
+fi
+
+CURRENT_ROOT="$(git rev-parse --show-toplevel)"
+COMMON_GIT_DIR="$(git rev-parse --path-format=absolute --git-common-dir)"
+MAIN_ROOT="$(dirname "${COMMON_GIT_DIR}")"
+
+if [[ "${CURRENT_ROOT}" == "${MAIN_ROOT}" ]]; then
+  # In the main checkout there is never anything to copy.
+  [[ "${mode}" == "check" ]] && exit 0
+  echo "Already in the main checkout (${CURRENT_ROOT}); nothing to copy."
+  exit 0
+fi
+
+# Root-level, gitignored source-of-truth files. Nested sample config
+# (Android/Swift/RN) is intentionally omitted: `dev up` regenerates it from the
+# root .env via scripts/setup_storefront_env.
+ROOT_FILES=(
+  ".env"
+  ".dev.env"
+  "local.properties"
+)
+
+copied_any="false"
+
+for rel in "${ROOT_FILES[@]}"; do
+  src="${MAIN_ROOT}/${rel}"
+  dest="${CURRENT_ROOT}/${rel}"
+
+  if [[ ! -e "${src}" ]]; then
+    continue
+  fi
+
+  if [[ -e "${dest}" ]]; then
+    [[ "${mode}" == "check" ]] && continue
+    echo "skip (exists): ${rel}"
+    continue
+  fi
+
+  # A source file exists in the main checkout but is missing here.
+  if [[ "${mode}" == "check" ]]; then
+    echo "missing: ${rel}"
+    exit 1
+  fi
+
+  cp "${src}" "${dest}"
+  echo "copied: ${rel}"
+  copied_any="true"
+done
+
+# Check mode reached here with nothing missing: the worktree is already seeded.
+[[ "${mode}" == "check" ]] && exit 0
+
+if [[ "${copied_any}" != "true" ]]; then
+  echo "No new root env files to copy."
+fi
+
+echo "Next: run \`dev up\` in this worktree to regenerate sample app config."