@salesforce/webapp-template-app-react-template-b2e-experimental 1.91.0 → 1.92.1

package/dist/AGENT.md

@@ -1,11 +1,15 @@
 # Agent guide: SFDX project with React web app
 
-This project is a **Salesforce DX (SFDX) project** containing a **React web application**. The structure is generated; the app lives under `force-app/main/default/webapplications/<appName>/`. Use this file when working in this directory.
+This project is a **Salesforce DX (SFDX) project** containing a **React web application**. The SFDX source path is defined in `sfdx-project.json` (`packageDirectories[].path`); the web app lives under `<sfdx-source>/webapplications/<appName>/`. Use this file when working in this directory.
+
+## SFDX Source Path
+
+The source path prefix is **not** always `force-app`. Read `sfdx-project.json` at the project root, take the first `packageDirectories[].path` value, and append `/main/default` to get `<sfdx-source>`. All paths below use this placeholder.
 
 ## Project layout
 
-- **Project root**: this directory — SFDX project root. Contains `sfdx-project.json`, `force-app/`, and (optionally) LWC/Aura.
-- **React web app**: `force-app/main/default/webapplications/<appName>/`  
+- **Project root**: this directory — SFDX project root. Contains `sfdx-project.json`, the SFDX source directory, and (optionally) LWC/Aura.
+- **React web app**: `<sfdx-source>/webapplications/<appName>/`  
   - Replace `<appName>` with the actual app folder name (e.g. `base-react-app`, or the name chosen when the app was generated).
   - Entry: `src/App.tsx`  
   - Routes: `src/routes.tsx`  
@@ -35,7 +39,7 @@ Root **does not** run the React app. The root `npm run build` is a no-op for the
 **Always `cd` into the web app directory for dev/build/lint/test:**
 
 ```bash
-cd force-app/main/default/webapplications/<appName>
+cd <sfdx-source>/webapplications/<appName>
 ```
 
 | Command | Purpose |
@@ -54,24 +58,24 @@ cd force-app/main/default/webapplications/<appName>
 
 This project includes **.a4drules/** at the project root. Follow them when generating or editing code.
 
-When rules refer to “web app directory” or `force-app/main/default/webapplications/<appName>/`, use the **actual app folder name** for this project.
+When rules refer to "web app directory" or `<sfdx-source>/webapplications/<appName>/`, resolve `<sfdx-source>` from `sfdx-project.json` and use the **actual app folder name** for this project.
 
 ## Deploying
 
-From **this project root**:
+From **this project root** (resolve the actual SFDX source path from `sfdx-project.json`):
 
 ```bash
-# Build the React app first (replace <appName> with the app folder name)
-cd force-app/main/default/webapplications/<appName> && npm i && npm run build && cd -
+# Build the React app first (replace <sfdx-source> and <appName> with actual values)
+cd <sfdx-source>/webapplications/<appName> && npm i && npm run build && cd -
 
-# Deploy web app only
-sf project deploy start --source-dir force-app/main/default/webapplications --target-org <alias>
+# Deploy web app only (replace <sfdx-source> with actual path, e.g. force-app/main/default)
+sf project deploy start --source-dir <sfdx-source>/webapplications --target-org <alias>
 
-# Deploy all metadata
-sf project deploy start --source-dir force-app --target-org <alias>
+# Deploy all metadata (use the top-level package directory, e.g. force-app)
+sf project deploy start --source-dir <packageDir> --target-org <alias>
 ```
 
 ## Conventions (quick reference)
 
 - **UI**: shadcn/ui + Tailwind. Import from `@/components/ui/...`.
-- **Entry**: Keep `App.tsx` and routes in `src/`; add features as new routes or sections, don’t replace the app shell but you may modify it to match the requested design.
+- **Entry**: Keep `App.tsx` and routes in `src/`; add features as new routes or sections, don't replace the app shell but you may modify it to match the requested design.

package/dist/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.92.1](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.92.0...v1.92.1) (2026-03-11)
+
+
+### Bug Fixes
+
+* **template:** make setup-cli data import idempotent with Apex-based insert ([#254](https://github.com/salesforce-experience-platform-emu/webapps/issues/254)) ([76ee673](https://github.com/salesforce-experience-platform-emu/webapps/commit/76ee673f1f13c117f33550dfbb2fff6870a038dc))
+
+
+
+
+
+# [1.92.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.91.0...v1.92.0) (2026-03-11)
+
+**Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental
+
+
+
+
+
 # [1.91.0](https://github.com/salesforce-experience-platform-emu/webapps/compare/v1.90.4...v1.91.0) (2026-03-11)
 
 **Note:** Version bump only for package @salesforce/webapp-template-base-sfdx-project-experimental

package/dist/force-app/main/default/webapplications/appreacttemplateb2e/package.json

@@ -15,9 +15,14 @@
     "graphql:schema": "node scripts/get-graphql-schema.mjs"
   },
   "dependencies": {
-    "@salesforce/agentforce-conversation-client": "^1.91.0",
-    "@salesforce/sdk-data": "^1.91.0",
-    "@salesforce/webapp-experimental": "^1.91.0",
+    "@salesforce/agentforce-conversation-client": "file:../../../../../../../../../agentforceConversationClient",
+    "@salesforce/micro-frontends-experimental": "file:../../../../../../../../../micro-frontends",
+    "@salesforce/sdk-chat": "file:../../../../../../../../../sdk/sdk-chat",
+    "@salesforce/sdk-core": "file:../../../../../../../../../sdk/sdk-core",
+    "@salesforce/sdk-data": "file:../../../../../../../../../sdk/sdk-data",
+    "@salesforce/sdk-lightning": "file:../../../../../../../../../sdk/sdk-lightning",
+    "@salesforce/sdk-view": "file:../../../../../../../../../sdk/sdk-view",
+    "@salesforce/webapp-experimental": "file:../../../../../../../../../webapps",
     "@tailwindcss/vite": "^4.1.17",
     "@tanstack/react-form": "^1.28.4",
     "class-variance-authority": "^0.7.1",
@@ -41,7 +46,7 @@
     "@graphql-eslint/eslint-plugin": "^4.1.0",
     "@graphql-tools/utils": "^11.0.0",
     "@playwright/test": "^1.49.0",
-    "@salesforce/vite-plugin-webapp-experimental": "^1.91.0",
+    "@salesforce/vite-plugin-webapp-experimental": "file:../../../../../../../../../vite-plugin-webapps",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.1.0",
     "@testing-library/user-event": "^14.5.2",

package/dist/force-app/main/default/webapplications/appreacttemplateb2e/tsconfig.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["./src/app.tsx","./src/appLayout.tsx","./src/index.ts","./src/navigationMenu.tsx","./src/router-utils.tsx","./src/routes.tsx","./src/components/AgentforceConversationClient.tsx","./src/components/__inherit_AgentforceConversationClient.tsx","./src/components/alerts/status-alert.tsx","./src/components/layouts/card-layout.tsx","./src/components/ui/alert.tsx","./src/components/ui/button.tsx","./src/components/ui/card.tsx","./src/components/ui/dialog.tsx","./src/components/ui/field.tsx","./src/components/ui/index.ts","./src/components/ui/input.tsx","./src/components/ui/label.tsx","./src/components/ui/pagination.tsx","./src/components/ui/select.tsx","./src/components/ui/separator.tsx","./src/components/ui/skeleton.tsx","./src/components/ui/spinner.tsx","./src/components/ui/table.tsx","./src/components/ui/tabs.tsx","./src/features/global-search/constants.ts","./src/features/global-search/api/objectDetailService.ts","./src/features/global-search/api/objectInfoGraphQLService.ts","./src/features/global-search/api/objectInfoService.ts","./src/features/global-search/api/recordListGraphQLService.ts","./src/features/global-search/components/detail/DetailFields.tsx","./src/features/global-search/components/detail/DetailForm.tsx","./src/features/global-search/components/detail/DetailHeader.tsx","./src/features/global-search/components/detail/DetailLayoutSections.tsx","./src/features/global-search/components/detail/Section.tsx","./src/features/global-search/components/detail/SectionRow.tsx","./src/features/global-search/components/detail/UiApiDetailForm.tsx","./src/features/global-search/components/detail/formatted/FieldValueDisplay.tsx","./src/features/global-search/components/detail/formatted/FormattedAddress.tsx","./src/features/global-search/components/detail/formatted/FormattedEmail.tsx","./src/features/global-search/components/detail/formatted/FormattedPhone.tsx","./src/features/global-search/components/detail/formatted/FormattedText.tsx","./src/features/global-search/components/detail/formatted/FormattedUrl.tsx","./src/features/global-search/components/filters/FilterField.tsx","./src/features/global-search/components/filters/FilterInput.tsx","./src/features/global-search/components/filters/FilterSelect.tsx","./src/features/global-search/components/filters/FiltersPanel.tsx","./src/features/global-search/components/forms/filters-form.tsx","./src/features/global-search/components/forms/submit-button.tsx","./src/features/global-search/components/search/GlobalSearchInput.tsx","./src/features/global-search/components/search/ResultCardFields.tsx","./src/features/global-search/components/search/SearchHeader.tsx","./src/features/global-search/components/search/SearchPagination.tsx","./src/features/global-search/components/search/SearchResultCard.tsx","./src/features/global-search/components/search/SearchResultsPanel.tsx","./src/features/global-search/components/shared/LoadingFallback.tsx","./src/features/global-search/filters/FilterInput.tsx","./src/features/global-search/filters/FilterSelect.tsx","./src/features/global-search/hooks/form.tsx","./src/features/global-search/hooks/useObjectInfoBatch.ts","./src/features/global-search/hooks/useObjectSearchData.ts","./src/features/global-search/hooks/useRecordDetailLayout.ts","./src/features/global-search/hooks/useRecordListGraphQL.ts","./src/features/global-search/pages/DetailPage.tsx","./src/features/global-search/pages/GlobalSearch.tsx","./src/features/global-search/types/schema.d.ts","./src/features/global-search/types/filters/filters.ts","./src/features/global-search/types/filters/picklist.ts","./src/features/global-search/types/objectInfo/objectInfo.ts","./src/features/global-search/types/recordDetail/recordDetail.ts","./src/features/global-search/types/search/searchResults.ts","./src/features/global-search/utils/apiUtils.ts","./src/features/global-search/utils/cacheUtils.ts","./src/features/global-search/utils/debounce.ts","./src/features/global-search/utils/fieldUtils.ts","./src/features/global-search/utils/fieldValueExtractor.ts","./src/features/global-search/utils/filterUtils.ts","./src/features/global-search/utils/formDataTransformUtils.ts","./src/features/global-search/utils/formUtils.ts","./src/features/global-search/utils/graphQLNodeFieldUtils.ts","./src/features/global-search/utils/graphQLObjectInfoAdapter.ts","./src/features/global-search/utils/graphQLRecordAdapter.ts","./src/features/global-search/utils/layoutTransformUtils.ts","./src/features/global-search/utils/linkUtils.ts","./src/features/global-search/utils/paginationUtils.ts","./src/features/global-search/utils/recordUtils.ts","./src/features/global-search/utils/sanitizationUtils.ts","./src/lib/utils.ts","./src/pages/Home.tsx","./src/pages/NotFound.tsx","./src/pages/TestAccPage.tsx","./src/types/conversation.ts","./vite-env.d.ts","./vitest-env.d.ts"],"version":"5.9.3"}

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/webapp-template-base-sfdx-project-experimental",
-  "version": "1.91.0",
+  "version": "1.92.1",
   "description": "Base SFDX project template",
   "private": true,
   "files": [

package/dist/scripts/prepare-import-unique-fields.js

@@ -5,7 +5,7 @@
  *
  * Usage:
  *   node scripts/prepare-import-unique-fields.js
- *   node scripts/prepare-import-unique-fields.js --data-dir /path/to/force-app/main/default/data
+ *   node scripts/prepare-import-unique-fields.js --data-dir /path/to/<sfdx-source>/data
  *
  * Expects data dir to contain (optional) JSON files:
  *   Contact.json (Email with unique domain per run, LastName, FirstName, Phone — standard Contact)
@@ -18,8 +18,22 @@
 const fs = require('fs');
 const path = require('path');
 
-// When run from project root: scripts/prepare-import-unique-fields.js → data dir under force-app
-const DEFAULT_DATA_DIR = path.resolve(__dirname, '..', 'force-app/main/default/data');
+function resolveSfdxSource() {
+  const sfdxPath = path.resolve(__dirname, '..', 'sfdx-project.json');
+  if (!fs.existsSync(sfdxPath)) {
+    console.error('Error: sfdx-project.json not found at project root.');
+    process.exit(1);
+  }
+  const sfdxProject = JSON.parse(fs.readFileSync(sfdxPath, 'utf8'));
+  const pkgDir = sfdxProject?.packageDirectories?.[0]?.path;
+  if (!pkgDir) {
+    console.error('Error: No packageDirectories[].path found in sfdx-project.json.');
+    process.exit(1);
+  }
+  return path.resolve(__dirname, '..', pkgDir, 'main', 'default');
+}
+
+const DEFAULT_DATA_DIR = path.resolve(resolveSfdxSource(), 'data');
 
 function parseArgs() {
   const args = process.argv.slice(2);

package/dist/scripts/setup-cli.mjs

@@ -4,37 +4,56 @@
  * Use this script to make setup easier for each app generated from this template.
  *
  * Usage:
- *   node scripts/setup-cli.mjs --target-org <alias>   # run all steps
+ *   node scripts/setup-cli.mjs --target-org <alias>           # interactive step picker (all selected)
+ *   node scripts/setup-cli.mjs --target-org <alias> --yes     # skip picker, run all steps
  *   node scripts/setup-cli.mjs --target-org afv5 --skip-login
  *   node scripts/setup-cli.mjs --target-org afv5 --skip-data --skip-webapp-build
  *   node scripts/setup-cli.mjs --target-org myorg --webapp-name my-app
  *
  * Steps (in order):
  *   1. login     — sf org login web only if org not already connected (skip with --skip-login)
- *   2. deploy    — sf project deploy start --target-org <alias>
- *   3. permset   — sf org assign permset (skip with --skip-permset; name via --permset-name)
- *   4. data      — prepare unique fields + sf data import tree (skipped if no data dir/plan)
- *   5. graphql   — (in webapp) npm run graphql:schema then npm run graphql:codegen
- *   6. webapp    — (in webapp) npm install && npm run build
+ *   2. webapp    — (all web apps) npm install && npm run build so dist exists for deploy (skip with --skip-webapp-build)
+ *   3. deploy    — sf project deploy start --target-org <alias> (requires dist for entity deployment)
+ *   4. permset   — sf org assign permset (skip with --skip-permset; name via --permset-name)
+ *   5. data      — prepare unique fields + sf data import tree (skipped if no data dir/plan)
+ *   6. graphql   — (in webapp) npm run graphql:schema then npm run graphql:codegen
  *   7. dev       — (in webapp) npm run dev — launch dev server (skip with --skip-dev)
  */
 
 import { spawnSync } from 'node:child_process';
 import { resolve, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { readdirSync, existsSync } from 'node:fs';
+import { readdirSync, existsSync, readFileSync, writeFileSync, unlinkSync } from 'node:fs';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const ROOT = resolve(__dirname, '..');
-const WEBAPPLICATIONS_DIR = resolve(ROOT, 'force-app/main/default/webapplications');
-const DATA_DIR = resolve(ROOT, 'force-app/main/default/data');
-const DATA_PLAN = resolve(ROOT, 'force-app/main/default/data/data-plan.json');
+
+function resolveSfdxSource() {
+  const sfdxPath = resolve(ROOT, 'sfdx-project.json');
+  if (!existsSync(sfdxPath)) {
+    console.error('Error: sfdx-project.json not found at project root.');
+    process.exit(1);
+  }
+  const sfdxProject = JSON.parse(readFileSync(sfdxPath, 'utf8'));
+  const pkgDir = sfdxProject?.packageDirectories?.[0]?.path;
+  if (!pkgDir) {
+    console.error('Error: No packageDirectories[].path found in sfdx-project.json.');
+    process.exit(1);
+  }
+  return resolve(ROOT, pkgDir, 'main', 'default');
+}
+
+const SFDX_SOURCE = resolveSfdxSource();
+const WEBAPPLICATIONS_DIR = resolve(SFDX_SOURCE, 'webapplications');
+const DATA_DIR = resolve(SFDX_SOURCE, 'data');
+const DATA_PLAN = resolve(SFDX_SOURCE, 'data/data-plan.json');
 
 function parseArgs() {
   const args = process.argv.slice(2);
   let targetOrg = null;
   let webappName = null;
   let permsetName = 'Property_Management_Access';
+  let yes = false;
   const flags = {
     skipLogin: false,
     skipDeploy: false,
@@ -58,6 +77,7 @@ function parseArgs() {
     else if (args[i] === '--skip-graphql') flags.skipGraphql = true;
     else if (args[i] === '--skip-webapp-build') flags.skipWebappBuild = true;
     else if (args[i] === '--skip-dev') flags.skipDev = true;
+    else if (args[i] === '--yes' || args[i] === '-y') yes = true;
     else if (args[i] === '--help' || args[i] === '-h') {
       console.log(`
 Setup CLI — one-command setup for apps in this project
@@ -78,6 +98,7 @@ Options:
   --skip-graphql         Do not fetch schema or run GraphQL codegen
   --skip-webapp-build    Do not npm install / build the web application
   --skip-dev             Do not launch the dev server at the end
+  -y, --yes              Skip interactive step picker; run all enabled steps immediately
   -h, --help             Show this help
 `);
       process.exit(0);
@@ -87,18 +108,10 @@ Options:
     console.error('Error: --target-org <alias> is required.');
     process.exit(1);
   }
-  return { targetOrg, webappName, permsetName, ...flags };
+  return { targetOrg, webappName, permsetName, yes, ...flags };
 }
 
-function discoverWebappDir(webappName) {
-  if (webappName) {
-    const dir = resolve(WEBAPPLICATIONS_DIR, webappName);
-    if (!existsSync(dir)) {
-      console.error(`Error: Web app directory not found: ${dir}`);
-      process.exit(1);
-    }
-    return dir;
-  }
+function discoverAllWebappDirs(webappName) {
   if (!existsSync(WEBAPPLICATIONS_DIR)) {
     console.error(`Error: webapplications directory not found: ${WEBAPPLICATIONS_DIR}`);
     process.exit(1);
@@ -109,10 +122,23 @@ function discoverWebappDir(webappName) {
     console.error(`Error: No web app folder found under ${WEBAPPLICATIONS_DIR}`);
     process.exit(1);
   }
-  if (dirs.length > 1) {
-    console.log(`Multiple web apps found; using first: ${dirs[0].name}`);
+  if (webappName) {
+    const requested = dirs.find((d) => d.name === webappName);
+    if (!requested) {
+      console.error(`Error: Web app directory not found: ${webappName}`);
+      process.exit(1);
+    }
+    return [resolve(WEBAPPLICATIONS_DIR, requested.name)];
+  }
+  return dirs.map((d) => resolve(WEBAPPLICATIONS_DIR, d.name));
+}
+
+function discoverWebappDir(webappName) {
+  const all = discoverAllWebappDirs(webappName);
+  if (all.length > 1 && !webappName) {
+    console.log(`Multiple web apps found; using first: ${all[0].split(/[/\\]/).pop()}`);
   }
-  return resolve(WEBAPPLICATIONS_DIR, dirs[0].name);
+  return all[0];
 }
 
 function isOrgConnected(targetOrg) {
@@ -124,6 +150,117 @@ function isOrgConnected(targetOrg) {
   return result.status === 0;
 }
 
+function apexLiteral(value) {
+  if (value === null || value === undefined) return 'null';
+  if (typeof value === 'boolean') return String(value);
+  if (typeof value === 'number') return String(value);
+  const s = String(value);
+  if (/^\d{4}-\d{2}-\d{2}$/.test(s)) return `Date.valueOf('${s}')`;
+  if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}/.test(s)) {
+    const dt = s.replace('T', ' ').replace(/\.\d+/, '').replace('Z', '');
+    return `DateTime.valueOf('${dt}')`;
+  }
+  return "'" + s.replace(/\\/g, '\\\\').replace(/'/g, "\\'") + "'";
+}
+
+function buildApexInsert(sobject, records, refIds) {
+  const lines = [
+    'Database.DMLOptions dmlOpts = new Database.DMLOptions();',
+    'dmlOpts.DuplicateRuleHeader.allowSave = true;',
+    `List<${sobject}> recs = new List<${sobject}>();`,
+  ];
+  for (const rec of records) {
+    lines.push(`{ ${sobject} r = new ${sobject}();`);
+    for (const [key, val] of Object.entries(rec)) {
+      if (key === 'attributes') continue;
+      lines.push(`r.put('${key}', ${apexLiteral(val)});`);
+    }
+    lines.push('recs.add(r); }');
+  }
+  lines.push('Database.SaveResult[] results = Database.insert(recs, dmlOpts);');
+  const refArray = refIds.map((r) => `'${r}'`).join(',');
+  lines.push(`String[] refs = new String[]{${refArray}};`);
+  lines.push('for (Integer i = 0; i < results.size(); i++) {');
+  lines.push("  if (results[i].isSuccess()) System.debug('REF:' + refs[i] + ':' + results[i].getId());");
+  lines.push("  else System.debug('ERR:' + refs[i] + ':' + results[i].getErrors()[0].getMessage());");
+  lines.push('}');
+  return lines.join('\n');
+}
+
+/**
+ * Interactive multi-select: arrow keys navigate, space toggles, 'a' toggles all, enter confirms.
+ * Returns a boolean[] matching the input order.  Falls through immediately when stdin is not a TTY.
+ */
+async function promptSteps(steps) {
+  if (!process.stdin.isTTY) return steps.map((s) => s.enabled);
+
+  const selected = steps.map((s) => s.enabled);
+  let cursor = 0;
+  const DIM = '\x1B[2m';
+  const RST = '\x1B[0m';
+  const CYAN = '\x1B[36m';
+  const GREEN = '\x1B[32m';
+
+  function render() {
+    return steps.map((s, i) => {
+      const ptr = i === cursor ? `${CYAN}❯${RST}` : ' ';
+      if (!s.available) return `${ptr} ${DIM}○ ${s.label} (n/a)${RST}`;
+      const chk = selected[i] ? `${GREEN}●${RST}` : '○';
+      return `${ptr} ${chk} ${s.label}`;
+    });
+  }
+
+  return new Promise((resolve) => {
+    process.stdin.setRawMode(true);
+    process.stdin.resume();
+    process.stdin.setEncoding('utf8');
+    process.stdout.write('\x1B[?25l');
+    console.log('\nSelect steps (↑↓ move, space toggle, a all, enter confirm):\n');
+    process.stdout.write(render().join('\n') + '\n');
+
+    function redraw() {
+      process.stdout.write(`\x1B[${steps.length}A`);
+      for (const line of render()) process.stdout.write(`\x1B[2K${line}\n`);
+    }
+
+    process.stdin.on('data', (key) => {
+      if (key === '\x03') {
+        process.stdout.write('\x1B[?25h\n');
+        process.exit(0);
+      }
+      if (key === '\r' || key === '\n') {
+        process.stdout.write('\x1B[?25h');
+        process.stdin.setRawMode(false);
+        process.stdin.pause();
+        process.stdin.removeAllListeners('data');
+        console.log();
+        resolve(selected);
+        return;
+      }
+      if (key === ' ') {
+        if (steps[cursor].available) selected[cursor] = !selected[cursor];
+        redraw();
+        return;
+      }
+      if (key === 'a') {
+        const allOn = steps.every((s, i) => !s.available || selected[i]);
+        for (let i = 0; i < steps.length; i++) {
+          if (steps[i].available) selected[i] = !allOn;
+        }
+        redraw();
+        return;
+      }
+      if (key === '\x1B[A' || key === 'k') {
+        cursor = Math.max(0, cursor - 1);
+        redraw();
+      } else if (key === '\x1B[B' || key === 'j') {
+        cursor = Math.min(steps.length - 1, cursor + 1);
+        redraw();
+      }
+    });
+  });
+}
+
 function run(name, cmd, args, opts = {}) {
   const { cwd = ROOT, optional = false } = opts;
   console.log('\n---', name, '---');
@@ -140,25 +277,52 @@ function run(name, cmd, args, opts = {}) {
   return result;
 }
 
-function main() {
+async function main() {
   const {
     targetOrg,
     webappName,
     permsetName,
-    skipLogin,
-    skipDeploy,
-    skipPermset,
-    skipData,
-    skipGraphql,
-    skipWebappBuild,
-    skipDev,
+    yes,
+    skipLogin: argSkipLogin,
+    skipDeploy: argSkipDeploy,
+    skipPermset: argSkipPermset,
+    skipData: argSkipData,
+    skipGraphql: argSkipGraphql,
+    skipWebappBuild: argSkipWebappBuild,
+    skipDev: argSkipDev,
   } = parseArgs();
 
-  const webappDir = discoverWebappDir(webappName);
   const hasDataPlan = existsSync(DATA_PLAN) && existsSync(DATA_DIR);
-  const doData = !skipData && hasDataPlan;
 
-  console.log('Setup — target org:', targetOrg, '| web app:', webappDir);
+  const stepDefs = [
+    { key: 'login', label: 'Login — org authentication', enabled: !argSkipLogin, available: true },
+    { key: 'webappBuild', label: 'Webapp Build — npm install + build (pre-deploy)', enabled: !argSkipWebappBuild, available: true },
+    { key: 'deploy', label: 'Deploy — sf project deploy start', enabled: !argSkipDeploy, available: true },
+    { key: 'permset', label: `Permset — assign ${permsetName}`, enabled: !argSkipPermset, available: true },
+    { key: 'data', label: 'Data — delete + import records via Apex', enabled: !argSkipData && hasDataPlan, available: hasDataPlan },
+    { key: 'graphql', label: 'GraphQL — schema introspect + codegen', enabled: !argSkipGraphql, available: true },
+    { key: 'dev', label: 'Dev — launch dev server', enabled: !argSkipDev, available: true },
+  ];
+
+  const selections = yes ? stepDefs.map((s) => s.enabled) : await promptSteps(stepDefs);
+  const on = {};
+  stepDefs.forEach((s, i) => {
+    on[s.key] = selections[i];
+  });
+
+  const skipLogin = !on.login;
+  const skipWebappBuild = !on.webappBuild;
+  const skipDeploy = !on.deploy;
+  const skipPermset = !on.permset;
+  const skipData = !on.data;
+  const skipGraphql = !on.graphql;
+  const skipDev = !on.dev;
+
+  const needsWebapp = !skipWebappBuild || !skipGraphql || !skipDev;
+  const webappDir = needsWebapp ? discoverWebappDir(webappName) : null;
+  const doData = !skipData;
+
+  console.log('Setup — target org:', targetOrg, '| web app:', webappDir ?? '(none)');
   console.log(
     'Steps: login=%s deploy=%s permset=%s data=%s graphql=%s webapp=%s dev=%s',
     !skipLogin,
@@ -169,11 +333,6 @@ function main() {
     !skipWebappBuild,
     !skipDev
   );
-  if (skipData && hasDataPlan) {
-    console.log('(Data dir present; use without --skip-data to run data import.)');
-  } else if (!hasDataPlan && !skipData) {
-    console.log('(No data plan found; skipping data step.)');
-  }
 
   if (!skipLogin) {
     if (isOrgConnected(targetOrg)) {
@@ -184,6 +343,16 @@ function main() {
     }
   }
 
+  // Build all web apps before deploy so dist exists for entity deployment
+  if (!skipDeploy && !skipWebappBuild) {
+    const allWebappDirs = discoverAllWebappDirs(webappName);
+    for (const dir of allWebappDirs) {
+      const name = dir.split(/[/\\]/).pop();
+      run(`Web app install (${name})`, 'npm', ['install'], { cwd: dir });
+      run(`Web app build (${name})`, 'npm', ['run', 'build'], { cwd: dir });
+    }
+  }
+
   if (!skipDeploy) {
     run('Deploy metadata', 'sf', ['project', 'deploy', 'start', '--target-org', targetOrg], {
       timeout: 180000,
@@ -225,36 +394,115 @@ function main() {
     run('Prepare data (unique fields)', 'node', [prepareScript, '--data-dir', DATA_DIR], {
       cwd: ROOT,
     });
-    // Data import tree: if only DUPLICATES_DETECTED (org duplicate rules), warn and continue
+    // Normalize Lease__c Tenant refs to 1–15 so all refs resolve (Tenant__c.json has 15 records)
+    const leasePath = resolve(DATA_DIR, 'Lease__c.json');
+    if (existsSync(leasePath)) {
+      let leaseContent = readFileSync(leasePath, 'utf8');
+      leaseContent = leaseContent.replace(/@TenantRef(\d+)/g, (_m, n) => {
+        const k = ((parseInt(n, 10) - 1) % 15) + 1;
+        return `@TenantRef${k}`;
+      });
+      writeFileSync(leasePath, leaseContent);
+    }
+
+    // Delete existing records so every run inserts the full dataset without duplicate conflicts.
+    // Reverse plan order ensures children are removed before parents (FK safety).
+    console.log('\n--- Clean existing data for fresh import ---');
+    const planEntries = JSON.parse(readFileSync(DATA_PLAN, 'utf8'));
+    const sobjectsReversed = [...planEntries.map((e) => e.sobject)].reverse();
+    const tmpApex = resolve(ROOT, '.tmp-setup-delete.apex');
+    for (const sobject of sobjectsReversed) {
+      const apexCode = [
+        'try {',
+        `  List<SObject> recs = Database.query('SELECT Id FROM ${sobject} LIMIT 10000');`,
+        '  if (!recs.isEmpty()) {',
+        '    Database.delete(recs, false);',
+        '    Database.emptyRecycleBin(recs);',
+        '  }',
+        '} catch (Exception e) {',
+        '  // non-deletable records (e.g. Contact linked to Case) are skipped via allOrNone=false',
+        '}',
+      ].join('\n');
+      writeFileSync(tmpApex, apexCode);
+      spawnSync('sf', ['apex', 'run', '--target-org', targetOrg, '--file', tmpApex], {
+        cwd: ROOT,
+        stdio: 'pipe',
+        shell: true,
+        timeout: 60000,
+      });
+      console.log(`  ${sobject}: cleaned`);
+    }
+    if (existsSync(tmpApex)) unlinkSync(tmpApex);
+
+    // Import via Anonymous Apex with Database.DMLOptions.duplicateRuleHeader.allowSave = true.
+    // This bypasses both duplicate-rule blocks AND matching-service timeouts that the REST
+    // API headers (Sforce-Duplicate-Rule-Action) cannot override.
     console.log('\n--- Data import tree ---');
-    const importResult = spawnSync(
-      'sf',
-      ['data', 'import', 'tree', '--plan', DATA_PLAN, '--target-org', targetOrg, '--json'],
-      { cwd: ROOT, stdio: 'pipe', shell: true, timeout: 120000 }
-    );
-    const out = (importResult.stdout?.toString() || '') + (importResult.stderr?.toString() || '');
-    if (importResult.status !== 0) {
-      let onlyDuplicates = false;
-      try {
-        const j = JSON.parse(out);
-        const errors = Array.isArray(j?.data) ? j.data : [];
-        onlyDuplicates =
-          errors.length > 0 &&
-          errors.every((e) => e.StatusCode === 'DUPLICATES_DETECTED' || e.statusCode === 'DUPLICATES_DETECTED');
-      } catch (_) {
-        onlyDuplicates = out.includes('DUPLICATES_DETECTED') && /Use one of these records\?/.test(out);
-      }
-      if (onlyDuplicates) {
-        console.warn(
-          'Data import hit org duplicate rules (e.g. Contact). Skipping import; rest of setup continues.'
-        );
-      } else {
-        process.stdout.write(importResult.stdout?.toString() || '');
-        process.stderr.write(importResult.stderr?.toString() || '');
-        console.error('\nSetup failed at step: Data import tree');
-        process.exit(importResult.status ?? 1);
+    const refMap = new Map();
+    const APEX_CHAR_LIMIT = 25000;
+    const APEX_MAX_BATCH = 200;
+
+    for (const entry of planEntries) {
+      for (const file of entry.files) {
+        const data = JSON.parse(readFileSync(resolve(DATA_DIR, file), 'utf8'));
+        const records = data.records || [];
+
+        for (const rec of records) {
+          for (const key of Object.keys(rec)) {
+            if (key === 'attributes') continue;
+            const val = rec[key];
+            if (typeof val === 'string' && val.startsWith('@')) {
+              const actual = refMap.get(val.slice(1));
+              if (actual) {
+                rec[key] = actual;
+              } else if (refMap.size > 0) {
+                console.warn(`    Warning: unresolved ref ${val} in ${file}`);
+              }
+            }
+          }
+        }
+
+        let imported = 0;
+        const sampleRec = records[0] || {};
+        const fieldsPerRec = Object.keys(sampleRec).filter((k) => k !== 'attributes').length;
+        const estCharsPerRec = 40 + fieldsPerRec * 55;
+        const batchSize = Math.min(APEX_MAX_BATCH, Math.max(5, Math.floor(APEX_CHAR_LIMIT / estCharsPerRec)));
+        for (let i = 0; i < records.length; i += batchSize) {
+          const batch = records.slice(i, i + batchSize);
+          const refIds = batch.map((r) => r.attributes?.referenceId || `_idx${i}`);
+          const apex = buildApexInsert(entry.sobject, batch, refIds);
+          writeFileSync(tmpApex, apex);
+          const apexResult = spawnSync(
+            'sf',
+            ['apex', 'run', '--target-org', targetOrg, '--file', tmpApex],
+            { cwd: ROOT, stdio: 'pipe', shell: true, timeout: 120000 }
+          );
+          const apexOut = apexResult.stdout?.toString() || '';
+          const apexErr = apexResult.stderr?.toString() || '';
+          if (apexResult.status !== 0 && !apexOut.includes('Compiled successfully')) {
+            console.error(`  ${entry.sobject}: apex execution failed`);
+            process.stderr.write(apexErr || apexOut);
+            process.exit(1);
+          }
+          const okMatches = [...apexOut.matchAll(/\|DEBUG\|REF:([^:\n]+):(\w+)/g)];
+          const errMatches = [...apexOut.matchAll(/\|DEBUG\|ERR:([^:\n]+):([^\n]+)/g)];
+          if (errMatches.length) {
+            for (const m of errMatches.slice(0, 5)) {
+              console.error(`    ${m[1]}: ${m[2].trim()}`);
+            }
+            if (errMatches.length > 5) console.error(`    ... and ${errMatches.length - 5} more`);
+            console.error(`\nSetup failed at step: Data import tree (${entry.sobject})`);
+            process.exit(1);
+          }
+          if (entry.saveRefs) {
+            for (const m of okMatches) refMap.set(m[1], m[2]);
+          }
+          imported += okMatches.length;
+        }
+        console.log(`  ${entry.sobject}: imported ${imported} records`);
       }
     }
+    if (existsSync(tmpApex)) unlinkSync(tmpApex);
   }
 
   if (!skipGraphql || !skipWebappBuild) {
@@ -279,4 +527,7 @@ function main() {
   }
 }
 
-main();
+main().catch((err) => {
+  console.error(err);
+  process.exit(1);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/webapp-template-app-react-template-b2e-experimental",
-  "version": "1.91.0",
+  "version": "1.92.1",
   "description": "B2E template app (from BYO)",
   "license": "SEE LICENSE IN LICENSE.txt",
   "author": "",