@aifabrix/builder 2.44.2 → 2.44.4

package/lib/schema/datasource-test-run.schema.json

@@ -9,7 +9,7 @@
     "reportVersion": {
       "type": "string",
       "description": "Semver-style contract version for this envelope. Policy: additive fields => minor bump within same major; removed/renamed fields => major bump. Route migrations must cite target reportVersion.",
-      "example": "1.1.0"
+      "example": "1.3.0"
     },
     "runType": {
       "type": "string",
@@ -51,6 +51,10 @@
     "certificate": {
       "$ref": "#/$defs/CertificateResult"
     },
+    "certificateIssuance": {
+      "$ref": "#/$defs/CertificateIssuanceResult",
+      "description": "Integration-certificate auto-issue outcome for this datasource scope (VALIDATION_AUTO_ISSUE_INTEGRATION_CERTIFICATE)."
+    },
     "capabilitySummary": {
       "$ref": "#/$defs/CapabilitySummary"
     },
@@ -69,9 +73,50 @@
     },
     "developer": {
       "$ref": "#/$defs/DeveloperSummary"
+    },
+    "datasourceSummaries": {
+      "type": "array",
+      "description": "Optional per-datasource rollups when the underlying run evaluated multiple datasources (e.g. validationScope=externalSystem).",
+      "items": {
+        "$ref": "#/$defs/DatasourceSummary"
+      }
     }
   },
   "$defs": {
+    "DatasourceSummary": {
+      "type": "object",
+      "required": ["datasourceKey", "status"],
+      "additionalProperties": false,
+      "description": "Lightweight per-datasource rollup for system-scoped runs.",
+      "properties": {
+        "datasourceKey": {
+          "type": "string",
+          "description": "Datasource key within the system."
+        },
+        "status": {
+          "type": "string",
+          "description": "Datasource rollup: ok | warn | fail | skipped.",
+          "enum": ["ok", "warn", "fail", "skipped"]
+        },
+        "validationStatus": {
+          "type": "string",
+          "description": "Validation layer rollup for this datasource.",
+          "enum": ["ok", "warn", "fail"]
+        },
+        "certificateStatus": {
+          "type": "string",
+          "description": "Certification rollup for this datasource.",
+          "enum": ["passed", "not_passed"]
+        },
+        "issues": {
+          "type": "array",
+          "description": "Blocking/warning issues for this datasource.",
+          "items": {
+            "$ref": "#/$defs/Issue"
+          }
+        }
+      }
+    },
     "ValidationLayerResult": {
       "type": "object",
       "required": ["status"],
@@ -161,6 +206,39 @@
         }
       }
     },
+    "CertificateIssuanceResult": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["status", "systemKey", "datasourceKey"],
+      "description": "Structured result when the dataplane evaluates integration-certificate auto-issue (safe for clients and logs).",
+      "properties": {
+        "status": {
+          "type": "string",
+          "enum": ["issued", "reusedActive", "skipped", "failed"],
+          "description": "issued | reusedActive | skipped | failed."
+        },
+        "reasonCode": {
+          "type": "string",
+          "description": "Stable machine code when status is skipped or failed."
+        },
+        "message": {
+          "type": "string",
+          "description": "Human-readable summary."
+        },
+        "validationHint": {
+          "type": "string",
+          "description": "Optional remediation hint."
+        },
+        "systemKey": {
+          "type": "string",
+          "description": "External system key for this issuance scope."
+        },
+        "datasourceKey": {
+          "type": "string",
+          "description": "Datasource key for this issuance scope."
+        }
+      }
+    },
     "CertificateResult": {
       "type": "object",
       "required": ["status"],

package/lib/schema/external-datasource.schema.json

@@ -7,12 +7,12 @@
         "key":"external-datasource-schema",
         "name":"External Data Source Configuration Schema",
         "description":"JSON schema for validating ExternalDataSource configuration files",
-        "version":"2.4.5",
+    "version":"2.4.6",
         "type":"schema",
         "category":"integration",
         "author":"AI Fabrix Team",
         "createdAt":"2024-01-01T00:00:00Z",
-        "updatedAt":"2026-04-07T00:00:00Z",
+        "updatedAt":"2026-04-20T00:00:00Z",
         "compatibility":{
            "minVersion":"1.0.0",
            "maxVersion":"3.0.0",
@@ -175,6 +175,14 @@
               "exposed.profiles object profiles: attributes may be an object map (property names = field keys; values ignored), matching runtime exposed_profile_field_names and CIP/ExposedFieldsValidator behavior."
            ],
            "breaking":false
+        },
+        {
+           "version":"2.4.6",
+           "date":"2026-04-24T00:00:00Z",
+           "changes":[
+              "Added optional fetch.httpResponseNormalization for manifest-driven GET response shaping (302 Location follow, JSON redirect envelopes, nested JSON string URL follow-up)."
+           ],
+           "breaking":false
         }
      ]
   },
@@ -705,6 +713,10 @@
                     "input":{
                        "type":"object",
                        "additionalProperties":true
+                    },
+                    "order":{
+                       "type":"integer",
+                       "description":"Optional stable sort hint for scenario execution / diagnostics."
                     }
                  },
                  "additionalProperties":false
@@ -950,6 +962,83 @@
      }
   ],
   "$defs":{
+     "httpResponseNormalization":{
+        "type":"object",
+        "description":"Optional GET response shaping for miso-client adapter dicts and native 302 Location follows. Omitted = disabled.",
+        "additionalProperties":false,
+        "properties":{
+           "applyWhenUrlContains":{
+              "type":"array",
+              "items":{
+                 "type":"string",
+                 "minLength":1
+              },
+              "description":"When non-empty, normalization applies only if the request URL (path plus query, lowercased) contains at least one substring (case-insensitive)."
+           },
+           "followRedirectJsonEnvelope":{
+              "type":"object",
+              "additionalProperties":false,
+              "properties":{
+                 "enabled":{
+                    "type":"boolean",
+                    "default":false
+                 },
+                 "locationHostSuffixAllowlist":{
+                    "type":"array",
+                    "items":{
+                       "type":"string",
+                       "minLength":1
+                    },
+                    "description":"Location header URL must contain one of these substrings (case-insensitive) before an unauthenticated follow-up GET."
+                 }
+              }
+           },
+           "followNestedJsonStringUrl":{
+              "type":"object",
+              "additionalProperties":false,
+              "properties":{
+                 "enabled":{
+                    "type":"boolean",
+                    "default":false
+                 },
+                 "jsonKeys":{
+                    "type":"array",
+                    "items":{
+                       "type":"string",
+                       "minLength":1
+                    },
+                    "description":"JSON object key names searched depth-first for a non-empty string URL."
+                 },
+                 "targetUrlHostSuffixAllowlist":{
+                    "type":"array",
+                    "items":{
+                       "type":"string",
+                       "minLength":1
+                    },
+                    "description":"Discovered URL must contain one of these substrings before an unauthenticated follow-up GET."
+                 }
+              }
+           },
+           "followNativeHttpRedirect302":{
+              "type":"object",
+              "additionalProperties":false,
+              "properties":{
+                 "enabled":{
+                    "type":"boolean",
+                    "default":false
+                 },
+                 "locationHostSuffixAllowlist":{
+                    "type":"array",
+                    "items":{
+                       "type":"string",
+                       "minLength":1
+                    },
+                    "description":"Native httpx 302 Location URL must contain one of these substrings before follow-up GET."
+                 }
+              }
+           }
+        }
+     },
      "metadataSchemaNode":{
         "type":"object",
         "description":"Strict supported subset of JSON Schema for metadataSchema.",
@@ -1829,6 +1918,9 @@
                     "additionalProperties":{
                        "type":"string"
                     }
+                 },
+                 "httpResponseNormalization":{
+                    "$ref":"#/$defs/httpResponseNormalization"
                  }
               },
               "allOf":[

package/lib/schema/external-system.schema.json

@@ -7,12 +7,12 @@
      "key":"external-system-schema",
      "name":"External System Configuration Schema",
      "description":"JSON schema for validating ExternalSystem configuration files",
-     "version":"1.6.0",
+     "version":"1.6.2",
      "type":"schema",
      "category":"integration",
      "author":"AI Fabrix Team",
      "createdAt":"2024-01-01T00:00:00Z",
-     "updatedAt":"2026-04-09T00:00:00Z",
+     "updatedAt":"2026-04-23T00:00:00Z",
      "compatibility":{
         "minVersion":"1.4.0",
         "maxVersion":"2.0.0",
@@ -29,6 +29,20 @@
         
      ],
      "changelog":[
+        {
+           "version":"1.6.2",
+           "date":"2026-04-23T00:00:00Z",
+           "changes":[
+              "certification.algorithm: RS256 only (removed HS256 from enum)"
+           ]
+        },
+        {
+           "version":"1.6.1",
+           "date":"2026-04-22T00:00:00Z",
+           "changes":[
+              "Optional certification.publicKeyFingerprint (sha256: hex of SPKI DER) for RS256 public key verification"
+           ]
+        },
         {
            "version":"1.6.0",
            "date":"2026-04-09T00:00:00Z",
@@ -679,15 +693,24 @@
            "publicKey":{
               "type":"string",
               "minLength":1,
-              "description":"Public verification material (SPKI PEM for RS256; dev placeholder for HS256). Private keys must never appear in config."
+              "description":"Public verification material (SPKI PEM for RS256). Private keys must never appear in config."
+           },
+           "publicKeyFingerprint":{
+              "type":"string",
+              "pattern":"^sha256:[0-9a-f]{64}$",
+              "description":"SHA-256 fingerprint of the SubjectPublicKeyInfo DER (same convention as integration certificate publicKeyFingerprint); must match embedded publicKey."
+           },
+           "contractHash":{
+              "type":"string",
+              "pattern":"^sha256:[0-9a-f]{64}$",
+              "description":"Optional copy of the active integration certificate contractHash (certification contract material digest) for drift checks; should match the dataplane active trusted certificate when present."
            },
            "algorithm":{
               "type":"string",
               "enum":[
-                 "RS256",
-                 "HS256"
+                 "RS256"
               ],
-              "description":"Signing algorithm for certificate verification (RS256 in production; HS256 only for local dev when the dataplane uses the dev HMAC signer)."
+              "description":"Signing algorithm for integration certificate verification (RS256 only)."
            },
            "issuer":{
               "type":"string",

package/lib/schema/flag-map-validation-run.json

@@ -11,8 +11,7 @@
     { "cliFlag": "--timeout <ms>", "requestField": null, "note": "Client aggregate HTTP budget (POST + polls)" },
     { "cliFlag": "--debug [level]", "requestField": "includeDebug", "default": false, "note": "summary|full|raw affects TTY appendix only; any presence sets includeDebug" },
     { "cliFlag": "--no-async", "requestField": "asyncRun", "note": "When true on CLI, omit asyncRun or set false; sync-only POST" },
-    { "cliFlag": "--test-crud", "requestField": "e2eOptions.testCrud", "runType": "e2e" },
-    { "cliFlag": "--record-id", "requestField": "e2eOptions.recordId", "runType": "e2e" },
+    { "cliFlag": "--no-run-scenarios", "requestField": "e2eOptions.runScenarios", "runType": "e2e" },
     { "cliFlag": "--no-cleanup", "requestField": "e2eOptions.cleanup", "runType": "e2e" },
     { "cliFlag": "--primary-key-value", "requestField": "e2eOptions.primaryKeyValue", "runType": "e2e" },
     { "cliFlag": "--capability <key>", "requestField": "e2eOptions.capabilityKeys", "runType": "e2e", "note": "Single key forwarded as capabilityKeys array in request body when set" },

package/lib/schema/type/document-storage.json

@@ -7,12 +7,12 @@
     "key": "document-storage-schema",
     "name": "Document Storage Configuration Schema",
     "description": "JSON schema for validating document storage configurations",
-    "version": "1.3.0",
+    "version": "1.7.0",
     "type": "schema",
     "category": "document-storage",
     "author": "AI Fabrix Team",
     "createdAt": "2026-01-02T00:00:00Z",
-    "updatedAt": "2026-04-22T00:00:00Z",
+    "updatedAt": "2026-05-01T00:00:00Z",
     "compatibility": {
       "minVersion": "1.0.0",
       "maxVersion": "2.0.0",
@@ -71,6 +71,38 @@
           "Added optional parameterLookupCoalesceNestedItemScope (boolean, default true) for manifest-controlled binary parameter lookup enrichment"
         ],
         "breaking": false
+      },
+      {
+        "version": "1.4.0",
+        "date": "2026-04-26T00:00:00Z",
+        "changes": [
+          "Added optional maxBinaryFetchesPerSync (integer >= 1) to cap binary fetch+store operations per sync run"
+        ],
+        "breaking": false
+      },
+      {
+        "version": "1.5.0",
+        "date": "2026-04-27T00:00:00Z",
+        "changes": [
+          "ingestAfterSync: post-sync chunk+embed no longer waits on trust (eligibility/schema gates unchanged)"
+        ],
+        "breaking": false
+      },
+      {
+        "version": "1.6.0",
+        "date": "2026-04-28T00:00:00Z",
+        "changes": [
+          "Added documentStorage.changeDetection.ignoreMetadataKeys / ignoreMetadataPaths for stable contentHash when volatile metadata changes"
+        ],
+        "breaking": false
+      },
+      {
+        "version": "1.7.0",
+        "date": "2026-05-01T00:00:00Z",
+        "changes": [
+          "Added optional maxBinaryFetchConcurrency (integer >= 1, default 1) to bound parallel binary fetches in two-phase sync phase 3"
+        ],
+        "breaking": false
       }
     ]
   },
@@ -95,7 +127,18 @@
     "ingestAfterSync": {
       "type": "boolean",
       "default": false,
-      "description": "When true, chunk and embed each document after store during sync so vector search returns hits immediately. When false, ingestion runs later (e.g. Celery task or on approval). Set true for E2E tests that validate vector step."
+      "description": "When true, chunk and embed each document after store during sync without requiring trust promotion first; eligibility (validation/schema/dimensions) still enforced. When false, ingestion runs later."
+    },
+    "maxBinaryFetchesPerSync": {
+      "type": "integer",
+      "minimum": 1,
+      "description": "When set, caps binary fetch + store operations per sync run (metadata list may still return more rows). Optional for fast integration/E2E; omit in production for full sync."
+    },
+    "maxBinaryFetchConcurrency": {
+      "type": "integer",
+      "minimum": 1,
+      "default": 1,
+      "description": "Maximum concurrent binary CIP/HTTP fetches during two-phase sync phase 3. Default 1 (sequential). Increase cautiously; external APIs may throttle."
     },
     "binaryOperationRef": {
       "type": "string",
@@ -133,6 +176,22 @@
       "default": true,
       "description": "When true, binary parameterMapping and HTTP path templates use a lookup view that merges metadata and coalesces storage-scope ids from a nested item parentReference when the row's parentReference omits them. Set false for strict manifest-only paths."
     },
+    "jsonNestedDownloadUrlKeys": {
+      "type": "array",
+      "items": {
+        "type": "string",
+        "minLength": 1
+      },
+      "description": "Optional JSON object key names (exact match) searched depth-first when a binary GET returns JSON without bytes; requires preAuthenticatedDownloadUrlHostSuffixAllowlist. Merged into binaryOperation when using binaryOperationRef."
+    },
+    "preAuthenticatedDownloadUrlHostSuffixAllowlist": {
+      "type": "array",
+      "items": {
+        "type": "string",
+        "minLength": 1
+      },
+      "description": "Substrings the discovered follow-up URL must contain (case-insensitive) before an unauthenticated GET. Required when jsonNestedDownloadUrlKeys is set."
+    },
     "processing": {
       "type": "object",
       "properties": {
@@ -219,6 +278,27 @@
         }
       },
       "additionalProperties": false
+    },
+    "changeDetection": {
+      "type": "object",
+      "description": "Optional configuration to ignore volatile metadata keys/paths during contentHash / change detection only.",
+      "properties": {
+        "ignoreMetadataKeys": {
+          "type": "array",
+          "description": "Top-level metadata keys to ignore when computing contentHash / change detection.",
+          "items": { "type": "string", "minLength": 1 },
+          "uniqueItems": true,
+          "default": []
+        },
+        "ignoreMetadataPaths": {
+          "type": "array",
+          "description": "Optional dot-path patterns to ignore (e.g. 'analytics.*', 'versions').",
+          "items": { "type": "string", "minLength": 1 },
+          "uniqueItems": true,
+          "default": []
+        }
+      },
+      "additionalProperties": false
     }
   },
   "additionalProperties": false

package/lib/utils/configuration-env-resolver.js

@@ -113,6 +113,43 @@ function resolveConfigurationValues(configArray, envMap, secrets, systemKey) {
   }
 }
 
+/**
+ * Collects `configuration[]` entry names with `location: "variable"` whose values look
+ * resolved for publish (literal strings: no `{{`, not `kv://`, non-empty). Used after
+ * `resolveConfigurationValues` mutates the upload payload.
+ *
+ * @param {{ application?: { configuration?: unknown[] }, dataSources?: unknown[] }} payload - Pipeline upload payload
+ * @returns {string[]} Unique names in encounter order (application first, then dataSources)
+ */
+function collectResolvedVariableConfigurationNames(payload) {
+  const out = [];
+  const seen = new Set();
+
+  function consider(arr) {
+    if (!Array.isArray(arr)) return;
+    for (const item of arr) {
+      if (!item || typeof item !== 'object') continue;
+      if (String(item.location || '').toLowerCase() !== 'variable') continue;
+      const name = item.name && String(item.name).trim();
+      if (!name || seen.has(name)) continue;
+      const val = item.value;
+      if (typeof val !== 'string') continue;
+      const trimmed = val.trim();
+      if (!trimmed) continue;
+      if (trimmed.startsWith('kv://')) continue;
+      if (trimmed.includes('{{')) continue;
+      seen.add(name);
+      out.push(name);
+    }
+  }
+
+  consider(payload?.application?.configuration);
+  for (const ds of payload?.dataSources || []) {
+    consider(ds?.configuration);
+  }
+  return out;
+}
+
 /**
  * Returns the set of variable names (keys) defined in env.template content.
  *
@@ -175,6 +212,7 @@ async function retemplateConfigurationForDownload(systemKey, configArray) {
 module.exports = {
   buildResolvedEnvMapForIntegration,
   resolveConfigurationValues,
+  collectResolvedVariableConfigurationNames,
   getEnvTemplateVariableNames,
   retemplateConfigurationFromEnvTemplate,
   retemplateConfigurationForDownload,

package/lib/utils/dataplane-resolver.js

@@ -17,11 +17,12 @@ const { discoverDataplaneUrl } = require('../commands/wizard-dataplane');
  * @param {string} controllerUrl - Controller URL
  * @param {string} environment - Environment key
  * @param {Object} authConfig - Authentication configuration
+ * @param {{ silent?: boolean }} [opts] - Passed to discoverDataplaneUrl
  * @returns {Promise<string>} Resolved dataplane URL
  * @throws {Error} If dataplane URL cannot be resolved
  */
-async function resolveDataplaneUrl(controllerUrl, environment, authConfig) {
-  return await discoverDataplaneUrl(controllerUrl, environment, authConfig);
+async function resolveDataplaneUrl(controllerUrl, environment, authConfig, opts = {}) {
+  return await discoverDataplaneUrl(controllerUrl, environment, authConfig, opts);
 }
 
 module.exports = {

package/lib/utils/datasource-test-run-capacity-operations.js

@@ -0,0 +1,149 @@
+/**
+ * @fileoverview Capacity scenario outcome lines for DatasourceTestRun TTY (shared by header + debug appendix).
+ * @author AI Fabrix Team
+ * @version 2.0.0
+ */
+
+'use strict';
+
+const chalk = require('chalk');
+const { successGlyph, failureGlyph } = require('./cli-test-layout-chalk');
+const {
+  getCipCapacityDisplayConfig,
+  standardOperationRank,
+  parseCapacityDetailKey
+} = require('./load-cip-capacity-display-config');
+
+/**
+ * @param {string} op
+ * @returns {string}
+ */
+function formatCapacityOperationLabel(op) {
+  const { aliases } = getCipCapacityDisplayConfig();
+  return (aliases && aliases[op]) || op;
+}
+
+/**
+ * @param {Object} envelope
+ * @returns {object|null}
+ */
+function findCapacityStep(envelope) {
+  const dbg = envelope && envelope.debug;
+  const e2e = dbg && dbg.e2eAsyncDebug;
+  const stepDebug = e2e && Array.isArray(e2e.stepDebug) ? e2e.stepDebug : [];
+  return stepDebug.find(s => s && String(s.name) === 'capacity') || null;
+}
+
+/**
+ * @param {object[]} rows
+ * @param {string} datasourceKey
+ * @returns {object[]}
+ */
+function filterCapacityDatasourceRows(rows, datasourceKey) {
+  if (!datasourceKey) return rows;
+  const matched = rows.filter(r => r && String(r.key) === datasourceKey);
+  return matched.length ? matched : rows;
+}
+
+/**
+ * @param {object[]} dsRows
+ * @returns {Map<string, { ok: boolean, error: string, minIndex: number }>}
+ */
+function mergeCapacityDetailsByOp(dsRows) {
+  /** @type {Map<string, { ok: boolean, error: string, minIndex: number }>} */
+  const byOp = new Map();
+  for (const ds of dsRows) {
+    const details = ds && Array.isArray(ds.capabilityDetails) ? ds.capabilityDetails : [];
+    for (const row of details) {
+      if (!row || row.key === undefined || row.key === null) continue;
+      const parsed = parseCapacityDetailKey(String(row.key));
+      if (!parsed) continue;
+      const { op, index } = parsed;
+      const ok = row.success !== false && !row.error;
+      const err = row.error ? String(row.error) : '';
+      const prev = byOp.get(op);
+      if (!prev) {
+        byOp.set(op, { ok, error: ok ? '' : err, minIndex: index });
+      } else {
+        byOp.set(op, {
+          ok: prev.ok && ok,
+          error: prev.error || err,
+          minIndex: Math.min(prev.minIndex, index)
+        });
+      }
+    }
+  }
+  return byOp;
+}
+
+/**
+ * @param {string[]} standardOrder
+ * @param {Map<string, { minIndex: number }>} byOp
+ * @returns {(a: string, b: string) => number}
+ */
+function capacityOpComparator(standardOrder, byOp) {
+  return (a, b) => {
+    const ia = byOp.get(a).minIndex;
+    const ib = byOp.get(b).minIndex;
+    if (ia !== ib) return ia - ib;
+    const ra = standardOperationRank(standardOrder, a);
+    const rb = standardOperationRank(standardOrder, b);
+    if (ra !== rb) return ra - rb;
+    return a.localeCompare(b);
+  };
+}
+
+/**
+ * @param {string[]} lines
+ * @param {Map<string, { ok: boolean, error: string }>} byOp
+ * @param {string[]} opsSorted
+ */
+function appendCapacityOperationsLines(lines, byOp, opsSorted) {
+  lines.push('');
+  lines.push(chalk.blue.bold('Capacity operations:'));
+  for (const op of opsSorted) {
+    const row = byOp.get(op);
+    const label = formatCapacityOperationLabel(op);
+    const sym = row.ok ? successGlyph() : failureGlyph();
+    const tail = row.ok ? '' : chalk.red(` — ${row.error || 'failed'}`);
+    lines.push(`  ${sym} ${chalk.white(label)}${tail}`);
+  }
+}
+
+/**
+ * List capacity scenario outcomes from the capacity step (order: scenario index `#`, then schema op order).
+ * @param {string[]} lines
+ * @param {Object} envelope
+ */
+function pushCapacityOperationsSummaryLines(lines, envelope) {
+  const capStep = findCapacityStep(envelope);
+  if (!capStep || !capStep.evidence || !Array.isArray(capStep.evidence.datasources)) return;
+
+  const dk =
+    envelope && envelope.datasourceKey !== undefined && envelope.datasourceKey !== null
+      ? String(envelope.datasourceKey)
+      : '';
+  const dsRows = filterCapacityDatasourceRows(capStep.evidence.datasources, dk);
+  const byOp = mergeCapacityDetailsByOp(dsRows);
+  if (!byOp.size) return;
+
+  const { standardOrder } = getCipCapacityDisplayConfig();
+  const opsSorted = Array.from(byOp.keys()).sort(capacityOpComparator(standardOrder, byOp));
+  appendCapacityOperationsLines(lines, byOp, opsSorted);
+}
+
+/**
+ * @param {string} capacityKey
+ * @returns {string|null}
+ */
+function parseCapacityScenarioOp(capacityKey) {
+  const p = parseCapacityDetailKey(String(capacityKey));
+  return p ? p.op : null;
+}
+
+module.exports = {
+  pushCapacityOperationsSummaryLines,
+  formatCapacityOperationLabel,
+  parseCapacityScenarioOp,
+  parseCapacityDetailKey
+};