@aifabrix/builder 2.45.5 → 2.47.0

package/lib/datasource/capability/remove-operations.js

@@ -17,6 +17,7 @@ const {
   findMatchingOpsKeys,
   resolveProfileKeyForLogical
 } = require('./capability-resolve');
+const { capabilityKeyFromEntry } = require('./capability-manifest');
 
 /**
  * @param {unknown} capabilities
@@ -28,7 +29,7 @@ function findCapabilityIndex(capabilities, logicalName) {
     return -1;
   }
   return capabilities.findIndex(
-    (c) => String(c).toLowerCase() === String(logicalName).toLowerCase()
+    (c) => capabilityKeyFromEntry(c).toLowerCase() === String(logicalName).toLowerCase()
   );
 }
 

package/lib/datasource/capability/run-capability-copy.js

@@ -8,6 +8,7 @@
 
 const fs = require('node:fs');
 const path = require('path');
+const { loadConfigFile, writeConfigFile } = require('../../utils/config-format');
 const { writeBackup } = require('../../utils/integration-file-backup');
 const {
   resolveValidateInputPath,
@@ -46,6 +47,33 @@ function resolveCapabilityCopyInputPath(identifier) {
   return resolveValidateInputPath(trimmed);
 }
 
+/**
+ * Read a datasource config file (.json, .yaml, or .yml).
+ *
+ * @param {string} filePath
+ * @returns {object}
+ */
+function readDatasourceConfigFile(filePath) {
+  return loadConfigFile(filePath);
+}
+
+/**
+ * @param {string} filePath
+ * @returns {'json'|'yaml'}
+ */
+function inferDatasourceConfigFormat(filePath) {
+  const ext = path.extname(filePath).toLowerCase();
+  if (ext === '.json') {
+    return 'json';
+  }
+  if (ext === '.yaml' || ext === '.yml') {
+    return 'yaml';
+  }
+  throw new Error(
+    `Unsupported datasource config extension: ${ext || '(none)'}. Use .json, .yaml, or .yml`
+  );
+}
+
 /**
  * @param {string} filePath
  * @param {object} obj
@@ -53,9 +81,9 @@ function resolveCapabilityCopyInputPath(identifier) {
  */
 function atomicWriteJson(filePath, obj) {
   const dir = path.dirname(filePath);
+  const format = inferDatasourceConfigFormat(filePath);
   const tmp = path.join(dir, `.${path.basename(filePath)}.${process.pid}.tmp`);
-  const payload = `${JSON.stringify(obj, null, 2)}\n`;
-  fs.writeFileSync(tmp, payload, 'utf8');
+  writeConfigFile(tmp, obj, format);
   fs.renameSync(tmp, filePath);
 }
 
@@ -89,8 +117,7 @@ function atomicWriteJson(filePath, obj) {
  */
 async function runCapabilityCopy(opts) {
   const resolvedPath = resolveCapabilityCopyInputPath(opts.fileOrKey.trim());
-  const raw = fs.readFileSync(resolvedPath, 'utf8');
-  const parsed = JSON.parse(raw);
+  const parsed = readDatasourceConfigFile(resolvedPath);
 
   const to = normalizeCapabilityKey(opts.as, 'Target (--as)');
   const fromRaw = opts.from !== undefined && opts.from !== null ? String(opts.from).trim() : '';
@@ -148,5 +175,6 @@ async function runCapabilityCopy(opts) {
 module.exports = {
   runCapabilityCopy,
   writeBackup,
+  readDatasourceConfigFile,
   atomicWriteJson
 };

package/lib/datasource/capability/run-capability-diff.js

@@ -6,8 +6,8 @@
  * @version 2.0.0
  */
 
-const fs = require('fs');
 const path = require('path');
+const { readDatasourceConfigFile } = require('./run-capability-copy');
 const { resolveValidateInputPath } = require('../validate');
 const { normalizeCapabilityKey } = require('./capability-key');
 const { extractCapabilitySliceForDiff } = require('./capability-diff-slice');
@@ -108,8 +108,8 @@ function resolveProfileKeys(opts) {
 function runCapabilityDiff(opts) {
   const pathA = resolveValidateInputPath(opts.fileA.trim());
   const pathB = resolveValidateInputPath(opts.fileB.trim());
-  const docA = JSON.parse(fs.readFileSync(pathA, 'utf8'));
-  const docB = JSON.parse(fs.readFileSync(pathB, 'utf8'));
+  const docA = readDatasourceConfigFile(pathA);
+  const docB = readDatasourceConfigFile(pathB);
 
   const { capA, capB } = resolveCapabilityKeys(opts);
   const { profA, profB } = resolveProfileKeys(opts);

package/lib/datasource/capability/run-capability-dimension.js

@@ -8,7 +8,6 @@
 
 'use strict';
 
-const fs = require('fs');
 const { resolveControllerUrl } = require('../../utils/controller-url');
 const { normalizeControllerUrl } = require('../../core/config');
 const { getOrRefreshDeviceToken } = require('../../utils/token-manager');
@@ -19,7 +18,7 @@ const {
 } = require('../validate');
 const { applyCapabilityDimension } = require('./dimension-operations');
 const { validateDimensionSemantics } = require('./dimension-validate');
-const { writeBackup, atomicWriteJson } = require('./run-capability-copy');
+const { writeBackup, atomicWriteJson, readDatasourceConfigFile } = require('./run-capability-copy');
 const { tryResolveDatasourceKeyToLocalPath, readJsonFile } = require('../../resolvers/datasource-resolver');
 const { tryFetchDatasourceConfig } = require('../../resolvers/manifest-resolver');
 
@@ -231,8 +230,7 @@ function applyBindingAndValidateSchema({ parsed, opts, semanticWarnings, remoteF
 async function runCapabilityDimension(rawOpts) {
   const opts = normalizeRunOptions(rawOpts);
   const resolvedPath = resolveValidateInputPath(opts.fileOrKey);
-  const raw = fs.readFileSync(resolvedPath, 'utf8');
-  const parsed = JSON.parse(raw);
+  const parsed = readDatasourceConfigFile(resolvedPath);
 
   const systemKeyForAuth = resolveSystemKeyForAuth(parsed);
   const { remoteTargetsByKey, remoteFetchMeta } = await loadRemoteTargetsByKey({

package/lib/datasource/capability/run-capability-edit.js

@@ -6,7 +6,6 @@
  * @version 2.0.0
  */
 
-const fs = require('fs');
 const { execSync } = require('child_process');
 const inquirer = require('inquirer');
 const {
@@ -19,7 +18,8 @@ const {
   resolveSingleOpsKey,
   resolveProfileKeyForLogical
 } = require('./capability-resolve');
-const { writeBackup, atomicWriteJson } = require('./run-capability-copy');
+const { writeBackup, atomicWriteJson, readDatasourceConfigFile } = require('./run-capability-copy');
+const { listCapabilityKeys } = require('./capability-manifest');
 
 /**
  * @typedef {object} RunCapabilityEditOpts
@@ -35,10 +35,7 @@ const { writeBackup, atomicWriteJson } = require('./run-capability-copy');
  * @returns {string[]}
  */
 function collectCapabilityKeys(doc) {
-  const s = new Set();
-  if (Array.isArray(doc.capabilities)) {
-    doc.capabilities.forEach((c) => s.add(String(c)));
-  }
+  const s = new Set(listCapabilityKeys(doc.capabilities));
   if (doc.openapi?.operations) {
     Object.keys(doc.openapi.operations).forEach((k) => s.add(k));
   }
@@ -351,7 +348,7 @@ async function runCapabilityEdit(opts) {
     throw new Error('capability edit requires an interactive terminal (TTY). Use a terminal or SSH with -t.');
   }
   const resolvedPath = resolveValidateInputPath(opts.fileOrKey.trim());
-  const doc = JSON.parse(fs.readFileSync(resolvedPath, 'utf8'));
+  const doc = readDatasourceConfigFile(resolvedPath);
   const { capKey, section, profileKey } = await resolveEditTargets(doc, opts);
   const initial = getEditableJson(doc, capKey, section, profileKey);
   const body = await promptEditorJson(initial);

package/lib/datasource/capability/run-capability-relate.js

@@ -6,14 +6,13 @@
  * @version 2.0.0
  */
 
-const fs = require('fs');
 const {
   resolveValidateInputPath,
   validateDatasourceParsed
 } = require('../validate');
 const { applyCapabilityRelate } = require('./relate-operations');
 const { validateRelateSemantics } = require('./relate-validate');
-const { writeBackup, atomicWriteJson } = require('./run-capability-copy');
+const { writeBackup, atomicWriteJson, readDatasourceConfigFile } = require('./run-capability-copy');
 const { tryResolveDatasourceKeyToLocalPath, readJsonFile } = require('../../resolvers/datasource-resolver');
 const { tryFetchDatasourceConfig } = require('../../resolvers/manifest-resolver');
 
@@ -134,8 +133,7 @@ function applyRelateAndValidateSchema(parsed, opts, semanticWarnings, remoteVali
  */
 async function runCapabilityRelate(opts) {
   const resolvedPath = resolveValidateInputPath(opts.fileOrKey.trim());
-  const raw = fs.readFileSync(resolvedPath, 'utf8');
-  const parsed = JSON.parse(raw);
+  const parsed = readDatasourceConfigFile(resolvedPath);
 
   const targetDocLocal = loadTargetDocLocal(opts.targetDatasource);
   const systemKeyForAuth = resolveSystemKeyForAuth(parsed);

package/lib/datasource/capability/run-capability-remove.js

@@ -6,14 +6,13 @@
  * @version 2.0.0
  */
 
-const fs = require('fs');
 const {
   resolveValidateInputPath,
   validateDatasourceParsed
 } = require('../validate');
 const { normalizeCapabilityKey } = require('./capability-key');
 const { applyCapabilityRemove } = require('./remove-operations');
-const { writeBackup, atomicWriteJson } = require('./run-capability-copy');
+const { writeBackup, atomicWriteJson, readDatasourceConfigFile } = require('./run-capability-copy');
 
 /**
  * @param {{ valid: boolean, errors: string[] }} validation
@@ -67,8 +66,7 @@ function makeRemoveResult(resolvedPath, capability, result, validation, dryRun,
  */
 async function runCapabilityRemove(opts) {
   const resolvedPath = resolveValidateInputPath(opts.fileOrKey.trim());
-  const raw = fs.readFileSync(resolvedPath, 'utf8');
-  const parsed = JSON.parse(raw);
+  const parsed = readDatasourceConfigFile(resolvedPath);
 
   const capability = normalizeCapabilityKey(opts.capability, 'Capability (--capability)');
 

package/lib/datasource/capability/validate-capability-slice.js

@@ -7,6 +7,7 @@
  */
 
 const { normalizeCapabilityKey } = require('./capability-key');
+const { capabilitiesIncludes } = require('./capability-manifest');
 
 /**
  * Lists structural locations where a capability key should appear.
@@ -18,7 +19,7 @@ const { normalizeCapabilityKey } = require('./capability-key');
 function checkCapabilitySlices(parsed, rawKey) {
   const key = normalizeCapabilityKey(rawKey, 'capability');
   const missing = [];
-  if (!Array.isArray(parsed.capabilities) || !parsed.capabilities.includes(key)) {
+  if (!capabilitiesIncludes(parsed.capabilities, key)) {
     missing.push(`capabilities[] (missing "${key}")`);
   }
   if (!parsed.openapi?.operations?.[key]) {

package/lib/datasource/datasource-identifier.js

@@ -38,7 +38,8 @@ function datasourceIdentifierMatchesFile(identifier, fileRef, parsed) {
   if (stem === id) {
     return true;
   }
-  if (`${stem}.json` === id.toLowerCase()) {
+  const lowerId = id.toLowerCase();
+  if (`${stem}.json` === lowerId || `${stem}.yaml` === lowerId || `${stem}.yml` === lowerId) {
     return true;
   }
   return false;

package/lib/datasource/datasource-load-export-context.js

@@ -8,6 +8,7 @@
 
 const { getConfig } = require('../core/config');
 const { setupIntegrationTestAuth } = require('../external-system/test-auth');
+const { applyLabDataplaneApiKeyBearer } = require('../utils/token-manager');
 const { resolveAppKeyForDatasource } = require('./resolve-app');
 const { getSystemKeyFromAppKey } = require('./integration-context');
 const { loadDatasourceForApp } = require('./unified-validation-run-resolve');
@@ -62,6 +63,8 @@ async function resolveLoadExportContext(datasourceKey, options = {}) {
     dataplaneUrl = auth.dataplaneUrl;
   }
 
+  authConfig = applyLabDataplaneApiKeyBearer(authConfig);
+
   return {
     appKey,
     systemKey,

package/lib/datasource/datasource-validate-display.js

@@ -30,7 +30,7 @@ function logHeaderAndIdentity(result, trimmed, showMapping) {
   const { resolvedPath, summary } = result;
   logger.log('');
   logger.log(sectionTitle('Datasource validation'));
-  logger.log(metadata('Offline — JSON schema and integration wiring'));
+  logger.log(metadata('Offline — YAML/JSON schema and integration wiring'));
   logger.log('');
   if (summary) {
     logger.log(`  ${headerKeyValue('Key:', summary.key)}`);

package/lib/datasource/field-reference-validator.js

@@ -10,6 +10,8 @@
  * @version 2.0.0
  */
 
+const { validateOrphanExposedProfiles } = require('./orphan-profiles-validator');
+
 /**
  * Set of attribute names plus root dimension keys valid for field references.
  * Used for primaryKey (schema allows dimension keys or attributes) and other paths (attributes only).
@@ -40,16 +42,34 @@ function checkPrimaryKey(parsed, attributesAndDimensions, errors) {
   });
 }
 
+/** @returns {Set<string>} */
+function profileReferenceSet(parsed) {
+  if (parsed?.entityType === 'serviceContract') {
+    const schema = parsed?.exposed?.schema;
+    if (schema && typeof schema === 'object' && !Array.isArray(schema)) {
+      return new Set(
+        Object.keys(schema).filter(key => typeof key === 'string' && key !== '')
+      );
+    }
+  }
+  return new Set(Object.keys(parsed?.fieldMappings?.attributes ?? {}));
+}
+
 /** @param {string[]} errors */
-function checkExposedProfiles(parsed, attrSet, errors) {
+function checkExposedProfiles(parsed, _attrSet, errors) {
   const profiles = parsed?.exposed?.profiles;
   if (!profiles || typeof profiles !== 'object' || Array.isArray(profiles)) return;
+  const profileRefSet = profileReferenceSet(parsed);
+  const referenceLabel =
+    parsed?.entityType === 'serviceContract'
+      ? 'exposed.schema'
+      : 'fieldMappings.attributes';
   Object.entries(profiles).forEach(([profileName, fields]) => {
     if (!Array.isArray(fields)) return;
     fields.forEach((field, idx) => {
-      if (typeof field === 'string' && !attrSet.has(field)) {
+      if (typeof field === 'string' && !profileRefSet.has(field)) {
         errors.push(
-          `exposed.profiles.${profileName}[${idx}]: field '${field}' does not exist in fieldMappings.attributes. Add the attribute or remove the reference.`
+          `exposed.profiles.${profileName}[${idx}]: field '${field}' does not exist in ${referenceLabel}. Add the attribute or remove the reference.`
         );
       }
     });
@@ -121,6 +141,7 @@ function validateFieldReferences(parsed) {
 
   checkPrimaryKey(parsed, attributesAndDimensions, errors);
   checkExposedProfiles(parsed, attrSet, errors);
+  errors.push(...validateOrphanExposedProfiles(parsed));
   if (normalizedAttributes.length === 0) return errors;
 
   checkIndexingAndValidation(parsed, normalizedAttributes, errors);

package/lib/datasource/log-cleaner.js

@@ -1,6 +1,6 @@
 /**
  * Remove saved datasource test debug JSON under integration/<app>/logs/.
- * @fileoverview Local cleanup for test / test-integration / test-e2e / test-trust logs
+ * @fileoverview Local cleanup for test / test-integration / test-e2e / verify-trust logs
  * @author AI Fabrix Team
  * @version 1.0.0
  */
@@ -42,7 +42,7 @@ function matchesLogCleanType(fileName, type) {
     return fileName.startsWith('test-integration-');
   }
   if (type === 'e2e') return fileName.startsWith('test-e2e-');
-  if (type === 'trust') return fileName.startsWith('test-trust-');
+  if (type === 'trust') return fileName.startsWith('verify-trust-');
   return false;
 }
 

package/lib/datasource/log-viewer.js

@@ -59,7 +59,7 @@ function isStructuralTestLogFileName(name) {
   if (
     name.startsWith('test-e2e-') ||
     name.startsWith('test-integration-') ||
-    name.startsWith('test-trust-')
+    name.startsWith('verify-trust-')
   ) {
     return false;
   }
@@ -276,7 +276,7 @@ function logTrustFindingsSection(run) {
 }
 
 /**
- * Format agent trust log (`datasource test-trust --debug` → `test-trust-*.json`).
+ * Format agent trust log (`datasource verify-trust --debug` → `verify-trust-*.json`).
  * @param {Object} data - Parsed JSON { request, response?, error? }
  * @param {string} [fileName] - Log file name for header
  */
@@ -356,7 +356,7 @@ function formatStructuralTestLog(data, fileName) {
 /**
  * Format log content by type
  * @param {Object} parsed - Parsed JSON log
- * @param {'test'|'test-e2e'|'test-integration'|'test-trust'} logType - Log type
+ * @param {'test'|'test-e2e'|'test-integration'|'verify-trust'} logType - Log type
  * @param {string} [fileName] - File name for header
  */
 function formatLogContent(parsed, logType, fileName) {
@@ -364,7 +364,7 @@ function formatLogContent(parsed, logType, fileName) {
     formatStructuralTestLog(parsed, fileName);
     return;
   }
-  if (logType === 'test-trust') {
+  if (logType === 'verify-trust') {
     formatTrustLog(parsed, fileName);
     return;
   }
@@ -410,7 +410,7 @@ function parseDatasourceLogJson(content, logPath) {
  * @param {Object} options - Options
  * @param {string} [options.app] - App key (optional, resolved from key if omitted)
  * @param {string} [options.file] - Path to log file (overrides app resolution)
- * @param {'test'|'test-e2e'|'test-integration'|'test-trust'} options.logType - Log type
+ * @param {'test'|'test-e2e'|'test-integration'|'verify-trust'} options.logType - Log type
  * @throws {Error} When file not found or invalid JSON
  */
 /* eslint-disable-next-line max-statements -- Resolve path, read, parse, format */
@@ -433,11 +433,11 @@ async function runLogViewer(datasourceKey, options) {
           `No structural validation log found in ${logsDir}. Run: aifabrix datasource test <key> --debug`
         );
       }
-    } else if (logType === 'test-trust') {
-      logPath = await getLatestLogPath(logsDir, 'test-trust-');
+    } else if (logType === 'verify-trust') {
+      logPath = await getLatestLogPath(logsDir, 'verify-trust-');
       if (!logPath) {
         throw new Error(
-          `No test-trust log found in ${logsDir}. Run: aifabrix datasource test-trust <key> --debug`
+          `No verify-trust log found in ${logsDir}. Run: aifabrix datasource verify-trust <key> --debug`
         );
       }
     } else {

package/lib/datasource/orphan-profiles-validator.js

@@ -0,0 +1,98 @@
+/**
+ * Validate exposed.profiles keys against capabilities (346 §13 — no orphan profiles).
+ *
+ * @fileoverview Orphan exposed profile validation for datasource manifests
+ * @author AI Fabrix Team
+ * @version 1.0.0
+ */
+
+'use strict';
+
+const { listCapabilityKeys } = require('./capability/capability-manifest');
+
+const FORBIDDEN_ORPHAN_PROFILE_KEYS = new Set(['minimal', 'analytics', 'metadata']);
+
+/**
+ * @param {string} name
+ * @returns {string}
+ */
+function normalizeProfileKey(name) {
+  return String(name).trim().toLowerCase();
+}
+
+/**
+ * @param {object} parsed
+ * @returns {Set<string>}
+ */
+function operationKeysFromConfig(parsed) {
+  const keys = new Set();
+  const openapiOps = parsed?.openapi?.operations;
+  if (openapiOps && typeof openapiOps === 'object') {
+    Object.keys(openapiOps).forEach((k) => keys.add(normalizeProfileKey(k)));
+  }
+  const cipOps = parsed?.execution?.cip?.operations;
+  if (cipOps && typeof cipOps === 'object') {
+    Object.keys(cipOps).forEach((k) => keys.add(normalizeProfileKey(k)));
+  }
+  return keys;
+}
+
+/**
+ * @param {object} parsed
+ * @returns {Set<string>}
+ */
+function allowedExposedProfileKeys(parsed) {
+  const allowed = new Set(['default']);
+  const capabilityKeys = listCapabilityKeys(parsed?.capabilities).map(normalizeProfileKey);
+  if (capabilityKeys.length > 0) {
+    capabilityKeys.forEach((k) => allowed.add(k));
+  } else {
+    operationKeysFromConfig(parsed).forEach((k) => allowed.add(k));
+  }
+  return allowed;
+}
+
+/**
+ * @param {object} parsed - Parsed datasource manifest
+ * @returns {string[]} Error messages; empty when valid
+ */
+function validateOrphanExposedProfiles(parsed) {
+  const errors = [];
+  const profiles = parsed?.exposed?.profiles;
+  if (!profiles || typeof profiles !== 'object' || Array.isArray(profiles)) {
+    return errors;
+  }
+
+  const allowed = allowedExposedProfileKeys(parsed);
+  const orphans = Object.keys(profiles).filter((name) => {
+    const normalized = normalizeProfileKey(name);
+    return FORBIDDEN_ORPHAN_PROFILE_KEYS.has(normalized) || !allowed.has(normalized);
+  });
+
+  if (orphans.length === 0) {
+    return errors;
+  }
+
+  const decorative = orphans.filter((name) =>
+    FORBIDDEN_ORPHAN_PROFILE_KEYS.has(normalizeProfileKey(name))
+  );
+  if (decorative.length > 0) {
+    errors.push(
+      `exposed.profiles: orphan exposed profiles are forbidden: ${decorative.join(', ')}. ` +
+        'Use exposed.profiles.default and one profile per capabilities[].key only.'
+    );
+    return errors;
+  }
+
+  errors.push(
+    `exposed.profiles: orphan profile keys must match capabilities[].key or default: ${orphans.join(', ')}. ` +
+      `Allowed profile keys: ${[...allowed].sort().join(', ')}.`
+  );
+  return errors;
+}
+
+module.exports = {
+  FORBIDDEN_ORPHAN_PROFILE_KEYS,
+  allowedExposedProfileKeys,
+  validateOrphanExposedProfiles
+};

package/lib/datasource/test-e2e.js

@@ -42,8 +42,11 @@ function buildUnifiedE2eRunOptions(options, timeoutMs, pk) {
     capabilityKey: options.capabilityKey,
     timeout: timeoutMs,
     sync: options.sync === true,
+    force: options.force === true,
     authConfig: options.authConfig,
-    dataplaneUrl: options.dataplaneUrl || options.dataplane
+    dataplaneUrl: options.dataplaneUrl || options.dataplane,
+    quietPollUi: options.quietPollUi === true,
+    onPollProgress: options.onPollProgress
   };
 }
 

package/lib/datasource/unified-validation-run-body.js

@@ -10,6 +10,7 @@ const {
   includeDebugForRequest
 } = require('../utils/validation-run-request');
 const testHelpers = require('../utils/external-system-test-helpers');
+const { withStageOnValidationRunBody } = require('../utils/validation-run-stage');
 
 /**
  * @param {Object} params
@@ -52,7 +53,7 @@ async function buildUnifiedValidationBody(params) {
       })
       : undefined;
 
-  return buildExternalDataSourceValidationRequest({
+  const body = buildExternalDataSourceValidationRequest({
     systemKey,
     datasourceKey,
     runType,
@@ -62,6 +63,7 @@ async function buildUnifiedValidationBody(params) {
     explain: options.verbose === true,
     e2eOptions: e2eOptions && Object.keys(e2eOptions).length > 0 ? e2eOptions : undefined
   });
+  return withStageOnValidationRunBody(body, runType);
 }
 
 module.exports = { buildUnifiedValidationBody };

package/lib/datasource/unified-validation-run.js

@@ -18,6 +18,7 @@ const { buildUnifiedValidationBody } = require('./unified-validation-run-body');
 const { postValidationRunAndOptionalPoll } = require('./unified-validation-run-post');
 const { requireBearerForDataplanePipeline } = require('../utils/token-manager');
 const logger = require('../utils/logger');
+const { buildMinimalUploadSyncOptions } = require('../utils/upload-sync-options');
 
 function _resourceTypeFromDatasource(datasource) {
   return datasource && typeof datasource === 'object' && typeof datasource.resourceType === 'string'
@@ -59,7 +60,7 @@ async function maybeSyncDatasourceToDataplane({ options, authConfig, systemKey }
   // are updated before validation runs. Datasource-only publish can still fail DP-SEC-013 when the
   // dataplane system permissions[] are stale.
   const { uploadExternalSystem } = require('../commands/upload');
-  await uploadExternalSystem(systemKey, { minimal: true });
+  await uploadExternalSystem(systemKey, buildMinimalUploadSyncOptions(options));
   logger.log(formatSuccessLine('Sync complete'));
 }
 
@@ -139,7 +140,9 @@ async function runUnifiedDatasourceValidation(datasourceKey, options) {
     useAsync,
     noAsync: options.noAsync === true || options.async === false,
     verbosePoll: options.verbose === true,
-    pollSubject: datasourceKey
+    quietPollUi: options.quietPollUi === true,
+    pollSubject: datasourceKey,
+    onPollProgress: options.onPollProgress
   });
 
   if (result && result.envelope) {