address review feedback (shadowenv, CONTRIBUTING dev tooling, swift clean/build)

Author: kyle-schellen

.github/CONTRIBUTING.md

@@ -39,6 +39,17 @@ When in doubt about whether we will be interested in including a new feature, pl
 7. Ensure all checks (tests, lint) are passing in GitHub.
 8. Open a pull request with a detailed description of what is changing and why.
 
+### Dev tooling
+
+Shopify employees can use the root `dev.yml` from the repo root:
+
+```bash
+dev up
+dev check
+```
+
+Platform-scoped commands are available as `dev android <command>`, `dev swift <command>`, and `dev react-native <command>` (or `dev rn`). Protocol schema/model commands are available as `dev protocol <command>`. For cross-platform changes, use `dev lint`, `dev test`, `dev check`, `dev format`, and `dev build`.
+
 ---
 
 ## Swift (`platforms/swift/`)

AGENTS.md

@@ -12,16 +12,24 @@ e2e/             # cross-platform end-to-end tests
 
 ## Dev workflow
 
+> **AI agents:** All commands require the `shadowenv exec --` prefix to run inside the shadowenv-managed environment.
+>
+> ```
+> shadowenv exec --dir <repo_root> -- /opt/dev/bin/dev up
+> shadowenv exec --dir <repo_root> -- /opt/dev/bin/dev test [ARGS]
+> ```
+
 Run `dev` commands from the repo root. Use `dev up` before running commands when
 the environment may not be provisioned.
 
 For platform-scoped work, prefer the root `dev.yml` commands:
 
 - Android: `dev android <command>`
 - Swift: `dev swift <command>`
-- Protocol: `dev protocol <command>`
 - React Native: `dev react-native <command>` or `dev rn <command>`
 
+For protocol schema/model work, use `dev protocol <command>`.
+
 For cross-platform changes, use the repo-wide aggregates: `dev lint`,
 `dev test`, `dev check`, `dev format`, and `dev build`. Use
 `dev <platform> format` for formatting; `fix` remains an alias for existing

README.md

@@ -27,17 +27,6 @@ Feature guides:
 - [Privacy compliance](https://shopify.dev/docs/storefronts/mobile/checkout-kit/privacy-compliance) - pass GDPR, CCPA, and ATT consent through to Shopify.
 - [Accelerated checkouts](https://shopify.dev/docs/storefronts/mobile/checkout-kit/accelerated-checkouts?extension=react-native) - Shop Pay and Apple Pay buttons for one-tap purchase on product and cart pages.
 
-## Development
-
-Shopify employees can use the root `dev.yml` from the repo root:
-
-```bash
-dev up
-dev check
-```
-
-Platform-scoped commands are available as `dev android <command>`, `dev swift <command>`, `dev protocol <command>`, and `dev react-native <command>` or `dev rn <command>`. For cross-platform changes, use `dev lint`, `dev test`, `dev check`, `dev format`, and `dev build`.
-
 ## Packages in this repo
 
 Checkout Kit is a monorepo containing all the platforms Checkout Kit supports together.

dev.yml

@@ -89,7 +89,6 @@ check:
   react-native-license-headers: cd platforms/react-native && ./scripts/copy_license --check
   web-lint: cd platforms/web && pnpm lint
   web-test: cd platforms/web && pnpm test
-  protocol-build: cd protocol/languages/swift && swift build
 
 commands:
   # Repo-wide
@@ -99,7 +98,6 @@ commands:
       set -e
       /opt/dev/bin/dev android build
       /opt/dev/bin/dev swift build
-      /opt/dev/bin/dev protocol build
       /opt/dev/bin/dev react-native build
 
   codegen:
@@ -135,7 +133,6 @@ commands:
       set -e
       /opt/dev/bin/dev android test
       /opt/dev/bin/dev swift test
-      /opt/dev/bin/dev protocol test
       /opt/dev/bin/dev react-native test
 
   apollo:
@@ -164,13 +161,13 @@ commands:
     desc: "Checkout protocol commands"
     subcommands:
       build:
-        desc: Build the Swift protocol package
-        run: cd protocol/languages/swift && swift build
+        desc: Build the Swift protocol target
+        run: swift build --target ShopifyCheckoutProtocol
       test:
-        desc: Run Swift protocol package tests
-        run: cd protocol/languages/swift && swift test
+        desc: Run Swift protocol target tests
+        run: cd platforms/swift && ./Scripts/xcode_run test ShopifyCheckoutKit-Package ShopifyCheckoutProtocolTests
       check:
-        desc: Build and test the Swift protocol package
+        desc: Build and test the Swift protocol target
         run: |
           set -e
           /opt/dev/bin/dev protocol build
@@ -257,12 +254,34 @@ commands:
         aliases: [fix]
         run: cd platforms/swift && ./Scripts/lint fix
       clean:
-        desc: Clean Swift package build artifacts
-        run: cd platforms/swift && ./Scripts/xcode_run clean ShopifyCheckoutKit-Package
+        desc: Clean Swift packages and sample app build artifacts
+        run: |
+          set -e
+          cd platforms/swift
+          # ShopifyCheckoutKit-Package is the SPM-wide scheme: it cleans all
+          # library targets in Package.swift (ShopifyCheckoutKit,
+          # ShopifyAcceleratedCheckouts, ShopifyCheckoutProtocol) in one pass.
+          ./Scripts/xcode_run clean ShopifyCheckoutKit-Package
+          cd Samples
+          # Sample apps have a "Run Script" build phase that runs during clean
+          # and exits non-zero when there is nothing to delete. Tolerate it so
+          # the second sample still gets cleaned.
+          ../Scripts/xcode_run clean MobileBuyIntegration || true
+          ../Scripts/xcode_run clean ShopifyAcceleratedCheckoutsApp || true
       build:
-        desc: Build the Swift package
-        run: cd platforms/swift && ./Scripts/xcode_run build ShopifyCheckoutKit-Package
+        desc: Build all Swift packages and sample apps
+        run: |
+          set -e
+          cd platforms/swift
+          # ShopifyCheckoutKit-Package builds every library target in
+          # Package.swift in one xcodebuild invocation. The sample apps act as
+          # integration compilation checks against the built libraries.
+          ./Scripts/xcode_run build ShopifyCheckoutKit-Package
+          ./Scripts/build_samples
         subcommands:
+          packages:
+            desc: Build Swift package targets
+            run: cd platforms/swift && ./Scripts/xcode_run build ShopifyCheckoutKit-Package
           samples:
             desc: Build all sample applications to verify integration
             run: cd platforms/swift && ./Scripts/build_samples
@@ -336,9 +355,6 @@ commands:
             sccache --stop-server 2>/dev/null || true
           fi
           echo "Cleaned root, module and sample workspaces"
-      build:
-        desc: Build the @shopify/checkout-kit-react-native module
-        run: cd platforms/react-native && pnpm module build
       lint:
         desc: Run all React Native lint checks (Swift, module, sample)
         aliases: [style]
@@ -353,13 +369,13 @@ commands:
             desc: Lint Swift code via SwiftLint
             run: cd platforms/react-native && ./scripts/lint_swift
           module:
-            desc: Lint the @shopify/checkout-sheet-kit module
+            desc: Lint the @shopify/checkout-kit-react-native module
             run: cd platforms/react-native && pnpm module lint
           sample:
             desc: Lint the sample app
             run: cd platforms/react-native && pnpm sample lint
       format:
-        desc: Auto-fix Swift lint and format issues
+        desc: Auto-format and apply safe lint autocorrections (Swift bridge only)
         aliases: [fix]
         run: cd platforms/react-native && ./scripts/lint_swift fix
       test:

platforms/swift/.cursor/rules/swift-development.mdc

@@ -26,7 +26,7 @@ alwaysApply: true
 Key commands for verification:
 - `dev swift lint` (alias: `dev swift style`) - Check format & lint issues
 - `dev swift format` - Auto-format and apply safe lint autocorrections
-- `dev swift build packages` - Build both packages
+- `dev swift build packages` - Build Swift package targets
 - `dev swift test` - Run all tests
 
 ## Concurrency Best Practices

platforms/swift/Scripts/xcode_run

@@ -50,12 +50,18 @@ if [[ "$ACTION" == *"test"* && -n "$TEST_FILTER" ]]; then
         # Find which test target contains this test class (search all test targets automatically)
         project_root="$(cd "$SCRIPT_DIR/.." && pwd)"
         test_target=""
+        target_filter_added=""
 
         # Discover all test targets by looking for *Tests directories
         test_file=""
         for test_dir in "$project_root/Tests"/*Tests; do
             if [[ -d "$test_dir" ]]; then
                 target_name=$(basename "$test_dir")
+                if [[ "$TEST_FILTER" == "$target_name" ]]; then
+                    xcodebuild_cmd="$xcodebuild_cmd -only-testing:$target_name"
+                    target_filter_added="1"
+                    break
+                fi
                 # Check if TEST_FILTER matches a .swift filename
                 if find "$test_dir" -name "$TEST_FILTER.swift" -type f | grep -q .; then
                     test_target="$target_name"
@@ -65,7 +71,9 @@ if [[ "$ACTION" == *"test"* && -n "$TEST_FILTER" ]]; then
             fi
         done
 
-        if [[ -n "$test_target" && -n "$test_file" ]]; then
+        if [[ -n "$target_filter_added" ]]; then
+            :
+        elif [[ -n "$test_target" && -n "$test_file" ]]; then
             # Extract all test class names from the file
             test_classes=$(grep "class.*XCTestCase" "$test_file" | sed 's/.*class \([^:]*\):.*/\1/')