From eb98f50b5c7462636fd5695adfa27264a5188ce5 Mon Sep 17 00:00:00 2001
From: Charles Lavery <clavery@salesforce.com>
Date: Tue, 6 Jan 2026 20:34:44 -0500
Subject: [PATCH 01/11] e2e shell script testing

---
 .../b2c-cli/test/functional/e2e_cli_test.sh   | 253 ++++++++++++++++--
 .../TestSite/catalogs/TestCatalog/catalog.xml |  47 ++++
 .../TestSite/inventory-lists/inventory.xml    |  15 ++
 .../meta/system-objecttype-extensions.xml     |   3 +
 .../TestSite/pricebooks/pricebook.xml         |  15 ++
 .../TestSite/sites/TestSite/preferences.xml   |   9 +
 .../TestSite/sites/TestSite/site.xml          |  17 ++
 7 files changed, 340 insertions(+), 19 deletions(-)
 create mode 100644 packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/catalogs/TestCatalog/catalog.xml
 create mode 100644 packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/inventory-lists/inventory.xml
 create mode 100644 packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/meta/system-objecttype-extensions.xml
 create mode 100644 packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/pricebooks/pricebook.xml
 create mode 100644 packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/sites/TestSite/preferences.xml
 create mode 100644 packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/sites/TestSite/site.xml

diff --git a/packages/b2c-cli/test/functional/e2e_cli_test.sh b/packages/b2c-cli/test/functional/e2e_cli_test.sh
index f5002e35..d266bdb9 100755
--- a/packages/b2c-cli/test/functional/e2e_cli_test.sh
+++ b/packages/b2c-cli/test/functional/e2e_cli_test.sh
@@ -1,40 +1,255 @@
 #!/usr/bin/env bash
 # b2c-cli e2e cli tests
-# required env vars
-# SFCC_CLIENT_ID
-# SFCC_CLIENT_SECRET
-# SFCC_SHORTCODE
-# TEST_REALM
+#
+# Required environment variables:
+# SFCC_CLIENT_ID      - Account Manager API client ID
+# SFCC_CLIENT_SECRET  - Account Manager API client secret
+# SFCC_SHORTCODE      - SCAPI short code
+# TEST_REALM          - Realm ID for sandbox creation (four-letter ID)
+#
+# Optional environment variables:
+# SFCC_ACCOUNT_MANAGER_HOST - Account Manager hostname (default: account.demandware.com)
+# SFCC_SANDBOX_API_HOST     - Sandbox API hostname (default: admin.dx.commercecloud.salesforce.com)
 
 set -e
 
+# Script directory for relative paths
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+CLI="$SCRIPT_DIR/../../bin/run.js"
 
-# 1. Create on demand sandbox
+# Fixtures paths
+CARTRIDGE_PATH="$SCRIPT_DIR/fixtures/cartridges"
+SITE_ARCHIVE_PATH="$SCRIPT_DIR/fixtures/site_archive/TestSite"
 
-# Create ODS will automatically configure webdav and ocapi for the SFCC_CLIENT_ID we're using
-# just like sfcc-ci
-ODS_CREATE_RESULT=$(../../bin/run.js ods create --realm "$TEST_REALM" --wait --json)
+# Test configuration
+SITE_ID="TestSite"
+TTL_HOURS=4  # 4 hours in case test fails and needs manual cleanup
+
+# Cleanup function for error handling
+cleanup() {
+    local exit_code=$?
+    echo ""
+    echo "========================================="
+    echo "Cleanup (exit code: $exit_code)"
+    echo "========================================="
+
+    # Delete SLAS client if it was created
+    if [ -n "$SLAS_CLIENT_ID" ] && [ -n "$TENANT_ID" ]; then
+        echo "Deleting SLAS client: $SLAS_CLIENT_ID"
+        $CLI slas client delete "$SLAS_CLIENT_ID" --tenant-id "$TENANT_ID" || true
+    fi
+
+    # Delete sandbox if it was created
+    if [ -n "$ODS_ID" ]; then
+        echo "Deleting sandbox: $ODS_ID"
+        $CLI ods delete "$ODS_ID" --force || true
+    fi
+
+    exit $exit_code
+}
+
+# Set up cleanup trap
+trap cleanup EXIT
+
+echo "========================================="
+echo "B2C CLI E2E Test Suite"
+echo "========================================="
+echo "Realm: $TEST_REALM"
+echo "Short Code: $SFCC_SHORTCODE"
+echo ""
+
+################################################################################
+# 1. Create On-Demand Sandbox
+################################################################################
+echo "Step 1: Creating on-demand sandbox..."
+
+ODS_CREATE_RESULT=$($CLI ods create \
+    --realm "$TEST_REALM" \
+    --ttl "$TTL_HOURS" \
+    --wait \
+    --json)
 
 ODS_ID=$(echo "$ODS_CREATE_RESULT" | jq -r '.[0].id')
+SERVER=$(echo "$ODS_CREATE_RESULT" | jq -r '.[0].server')
+INSTANCE_NUM=$(echo "$ODS_CREATE_RESULT" | jq -r '.[0].instance')
 
 if [ -z "$ODS_ID" ] || [ "$ODS_ID" == "null" ]; then
-  echo "Failed to create on demand sandbox"
-  exit 1
+    echo "FAILED: Could not create on-demand sandbox"
+    exit 1
 fi
 
-echo "Created on demand sandbox with ID: $ODS_ID"
+echo "SUCCESS: Created sandbox"
+echo "  ID: $ODS_ID"
+echo "  Server: $SERVER"
+echo "  Instance: $INSTANCE_NUM"
+echo ""
+
+################################################################################
+# 2. List and Verify Sandbox
+################################################################################
+echo "Step 2: Verifying sandbox in list..."
 
-# 2. List on demand sandboxes and verify the created one is present
-ODS_LIST_RESULT=$(../../bin/run.js ods list --realm "$TEST_REALM" --json)
+ODS_LIST_RESULT=$($CLI ods list --realm "$TEST_REALM" --json)
 ODS_PRESENT=$(echo "$ODS_LIST_RESULT" | jq -r --arg ODS_ID "$ODS_ID" '.[] | select(.id == $ODS_ID) | .id')
 
 if [ "$ODS_PRESENT" != "$ODS_ID" ]; then
-  echo "Created on demand sandbox not found in list"
-  exit 1
+    echo "FAILED: Created sandbox not found in list"
+    exit 1
 fi
 
-SERVER=$(echo "$ODS_CREATE_RESULT" | jq -r '.[0].server')
+echo "SUCCESS: Sandbox verified in list"
+echo ""
+
+################################################################################
+# 3. Deploy Code
+################################################################################
+echo "Step 3: Deploying code to sandbox..."
+
+$CLI code deploy "$CARTRIDGE_PATH" \
+    --server "$SERVER" \
+    --code-version "e2e-test-version"
+
+echo "SUCCESS: Code deployed"
+echo ""
+
+################################################################################
+# 4. Import Site Data
+################################################################################
+echo "Step 4: Importing site data..."
+
+$CLI job import "$SITE_ARCHIVE_PATH" \
+    --server "$SERVER" \
+    --timeout 300
+
+echo "SUCCESS: Site data imported"
+echo ""
+
+################################################################################
+# 5. Run Search Index Job
+################################################################################
+echo "Step 5: Running search index job..."
+
+$CLI job run sfcc-search-index-product-full-update \
+    --server "$SERVER" \
+    --wait \
+    --timeout 300 \
+    -P "SiteScope={\"named_sites\":[\"$SITE_ID\"]}"
+
+echo "SUCCESS: Search index job completed"
+echo ""
+
+################################################################################
+# 6. Create SLAS Client
+################################################################################
+echo "Step 6: Creating SLAS client..."
+
+# Construct tenant ID from realm and instance number
+TENANT_ID="${TEST_REALM}_${INSTANCE_NUM}"
+
+# Generate a unique SLAS client ID
+SLAS_CLIENT_ID="e2e-test-$(date +%s)-$(openssl rand -hex 4)"
+
+SLAS_CREATE_RESULT=$($CLI slas client create "$SLAS_CLIENT_ID" \
+    --tenant-id "$TENANT_ID" \
+    --channels "$SITE_ID" \
+    --default-scopes \
+    --redirect-uri "http://localhost:3000/callback" \
+    --json)
+
+SLAS_SECRET=$(echo "$SLAS_CREATE_RESULT" | jq -r '.secret')
+
+if [ -z "$SLAS_SECRET" ] || [ "$SLAS_SECRET" == "null" ]; then
+    echo "FAILED: Could not create SLAS client"
+    echo "$SLAS_CREATE_RESULT"
+    exit 1
+fi
+
+echo "SUCCESS: SLAS client created"
+echo "  Client ID: $SLAS_CLIENT_ID"
+echo "  Tenant ID: $TENANT_ID"
+echo ""
+
+################################################################################
+# 7. Test SLAS Guest Login
+################################################################################
+echo "Step 7: Testing SLAS guest login..."
+
+# Wait a moment for SLAS client to be ready and search index to be available
+sleep 10
+
+# Organization ID format for SLAS
+ORG_ID="f_ecom_${TEST_REALM}_${INSTANCE_NUM}"
+SLAS_BASE="https://${SFCC_SHORTCODE}.api.commercecloud.salesforce.com"
+
+echo "  ORG ID: $ORG_ID"
+echo "  SLAS Base: $SLAS_BASE"
+
+# Get shopper token via client credentials (guest login)
+TOKEN_RESPONSE=$(curl -s "${SLAS_BASE}/shopper/auth/v1/organizations/${ORG_ID}/oauth2/token" \
+    -u "${SLAS_CLIENT_ID}:${SLAS_SECRET}" \
+    -d "grant_type=client_credentials&channel_id=${SITE_ID}")
+
+SHOPPER_TOKEN=$(echo "$TOKEN_RESPONSE" | jq -r '.access_token')
+
+if [ -z "$SHOPPER_TOKEN" ] || [ "$SHOPPER_TOKEN" == "null" ]; then
+    echo "FAILED: Could not obtain shopper token"
+    echo "$TOKEN_RESPONSE" | jq
+    exit 1
+fi
+
+echo "SUCCESS: Obtained shopper access token"
+echo ""
+
+################################################################################
+# 8. Test Shopper Search
+################################################################################
+echo "Step 8: Testing shopper product search..."
+
+SEARCH_RESPONSE=$(curl -s "${SLAS_BASE}/search/shopper-search/v1/organizations/${ORG_ID}/product-search?siteId=${SITE_ID}&limit=5&q=sample" \
+    -H "Authorization: Bearer ${SHOPPER_TOKEN}")
+
+# Check if we got a valid response (should have a 'hits' array or 'total' field)
+SEARCH_TOTAL=$(echo "$SEARCH_RESPONSE" | jq -r '.total // .hits | length // 0')
+
+if [ "$SEARCH_TOTAL" == "null" ]; then
+    echo "WARNING: Search returned unexpected response format"
+    echo "$SEARCH_RESPONSE" | jq
+    # Don't fail - the product might not be indexed yet
+else
+    echo "SUCCESS: Shopper search returned results"
+    echo "  Total results: $SEARCH_TOTAL"
+fi
+echo ""
+
+################################################################################
+# 9. Delete SLAS Client
+################################################################################
+echo "Step 9: Deleting SLAS client..."
+
+$CLI slas client delete "$SLAS_CLIENT_ID" --tenant-id "$TENANT_ID"
+
+# Clear SLAS_CLIENT_ID so cleanup doesn't try to delete again
+SLAS_CLIENT_ID=""
+
+echo "SUCCESS: SLAS client deleted"
+echo ""
+
+################################################################################
+# 10. Delete Sandbox
+################################################################################
+echo "Step 10: Deleting sandbox..."
+
+$CLI ods delete "$ODS_ID" --force
+
+# Clear ODS_ID so cleanup doesn't try to delete again
+ODS_ID=""
 
-# 3. Import code into the created sandbox
+echo "SUCCESS: Sandbox deleted"
+echo ""
 
-IMPORT_RESULT=$(../../bin/run.js code deploy --server --sandbox "$ODS_ID" --source ./test/functional/sample_code --wait --json)
+################################################################################
+# Complete
+################################################################################
+echo "========================================="
+echo "All E2E tests passed!"
+echo "========================================="
diff --git a/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/catalogs/TestCatalog/catalog.xml b/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/catalogs/TestCatalog/catalog.xml
new file mode 100644
index 00000000..db403560
--- /dev/null
+++ b/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/catalogs/TestCatalog/catalog.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<catalog xmlns="http://www.demandware.com/xml/impex/catalog/2006-10-31" catalog-id="TestCatalog">
+    <header>
+        <image-settings>
+            <internal-location base-path="/"/>
+            <view-types>
+                <view-type>large</view-type>
+                <view-type>medium</view-type>
+                <view-type>small</view-type>
+            </view-types>
+        </image-settings>
+    </header>
+
+    <category category-id="root">
+        <display-name xml:lang="x-default">Root Category</display-name>
+        <online-flag>true</online-flag>
+        <template/>
+    </category>
+
+    <category category-id="test-products">
+        <display-name xml:lang="x-default">Test Products</display-name>
+        <online-flag>true</online-flag>
+        <parent>root</parent>
+        <template/>
+    </category>
+
+    <product product-id="test-product-001">
+        <ean/>
+        <upc/>
+        <unit/>
+        <min-order-quantity>1</min-order-quantity>
+        <step-quantity>1</step-quantity>
+        <display-name xml:lang="x-default">Sample Test Product</display-name>
+        <short-description xml:lang="x-default">A sample product for E2E testing</short-description>
+        <long-description xml:lang="x-default">This is a sample product created for end-to-end testing of the B2C CLI.</long-description>
+        <online-flag>true</online-flag>
+        <searchable-flag>true</searchable-flag>
+        <tax-class-id>standard</tax-class-id>
+        <brand>TestBrand</brand>
+        <page-attributes/>
+        <custom-attributes/>
+        <classification-category catalog-id="TestCatalog">test-products</classification-category>
+    </product>
+
+    <category-assignment category-id="root" product-id="test-product-001"/>
+    <category-assignment category-id="test-products" product-id="test-product-001"/>
+</catalog>
diff --git a/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/inventory-lists/inventory.xml b/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/inventory-lists/inventory.xml
new file mode 100644
index 00000000..219cc327
--- /dev/null
+++ b/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/inventory-lists/inventory.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inventory xmlns="http://www.demandware.com/xml/impex/inventory/2007-05-31">
+    <inventory-list>
+        <header list-id="test-inventory">
+            <default-instock>true</default-instock>
+            <description>Test Inventory List</description>
+        </header>
+        <records>
+            <record product-id="test-product-001">
+                <allocation>100</allocation>
+                <perpetual>false</perpetual>
+            </record>
+        </records>
+    </inventory-list>
+</inventory>
diff --git a/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/meta/system-objecttype-extensions.xml b/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/meta/system-objecttype-extensions.xml
new file mode 100644
index 00000000..2ca40f2a
--- /dev/null
+++ b/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/meta/system-objecttype-extensions.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xmlns="http://www.demandware.com/xml/impex/metadata/2006-10-31">
+</metadata>
diff --git a/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/pricebooks/pricebook.xml b/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/pricebooks/pricebook.xml
new file mode 100644
index 00000000..f7db4858
--- /dev/null
+++ b/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/pricebooks/pricebook.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pricebooks xmlns="http://www.demandware.com/xml/impex/pricebook/2006-10-31">
+    <pricebook>
+        <header pricebook-id="test-usd-pricebook">
+            <currency>USD</currency>
+            <display-name xml:lang="x-default">Test USD Pricebook</display-name>
+            <online-flag>true</online-flag>
+        </header>
+        <price-tables>
+            <price-table product-id="test-product-001">
+                <amount quantity="1">19.99</amount>
+            </price-table>
+        </price-tables>
+    </pricebook>
+</pricebooks>
diff --git a/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/sites/TestSite/preferences.xml b/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/sites/TestSite/preferences.xml
new file mode 100644
index 00000000..53202a58
--- /dev/null
+++ b/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/sites/TestSite/preferences.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<preferences xmlns="http://www.demandware.com/xml/impex/preferences/2019-01-08">
+    <all-instances>
+        <custom-preference preference-id="SiteGenesis_storefront_catalog_id">TestCatalog</custom-preference>
+    </all-instances>
+    <organization-preferences>
+        <custom-preference preference-id="SiteGenesis_storefront_catalog_id">TestCatalog</custom-preference>
+    </organization-preferences>
+</preferences>
diff --git a/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/sites/TestSite/site.xml b/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/sites/TestSite/site.xml
new file mode 100644
index 00000000..a32c9c09
--- /dev/null
+++ b/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/sites/TestSite/site.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site xmlns="http://www.demandware.com/xml/impex/site/2007-04-30" site-id="TestSite">
+    <name xml:lang="x-default">Test Site</name>
+    <description xml:lang="x-default">E2E Test Site for CLI testing</description>
+    <currency>USD</currency>
+    <taxation>net</taxation>
+    <default-locale>en_US</default-locale>
+    <allowed-currencies>
+        <currency>USD</currency>
+    </allowed-currencies>
+    <allowed-locales>
+        <locale>en_US</locale>
+    </allowed-locales>
+    <storefront-status>
+        <status>online</status>
+    </storefront-status>
+</site>

From ef4b32d3009b8f115302b0e9f7fd6a2d9e10ee89 Mon Sep 17 00:00:00 2001
From: Charles Lavery <clavery@salesforce.com>
Date: Tue, 6 Jan 2026 20:50:33 -0500
Subject: [PATCH 02/11] fix issues with ods timing and general error logging in
 json mode

---
 packages/b2c-cli/src/commands/ods/create.ts   |  7 ++++++-
 .../b2c-tooling-sdk/src/cli/base-command.ts   | 21 ++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/packages/b2c-cli/src/commands/ods/create.ts b/packages/b2c-cli/src/commands/ods/create.ts
index 4cde1523..40f29006 100644
--- a/packages/b2c-cli/src/commands/ods/create.ts
+++ b/packages/b2c-cli/src/commands/ods/create.ts
@@ -152,7 +152,9 @@ export default class OdsCreate extends OdsCommand<typeof OdsCreate> {
     let sandbox = result.data.data;
 
     this.log('');
-    this.log(t('commands.ods.create.success', 'Sandbox created successfully!'));
+    this.log(
+      t('commands.ods.create.success', 'Sandbox created successfully: {{sandboxId}}', {sandboxId: sandbox.id}),
+    );
 
     if (wait && sandbox.id) {
       this.log('');
@@ -256,6 +258,9 @@ export default class OdsCreate extends OdsCommand<typeof OdsCreate> {
 
     this.log(t('commands.ods.create.waiting', 'Waiting for sandbox to be ready...'));
 
+    // Initial delay before first poll to allow the sandbox to be registered in the API
+    await this.sleep(2000);
+
     while (true) {
       // Check for timeout
       if (timeoutSeconds > 0 && Date.now() - startTime > timeoutMs) {
diff --git a/packages/b2c-tooling-sdk/src/cli/base-command.ts b/packages/b2c-tooling-sdk/src/cli/base-command.ts
index 6f45ceaa..0ad10395 100644
--- a/packages/b2c-tooling-sdk/src/cli/base-command.ts
+++ b/packages/b2c-tooling-sdk/src/cli/base-command.ts
@@ -168,17 +168,32 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
   /**
    * Handle errors thrown during command execution.
    *
-   * Logs the error using the structured logger (including cause if available),
-   * then uses oclif's error() to exit with proper code.
+   * Logs the error using the structured logger (including cause if available).
+   * In JSON mode, outputs a JSON error object to stdout instead of oclif's default format.
    */
   protected async catch(err: Error & {exitCode?: number}): Promise<never> {
+    const exitCode = err.exitCode ?? 1;
+
     // Log if logger is available (may not be if error during init)
     if (this.logger) {
       this.logger.error({cause: err?.cause}, err.message);
     }
 
+    // In JSON mode, output structured error to stderr and exit
+    if (this.jsonEnabled()) {
+      const errorOutput = {
+        error: {
+          message: err.message,
+          code: exitCode,
+          ...(err.cause ? {cause: String(err.cause)} : {}),
+        },
+      };
+      process.stderr.write(JSON.stringify(errorOutput) + '\n');
+      process.exit(exitCode);
+    }
+
     // Use oclif's error() for proper exit code and display
-    this.error(err.message, {exit: err.exitCode ?? 1});
+    this.error(err.message, {exit: exitCode});
   }
 
   public baseCommandTest(): void {

From 4a69e5208b1a2445c4131ee6f8c7672bd4e26fb7 Mon Sep 17 00:00:00 2001
From: Charles Lavery <clavery@salesforce.com>
Date: Tue, 6 Jan 2026 20:50:45 -0500
Subject: [PATCH 03/11] handle ods create output

---
 .../b2c-cli/test/functional/e2e_cli_test.sh   | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/packages/b2c-cli/test/functional/e2e_cli_test.sh b/packages/b2c-cli/test/functional/e2e_cli_test.sh
index d266bdb9..d145ef0c 100755
--- a/packages/b2c-cli/test/functional/e2e_cli_test.sh
+++ b/packages/b2c-cli/test/functional/e2e_cli_test.sh
@@ -69,9 +69,13 @@ ODS_CREATE_RESULT=$($CLI ods create \
     --wait \
     --json)
 
-ODS_ID=$(echo "$ODS_CREATE_RESULT" | jq -r '.[0].id')
-SERVER=$(echo "$ODS_CREATE_RESULT" | jq -r '.[0].server')
-INSTANCE_NUM=$(echo "$ODS_CREATE_RESULT" | jq -r '.[0].instance')
+echo "DEBUG: ODS create result:"
+echo "$ODS_CREATE_RESULT" | jq .
+
+# The JSON output is the sandbox object directly (not an array)
+ODS_ID=$(echo "$ODS_CREATE_RESULT" | jq -r '.id')
+SERVER=$(echo "$ODS_CREATE_RESULT" | jq -r '.hostName')
+INSTANCE_NUM=$(echo "$ODS_CREATE_RESULT" | jq -r '.instance')
 
 if [ -z "$ODS_ID" ] || [ "$ODS_ID" == "null" ]; then
     echo "FAILED: Could not create on-demand sandbox"
@@ -90,7 +94,12 @@ echo ""
 echo "Step 2: Verifying sandbox in list..."
 
 ODS_LIST_RESULT=$($CLI ods list --realm "$TEST_REALM" --json)
-ODS_PRESENT=$(echo "$ODS_LIST_RESULT" | jq -r --arg ODS_ID "$ODS_ID" '.[] | select(.id == $ODS_ID) | .id')
+
+echo "DEBUG: ODS list result:"
+echo "$ODS_LIST_RESULT" | jq .
+
+# The JSON output is { count: number, data: SandboxModel[] }
+ODS_PRESENT=$(echo "$ODS_LIST_RESULT" | jq -r --arg ODS_ID "$ODS_ID" '.data[] | select(.id == $ODS_ID) | .id')
 
 if [ "$ODS_PRESENT" != "$ODS_ID" ]; then
     echo "FAILED: Created sandbox not found in list"
@@ -156,6 +165,10 @@ SLAS_CREATE_RESULT=$($CLI slas client create "$SLAS_CLIENT_ID" \
     --redirect-uri "http://localhost:3000/callback" \
     --json)
 
+echo "DEBUG: SLAS create result:"
+echo "$SLAS_CREATE_RESULT" | jq .
+
+# The JSON output is a ClientOutput object with secret field
 SLAS_SECRET=$(echo "$SLAS_CREATE_RESULT" | jq -r '.secret')
 
 if [ -z "$SLAS_SECRET" ] || [ "$SLAS_SECRET" == "null" ]; then

From 8ad651fce629447305d287041517f2cc1eb3ba9b Mon Sep 17 00:00:00 2001
From: Charles Lavery <clavery@salesforce.com>
Date: Tue, 6 Jan 2026 20:57:34 -0500
Subject: [PATCH 04/11] better structured logging in ods create

---
 packages/b2c-cli/src/commands/ods/create.ts | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/packages/b2c-cli/src/commands/ods/create.ts b/packages/b2c-cli/src/commands/ods/create.ts
index 40f29006..5fa0e2f0 100644
--- a/packages/b2c-cli/src/commands/ods/create.ts
+++ b/packages/b2c-cli/src/commands/ods/create.ts
@@ -152,9 +152,7 @@ export default class OdsCreate extends OdsCommand<typeof OdsCreate> {
     let sandbox = result.data.data;
 
     this.log('');
-    this.log(
-      t('commands.ods.create.success', 'Sandbox created successfully: {{sandboxId}}', {sandboxId: sandbox.id}),
-    );
+    this.logger.info({sandboxId: sandbox.id}, t('commands.ods.create.success', 'Sandbox created successfully'));
 
     if (wait && sandbox.id) {
       this.log('');
@@ -291,12 +289,8 @@ export default class OdsCreate extends OdsCommand<typeof OdsCreate> {
 
       // Log current state on each poll
       const elapsed = Math.round((Date.now() - startTime) / 1000);
-      this.log(
-        t('commands.ods.create.stateChange', '[{{elapsed}}s] State: {{state}}', {
-          elapsed: String(elapsed),
-          state: currentState || 'unknown',
-        }),
-      );
+      const state = currentState || 'unknown';
+      this.logger.info({sandboxId, elapsed, state}, `[${elapsed}s] State: ${state}`);
 
       // Check for terminal states
       if (currentState && TERMINAL_STATES.has(currentState)) {
@@ -311,7 +305,7 @@ export default class OdsCreate extends OdsCommand<typeof OdsCreate> {
           }
           case 'started': {
             this.log('');
-            this.log(t('commands.ods.create.ready', 'Sandbox is now ready!'));
+            this.logger.info({sandboxId}, t('commands.ods.create.ready', 'Sandbox is now ready'));
             break;
           }
         }

From 67c38016018959cdb90bd5781db617e9fd4ffc2a Mon Sep 17 00:00:00 2001
From: Charles Lavery <clavery@salesforce.com>
Date: Tue, 6 Jan 2026 21:32:47 -0500
Subject: [PATCH 05/11] support raw request for job run for system jobs

---
 packages/b2c-cli/src/commands/job/run.ts      | 23 ++++++++++--
 packages/b2c-tooling-sdk/src/cli/config.ts    | 35 +++++++++++++++++++
 .../src/operations/jobs/run.ts                | 23 ++++++++----
 3 files changed, 71 insertions(+), 10 deletions(-)

diff --git a/packages/b2c-cli/src/commands/job/run.ts b/packages/b2c-cli/src/commands/job/run.ts
index a1b337c4..a3f0793b 100644
--- a/packages/b2c-cli/src/commands/job/run.ts
+++ b/packages/b2c-cli/src/commands/job/run.ts
@@ -30,6 +30,7 @@ export default class JobRun extends JobCommand<typeof JobRun> {
     '<%= config.bin %> <%= command.id %> my-custom-job --wait',
     String.raw`<%= config.bin %> <%= command.id %> my-custom-job -P "SiteScope={\"all_storefront_sites\":true}" -P OtherParam=value`,
     '<%= config.bin %> <%= command.id %> my-custom-job --wait --timeout 600',
+    String.raw`<%= config.bin %> <%= command.id %> sfcc-search-index-product-full-update --body '{"site_scope":{"named_sites":["RefArch"]}}'`,
   ];
 
   static flags = {
@@ -48,6 +49,12 @@ export default class JobRun extends JobCommand<typeof JobRun> {
       description: 'Job parameter in format "name=value" (use -P multiple times for multiple params)',
       multiple: true,
       multipleNonGreedy: true,
+      exclusive: ['body'],
+    }),
+    body: Flags.string({
+      char: 'B',
+      description: 'Raw JSON request body (for system jobs with non-standard schemas)',
+      exclusive: ['param'],
     }),
     'no-wait-running': Flags.boolean({
       description: 'Do not wait for running job to finish before starting',
@@ -63,10 +70,11 @@ export default class JobRun extends JobCommand<typeof JobRun> {
     this.requireOAuthCredentials();
 
     const {jobId} = this.args;
-    const {wait, timeout, param, 'no-wait-running': noWaitRunning, 'show-log': showLog} = this.flags;
+    const {wait, timeout, param, body, 'no-wait-running': noWaitRunning, 'show-log': showLog} = this.flags;
 
-    // Parse parameters
+    // Parse parameters or body
     const parameters = this.parseParameters(param || []);
+    const rawBody = body ? this.parseBody(body) : undefined;
 
     this.log(
       t('commands.job.run.executing', 'Executing job {{jobId}} on {{hostname}}...', {
@@ -78,7 +86,8 @@ export default class JobRun extends JobCommand<typeof JobRun> {
     let execution: JobExecution;
     try {
       execution = await executeJob(this.instance, jobId, {
-        parameters,
+        parameters: rawBody ? undefined : parameters,
+        body: rawBody,
         waitForRunning: !noWaitRunning,
       });
     } catch (error) {
@@ -161,4 +170,12 @@ export default class JobRun extends JobCommand<typeof JobRun> {
       };
     });
   }
+
+  private parseBody(body: string): Record<string, unknown> {
+    try {
+      return JSON.parse(body) as Record<string, unknown>;
+    } catch {
+      this.error(t('commands.job.run.invalidBody', 'Invalid JSON body: {{body}}', {body}));
+    }
+  }
 }
diff --git a/packages/b2c-tooling-sdk/src/cli/config.ts b/packages/b2c-tooling-sdk/src/cli/config.ts
index dc2d9fb5..4eec9116 100644
--- a/packages/b2c-tooling-sdk/src/cli/config.ts
+++ b/packages/b2c-tooling-sdk/src/cli/config.ts
@@ -173,12 +173,47 @@ function loadDwJson(instanceName?: string, configPath?: string): ResolvedConfig
  * Note: Environment variables are handled by OCLIF's flag parsing with the `env`
  * property on each flag definition. By the time flags reach this function, they
  * already contain env var values where applicable.
+ *
+ * IMPORTANT: If the hostname is explicitly provided (via flags/env) and differs
+ * from the dw.json hostname, we do NOT use ANY configuration from dw.json since
+ * the dw.json is configured for a different server.
  */
 function mergeConfigs(
   flags: Partial<ResolvedConfig>,
   dwJson: ResolvedConfig,
   options: LoadConfigOptions,
 ): ResolvedConfig {
+  const logger = getLogger();
+
+  // Check if hostname was explicitly provided and differs from dw.json
+  const hostnameExplicitlyProvided = Boolean(flags.hostname);
+  const hostnameMismatch = hostnameExplicitlyProvided && dwJson.hostname && flags.hostname !== dwJson.hostname;
+
+  // If hostname mismatch, ignore dw.json entirely
+  if (hostnameMismatch) {
+    logger.trace(
+      {providedHostname: flags.hostname, dwJsonHostname: dwJson.hostname, ignoredConfig: dwJson},
+      '[Config] Hostname mismatch - ignoring dw.json configuration',
+    );
+    return {
+      hostname: flags.hostname,
+      webdavHostname: flags.webdavHostname,
+      codeVersion: flags.codeVersion,
+      username: flags.username,
+      password: flags.password,
+      clientId: flags.clientId,
+      clientSecret: flags.clientSecret,
+      scopes: flags.scopes,
+      shortCode: flags.shortCode,
+      mrtApiKey: flags.mrtApiKey,
+      mrtProject: flags.mrtProject,
+      mrtEnvironment: flags.mrtEnvironment,
+      mrtOrigin: flags.mrtOrigin,
+      instanceName: undefined,
+      authMethods: flags.authMethods,
+    };
+  }
+
   return {
     hostname: flags.hostname || dwJson.hostname,
     webdavHostname: flags.webdavHostname || dwJson.webdavHostname,
diff --git a/packages/b2c-tooling-sdk/src/operations/jobs/run.ts b/packages/b2c-tooling-sdk/src/operations/jobs/run.ts
index b23be79f..bb7d5b0f 100644
--- a/packages/b2c-tooling-sdk/src/operations/jobs/run.ts
+++ b/packages/b2c-tooling-sdk/src/operations/jobs/run.ts
@@ -40,8 +40,10 @@ export type JobExecutionParameter = components['schemas']['job_execution_paramet
  * Options for executing a job.
  */
 export interface ExecuteJobOptions {
-  /** Job parameters to pass */
+  /** Job parameters to pass (standard jobs) */
   parameters?: JobExecutionParameter[];
+  /** Raw request body (for system jobs with non-standard schemas like sfcc-search-index-*) */
+  body?: Record<string, unknown>;
   /** Wait for running jobs to finish before starting (default: true) */
   waitForRunning?: boolean;
 }
@@ -90,12 +92,19 @@ export async function executeJob(
   options: ExecuteJobOptions = {},
 ): Promise<JobExecution> {
   const logger = getLogger();
-  const {parameters = [], waitForRunning = true} = options;
-
-  logger.debug({jobId, parameters}, `Executing job ${jobId}`);
-
-  // Build request body - OCAPI accepts either parameters array or job-specific fields
-  const body = parameters.length > 0 ? {parameters} : undefined;
+  const {parameters = [], body: rawBody, waitForRunning = true} = options;
+
+  // Build request body - use raw body if provided, otherwise use parameters array
+  let body: Record<string, unknown> | undefined;
+  if (rawBody) {
+    body = rawBody;
+    logger.debug({jobId, body}, `Executing job ${jobId} with raw body`);
+  } else if (parameters.length > 0) {
+    body = {parameters};
+    logger.debug({jobId, parameters}, `Executing job ${jobId} with parameters`);
+  } else {
+    logger.debug({jobId}, `Executing job ${jobId}`);
+  }
 
   const {data, error, response} = await instance.ocapi.POST('/jobs/{job_id}/executions', {
     params: {path: {job_id: jobId}},

From 2891aeb18ffd3364349313c915480e1f120bb586 Mon Sep 17 00:00:00 2001
From: Charles Lavery <clavery@salesforce.com>
Date: Tue, 6 Jan 2026 21:33:34 -0500
Subject: [PATCH 06/11] fix e2e test; valid site archive fixture

---
 .../b2c-cli/test/functional/e2e_cli_test.sh     |  8 ++++----
 .../TestSite/sites/TestSite/preferences.xml     |  9 ---------
 .../TestSite/sites/TestSite/site.xml            | 17 -----------------
 .../catalogs/TestCatalog/catalog.xml            |  0
 .../inventory-lists/inventory.xml               |  0
 .../meta/system-objecttype-extensions.xml       |  0
 .../{TestSite => }/pricebooks/pricebook.xml     |  0
 .../site_archive/sites/TestSite/site.xml        |  8 ++++++++
 8 files changed, 12 insertions(+), 30 deletions(-)
 delete mode 100644 packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/sites/TestSite/preferences.xml
 delete mode 100644 packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/sites/TestSite/site.xml
 rename packages/b2c-cli/test/functional/fixtures/site_archive/{TestSite => }/catalogs/TestCatalog/catalog.xml (100%)
 rename packages/b2c-cli/test/functional/fixtures/site_archive/{TestSite => }/inventory-lists/inventory.xml (100%)
 rename packages/b2c-cli/test/functional/fixtures/site_archive/{TestSite => }/meta/system-objecttype-extensions.xml (100%)
 rename packages/b2c-cli/test/functional/fixtures/site_archive/{TestSite => }/pricebooks/pricebook.xml (100%)
 create mode 100644 packages/b2c-cli/test/functional/fixtures/site_archive/sites/TestSite/site.xml

diff --git a/packages/b2c-cli/test/functional/e2e_cli_test.sh b/packages/b2c-cli/test/functional/e2e_cli_test.sh
index d145ef0c..a88c55f8 100755
--- a/packages/b2c-cli/test/functional/e2e_cli_test.sh
+++ b/packages/b2c-cli/test/functional/e2e_cli_test.sh
@@ -41,8 +41,8 @@ cleanup() {
 
     # Delete sandbox if it was created
     if [ -n "$ODS_ID" ]; then
-        echo "Deleting sandbox: $ODS_ID"
-        $CLI ods delete "$ODS_ID" --force || true
+        echo "skipping Deleting sandbox: $ODS_ID"
+        #$CLI ods delete "$ODS_ID" --force || true
     fi
 
     exit $exit_code
@@ -116,7 +116,7 @@ echo "Step 3: Deploying code to sandbox..."
 
 $CLI code deploy "$CARTRIDGE_PATH" \
     --server "$SERVER" \
-    --code-version "e2e-test-version"
+    --code-version "e2e-test-version" --log-level debug --json
 
 echo "SUCCESS: Code deployed"
 echo ""
@@ -142,7 +142,7 @@ $CLI job run sfcc-search-index-product-full-update \
     --server "$SERVER" \
     --wait \
     --timeout 300 \
-    -P "SiteScope={\"named_sites\":[\"$SITE_ID\"]}"
+    --body "{\"site_scope\":[\"$SITE_ID\"]}"
 
 echo "SUCCESS: Search index job completed"
 echo ""
diff --git a/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/sites/TestSite/preferences.xml b/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/sites/TestSite/preferences.xml
deleted file mode 100644
index 53202a58..00000000
--- a/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/sites/TestSite/preferences.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<preferences xmlns="http://www.demandware.com/xml/impex/preferences/2019-01-08">
-    <all-instances>
-        <custom-preference preference-id="SiteGenesis_storefront_catalog_id">TestCatalog</custom-preference>
-    </all-instances>
-    <organization-preferences>
-        <custom-preference preference-id="SiteGenesis_storefront_catalog_id">TestCatalog</custom-preference>
-    </organization-preferences>
-</preferences>
diff --git a/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/sites/TestSite/site.xml b/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/sites/TestSite/site.xml
deleted file mode 100644
index a32c9c09..00000000
--- a/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/sites/TestSite/site.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site xmlns="http://www.demandware.com/xml/impex/site/2007-04-30" site-id="TestSite">
-    <name xml:lang="x-default">Test Site</name>
-    <description xml:lang="x-default">E2E Test Site for CLI testing</description>
-    <currency>USD</currency>
-    <taxation>net</taxation>
-    <default-locale>en_US</default-locale>
-    <allowed-currencies>
-        <currency>USD</currency>
-    </allowed-currencies>
-    <allowed-locales>
-        <locale>en_US</locale>
-    </allowed-locales>
-    <storefront-status>
-        <status>online</status>
-    </storefront-status>
-</site>
diff --git a/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/catalogs/TestCatalog/catalog.xml b/packages/b2c-cli/test/functional/fixtures/site_archive/catalogs/TestCatalog/catalog.xml
similarity index 100%
rename from packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/catalogs/TestCatalog/catalog.xml
rename to packages/b2c-cli/test/functional/fixtures/site_archive/catalogs/TestCatalog/catalog.xml
diff --git a/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/inventory-lists/inventory.xml b/packages/b2c-cli/test/functional/fixtures/site_archive/inventory-lists/inventory.xml
similarity index 100%
rename from packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/inventory-lists/inventory.xml
rename to packages/b2c-cli/test/functional/fixtures/site_archive/inventory-lists/inventory.xml
diff --git a/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/meta/system-objecttype-extensions.xml b/packages/b2c-cli/test/functional/fixtures/site_archive/meta/system-objecttype-extensions.xml
similarity index 100%
rename from packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/meta/system-objecttype-extensions.xml
rename to packages/b2c-cli/test/functional/fixtures/site_archive/meta/system-objecttype-extensions.xml
diff --git a/packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/pricebooks/pricebook.xml b/packages/b2c-cli/test/functional/fixtures/site_archive/pricebooks/pricebook.xml
similarity index 100%
rename from packages/b2c-cli/test/functional/fixtures/site_archive/TestSite/pricebooks/pricebook.xml
rename to packages/b2c-cli/test/functional/fixtures/site_archive/pricebooks/pricebook.xml
diff --git a/packages/b2c-cli/test/functional/fixtures/site_archive/sites/TestSite/site.xml b/packages/b2c-cli/test/functional/fixtures/site_archive/sites/TestSite/site.xml
new file mode 100644
index 00000000..71f26a6b
--- /dev/null
+++ b/packages/b2c-cli/test/functional/fixtures/site_archive/sites/TestSite/site.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site xmlns="http://www.demandware.com/xml/impex/site/2007-04-30" site-id="TestSite">
+    <name>Test Site</name>
+    <currency>USD</currency>
+    <taxation>net</taxation>
+    <custom-cartridges>plugin_example</custom-cartridges>
+    <storefront-status>online</storefront-status>
+</site>

From 3aeb39287953138a07575d70c0a452f029f2626b Mon Sep 17 00:00:00 2001
From: Charles Lavery <clavery@salesforce.com>
Date: Tue, 6 Jan 2026 21:37:44 -0500
Subject: [PATCH 07/11] updating docs and skills for new job run capabilities

---
 docs/cli/jobs.md                        | 17 ++++++++++++++++-
 plugins/b2c-cli/skills/b2c-job/SKILL.md | 16 +++++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/docs/cli/jobs.md b/docs/cli/jobs.md
index 4b425bd1..bfd7dd03 100644
--- a/docs/cli/jobs.md
+++ b/docs/cli/jobs.md
@@ -27,9 +27,12 @@ In addition to [global flags](./index#global-flags):
 | `--wait`, `-w` | Wait for job to complete | `false` |
 | `--timeout`, `-t` | Timeout in seconds when waiting | No timeout |
 | `--param`, `-P` | Job parameter in format "name=value" (repeatable) | |
+| `--body`, `-B` | Raw JSON request body (for system jobs with non-standard schemas) | |
 | `--no-wait-running` | Do not wait for running job to finish before starting | `false` |
 | `--show-log` | Show job log on failure | `true` |
 
+Note: `--param` and `--body` are mutually exclusive.
+
 ### Examples
 
 ```bash
@@ -42,13 +45,25 @@ b2c job run my-custom-job --wait
 # Execute with timeout
 b2c job run my-custom-job --wait --timeout 600
 
-# Execute with parameters
+# Execute with parameters (standard jobs)
 b2c job run my-custom-job -P "SiteScope={\"all_storefront_sites\":true}" -P OtherParam=value
 
 # Output as JSON
 b2c job run my-custom-job --wait --json
 ```
 
+### System Jobs with Custom Request Bodies
+
+Some system jobs (like search indexing) use non-standard request schemas that don't follow the `parameters` array format. Use `--body` to provide a raw JSON request body:
+
+```bash
+# Run search index job for specific sites
+b2c job run sfcc-search-index-product-full-update --wait --body '{"site_scope":["RefArch","SiteGenesis"]}'
+
+# Run search index job for a single site
+b2c job run sfcc-search-index-product-full-update --wait --body '{"site_scope":["RefArch"]}'
+```
+
 ### Authentication
 
 This command requires OAuth authentication with OCAPI permissions for the `/jobs` resource.
diff --git a/plugins/b2c-cli/skills/b2c-job/SKILL.md b/plugins/b2c-cli/skills/b2c-job/SKILL.md
index 9a1882b1..2cb518c5 100644
--- a/plugins/b2c-cli/skills/b2c-job/SKILL.md
+++ b/plugins/b2c-cli/skills/b2c-job/SKILL.md
@@ -21,13 +21,27 @@ b2c job run my-custom-job --wait
 # run a job with a timeout (in seconds)
 b2c job run my-custom-job --wait --timeout 600
 
-# run a job with parameters
+# run a job with parameters (standard jobs)
 b2c job run my-custom-job -P "SiteScope={\"all_storefront_sites\":true}" -P OtherParam=value
 
 # show job log if the job fails
 b2c job run my-custom-job --wait --show-log
 ```
 
+### Run System Jobs with Custom Request Bodies
+
+Some system jobs (like search indexing) use non-standard request schemas. Use `--body` to provide a raw JSON request body:
+
+```bash
+# run search index job for specific sites
+b2c job run sfcc-search-index-product-full-update --wait --body '{"site_scope":["RefArch","SiteGenesis"]}'
+
+# run search index job for a single site
+b2c job run sfcc-search-index-product-full-update --wait --body '{"site_scope":["RefArch"]}'
+```
+
+Note: `--body` and `-P` are mutually exclusive.
+
 ### Import Site Archives
 
 ```bash

From 2b95516f2c80711dee0a98107be144c1c4e456e6 Mon Sep 17 00:00:00 2001
From: Charles Lavery <clavery@salesforce.com>
Date: Tue, 6 Jan 2026 22:10:32 -0500
Subject: [PATCH 08/11] slas should create tenant if doesn't exist

---
 docs/cli/slas.md                              | 24 ++++---
 .../src/commands/slas/client/create.ts        | 11 +++
 packages/b2c-cli/src/utils/slas/client.ts     | 67 +++++++++++++++++++
 plugins/b2c-cli/skills/b2c-slas/SKILL.md      | 18 ++++-
 4 files changed, 107 insertions(+), 13 deletions(-)

diff --git a/docs/cli/slas.md b/docs/cli/slas.md
index 64f915c0..4a450df9 100644
--- a/docs/cli/slas.md
+++ b/docs/cli/slas.md
@@ -102,17 +102,18 @@ b2c slas client create [CLIENTID] --tenant-id <TENANT_ID> --channels <CHANNELS>
 
 ### Flags
 
-| Flag | Description | Required |
-|------|-------------|----------|
-| `--tenant-id` | SLAS tenant ID (organization ID) | Yes |
-| `--channels` | Site IDs/channels (comma-separated) | Yes |
-| `--redirect-uri` | Redirect URIs (comma-separated) | Yes |
-| `--name` | Display name for the client | No |
-| `--scopes` | OAuth scopes for the client (comma-separated) | No |
-| `--default-scopes` | Use default shopper scopes | No |
-| `--callback-uri` | Callback URIs for passwordless login | No |
-| `--secret` | Client secret (generated if omitted) | No |
-| `--public` | Create a public client (default is private) | No |
+| Flag | Description | Default |
+|------|-------------|---------|
+| `--tenant-id` | SLAS tenant ID (organization ID) | Required |
+| `--channels` | Site IDs/channels (comma-separated) | Required |
+| `--redirect-uri` | Redirect URIs (comma-separated) | Required |
+| `--name` | Display name for the client | Auto-generated |
+| `--scopes` | OAuth scopes for the client (comma-separated) | |
+| `--default-scopes` | Use default shopper scopes | `false` |
+| `--callback-uri` | Callback URIs for passwordless login | |
+| `--secret` | Client secret (generated if omitted) | Auto-generated |
+| `--public` | Create a public client (default is private) | `false` |
+| `--[no-]create-tenant` | Automatically create tenant if it doesn't exist | `true` |
 
 ### Examples
 
@@ -150,6 +151,7 @@ b2c slas client create --tenant-id abcd_123 \
 - If `--secret` is not provided for a private client, one will be generated
 - The generated secret is only shown once during creation
 - Use `--default-scopes` for common shopper API access scopes
+- By default, the tenant is automatically created if it doesn't exist. Use `--no-create-tenant` to disable this behavior if you prefer to manage tenants separately
 
 ---
 
diff --git a/packages/b2c-cli/src/commands/slas/client/create.ts b/packages/b2c-cli/src/commands/slas/client/create.ts
index a8009078..f57e233c 100644
--- a/packages/b2c-cli/src/commands/slas/client/create.ts
+++ b/packages/b2c-cli/src/commands/slas/client/create.ts
@@ -98,6 +98,11 @@ export default class SlasClientCreate extends SlasClientCommand<typeof SlasClien
       description: 'Create a public client (default is private)',
       default: false,
     }),
+    'create-tenant': Flags.boolean({
+      description: 'Automatically create tenant if it does not exist',
+      default: true,
+      allowNo: true,
+    }),
   };
 
   async run(): Promise<ClientOutput> {
@@ -113,6 +118,7 @@ export default class SlasClientCreate extends SlasClientCommand<typeof SlasClien
       'callback-uri': callbackUri,
       secret,
       public: isPublic,
+      'create-tenant': createTenant,
     } = this.flags;
 
     // Validate that either --scopes or --default-scopes is provided
@@ -140,6 +146,11 @@ export default class SlasClientCreate extends SlasClientCommand<typeof SlasClien
 
     const slasClient = this.getSlasClient();
 
+    // Ensure tenant exists before creating client (if enabled)
+    if (createTenant) {
+      await this.ensureTenantExists(slasClient, tenantId);
+    }
+
     // Build body - secret should only be included for private clients
     const body: Record<string, unknown> = {
       clientId,
diff --git a/packages/b2c-cli/src/utils/slas/client.ts b/packages/b2c-cli/src/utils/slas/client.ts
index 15c0f0e8..c06cd0b5 100644
--- a/packages/b2c-cli/src/utils/slas/client.ts
+++ b/packages/b2c-cli/src/utils/slas/client.ts
@@ -126,4 +126,71 @@ export abstract class SlasClientCommand<T extends typeof Command> extends OAuthC
     const oauthStrategy = this.getOAuthStrategy();
     return createSlasClient({shortCode}, oauthStrategy);
   }
+
+  /**
+   * Ensure tenant exists, creating it if necessary.
+   * This is required before creating SLAS clients.
+   */
+  protected async ensureTenantExists(slasClient: SlasClient, tenantId: string): Promise<void> {
+    // Try to get the tenant first
+    const {error, response} = await slasClient.GET('/tenants/{tenantId}', {
+      params: {
+        path: {tenantId},
+      },
+    });
+
+    // If tenant exists, we're done
+    if (!error) {
+      return;
+    }
+
+    // Check if this is a "tenant not found" error (SLAS returns 400 with TenantNotFoundException)
+    const isTenantNotFound =
+      response.status === 404 ||
+      (response.status === 400 &&
+        typeof error === 'object' &&
+        error !== null &&
+        'exception_name' in error &&
+        (error as {exception_name?: string}).exception_name === 'TenantNotFoundException');
+
+    // If it's not a tenant-not-found error, something else went wrong
+    if (!isTenantNotFound) {
+      this.error(
+        t('commands.slas.client.create.tenantError', 'Failed to check tenant: {{message}}', {
+          message: formatApiError(error),
+        }),
+      );
+    }
+
+    // Tenant doesn't exist, create it with placeholder values
+    if (!this.jsonEnabled()) {
+      this.log(t('commands.slas.client.create.creatingTenant', 'Creating SLAS tenant {{tenantId}}...', {tenantId}));
+    }
+
+    const {error: createError} = await slasClient.PUT('/tenants/{tenantId}', {
+      params: {
+        path: {tenantId},
+      },
+      body: {
+        tenantId,
+        merchantName: 'B2C CLI Tenant',
+        description: 'Auto-created by b2c-cli',
+        contact: 'B2C CLI',
+        emailAddress: 'noreply@example.com',
+        phoneNo: '+1 000-000-0000',
+      },
+    });
+
+    if (createError) {
+      this.error(
+        t('commands.slas.client.create.tenantCreateError', 'Failed to create tenant: {{message}}', {
+          message: formatApiError(createError),
+        }),
+      );
+    }
+
+    if (!this.jsonEnabled()) {
+      this.log(t('commands.slas.client.create.tenantCreated', 'SLAS tenant created successfully.'));
+    }
+  }
 }
diff --git a/plugins/b2c-cli/skills/b2c-slas/SKILL.md b/plugins/b2c-cli/skills/b2c-slas/SKILL.md
index c1eb398d..8d282668 100644
--- a/plugins/b2c-cli/skills/b2c-slas/SKILL.md
+++ b/plugins/b2c-cli/skills/b2c-slas/SKILL.md
@@ -29,10 +29,24 @@ b2c slas client get --tenant-id abcd_123 --client-id my-client-id
 ### Create SLAS Client
 
 ```bash
-# create a new SLAS client
-b2c slas client create --tenant-id abcd_123
+# create a new SLAS client with default scopes (auto-generates UUID client ID)
+b2c slas client create --tenant-id abcd_123 --channels RefArch --default-scopes --redirect-uri http://localhost:3000/callback
+
+# create with a specific client ID and custom scopes
+b2c slas client create my-client-id --tenant-id abcd_123 --channels RefArch --scopes sfcc.shopper-products,sfcc.shopper-search --redirect-uri http://localhost:3000/callback
+
+# create a public client
+b2c slas client create --tenant-id abcd_123 --channels RefArch --default-scopes --redirect-uri http://localhost:3000/callback --public
+
+# create client without auto-creating tenant (if you manage tenants separately)
+b2c slas client create --tenant-id abcd_123 --channels RefArch --default-scopes --redirect-uri http://localhost:3000/callback --no-create-tenant
+
+# output as JSON (useful for capturing the generated secret)
+b2c slas client create --tenant-id abcd_123 --channels RefArch --default-scopes --redirect-uri http://localhost:3000/callback --json
 ```
 
+Note: By default, the tenant is automatically created if it doesn't exist.
+
 ### Update SLAS Client
 
 ```bash

From 72527e9ea7410538500d47358f70d1b2cef0978e Mon Sep 17 00:00:00 2001
From: Charles Lavery <clavery@salesforce.com>
Date: Tue, 6 Jan 2026 22:10:50 -0500
Subject: [PATCH 09/11] fixing site import for site catalog; e2e tests updated;
 new workflow

---
 .github/workflows/e2e-shell-tests.yml         | 86 +++++++++++++++++++
 .../b2c-cli/test/functional/e2e_cli_test.sh   | 12 +--
 .../sites/TestSite/preferences.xml            | 47 ++++++++++
 3 files changed, 139 insertions(+), 6 deletions(-)
 create mode 100644 .github/workflows/e2e-shell-tests.yml
 create mode 100644 packages/b2c-cli/test/functional/fixtures/site_archive/sites/TestSite/preferences.xml

diff --git a/.github/workflows/e2e-shell-tests.yml b/.github/workflows/e2e-shell-tests.yml
new file mode 100644
index 00000000..8b62449f
--- /dev/null
+++ b/.github/workflows/e2e-shell-tests.yml
@@ -0,0 +1,86 @@
+name: E2E Shell Tests
+
+on:
+  schedule:
+    - cron: '0 3 * * *'  # Run at 3 AM UTC daily
+  workflow_dispatch:
+
+jobs:
+  e2e-shell-tests:
+    runs-on: ubuntu-latest
+    environment: e2e-dev
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+
+      - name: Check for required secrets and vars
+        id: check-secrets
+        env:
+          SFCC_CLIENT_ID: ${{ vars.SFCC_CLIENT_ID }}
+          SFCC_CLIENT_SECRET: ${{ secrets.SFCC_CLIENT_SECRET }}
+          TEST_REALM: ${{ vars.TEST_REALM }}
+          SFCC_ACCOUNT_MANAGER_HOST: ${{ vars.SFCC_ACCOUNT_MANAGER_HOST }}
+          SFCC_SANDBOX_API_HOST: ${{ vars.SFCC_SANDBOX_API_HOST }}
+          SFCC_SHORTCODE: ${{ vars.SFCC_SHORTCODE }}
+        run: |
+          missing=""
+          [ -z "$SFCC_CLIENT_ID" ] && missing="$missing SFCC_CLIENT_ID"
+          [ -z "$SFCC_CLIENT_SECRET" ] && missing="$missing SFCC_CLIENT_SECRET"
+          [ -z "$TEST_REALM" ] && missing="$missing TEST_REALM"
+          [ -z "$SFCC_ACCOUNT_MANAGER_HOST" ] && missing="$missing SFCC_ACCOUNT_MANAGER_HOST"
+          [ -z "$SFCC_SANDBOX_API_HOST" ] && missing="$missing SFCC_SANDBOX_API_HOST"
+          [ -z "$SFCC_SHORTCODE" ] && missing="$missing SFCC_SHORTCODE"
+
+          if [ -z "$missing" ]; then
+            echo "has-secrets=true" >> $GITHUB_OUTPUT
+          else
+            echo "has-secrets=false" >> $GITHUB_OUTPUT
+            echo "E2E shell tests skipped - missing required variables:$missing" >> $GITHUB_STEP_SUMMARY
+          fi
+
+      - name: Setup pnpm
+        if: steps.check-secrets.outputs.has-secrets == 'true'
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10.17.1
+
+      - name: Get pnpm store directory
+        if: steps.check-secrets.outputs.has-secrets == 'true'
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - name: Setup pnpm cache
+        if: steps.check-secrets.outputs.has-secrets == 'true'
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Install dependencies
+        if: steps.check-secrets.outputs.has-secrets == 'true'
+        run: pnpm install --frozen-lockfile
+
+      - name: Build packages
+        if: steps.check-secrets.outputs.has-secrets == 'true'
+        run: pnpm -r run build
+
+      - name: Run E2E Shell Tests
+        if: steps.check-secrets.outputs.has-secrets == 'true'
+        env:
+          SFCC_CLIENT_ID: ${{ vars.SFCC_CLIENT_ID }}
+          SFCC_CLIENT_SECRET: ${{ secrets.SFCC_CLIENT_SECRET }}
+          SFCC_ACCOUNT_MANAGER_HOST: ${{ vars.SFCC_ACCOUNT_MANAGER_HOST }}
+          SFCC_SANDBOX_API_HOST: ${{ vars.SFCC_SANDBOX_API_HOST }}
+          SFCC_SHORTCODE: ${{ vars.SFCC_SHORTCODE }}
+          TEST_REALM: ${{ vars.TEST_REALM }}
+        run: |
+          echo "Running E2E shell tests with realm: ${TEST_REALM}"
+          cd packages/b2c-cli
+          ./test/functional/e2e_cli_test.sh
diff --git a/packages/b2c-cli/test/functional/e2e_cli_test.sh b/packages/b2c-cli/test/functional/e2e_cli_test.sh
index a88c55f8..eaa96492 100755
--- a/packages/b2c-cli/test/functional/e2e_cli_test.sh
+++ b/packages/b2c-cli/test/functional/e2e_cli_test.sh
@@ -19,7 +19,7 @@ CLI="$SCRIPT_DIR/../../bin/run.js"
 
 # Fixtures paths
 CARTRIDGE_PATH="$SCRIPT_DIR/fixtures/cartridges"
-SITE_ARCHIVE_PATH="$SCRIPT_DIR/fixtures/site_archive/TestSite"
+SITE_ARCHIVE_PATH="$SCRIPT_DIR/fixtures/site_archive"
 
 # Test configuration
 SITE_ID="TestSite"
@@ -136,6 +136,7 @@ echo ""
 ################################################################################
 # 5. Run Search Index Job
 ################################################################################
+sleep 4
 echo "Step 5: Running search index job..."
 
 $CLI job run sfcc-search-index-product-full-update \
@@ -155,10 +156,8 @@ echo "Step 6: Creating SLAS client..."
 # Construct tenant ID from realm and instance number
 TENANT_ID="${TEST_REALM}_${INSTANCE_NUM}"
 
-# Generate a unique SLAS client ID
-SLAS_CLIENT_ID="e2e-test-$(date +%s)-$(openssl rand -hex 4)"
-
-SLAS_CREATE_RESULT=$($CLI slas client create "$SLAS_CLIENT_ID" \
+# Let the CLI auto-generate a UUID4 client ID
+SLAS_CREATE_RESULT=$($CLI slas client create \
     --tenant-id "$TENANT_ID" \
     --channels "$SITE_ID" \
     --default-scopes \
@@ -168,7 +167,8 @@ SLAS_CREATE_RESULT=$($CLI slas client create "$SLAS_CLIENT_ID" \
 echo "DEBUG: SLAS create result:"
 echo "$SLAS_CREATE_RESULT" | jq .
 
-# The JSON output is a ClientOutput object with secret field
+# Extract client ID and secret from response
+SLAS_CLIENT_ID=$(echo "$SLAS_CREATE_RESULT" | jq -r '.clientId')
 SLAS_SECRET=$(echo "$SLAS_CREATE_RESULT" | jq -r '.secret')
 
 if [ -z "$SLAS_SECRET" ] || [ "$SLAS_SECRET" == "null" ]; then
diff --git a/packages/b2c-cli/test/functional/fixtures/site_archive/sites/TestSite/preferences.xml b/packages/b2c-cli/test/functional/fixtures/site_archive/sites/TestSite/preferences.xml
new file mode 100644
index 00000000..8a8cf865
--- /dev/null
+++ b/packages/b2c-cli/test/functional/fixtures/site_archive/sites/TestSite/preferences.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<preferences xmlns="http://www.demandware.com/xml/impex/preferences/2007-03-31">
+    <standard-preferences>
+        <all-instances>
+            <preference preference-id="AccountNumberRetentionDays">30</preference>
+            <preference preference-id="AddProductToBasketBehavior">IncrementQuantities</preference>
+            <preference preference-id="BogoProrationEnabled">legacy</preference>
+            <preference preference-id="BonusProductProrationEnabled">true</preference>
+            <preference preference-id="CouponGeneratorIncludeDashes">true</preference>
+            <preference preference-id="CouponGeneratorIncludeVowels">true</preference>
+            <preference preference-id="EnableSiteOrderNumbers">false</preference>
+            <preference preference-id="IntegrationOrderCenterIncludeSite">true</preference>
+            <preference preference-id="SiteCatalog">TestCatalog</preference>
+            <preference preference-id="SiteCurrencies">USD</preference>
+            <preference preference-id="SiteCustomerList">TestSite</preference>
+            <preference preference-id="SiteDefaultLocale">default</preference>
+            <preference preference-id="SiteLibrary">TestSite</preference>
+            <preference preference-id="SiteLocales">default</preference>
+            <preference preference-id="SiteTimezone">Etc/UTC</preference>
+        </all-instances>
+        <development>
+            <preference preference-id="ExternallyPublishProductIndex">false</preference>
+            <preference preference-id="MergedVariationGroupsDisplayMode">false</preference>
+            <preference preference-id="RobotsTxtContent"/>
+            <preference preference-id="RobotsTxtMode">Cartridge</preference>
+        </development>
+        <staging>
+            <preference preference-id="ExternallyPublishProductIndex">false</preference>
+            <preference preference-id="MergedVariationGroupsDisplayMode">false</preference>
+            <preference preference-id="RobotsTxtContent"/>
+            <preference preference-id="RobotsTxtMode">Cartridge</preference>
+        </staging>
+        <production>
+            <preference preference-id="ExternallyPublishProductIndex">false</preference>
+            <preference preference-id="MergedVariationGroupsDisplayMode">false</preference>
+            <preference preference-id="RobotsTxtContent"/>
+            <preference preference-id="RobotsTxtMode">Cartridge</preference>
+        </production>
+    </standard-preferences>
+    <custom-preferences>
+        <all-instances/>
+        <development/>
+        <staging/>
+        <production/>
+    </custom-preferences>
+</preferences>
+

From 3c9de9ebe468d112653f73a355e6310fcf92c932 Mon Sep 17 00:00:00 2001
From: Charles Lavery <clavery@salesforce.com>
Date: Tue, 6 Jan 2026 22:16:58 -0500
Subject: [PATCH 10/11] linting; restore deletion

---
 packages/b2c-cli/src/commands/job/run.ts      | 16 ++++-----
 packages/b2c-cli/src/utils/slas/client.ts     | 36 +++++++++----------
 .../b2c-cli/test/functional/e2e_cli_test.sh   |  4 +--
 packages/b2c-dx-mcp/src/server.ts             |  1 -
 4 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/packages/b2c-cli/src/commands/job/run.ts b/packages/b2c-cli/src/commands/job/run.ts
index a3f0793b..b6d15038 100644
--- a/packages/b2c-cli/src/commands/job/run.ts
+++ b/packages/b2c-cli/src/commands/job/run.ts
@@ -156,6 +156,14 @@ export default class JobRun extends JobCommand<typeof JobRun> {
     return execution;
   }
 
+  private parseBody(body: string): Record<string, unknown> {
+    try {
+      return JSON.parse(body) as Record<string, unknown>;
+    } catch {
+      this.error(t('commands.job.run.invalidBody', 'Invalid JSON body: {{body}}', {body}));
+    }
+  }
+
   private parseParameters(params: string[]): Array<{name: string; value: string}> {
     return params.map((p) => {
       const eqIndex = p.indexOf('=');
@@ -170,12 +178,4 @@ export default class JobRun extends JobCommand<typeof JobRun> {
       };
     });
   }
-
-  private parseBody(body: string): Record<string, unknown> {
-    try {
-      return JSON.parse(body) as Record<string, unknown>;
-    } catch {
-      this.error(t('commands.job.run.invalidBody', 'Invalid JSON body: {{body}}', {body}));
-    }
-  }
 }
diff --git a/packages/b2c-cli/src/utils/slas/client.ts b/packages/b2c-cli/src/utils/slas/client.ts
index c06cd0b5..70e5ed19 100644
--- a/packages/b2c-cli/src/utils/slas/client.ts
+++ b/packages/b2c-cli/src/utils/slas/client.ts
@@ -109,24 +109,6 @@ export abstract class SlasClientCommand<T extends typeof Command> extends OAuthC
     }),
   };
 
-  /**
-   * Get the SLAS client, ensuring short code is configured.
-   */
-  protected getSlasClient(): SlasClient {
-    const {shortCode} = this.resolvedConfig;
-    if (!shortCode) {
-      this.error(
-        t(
-          'error.shortCodeRequired',
-          'SCAPI short code required. Provide --short-code, set SFCC_SHORTCODE, or configure short-code in dw.json.',
-        ),
-      );
-    }
-
-    const oauthStrategy = this.getOAuthStrategy();
-    return createSlasClient({shortCode}, oauthStrategy);
-  }
-
   /**
    * Ensure tenant exists, creating it if necessary.
    * This is required before creating SLAS clients.
@@ -193,4 +175,22 @@ export abstract class SlasClientCommand<T extends typeof Command> extends OAuthC
       this.log(t('commands.slas.client.create.tenantCreated', 'SLAS tenant created successfully.'));
     }
   }
+
+  /**
+   * Get the SLAS client, ensuring short code is configured.
+   */
+  protected getSlasClient(): SlasClient {
+    const {shortCode} = this.resolvedConfig;
+    if (!shortCode) {
+      this.error(
+        t(
+          'error.shortCodeRequired',
+          'SCAPI short code required. Provide --short-code, set SFCC_SHORTCODE, or configure short-code in dw.json.',
+        ),
+      );
+    }
+
+    const oauthStrategy = this.getOAuthStrategy();
+    return createSlasClient({shortCode}, oauthStrategy);
+  }
 }
diff --git a/packages/b2c-cli/test/functional/e2e_cli_test.sh b/packages/b2c-cli/test/functional/e2e_cli_test.sh
index eaa96492..f9494429 100755
--- a/packages/b2c-cli/test/functional/e2e_cli_test.sh
+++ b/packages/b2c-cli/test/functional/e2e_cli_test.sh
@@ -41,8 +41,8 @@ cleanup() {
 
     # Delete sandbox if it was created
     if [ -n "$ODS_ID" ]; then
-        echo "skipping Deleting sandbox: $ODS_ID"
-        #$CLI ods delete "$ODS_ID" --force || true
+        echo "Deleting sandbox: $ODS_ID"
+        $CLI ods delete "$ODS_ID" --force || true
     fi
 
     exit $exit_code
diff --git a/packages/b2c-dx-mcp/src/server.ts b/packages/b2c-dx-mcp/src/server.ts
index d393dea5..131949aa 100644
--- a/packages/b2c-dx-mcp/src/server.ts
+++ b/packages/b2c-dx-mcp/src/server.ts
@@ -70,7 +70,6 @@ export class B2CDxMcpServer extends McpServer {
       const startTime = Date.now();
       const result = await handler(args);
       // TODO: Telemetry - Send TOOL_CALLED event with { name, _runtimeMs, isError: result.isError }
-      // @ts-expect-error Ignore unused variable
       const _runtimeMs = Date.now() - startTime;
 
       return result;

From 5bd6e161de270ba9faec9abd38b101f2a1415c0b Mon Sep 17 00:00:00 2001
From: Charles Lavery <clavery@salesforce.com>
Date: Tue, 6 Jan 2026 22:20:09 -0500
Subject: [PATCH 11/11] more lint

---
 packages/b2c-dx-mcp/src/server.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/b2c-dx-mcp/src/server.ts b/packages/b2c-dx-mcp/src/server.ts
index 131949aa..0f94d349 100644
--- a/packages/b2c-dx-mcp/src/server.ts
+++ b/packages/b2c-dx-mcp/src/server.ts
@@ -69,8 +69,9 @@ export class B2CDxMcpServer extends McpServer {
     ): Promise<CallToolResult> => {
       const startTime = Date.now();
       const result = await handler(args);
-      // TODO: Telemetry - Send TOOL_CALLED event with { name, _runtimeMs, isError: result.isError }
-      const _runtimeMs = Date.now() - startTime;
+      // TODO: Telemetry - Send TOOL_CALLED event with { name, runtimeMs, isError: result.isError }
+      const runtimeMs = Date.now() - startTime;
+      void runtimeMs; // Silence unused variable until telemetry is implemented
 
       return result;
     };