@salesforce/afv-skills 1.59.0 → 1.61.0

package/skills/consumer-goods-accruals-datakit-deploy/SKILL.md

@@ -15,6 +15,8 @@ metadata:
       semver: ">=22.0.0"
     - tool: ["sf"]
       semver: ">=2.0.0"
+    - tool: ["sfdx"]
+      semver: ">=7.0.0"
 ---
 
 ## MANDATORY: Always write the Phase 6 report
@@ -134,37 +136,30 @@ is empty — `WHERE CreatedDate > null` is an `INVALID_QUERY_FILTER_OPERATOR` er
 Salesforce SOQL and will abort the query.
 
 ### 1.7 Org-side manual prerequisites
-The setup script (Step 0) displays the full prerequisites list and waits for user
-confirmation before proceeding. If the user's prompt already confirms these, treat them
-as confirmed — do **not** re-ask. Only ask for items the user has not already addressed:
+If the user's prompt already confirms these prerequisites, treat them as confirmed — do
+**not** re-ask. Only ask for items the user has not already addressed:
 - Data Cloud and Analytics Studio enabled (Setup → Data Cloud Setup)
 - Connectors feature enabled (Data Cloud Setup → Feature Manager)
 - A user assigned to the **Accrual Ingestion Process** in Processing Services Pairing
   with the **Data Cloud Architect** permission set
-- OAuth scope **`cdp_ingest_api`** configured on the integration app used by TPM Offcore.
-  This may be a **Connected App** or an **External Client App** depending on the org —
-  the app name varies by configuration. Verify via Setup → App Manager (Connected Apps)
-  or Setup → External Client Apps. Do NOT assume any specific app name.
-- Permission sets assigned to the System Admin (and to the Accrual Ingestion Process user):
-  - **Data Cloud Architect**
-- CRM Analytics must be enabled first (Setup → Feature Settings → Analytics → Analytics → Getting Started → "Enable CRM Analytics"), then assign to the admin:
-  - **CRM Analytics Plus Admin**
+- OAuth scope **`cdp_ingest_api`** on the TPM Offcore connected app
+- Licenses: `AccrualsProcessingAddOn`, `AccrualsProcessingUserAddOn`,
+  `TpmAccrualsAddOn`, `TpmAccrualsUserAddOn` (advisory — record what the user confirmed)
 
 ---
 
 ## Phase 2 — Verify the Data Cloud connection (best-effort)
 
-The OAuth client used by TPM Offcore can be a **Connected App** or an **External Client
-App**, and the app name varies by org configuration — it cannot be queried reliably by
-name. Skip the programmatic check. Instead, if the user has not already confirmed
-`cdp_ingest_api` as part of Phase 1.7, ask them to verify it manually:
+Try to verify `cdp_ingest_api` by query — treat "cannot verify" as WARN, not STOP:
 
-> "Please confirm that `cdp_ingest_api` is in the selected OAuth scopes for the
-> integration app used by TPM Offcore. You can check under Setup → App Manager
-> (for Connected Apps) or Setup → External Client Apps."
+```bash
+sf data query --target-org <alias> \
+  --query "SELECT Id, Name FROM ConnectedApplication WHERE Name LIKE '%TPM%'"
+```
 
-Continue once the user confirms. Do not block on this — treat unconfirmed as WARN in
-the Phase 6 report.
+If the query errors on permissions, ask the user to confirm `cdp_ingest_api` is in
+Setup → App Manager → (edit TPM Offcore connected app) → OAuth Policies →
+Selected OAuth Scopes. Continue only after the user confirms.
 
 ---
 
@@ -228,13 +223,8 @@ Evaluate the rows:
   failing component name and its `DeploymentError` value. Do not proceed to Phase 5.
   Record Phase 5 as `not run — deployment failures unresolved` in the Phase 6 report.
 - Any `InProgress` row → wait 60 s and re-query. **Do not advance to Phase 5 until all
-  rows are in a terminal state** (`Successful` or `Failure`). DataKit deployments on
-  production orgs typically take 60–90 minutes. The setup script (`node scripts/setup.js`)
-  has an internal 90-minute polling timeout — if the script exits with a timeout error,
-  **do not treat this as a failure**: query `DataKitDeploymentLog` directly in the agent
-  Phase 4 loop (as shown above) and continue polling until terminal state or a genuine
-  liveness signal is lost (org unreachable, explicit Failure rows). Surface live counts
-  periodically so the user can see progress.
+  rows are in a terminal state** (`Successful` or `Failure`). If any row is still
+  `InProgress` after 30 minutes, stop and surface the live counts.
 - Zero rows → the deployment has not produced log entries yet; re-query every 60 s up to
   30 minutes. Treat persistent zero rows as a deployment problem — stop and report.
 - All rows `Successful` → proceed to Phase 5.

package/skills/consumer-goods-accruals-datakit-deploy/scripts/setup.js

@@ -179,16 +179,7 @@ function getConfig() {
  * @param {string} salesOrg - Must be exactly 4 alphanumeric characters.
  * @param {string|null} namespaceOverride - When non-null, must be 1-15 alphanumeric characters.
  */
-function validateInputs(salesOrg, namespaceOverride, orgAlias) {
-  // Org alias: Salesforce allows alphanumeric, hyphens, underscores, dots, and @ (usernames).
-  // Restrict to safe characters to prevent shell metacharacter injection on Windows cmd.exe.
-  // Allow alphanumeric, hyphens, underscores, dots, @, and + (valid in Salesforce usernames, e.g. user+ci@example.com).
-  // None of these characters are cmd.exe metacharacters, so shell injection via org alias is prevented.
-  if (!/^[A-Za-z0-9_\-@.+]+$/.test(orgAlias)) {
-    console.error(`Error: Invalid org alias "${orgAlias}". Must contain only alphanumeric characters, hyphens, underscores, dots, @, or +.`);
-    process.exit(1);
-  }
-
+function validateInputs(salesOrg, namespaceOverride) {
   if (!/^[A-Za-z0-9]{4}$/.test(salesOrg)) {
     console.error('Error: Invalid sales org.');
     process.exit(1);
@@ -232,7 +223,7 @@ async function main() {
   const { orgAlias, skipDataSpace, salesOrg, dryRun, namespaceOverride } = config;
 
   // Validate inputs before any org access or step execution
-  validateInputs(salesOrg, namespaceOverride, orgAlias);
+  validateInputs(salesOrg, namespaceOverride);
 
   const { dataSpaceName, dataSpacePrefix } = getDataSpaceConfig(salesOrg);
 
@@ -274,6 +265,8 @@ async function main() {
   }
 
   const setupDir = __dirname;
+  const dataKitPath = path.join(setupDir, 'CGCloudAddons', 'TPM', 'Accruals', 'TPM Accruals Data Kit');
+  const scriptsDir = path.join(setupDir, 'CGCloudAddons', 'TPM', 'Accruals', 'Accruals Data Kit Deployment Scripts');
 
   console.log(`Sales Org: ${salesOrg}`);
   if (!skipDataSpace) {
@@ -289,10 +282,7 @@ async function main() {
   }
 
   // Run all steps in order
-  // Step 1 returns the extraction dir; derive dataKitPath and scriptsDir from it.
-  const cgcloudAddonsDir = await downloadStaticResource(orgAlias, setupDir);
-  const dataKitPath = path.join(cgcloudAddonsDir, 'TPM', 'Accruals', 'TPM Accruals Data Kit');
-  const scriptsDir = path.join(cgcloudAddonsDir, 'TPM', 'Accruals', 'Accruals Data Kit Deployment Scripts');
+  await downloadStaticResource(orgAlias, setupDir);
   await replaceOrgId(orgId, dataKitPath);
   await deployMetadata(orgAlias, dataKitPath, dryRun);
   await deployEngine(orgAlias, scriptsDir, orgId, namespace, dryRun);
@@ -306,10 +296,10 @@ async function main() {
   }
 
   // Step 7: Deploy Accruals Reports with Data Space replacements
-  await deployAccrualsReports(orgAlias, cgcloudAddonsDir, skipDataSpace, dataSpaceName, dataSpacePrefix, namespace, dryRun);
+  await deployAccrualsReports(orgAlias, setupDir, skipDataSpace, dataSpaceName, dataSpacePrefix, namespace, dryRun);
 
   // Step 8: Deploy UI components (TPMAccrualTacticSummary)
-  await deployUI(orgAlias, cgcloudAddonsDir, skipDataSpace, dataSpaceName, dataSpacePrefix, salesOrg, namespace, dryRun);
+  await deployUI(orgAlias, setupDir, skipDataSpace, dataSpaceName, dataSpacePrefix, salesOrg, namespace, dryRun);
 
   // Step 9: Completion and next steps
   await completion(dryRun);

package/skills/consumer-goods-accruals-datakit-deploy/scripts/steps/00-check-prerequisites.js

@@ -1,63 +1,47 @@
-const readline = require('readline');
-
-/**
- * Step 0: Check Prerequisites
- * Presents prerequisites to the user and waits for confirmation
- */
-async function checkPrerequisites() {
-  console.log('\n=== Step 0: Prerequisites ===');
-
-  console.log('\nBefore proceeding, confirm ALL of the following are complete in your org.\n');
-
-  console.log('--- PERMISSIONS ---');
-  console.log('\n1. Assign permission set "Data Cloud Architect" to:');
-  console.log('   - The System Admin user');
-  console.log('   - The user assigned to the Accrual Ingestion Process');
-  console.log('\n2. Enable CRM Analytics (if you need Accruals dashboards):');
-  console.log('   Setup > Feature Settings > Analytics > Analytics > Getting Started > Enable CRM Analytics');
-  console.log('   Then assign permission set "CRM Analytics Plus Admin" to the System Admin.');
-
-  console.log('\n--- DATA CLOUD ---');
-  console.log('\n3. Data Cloud is enabled and set up (via the Data Cloud app, not Setup).');
-  console.log('\n4. Salesforce CRM connector is active:');
-  console.log('   Data Cloud app > Data Cloud Setup > Salesforce CRM > enable Home Org connection.');
-  console.log('   Also activate any other required connectors using the dropdown button.');
-  console.log('\n5. A user is assigned to the Accrual Ingestion Process:');
-  console.log('   Setup > Processing Services Pairing > Accrual Ingestion Process.');
-
-  console.log('\n--- INTEGRATION ---');
-  console.log('\n6. OAuth scope "cdp_ingest_api" is configured on the integration app used by TPM Offcore.');
-  console.log('   Check Setup > App Manager (Connected Apps) or Setup > External Client Apps.');
-  console.log('   The app name varies by org — locate the one used by TPM Offcore.');
-
-  console.log('\n');
-
-  // Wait for user confirmation
-  await waitForUserConfirmation();
-
-  console.log('[OK] Prerequisites confirmed. Proceeding to next step...\n');
-}
-
-/**
- * Wait for user to press Enter.
- * Auto-confirms immediately when stdin is not a TTY (piped / headless run).
- */
-function waitForUserConfirmation() {
-  if (!process.stdin.isTTY) {
-    console.log('[Auto-confirmed: running non-interactively]');
-    return Promise.resolve();
-  }
-  return new Promise((resolve) => {
-    const rl = readline.createInterface({
-      input: process.stdin,
-      output: process.stdout
-    });
-
-    rl.question('Press Enter when you have confirmed all prerequisites are met...', () => {
-      rl.close();
-      resolve();
-    });
-  });
-}
-
-module.exports = checkPrerequisites;
+const readline = require('readline');
+
+/**
+ * Step 0: Check Prerequisites
+ * Presents prerequisites to the user and waits for confirmation
+ */
+async function checkPrerequisites() {
+  console.log('\n=== Step 0: Prerequisites ===');
+
+  console.log('\nBefore proceeding with the setup, please ensure the following prerequisites are met:');
+  console.log('\n1. Enable Data Cloud and Analytics Studio');
+  console.log('   - Navigate to Setup > Data Cloud Setup');
+  console.log('   - Ensure Data Cloud and Analytics Studio are enabled');
+  console.log('\n2. Ensure there is a user assigned in the Processing Services Pairing app to the Accrual Ingestion Process');
+  console.log('   - The user must have the Data Cloud Architect permission set');
+  console.log('   - Alternatively, a System Admin or user with Data Cloud Architect can be assigned to all processes');
+  console.log('\n3. Ensure the connected app or external client app for TPM Offcore has the oauth scope "cdp_ingest_api"');
+  console.log('   - Navigate to Setup > App Manager');
+  console.log('   - Edit your connected app and verify the oauth scope includes "cdp_ingest_api"');
+  console.log('   - Note: Depending on your org setup, this permission may already be included');
+
+  console.log('\n');
+
+  // Wait for user confirmation
+  await waitForUserConfirmation();
+
+  console.log('[OK] Prerequisites confirmed. Proceeding to next step...\n');
+}
+
+/**
+ * Wait for user to press Enter
+ */
+function waitForUserConfirmation() {
+  return new Promise((resolve) => {
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+
+    rl.question('Press Enter when you have confirmed all prerequisites are met...', () => {
+      rl.close();
+      resolve();
+    });
+  });
+}
+
+module.exports = checkPrerequisites;

package/skills/consumer-goods-accruals-datakit-deploy/scripts/steps/01-download-static-resource.js

@@ -1,6 +1,5 @@
 const fs = require('fs');
 const https = require('https');
-const os = require('os');
 const path = require('path');
 const { execFileSync } = require('child_process');
 const { execSfJson, getOrgDetails } = require('./utils');
@@ -12,8 +11,6 @@ async function downloadStaticResource(orgAlias, setupDir) {
   console.log('\n=== Step 1: Downloading CGCloudAddons static resource ===');
 
   const staticResourceName = 'CGCloudAddons';
-  // Extract to os.tmpdir() to avoid EBUSY locks in the script tree on Windows
-  const extractBase = path.join(os.tmpdir(), `tpm_accruals_extract_${Date.now()}`);
 
   // Get org details for REST API call
   console.log('Getting org connection details...');
@@ -33,8 +30,7 @@ async function downloadStaticResource(orgAlias, setupDir) {
 
   // Download the static resource body using REST API
   console.log('Downloading static resource content...');
-  fs.mkdirSync(extractBase, { recursive: true });
-  const targetFile = path.join(extractBase, `${staticResourceName}.zip`);
+  const targetFile = path.join(setupDir, `${staticResourceName}.zip`);
   const bodyUrl = `${orgDetails.instanceUrl}/services/data/v${orgDetails.apiVersion}/sobjects/StaticResource/${staticResourceId}/Body`;
 
   await new Promise((resolve, reject) => {
@@ -66,15 +62,17 @@ async function downloadStaticResource(orgAlias, setupDir) {
 
   // Extract the zip file
   console.log('Extracting static resource...');
-  const extractDir = path.join(extractBase, staticResourceName);
-  fs.mkdirSync(extractDir, { recursive: true });
+  const extractDir = path.join(setupDir, staticResourceName);
 
-  // Extract: use Windows System32 bsdtar on Windows (Git Bash's GNU tar cannot
-  // read ZIP and misinterprets Windows drive letters as URLs). Convert paths to
-  // forward-slash POSIX form so bsdtar receives them correctly.
-  function toPosix(p) { return p.replace(/\\/g, '/'); }
+  // Remove existing extraction directory if it exists
+  if (fs.existsSync(extractDir)) {
+    fs.rmSync(extractDir, { recursive: true });
+  }
+
+  // Extract: tar on Windows (bsdtar handles ZIP), unzip on macOS/Linux.
+  // GNU tar on Linux cannot read ZIP archives.
   const [unzipCmd, unzipArgs] = process.platform === 'win32'
-    ? ['C:\\Windows\\System32\\tar.exe', ['-xf', toPosix(targetFile), '-C', toPosix(extractDir)]]
+    ? ['tar', ['-xf', targetFile, '-C', extractDir]]
     : ['unzip', ['-o', '-q', targetFile, '-d', extractDir]];
   try {
     execFileSync(unzipCmd, unzipArgs, { stdio: 'pipe' });
@@ -94,7 +92,6 @@ async function downloadStaticResource(orgAlias, setupDir) {
   }
 
   console.log('[OK] CGCloudAddons static resource downloaded and extracted successfully\n');
-  return extractDir;
 }
 
 module.exports = downloadStaticResource;

package/skills/consumer-goods-accruals-datakit-deploy/scripts/steps/02-replace-org-id.js

@@ -1,46 +1,46 @@
-const fs = require('fs');
-const path = require('path');
-
-function walkFiles(dir, extensions) {
-  const results = [];
-  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-    const full = path.join(dir, entry.name);
-    if (entry.isDirectory()) results.push(...walkFiles(full, extensions));
-    else if (extensions.some(ext => entry.name.endsWith(ext))) results.push(full);
-  }
-  return results;
-}
-
-/**
- * Step 2: Replace __SF_ORG_ID__ placeholder with actual org ID in all metadata files
- */
-async function replaceOrgId(orgId, dataKitPath) {
-  console.log('\n=== Step 2: Replacing org ID placeholders ===');
-  console.log(`Target directory: ${dataKitPath}`);
-  console.log(`Org ID: ${orgId} (truncated to 15 chars: ${orgId.slice(0, 15)})`);
-
-  // Truncate org ID to 15 characters
-  const truncatedOrgId = orgId.slice(0, 15);
-
-  // Find all XML and JSON files
-  const files = walkFiles(dataKitPath, ['.xml', '.json']);
-
-  let replacementCount = 0;
-
-  files.forEach(file => {
-    try {
-      const content = fs.readFileSync(file, 'utf8');
-      if (content.includes('__SF_ORG_ID__')) {
-        const newContent = content.replace(/__SF_ORG_ID__/g, truncatedOrgId);
-        fs.writeFileSync(file, newContent, 'utf8');
-        replacementCount++;
-      }
-    } catch (error) {
-      console.error(`Warning: Failed to process file ${file}: ${error.message}`);
-    }
-  });
-
-  console.log(`[OK] Replaced org ID placeholder in ${replacementCount} file(s)\n`);
-}
-
-module.exports = replaceOrgId;
+const fs = require('fs');
+const path = require('path');
+
+function walkFiles(dir, extensions) {
+  const results = [];
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    const full = path.join(dir, entry.name);
+    if (entry.isDirectory()) results.push(...walkFiles(full, extensions));
+    else if (extensions.some(ext => entry.name.endsWith(ext))) results.push(full);
+  }
+  return results;
+}
+
+/**
+ * Step 2: Replace __SF_ORG_ID__ placeholder with actual org ID in all metadata files
+ */
+async function replaceOrgId(orgId, dataKitPath) {
+  console.log('\n=== Step 2: Replacing org ID placeholders ===');
+  console.log(`Target directory: ${dataKitPath}`);
+  console.log(`Org ID: ${orgId} (truncated to 15 chars: ${orgId.slice(0, 15)})`);
+
+  // Truncate org ID to 15 characters
+  const truncatedOrgId = orgId.slice(0, 15);
+
+  // Find all XML and JSON files
+  const files = walkFiles(dataKitPath, ['.xml', '.json']);
+
+  let replacementCount = 0;
+
+  files.forEach(file => {
+    try {
+      const content = fs.readFileSync(file, 'utf8');
+      if (content.includes('__SF_ORG_ID__')) {
+        const newContent = content.replace(/__SF_ORG_ID__/g, truncatedOrgId);
+        fs.writeFileSync(file, newContent, 'utf8');
+        replacementCount++;
+      }
+    } catch (error) {
+      console.error(`Warning: Failed to process file ${file}: ${error.message}`);
+    }
+  });
+
+  console.log(`[OK] Replaced org ID placeholder in ${replacementCount} file(s)\n`);
+}
+
+module.exports = replaceOrgId;

package/skills/consumer-goods-accruals-datakit-deploy/scripts/steps/03-deploy-metadata.js

@@ -1,7 +1,4 @@
-const os = require('os');
-const fs = require('fs');
-const path = require('path');
-const { exec, execDeployJson, execSfJson } = require('./utils');
+const { exec, execDeployJson, getSfBin } = require('./utils');
 
 /**
  * Step 3: Deploy TPM Accruals Data Kit metadata to the org
@@ -21,24 +18,10 @@ async function deployMetadata(orgAlias, dataKitPath, dryRun = false) {
     return;
   }
 
-  // Convert to MDAPI format first, then deploy via --metadata-dir.
-  // This bypasses SF CLI source-tracking ("NothingToDeploy" errors on non-scratch
-  // orgs where tracking state diverges from org reality).
-  const mdapiOut = path.join(os.tmpdir(), `tpm_accruals_mdapi_${Date.now()}`);
-  console.log('Converting source to MDAPI format...');
-  const convertResult = execSfJson(['project', 'convert', 'source', '--output-dir', mdapiOut, '--json'], { cwd: dataKitPath });
-  if (convertResult.status !== 0) {
-    throw new Error(`Source conversion failed: ${convertResult.message || JSON.stringify(convertResult)}`);
-  }
-  console.log(`Converted to: ${convertResult.result && convertResult.result.location || mdapiOut}`);
-
+  // Deploy using sf project deploy start from the data kit root so the
+  // sfdx-project.json sourceApiVersion is respected.
   console.log('Deploying metadata...');
-  execDeployJson(['project', 'deploy', 'start', '--metadata-dir', mdapiOut, '--target-org', orgAlias]);
-
-  // Clean up temp dir
-  try { fs.rmSync(mdapiOut, { recursive: true }); } catch (cleanupErr) {
-    console.warn(`[WARN] Could not remove temp directory ${mdapiOut}: ${cleanupErr.message}`);
-  }
+  execDeployJson(['project', 'deploy', 'start', '--source-dir', 'force-app', '--target-org', orgAlias], { cwd: dataKitPath });
 
   console.log('[OK] TPM Accruals Data Kit deployed successfully\n');
 }

package/skills/consumer-goods-accruals-datakit-deploy/scripts/steps/06-create-dataspace.js

@@ -1,82 +1,58 @@
-const readline = require('readline');
-const { execSfJson } = require('./utils');
-
-/**
- * Step 6: Manual Data Space creation with DLO configuration
- * @param {string} orgAlias - The Salesforce org alias
- * @param {string} salesOrg - The sales org value (e.g., "0001")
- * @param {string} dataSpaceName - The data space name (e.g., "DataSpace_0001")
- * @param {string} dataSpacePrefix - The data space prefix (e.g., "DS1")
- * @param {boolean} dryRun - If true, skip user prompt
- */
-async function createDataSpace(orgAlias, salesOrg, dataSpaceName, dataSpacePrefix, dryRun = false) {
-  console.log('\n=== Step 6: Create Data Space (Manual Step) ===');
-
-  console.log('\nData Space configuration:');
-  console.log(`   - Name: ${dataSpaceName}`);
-  console.log(`   - Prefix: ${dataSpacePrefix}`);
-  console.log(`   - DLO: accrualoutput_decorated__dll`);
-  console.log(`   - Filter: SalesOrg equals "${salesOrg}"`);
-
-  if (dryRun) {
-    console.log('\n[DRY RUN] Skipping manual step prompt');
-    console.log('[OK] Step 6 completed (dry run)\n');
-    return;
-  }
-
-  console.log('\nPlease complete the following manual steps in your Salesforce org:');
-  console.log('\n1. Navigate to the Data Spaces tab in your org');
-  console.log('2. Create a new Data Space with the details shown above');
-  console.log('3. Go into the newly created Data Space');
-  console.log('4. Add the DLO: accrualoutput_decorated__dll');
-  console.log('5. Apply the filter shown above');
-
-  console.log('\n');
-
-  // Wait for user confirmation
-  await waitForUserConfirmation();
-
-  // In headless mode, verify the Data Space actually exists before continuing.
-  // DataSpace is a queryable SOQL object — query it to confirm creation.
-  if (!process.stdin.isTTY) {
-    const verifyResult = execSfJson([
-      'data', 'query', '--target-org', orgAlias, '--json',
-      '--query', `SELECT Id, Status FROM DataSpace WHERE DataSpaceApiName = '${dataSpaceName}' LIMIT 1`
-    ]);
-    const records = (verifyResult.result && verifyResult.result.records) || [];
-    if (records.length === 0) {
-      throw new Error(
-        `Data Space '${dataSpaceName}' not found in org. ` +
-        `Create it manually (Data Cloud app → Data Spaces → New, prefix '${dataSpacePrefix}', ` +
-        `add DLO accrualoutput_decorated__dll with SalesOrg = '${salesOrg}') before re-running.`
-      );
-    }
-    console.log(`[OK] Data Space '${dataSpaceName}' verified (Status: ${records[0].Status}).\n`);
-  } else {
-    console.log('[OK] Data Space creation confirmed. Proceeding to next step...\n');
-  }
-}
-
-/**
- * Wait for user to press Enter.
- * Auto-confirms immediately when stdin is not a TTY (piped / headless run).
- */
-function waitForUserConfirmation() {
-  if (!process.stdin.isTTY) {
-    console.log('[Auto-confirmed: running non-interactively]');
-    return Promise.resolve();
-  }
-  return new Promise((resolve) => {
-    const rl = readline.createInterface({
-      input: process.stdin,
-      output: process.stdout
-    });
-
-    rl.question('Press Enter when you have completed these steps...', () => {
-      rl.close();
-      resolve();
-    });
-  });
-}
-
-module.exports = createDataSpace;
+const readline = require('readline');
+
+/**
+ * Step 6: Manual Data Space creation with DLO configuration
+ * @param {string} orgAlias - The Salesforce org alias
+ * @param {string} salesOrg - The sales org value (e.g., "0001")
+ * @param {string} dataSpaceName - The data space name (e.g., "DataSpace_0001")
+ * @param {string} dataSpacePrefix - The data space prefix (e.g., "DS1")
+ * @param {boolean} dryRun - If true, skip user prompt
+ */
+async function createDataSpace(orgAlias, salesOrg, dataSpaceName, dataSpacePrefix, dryRun = false) {
+  console.log('\n=== Step 6: Create Data Space (Manual Step) ===');
+
+  console.log('\nData Space configuration:');
+  console.log(`   - Name: ${dataSpaceName}`);
+  console.log(`   - Prefix: ${dataSpacePrefix}`);
+  console.log(`   - DLO: accrualoutput_decorated__dll`);
+  console.log(`   - Filter: SalesOrg equals "${salesOrg}"`);
+
+  if (dryRun) {
+    console.log('\n[DRY RUN] Skipping manual step prompt');
+    console.log('[OK] Step 6 completed (dry run)\n');
+    return;
+  }
+
+  console.log('\nPlease complete the following manual steps in your Salesforce org:');
+  console.log('\n1. Navigate to the Data Spaces tab in your org');
+  console.log('2. Create a new Data Space with the details shown above');
+  console.log('3. Go into the newly created Data Space');
+  console.log('4. Add the DLO: accrualoutput_decorated__dll');
+  console.log('5. Apply the filter shown above');
+
+  console.log('\n');
+
+  // Wait for user confirmation
+  await waitForUserConfirmation();
+
+  console.log('[OK] Data Space creation confirmed. Proceeding to next step...\n');
+}
+
+/**
+ * Wait for user to press Enter
+ */
+function waitForUserConfirmation() {
+  return new Promise((resolve) => {
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+
+    rl.question('Press Enter when you have completed these steps...', () => {
+      rl.close();
+      resolve();
+    });
+  });
+}
+
+module.exports = createDataSpace;