@arela/uploader 1.0.22 → 1.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arela/uploader",
-  "version": "1.0.22",
+  "version": "1.0.23",
   "description": "CLI to upload files/directories to Arela",
   "bin": {
     "arela": "./src/index.js"

package/src/commands/IdentifyCommand.js

@@ -10,9 +10,7 @@ import { ConfigurationError } from '../errors/ErrorTypes.js';
 import FileDetectionService from '../file-detection.js';
 
 /**
- * Paid pedimento detected_type values. `pedimento_completo_xml` is included
- * even though the XML matcher is currently disabled in the registry so that
- * re-enabling it requires no changes here.
+ * Paid pedimento detected_type values.
  */
 const DETECTED_PEDIMENTO_TYPES = new Set([
   'pedimento_simplificado',
@@ -543,13 +541,15 @@ export class IdentifyCommand {
 
     // Check if the text contains any required pedimento marker. This must
     // stay aligned with the `match()` predicates in pedimento-simplificado.js
-    // and pedimento-completo.js.
+    // and pedimento-completo.js (which accept both "DE" and "DEL" in the
+    // title, and treat the colon after "T. OPER" as optional).
     const text = result.text || '';
-    const hasSimplificadoMarker = /FORMA SIMPLIFICADA DE PEDIMENTO/i.test(text);
+    const hasSimplificadoMarker =
+      /FORMA\s+SIMPLIFICADA\s+DEL?\s+PEDIMENTO/i.test(text);
     const hasCompletoMarkers =
       /NUM\.?\s*PEDIMENTO:/i.test(text) &&
       /CVE\.?\s*PEDIMENTO:/i.test(text) &&
-      /T\.?\s*OPER:/i.test(text);
+      /T\.?\s*OPER:?/i.test(text);
 
     return !hasSimplificadoMarker && !hasCompletoMarkers;
   }

package/src/commands/ScanCommand.js

@@ -579,6 +579,9 @@ export class ScanCommand {
    * Normalize file record for database insertion
    * Stores paths with forward slashes for consistency but keeps them absolute
    * Sets likelySimplificado to true if file is a PDF and filename contains 'simp'
+   * Sets likelyInterAgencia to true if filename matches an inter-agency CFDI
+   * pattern (e.g. SICINGR*), so the API forces these XML/PDF through detection
+   * even though they lack the 'simp/pedim/covefact' heuristic.
    * @private
    */
   #normalizeFileRecord(filePath, fileStats, basePath, scanTimestamp) {
@@ -600,6 +603,17 @@ export class ScanCommand {
     const likelySimplificado =
       fileExtension === 'pdf' && /(simp|pedim|covefact)/i.test(fileName);
 
+    // Flag inter-agency CFDIs by filename so detection picks them up.
+    // Patterns are configurable via SCAN_INTER_AGENCIA_PATTERNS env var
+    // (see config.js). Only meaningful for PDF and XML.
+    let likelyInterAgencia = false;
+    if (fileExtension === 'pdf' || fileExtension === 'xml') {
+      const patterns = appConfig.scan.interAgenciaPatterns;
+      if (patterns && patterns.length > 0) {
+        likelyInterAgencia = patterns.some((re) => re.test(fileName));
+      }
+    }
+
     return {
       fileName,
       fileExtension,
@@ -610,6 +624,7 @@ export class ScanCommand {
       modifiedAt: fileStats.mtime.toISOString(),
       scanTimestamp,
       likelySimplificado,
+      likelyInterAgencia,
     };
   }
 

package/src/config/config.js

@@ -37,10 +37,10 @@ class Config {
       const __dirname = path.dirname(__filename);
       const packageJsonPath = path.resolve(__dirname, '../../package.json');
       const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
-      return packageJson.version || '1.0.22';
+      return packageJson.version || '1.0.23';
     } catch (error) {
       console.warn('⚠️ Could not read package.json version, using fallback');
-      return '1.0.22';
+      return '1.0.23';
     }
   }
 
@@ -294,6 +294,31 @@ class Config {
       .map((p) => p.trim())
       .filter(Boolean);
 
+    // Parse inter-agency CFDI filename patterns. Files whose basename matches
+    // any of these regex patterns are flagged at scan time (likelyInterAgencia)
+    // so the API forces them through detection and the factura_inter_agencia
+    // matcher can classify them. The push pipeline then excludes them (see
+    // NON_PUSHABLE_TYPES_SQL in arela-api). Comma-separated regex source list.
+    // Default: ^SICINGR — covers NORCOM's SICINGR70-NNNNNN(...).pdf/.XML files.
+    const defaultInterAgenciaPatterns = '^SICINGR';
+    const interAgenciaPatterns = (
+      process.env.SCAN_INTER_AGENCIA_PATTERNS || defaultInterAgenciaPatterns
+    )
+      .split(',')
+      .map((p) => p.trim())
+      .filter(Boolean)
+      .map((p) => {
+        try {
+          return new RegExp(p, 'i');
+        } catch (err) {
+          console.warn(
+            `⚠️ Invalid SCAN_INTER_AGENCIA_PATTERNS regex "${p}": ${err.message}`,
+          );
+          return null;
+        }
+      })
+      .filter(Boolean);
+
     // Generate table name if all components are available
     // Note: This is just for reference; actual table names are generated dynamically
     // in ScanCommand based on discovered directories and levels
@@ -312,6 +337,7 @@ class Config {
       basePathFull: basePathLabel, // Renamed for consistency
       tableName,
       excludePatterns,
+      interAgenciaPatterns,
       batchSize: parseInt(process.env.SCAN_BATCH_SIZE) || 2000,
       directoryLevel: parseInt(process.env.SCAN_DIRECTORY_LEVEL) || 0,
     };

package/src/document-type-shared.js

@@ -1,10 +1,10 @@
 // Import all document type definitions
 import { dodaPdfDefinition } from './document-types/doda-pdf.js';
 import { dodaXmlDefinition } from './document-types/doda-xml.js';
+import { facturaInterAgenciaDefinition } from './document-types/factura-inter-agencia.js';
 import { facturasComerciales } from './document-types/facturas-comerciales.js';
+import { pedimentoCompletoXmlDefinition } from './document-types/pedimento-completo-xml.js';
 import { pedimentoCompletoDefinition } from './document-types/pedimento-completo.js';
-// TODO: enable XML pedimento detection — implementation ready in pedimento-completo-xml.js
-// import { pedimentoCompletoXmlDefinition } from './document-types/pedimento-completo-xml.js';
 import { pedimentoSimplificadoDefinition } from './document-types/pedimento-simplificado.js';
 import { proformaDefinition } from './document-types/proforma.js';
 import { supportDocumentDefinition } from './document-types/support-document.js';
@@ -45,14 +45,14 @@ export class DocumentTypeDefinition {
 const documentTypes = [
   pedimentoSimplificadoDefinition,
   pedimentoCompletoDefinition,
-  // TODO: enable XML pedimento detection — uncomment the next line and the
-  // matching import at the top of this file. All downstream code
-  // (composeArelaPath, arela-api SQL filters, IdentifyCommand counters)
-  // already accepts `pedimento_completo_xml`.
-  // pedimentoCompletoXmlDefinition,
+  pedimentoCompletoXmlDefinition,
   supportDocumentDefinition,
   dodaPdfDefinition,
   dodaXmlDefinition,
+  // factura_inter_agencia MUST be evaluated BEFORE facturasComerciales
+  // because a NORCOM↔PALCO CFDI would also match the generic commercial
+  // invoice matcher. First match wins (see extractDocumentFields).
+  facturaInterAgenciaDefinition,
   facturasComerciales,
   // Add more document types here as needed
 ];
@@ -114,6 +114,14 @@ export function extractDocumentFields(source, fileExtension, filePath) {
         ? docType.extractPedimentoYear(source, fields, filePath)
         : null;
 
+      // Ensure downstream code (composeArelaPath) sees `numPedimento` as a
+      // field. PDF matchers add it via an explicit extractor; XML matchers
+      // compose it externally via extractNumPedimento. Backfill so both paths
+      // expose the same shape.
+      if (pedimento && !fields.some((f) => f.name === 'numPedimento')) {
+        fields.push(new FieldResult('numPedimento', true, pedimento));
+      }
+
       return [resolvedType, fields, pedimento, year];
     }
   }

package/src/document-types/_pedimento-shared-extractors.js

@@ -186,15 +186,34 @@ export const paymentDateExtractor = {
   field: 'paymentDate',
   extract: (source) => {
     const patterns = [
-      /FECHA\s+DE\s+PAGO:?\s*(\d{2}\/\d{2}\/\d{4})/i,
-      /FECHA\s+DE\s+PAGO:?\s*(\d{4}\/\d{2}\/\d{2})/i,
-      /2\s+PAGO:\s*(\d{2}\/\d{2}\/\d{4})/,
-      /(?:^|\n)\s*PAGO\s+(\d{2}\/\d{2}\/\d{4})/i,
-      /PRESENTACION:\s*(\d{2}\/\d{2}\/\d{4})/i,
+      /FECHA\s+DE\s+PAGO:?\s*(\d{2}\/\d{2}\/\d{4})/i, // 0: explicit label DD/MM/YYYY
+      /FECHA\s+DE\s+PAGO:?\s*(\d{4}\/\d{2}\/\d{2})/i, // 1: explicit label YYYY/MM/DD
+      /2\s+PAGO:\s*(\d{2}\/\d{2}\/\d{4})/, // 2: forma simplificada scheduled date ⚠️
+      /(?:^|\n)\s*PAGO\s+(\d{2}\/\d{2}\/\d{4})/i, // 3: PAGO at line start (original)
+      /(?<=\d)PAGO\s+(\d{2}\/\d{2}\/\d{4})/i, // 4: PAGO after digit (pdf-parse artifact)
+      /(\d{2}\/\d{2}\/\d{4})[ \t]+PAGO[ \t]*$/im, // 5: reversed layout — date before PAGO (FECHAS column)
+      // 6: forma simplificada — pdf-parse extracts table cells out of order, so the
+      // label "FECHA DE PAGO:" can appear on its own line and the value (along with
+      // other cells like línea de captura, pedimento, importe) follows several lines
+      // later. Take the FIRST dd/mm/yyyy after the label within a 400-char window.
+      // Safe because `isNoPagado` short-circuits documents without a real payment,
+      // so we won't grab the unrelated ENTRADA date from the "FECHAS:" block above.
+      /FECHA\s+DE\s+PAGO:[\s\S]{1,400}?(\d{2}\/\d{2}\/\d{4})/i,
+      /PRESENTACION:\s*(\d{2}\/\d{2}\/\d{4})/i, // 7: fallback
     ];
-    for (const re of patterns) {
-      const m = source.match(re);
-      if (m) return new FieldResult('paymentDate', true, m[1]);
+    // "*** NO PAGADO" is the explicit SAT marker that no payment has been
+    // certified. When present, the bank-certification block is physically
+    // absent, so any date matched by the fallback patterns (e.g.
+    // "2 PAGO:" with a scheduled date, or "PRESENTACION:") would be a false
+    // positive. Return null outright — the document is classified as proforma.
+    const isNoPagado = /\*{3}\s*NO\s+PAGADO/i.test(source);
+    if (isNoPagado) {
+      return new FieldResult('paymentDate', false, null);
+    }
+    for (const pattern of patterns) {
+      const m = source.match(pattern);
+      if (!m) continue;
+      return new FieldResult('paymentDate', true, m[1]);
     }
     return new FieldResult('paymentDate', false, null);
   },

package/src/document-types/factura-inter-agencia.js

@@ -0,0 +1,186 @@
+// NOTE: We intentionally do NOT import `FieldResult` from
+// '../document-type-shared.js' to avoid a circular-import TDZ when this
+// module is imported directly (e.g. from unit tests). `FieldResult` is a
+// plain data-class with shape `{ name, found, value }`, so we construct
+// equivalent plain objects locally.
+const fieldResult = (name, found, value) => ({ name, found, value });
+
+/**
+ * Factura Inter-Agencia Document Type Definition
+ *
+ * Detects CFDIs (XML or PDF) issued between customs broker agencies (e.g.,
+ * NORCOM ↔ PALCO). These files are dropped into a pedimento folder by the
+ * broker but they are NOT part of the customs electronic file (expediente
+ * aduanal) — they are inter-agency billing for broker services.
+ *
+ * Detection rules (ALL required):
+ *   1) CFDI markers present (either xml structure or PDF text representation)
+ *   2) Both emisor and receptor RFCs belong to the configured agency pair
+ *      (NAA120215F20 = NORCOM, PCC1008161WA = PALCO) in any direction.
+ *   3) At least one concepto with ClaveProdServ 78141502 (Servicios de
+ *      agentes aduaneros) — confirms the billing is for broker services.
+ *
+ * IMPORTANT: This matcher MUST be registered BEFORE `facturasComerciales`
+ * in document-type-shared.js — both would match a CFDI in a pedimento
+ * folder, but inter-agency invoices must take precedence so they are
+ * filtered out of the Arela push pipeline (see arela-api
+ * NON_PUSHABLE_TYPES_SQL).
+ *
+ * Currently scope-limited to NORCOM↔PALCO. To widen, move INTER_AGENCIA_RFCS
+ * to env config and require ≥2 distinct RFCs from the configured list.
+ */
+
+/**
+ * RFCs of agencies whose mutual invoices should be excluded from the Arela
+ * push pipeline. Order is irrelevant — a match is any pair of distinct RFCs
+ * from this set appearing as emisor and receptor.
+ */
+export const INTER_AGENCIA_RFCS = ['NAA120215F20', 'PCC1008161WA'];
+
+const BROKER_SERVICE_CLAVE_PROD_SERV = '78141502';
+
+const CFDI_XML_MARKERS = [
+  /cfdi:Comprobante/i,
+  /xmlns:cfdi/i,
+  /TipoDeComprobante/i,
+];
+
+/**
+ * Detect that the source represents a CFDI — either as the original XML
+ * structure or as text extracted from a printed CFDI (PDF representation).
+ *
+ * PDF text loses XML tags, so we look for the human-readable equivalents
+ * commonly rendered by SAT-style invoice templates ("Folio Fiscal", "Sello
+ * Digital del CFDI", "Cadena Original ... Certificacion Digital del SAT").
+ */
+function isCfdiContent(source) {
+  const xmlHits = CFDI_XML_MARKERS.filter((re) => re.test(source)).length;
+  if (xmlHits >= 2) return true;
+
+  const pdfMarkers = [
+    /folio\s*fiscal/i,
+    /sello\s*digital\s*del\s*cfdi/i,
+    /cadena\s*original.*certificaci[oó]n\s*digital\s*del\s*sat/i,
+    /representaci[oó]n\s*impresa\s*de\s*un\s*cfdi/i,
+  ];
+  return pdfMarkers.filter((re) => re.test(source)).length >= 2;
+}
+
+/**
+ * Return the subset of INTER_AGENCIA_RFCS that appear in `source`. Matching is
+ * case-insensitive and uses word boundaries so substrings inside larger tokens
+ * (cert/sello base64) don't produce false positives.
+ */
+function findInterAgenciaRfcs(source) {
+  const found = new Set();
+  for (const rfc of INTER_AGENCIA_RFCS) {
+    const re = new RegExp(`\\b${rfc}\\b`, 'i');
+    if (re.test(source)) found.add(rfc.toUpperCase());
+  }
+  return [...found];
+}
+
+export const facturaInterAgenciaDefinition = {
+  type: 'factura_inter_agencia',
+  extensions: ['xml', 'pdf'],
+
+  match: (source) => {
+    if (!isCfdiContent(source)) return false;
+
+    // Need ≥2 distinct configured RFCs present (one as emisor, one as receptor)
+    const rfcsFound = findInterAgenciaRfcs(source);
+    if (rfcsFound.length < 2) return false;
+
+    // Confirm the invoice is for broker services (customs agent services)
+    if (!source.includes(BROKER_SERVICE_CLAVE_PROD_SERV)) return false;
+
+    return true;
+  },
+
+  // Pedimento extraction is optional / informational — these files are
+  // excluded from push, so arela_path is never composed. We still extract
+  // a pedimento number when present (from the "Referencias" / "Pedimento:"
+  // section of the printable CFDI) for auditability.
+  extractNumPedimento: (source, fields) => {
+    return fields?.find((f) => f.name === 'numPedimento')?.value ?? null;
+  },
+
+  extractPedimentoYear: (source, fields) => {
+    const numPedimento = fields?.find((f) => f.name === 'numPedimento')?.value;
+    if (numPedimento && numPedimento.length >= 2) {
+      const yy = parseInt(numPedimento.substring(0, 2), 10);
+      if (!isNaN(yy)) return yy < 50 ? yy + 2000 : yy + 1900;
+    }
+    return null;
+  },
+
+  extractors: [
+    {
+      field: 'rfcEmisor',
+      extract: (source) => {
+        // XML form: <cfdi:Emisor Rfc="..." />
+        const xmlMatch = source.match(
+          /<[^>]*Emisor[^>]*Rfc\s*=\s*["']([A-ZÑ&]{3,4}\d{6}[A-Z0-9]{3})["']/i,
+        );
+        if (xmlMatch) return fieldResult('rfcEmisor', true, xmlMatch[1]);
+
+        // PDF form: "Emisor" section followed by RFC label/value on later lines.
+        // We pick the first INTER_AGENCIA RFC that appears in the document.
+        const rfcs = findInterAgenciaRfcs(source);
+        if (rfcs.length > 0) return fieldResult('rfcEmisor', true, rfcs[0]);
+
+        return fieldResult('rfcEmisor', false, null);
+      },
+    },
+    {
+      field: 'rfcReceptor',
+      extract: (source) => {
+        const xmlMatch = source.match(
+          /<[^>]*Receptor[^>]*Rfc\s*=\s*["']([A-ZÑ&]{3,4}\d{6}[A-Z0-9]{3})["']/i,
+        );
+        if (xmlMatch) return fieldResult('rfcReceptor', true, xmlMatch[1]);
+
+        const rfcs = findInterAgenciaRfcs(source);
+        if (rfcs.length >= 2) {
+          return fieldResult('rfcReceptor', true, rfcs[1]);
+        }
+        return fieldResult('rfcReceptor', false, null);
+      },
+    },
+    {
+      field: 'folio',
+      extract: (source) => {
+        // CFDI Folio attribute
+        const xmlMatch = source.match(/\bFolio\s*=\s*["']([A-Z0-9-]+)["']/i);
+        if (xmlMatch) return fieldResult('folio', true, xmlMatch[1]);
+
+        // PDF: "Numero Folio    012749"
+        const pdfMatch = source.match(/Numero\s+Folio\s+([A-Z0-9-]+)/i);
+        if (pdfMatch) return fieldResult('folio', true, pdfMatch[1]);
+
+        return fieldResult('folio', false, null);
+      },
+    },
+    {
+      field: 'uuid',
+      extract: (source) => {
+        const uuidRe =
+          /[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}/i;
+        const m = source.match(uuidRe);
+        return fieldResult('uuid', !!m, m ? m[0].toUpperCase() : null);
+      },
+    },
+    {
+      field: 'numPedimento',
+      extract: (source) => {
+        // Printable CFDI "Pedimento: 3458 6000046 Fecha: ..." — recovers an
+        // 11-digit pedimento (no YY prefix). Useful for auditability only.
+        const m = source.match(/Pedimento:?\s*(\d{4})\s*(\d{7})/i);
+        if (m) {
+          return fieldResult('numPedimento', true, `${m[1]}${m[2]}`);
+        }
+        return fieldResult('numPedimento', false, null);
+      },
+    },
+  ],
+};

package/src/document-types/pedimento-completo-xml.js

@@ -1,10 +1,8 @@
 // VUCEM "consultarPedimentoCompleto" XML matcher.
 //
-// STATUS: implemented but NOT registered in `document-type-shared.js`. To
-// activate, uncomment the import + registration in that file. All downstream
-// code (composeArelaPath, arela-api propagation SQL, IdentifyCommand
-// counters) already includes `pedimento_completo_xml`, so re-enabling is a
-// single-line change.
+// Registered in `document-type-shared.js`. Downstream code
+// (composeArelaPath, arela-api propagation SQL, IdentifyCommand counters)
+// also includes `pedimento_completo_xml`.
 //
 // Filename patterns recognized (try in order — patente extraction):
 //   1) VU_PATENTE_ADUANA_PEDIMENTO.xml          → e.g. VU_3429_070_5016101.xml
@@ -47,6 +45,22 @@ function pad(value, length) {
   return String(value).padStart(length, '0');
 }
 
+/**
+ * Convert a VUCEM `aduanaEntradaSalida.clave` (e.g. "70", "750", "40") to the
+ * 2-digit "sección aduanera" prefix used inside the 15-digit pedimento number.
+ *
+ *   VUCEM strips leading zeros from the canonical 3-digit SAT aduana code,
+ *   so `070` (Ciudad Juárez) arrives as `70`. The pedimento prefix is the
+ *   first 2 digits of the 3-digit code:
+ *     `70`  → `070` → `07`   (Cd. Juárez)
+ *     `750` → `750` → `75`   (Puebla)
+ *     `40`  → `040` → `04`   (Lázaro Cárdenas)
+ */
+function aduanaToSeccion(claveValue) {
+  if (claveValue == null) return null;
+  return pad(claveValue, 3).substring(0, 2);
+}
+
 /**
  * Try the three known filename patterns and return {patente, aduana, pedimento}
  * with any subset of the fields populated. Returns null if no pattern matches.
@@ -102,12 +116,17 @@ function yyFromIsoDate(iso) {
   return m ? m[1].substring(2, 4) : null;
 }
 
-// Find <ns2:fechas> block with nested clave==2 and return its <ns2:fecha>.
-function findPaymentDate(source) {
+// Find <ns2:fechas> block whose nested <clave> matches `claveValue` and
+// return its <ns2:fecha>. Works for both shapes:
+//   <fechas><clave>N</clave><fecha>...</fecha></fechas>
+//   <fechas><fecha>...</fecha><tipo><clave>N</clave></tipo></fechas>
+// (firstTag finds the FIRST <clave> in the block — both layouts expose only
+//  one clave per fechas entry.)
+function findFechaByClave(source, claveValue) {
   const fechasBlocks = allTagBlocks(source, 'fechas');
   for (const block of fechasBlocks) {
     const clave = firstTag(block, 'clave');
-    if (clave === '2') {
+    if (clave === claveValue) {
       const fecha = firstTag(block, 'fecha');
       if (fecha) return fecha;
     }
@@ -115,6 +134,18 @@ function findPaymentDate(source) {
   return null;
 }
 
+// Fecha de pago de las contribuciones (tipo.clave == 2).
+function findPaymentDate(source) {
+  return findFechaByClave(source, '2');
+}
+
+// Fecha de presentacion (tipo.clave == 5). This is the authoritative source
+// for the pedimento's YY prefix — a pedimento opened in Dec-2025 but paid in
+// Jan-2026 keeps the `25` prefix, matching what VUCEM stamps in the filename.
+function findPresentationDate(source) {
+  return findFechaByClave(source, '5');
+}
+
 // --------------------------- extractors ------------------------------------
 
 const rfcExtractor = {
@@ -152,7 +183,7 @@ const aduanaEntradaSalidaExtractor = {
     return new FieldResult(
       'aduanaEntradaSalida',
       !!clave,
-      clave ? pad(clave, 2) : null,
+      aduanaToSeccion(clave),
     );
   },
 };
@@ -165,6 +196,14 @@ const paymentDateExtractor = {
   },
 };
 
+const presentationDateExtractor = {
+  field: 'presentationDate',
+  extract: (source) => {
+    const fecha = findPresentationDate(source);
+    return new FieldResult('presentationDate', !!fecha, fecha);
+  },
+};
+
 const fechaPagoRectificacionExtractor = {
   field: 'fechaPagoRectificacion',
   extract: (source) => {
@@ -257,8 +296,14 @@ export const pedimentoCompletoXmlDefinition = {
 
   /**
    * Compose the 15-digit pedimento number from XML body + filename.
-   *   YY: from rectification fechaPago if present, else from the clave==2
-   *       payment-date fecha; falls back to filename pattern 3.
+   *   YY: priority order (most authoritative first):
+   *     1) Filename pattern 3 (`{15-digit}.xml`) — VUCEM stamps the correct
+   *        prefix at export time.
+   *     2) Fecha de presentacion (<fechas><clave>5) — the year the pedimento
+   *        was opened. Authoritative for the YY prefix even when payment
+   *        crosses calendar year (e.g. opened Dec-2025, paid Jan-2026 → YY=25).
+   *     3) Rectification fechaPago (only when no presentation date exists).
+   *     4) Payment date (last-resort fallback).
    *   AA: from <aduanaEntradaSalida><clave> padded to 2.
    *   PPPP: from the filename (any of the three patterns).
    *   NNNNNNN: from <pedimento> padded to 7.
@@ -267,15 +312,19 @@ export const pedimentoCompletoXmlDefinition = {
   extractNumPedimento: (source, fields, filePath) => {
     const parts = parseFilenameParts(filePath);
 
+    const presentation = fields?.find(
+      (f) => f.name === 'presentationDate' && f.found,
+    )?.value;
     const rect = fields?.find(
       (f) => f.name === 'fechaPagoRectificacion' && f.found,
     )?.value;
     const pay = fields?.find((f) => f.name === 'paymentDate' && f.found)?.value;
 
     let yy =
+      (parts && parts.year) ||
+      yyFromIsoDate(presentation) ||
       yyFromIsoDate(rect) ||
       yyFromIsoDate(pay) ||
-      (parts && parts.year) ||
       null;
 
     const aduanaField = fields?.find(
@@ -315,6 +364,7 @@ export const pedimentoCompletoXmlDefinition = {
     tipoOperacionExtractor,
     aduanaEntradaSalidaExtractor,
     paymentDateExtractor,
+    presentationDateExtractor,
     fechaPagoRectificacionExtractor,
     coveExtractor,
     numEDocumentoExtractor,

package/src/document-types/pedimento-completo.js

@@ -17,17 +17,19 @@ export const pedimentoCompletoDefinition = {
   type: 'pedimento_completo',
   extensions: ['pdf'],
   match: (source) => {
-    // Hard exclude: "FORMA SIMPLIFICADA" is handled by pedimento_simplificado.
-    if (/FORMA SIMPLIFICADA DE PEDIMENTO/i.test(source)) return false;
+    // Hard exclude: "FORMA SIMPLIFICADA [DE|DEL] PEDIMENTO" is handled by
+    // pedimento_simplificado.
+    if (/FORMA\s+SIMPLIFICADA\s+DEL?\s+PEDIMENTO/i.test(source)) return false;
 
     // Hard exclude: "AVISO CONSOLIDADO" shares the header trio but is a
     // different document type handled by aviso_consolidado.
     if (/AVISO\s+CONSOLIDADO/i.test(source)) return false;
 
+    // The colon after "T. OPER" is optional — see note in pedimento-simplificado.js.
     const hasHeaderFields =
       /NUM\.?\s*PEDIMENTO:/i.test(source) &&
       /CVE\.?\s*PEDIMENTO:/i.test(source) &&
-      /T\.?\s*OPER:/i.test(source);
+      /T\.?\s*OPER:?/i.test(source);
     if (hasHeaderFields) {
       const hasCopyMarker =
         /ORIGINAL:\s*ADMINISTRACION GENERAL DE ADUANAS/i.test(source) ||

package/src/document-types/pedimento-simplificado.js

@@ -12,15 +12,18 @@ export const pedimentoSimplificadoDefinition = {
     if (/AVISO\s+CONSOLIDADO/i.test(source)) return false;
 
     // Fast path: the literal title appears on standard SIMP layouts.
-    if (/FORMA SIMPLIFICADA DE PEDIMENTO/i.test(source)) return true;
+    // Some prevalidators print "FORMA SIMPLIFICADA DEL PEDIMENTO" (with DEL).
+    if (/FORMA\s+SIMPLIFICADA\s+DEL?\s+PEDIMENTO/i.test(source)) return true;
 
     // Some PDFs (single-page anchors) lack that title but still carry the
     // three pedimento header fields. Treat them as simplificado UNLESS they
     // have the multi-page copy markers that uniquely identify a completo.
+    // NOTE: the colon after "T. OPER" is optional — many printable layouts
+    // render OPER as a table-header label with the value in the next cell.
     const hasHeaderFields =
       /NUM\.?\s*PEDIMENTO:/i.test(source) &&
       /CVE\.?\s*PEDIMENTO:/i.test(source) &&
-      /T\.?\s*OPER:/i.test(source);
+      /T\.?\s*OPER:?/i.test(source);
     if (!hasHeaderFields) return false;
 
     const hasCompletoCopyMarker =

package/src/document-types/proforma.js

@@ -16,9 +16,9 @@ export const proformaDefinition = {
   type: 'proforma',
   extensions: ['pdf'],
 
-  // Same content marker as pedimento simplificado
+  // Same content marker as pedimento simplificado (accepts "DE" or "DEL").
   match: (source) => {
-    return /FORMA SIMPLIFICADA DE PEDIMENTO/i.test(source);
+    return /FORMA\s+SIMPLIFICADA\s+DEL?\s+PEDIMENTO/i.test(source);
   },
 
   extractNumPedimento: pedimentoSimplificadoDefinition.extractNumPedimento,

package/src/file-detection.js

@@ -4,9 +4,7 @@ import { PDFParse } from 'pdf-parse';
 
 import { extractDocumentFields } from './document-type-shared.js';
 
-// Document types that participate in arela_path composition. The XML type is
-// kept here even though its matcher is currently disabled — once re-enabled
-// in document-type-shared.js no further changes are needed here.
+// Document types that participate in arela_path composition.
 const ARELA_PATH_TYPES = new Set([
   'pedimento_simplificado',
   'pedimento_completo',

package/tests/unit/factura-inter-agencia.test.js

@@ -0,0 +1,218 @@
+/**
+ * Unit tests for the factura_inter_agencia matcher.
+ *
+ * Verifies that NORCOM↔PALCO CFDIs (XML and printable PDF text) are
+ * detected as `factura_inter_agencia`, and that ordinary CFDIs are NOT
+ * mis-classified.
+ */
+import { describe, it, expect } from '@jest/globals';
+
+import {
+  facturaInterAgenciaDefinition,
+  INTER_AGENCIA_RFCS,
+} from '../../src/document-types/factura-inter-agencia.js';
+import { extractDocumentFields } from '../../src/document-type-shared.js';
+
+const NORCOM_RFC = 'NAA120215F20';
+const PALCO_RFC = 'PCC1008161WA';
+
+// Realistic CFDI 4.0 XML between NORCOM (emisor) and PALCO (receptor).
+// Conceptos use ClaveProdServ 78141502 (servicios de agentes aduaneros).
+const CFDI_XML_INTER_AGENCIA = `<?xml version="1.0" encoding="utf-8"?>
+<cfdi:Comprobante xmlns:cfdi="http://www.sat.gob.mx/cfd/4" Version="4.0" Folio="012749"
+  TipoDeComprobante="I" SubTotal="3000.00" Total="3480.00" Moneda="MXN">
+  <cfdi:Emisor Rfc="${NORCOM_RFC}" Nombre="NORCOM AGENTES ADUANALES" RegimenFiscal="601"/>
+  <cfdi:Receptor Rfc="${PALCO_RFC}" Nombre="PALCO, CONSORCIO DE COMERCIO INTERNACIONAL"
+    DomicilioFiscalReceptor="32380" RegimenFiscalReceptor="601" UsoCFDI="G03"/>
+  <cfdi:Conceptos>
+    <cfdi:Concepto ClaveProdServ="78141502" NoIdentificacion="HONO" Cantidad="1.00"
+      ClaveUnidad="E48" Unidad="Unidad de servicio" Descripcion="HONORARIOS"
+      ValorUnitario="1300.00" Importe="1300.00" ObjetoImp="02"/>
+    <cfdi:Concepto ClaveProdServ="78141502" NoIdentificacion="VALID" Cantidad="1.00"
+      ClaveUnidad="E48" Unidad="Unidad de servicio" Descripcion="VALIDACION"
+      ValorUnitario="200.00" Importe="200.00" ObjetoImp="02"/>
+  </cfdi:Conceptos>
+</cfdi:Comprobante>`;
+
+// Same agencies but conceptos do NOT use 78141502 — should NOT match.
+const CFDI_XML_INTER_AGENCIA_WRONG_CONCEPT = CFDI_XML_INTER_AGENCIA.replace(
+  /78141502/g,
+  '90121502',
+);
+
+// CFDI between unrelated taxpayers — should NOT match.
+const CFDI_XML_REGULAR = `<?xml version="1.0" encoding="utf-8"?>
+<cfdi:Comprobante xmlns:cfdi="http://www.sat.gob.mx/cfd/4" Version="4.0" Folio="000123"
+  TipoDeComprobante="I" SubTotal="100.00" Total="116.00">
+  <cfdi:Emisor Rfc="ACME010101AB1" Nombre="ACME COMERCIAL" RegimenFiscal="601"/>
+  <cfdi:Receptor Rfc="XYZ020202CD2" Nombre="CLIENTE FINAL"
+    DomicilioFiscalReceptor="00000" RegimenFiscalReceptor="601" UsoCFDI="G03"/>
+  <cfdi:Conceptos>
+    <cfdi:Concepto ClaveProdServ="78141502" NoIdentificacion="ITEM" Cantidad="1.00"
+      ClaveUnidad="E48" Unidad="Unidad de servicio" Descripcion="SERVICIO"
+      ValorUnitario="100.00" Importe="100.00" ObjetoImp="02"/>
+  </cfdi:Conceptos>
+</cfdi:Comprobante>`;
+
+// Text extracted from the printable PDF representation of a CFDI inter-agencia.
+// Mirrors what pdf-parse returns for the sample SICINGR70-012749(...).pdf.
+const CFDI_PDF_TEXT_INTER_AGENCIA = `NORCOM AGENTES ADUANALES S.C
+Tipo de Comprobante: (I) Ingreso
+Folio Fiscal 84FC9CE2-00D5-4843-B377-B463321F9FC6
+Numero Folio 012749
+Emisor
+RFC ${NORCOM_RFC}
+Razon Social NORCOM AGENTES ADUANALES
+Receptor
+RFC ${PALCO_RFC}
+Razon Social PALCO, CONSORCIO DE COMERCIO INTERNACIONAL
+Pedimento: 3458 6000046 Fecha: 17/02/2026 Tipo: EXP Clave: A1
+Erogaciones
+78141502 HONO HONORARIOS 1,300.00
+78141502 SERCOM SERVICIOS COMPLEMENTARIOS 1,500.00
+78141502 VALID VALIDACION 200.00
+Sello Digital del CFDI
+c4oBJ8/zAol0zg1jVe4MK8...
+Cadena Original del Complemento de Certificacion Digital del SAT
+||4.0|012749|...
+Este documento es una representación impresa de un CFDI`;
+
+describe('factura_inter_agencia matcher', () => {
+  describe('configured RFC set', () => {
+    it('includes NORCOM and PALCO RFCs', () => {
+      expect(INTER_AGENCIA_RFCS).toContain(NORCOM_RFC);
+      expect(INTER_AGENCIA_RFCS).toContain(PALCO_RFC);
+    });
+  });
+
+  describe('match()', () => {
+    it('matches a NORCOM→PALCO XML CFDI with broker-service conceptos', () => {
+      expect(facturaInterAgenciaDefinition.match(CFDI_XML_INTER_AGENCIA)).toBe(
+        true,
+      );
+    });
+
+    it('matches the PDF-text representation of the same CFDI', () => {
+      expect(
+        facturaInterAgenciaDefinition.match(CFDI_PDF_TEXT_INTER_AGENCIA),
+      ).toBe(true);
+    });
+
+    it('does NOT match when ClaveProdServ is not 78141502', () => {
+      expect(
+        facturaInterAgenciaDefinition.match(
+          CFDI_XML_INTER_AGENCIA_WRONG_CONCEPT,
+        ),
+      ).toBe(false);
+    });
+
+    it('does NOT match a CFDI between unrelated taxpayers', () => {
+      expect(facturaInterAgenciaDefinition.match(CFDI_XML_REGULAR)).toBe(false);
+    });
+
+    it('does NOT match arbitrary non-CFDI text containing the RFCs', () => {
+      const text = `Reporte interno
+RFC emisor: ${NORCOM_RFC}
+RFC cliente: ${PALCO_RFC}
+Clave 78141502`;
+      // No CFDI markers → should not match.
+      expect(facturaInterAgenciaDefinition.match(text)).toBe(false);
+    });
+
+    it('does NOT match if only one of the configured RFCs is present', () => {
+      const text = CFDI_XML_INTER_AGENCIA.replace(PALCO_RFC, 'XYZ020202CD2');
+      expect(facturaInterAgenciaDefinition.match(text)).toBe(false);
+    });
+  });
+
+  describe('extractors', () => {
+    it('extracts emisor + receptor RFCs from XML', () => {
+      const rfcEmisor = facturaInterAgenciaDefinition.extractors
+        .find((e) => e.field === 'rfcEmisor')
+        .extract(CFDI_XML_INTER_AGENCIA);
+      const rfcReceptor = facturaInterAgenciaDefinition.extractors
+        .find((e) => e.field === 'rfcReceptor')
+        .extract(CFDI_XML_INTER_AGENCIA);
+
+      expect(rfcEmisor.found).toBe(true);
+      expect(rfcEmisor.value).toBe(NORCOM_RFC);
+      expect(rfcReceptor.found).toBe(true);
+      expect(rfcReceptor.value).toBe(PALCO_RFC);
+    });
+
+    it('extracts both RFCs from PDF text via fallback', () => {
+      const rfcEmisor = facturaInterAgenciaDefinition.extractors
+        .find((e) => e.field === 'rfcEmisor')
+        .extract(CFDI_PDF_TEXT_INTER_AGENCIA);
+      const rfcReceptor = facturaInterAgenciaDefinition.extractors
+        .find((e) => e.field === 'rfcReceptor')
+        .extract(CFDI_PDF_TEXT_INTER_AGENCIA);
+
+      expect(rfcEmisor.found).toBe(true);
+      expect(rfcReceptor.found).toBe(true);
+      // Order is the order of first appearance in the document.
+      const found = [rfcEmisor.value, rfcReceptor.value].sort();
+      expect(found).toEqual([NORCOM_RFC, PALCO_RFC].sort());
+    });
+
+    it('extracts the UUID (folio fiscal) from both formats', () => {
+      const uuidExtractor = facturaInterAgenciaDefinition.extractors.find(
+        (e) => e.field === 'uuid',
+      );
+
+      const fromXml = uuidExtractor.extract(CFDI_XML_INTER_AGENCIA);
+      // XML sample has no UUID inside the comprobante body — that's fine.
+      expect(fromXml.found).toBe(false);
+
+      const fromPdf = uuidExtractor.extract(CFDI_PDF_TEXT_INTER_AGENCIA);
+      expect(fromPdf.found).toBe(true);
+      expect(fromPdf.value).toBe('84FC9CE2-00D5-4843-B377-B463321F9FC6');
+    });
+
+    it('extracts numPedimento from the printable PDF "Pedimento:" line', () => {
+      const numExtractor = facturaInterAgenciaDefinition.extractors.find(
+        (e) => e.field === 'numPedimento',
+      );
+      const result = numExtractor.extract(CFDI_PDF_TEXT_INTER_AGENCIA);
+      expect(result.found).toBe(true);
+      expect(result.value).toBe('34586000046');
+    });
+
+    it('extracts the CFDI folio from XML attribute', () => {
+      const folio = facturaInterAgenciaDefinition.extractors
+        .find((e) => e.field === 'folio')
+        .extract(CFDI_XML_INTER_AGENCIA);
+      expect(folio.found).toBe(true);
+      expect(folio.value).toBe('012749');
+    });
+  });
+
+  describe('registry order (factura_inter_agencia precedes facturas_comerciales)', () => {
+    it('resolves the inter-agency CFDI XML to factura_inter_agencia, not factura_comercial', () => {
+      const [detectedType] = extractDocumentFields(
+        CFDI_XML_INTER_AGENCIA,
+        'xml',
+        '/tmp/SICINGR70-012749(PALCO).XML',
+      );
+      expect(detectedType).toBe('factura_inter_agencia');
+    });
+
+    it('resolves the inter-agency CFDI PDF text to factura_inter_agencia', () => {
+      const [detectedType] = extractDocumentFields(
+        CFDI_PDF_TEXT_INTER_AGENCIA,
+        'pdf',
+        '/tmp/SICINGR70-012749(PALCO).pdf',
+      );
+      expect(detectedType).toBe('factura_inter_agencia');
+    });
+
+    it('falls through to factura_comercial for a regular CFDI', () => {
+      const [detectedType] = extractDocumentFields(
+        CFDI_XML_REGULAR,
+        'xml',
+        '/tmp/regular-invoice.xml',
+      );
+      expect(detectedType).toBe('factura_comercial');
+    });
+  });
+});

package/tests/unit/pedimento-completo-xml-matcher.test.js

@@ -0,0 +1,271 @@
+/**
+ * Regression tests for the pedimento_completo_xml matcher.
+ *
+ * Covers:
+ *   1) Basic detection + arela_path composition from a VUCEM
+ *      `consultarPedimentoCompletoRespuesta` XML.
+ *   2) **YY truth source** — when the pedimento is opened in one year and
+ *      paid in the next (e.g. presentation 2025-12, payment 2026-01), the
+ *      15-digit pedimento MUST keep the presentation year (`25...`), not the
+ *      payment year (`26...`). This matches what VUCEM stamps in the
+ *      filename and what the PDF matchers produce.
+ *   3) **Aduana padding** — VUCEM returns the aduana code without leading
+ *      zeros (e.g. `70` for Ciudad Juárez instead of the canonical `070`).
+ *      The 2-digit "sección aduanera" prefix used inside the 15-digit
+ *      pedimento is the first 2 digits of the 3-digit form (`70` → `07`).
+ *   4) **numPedimento backfill** — the XML matcher composes numPedimento
+ *      externally via `extractNumPedimento` rather than as a field
+ *      extractor. `extractDocumentFields` must backfill it so that
+ *      `composeArelaPath` can find it.
+ *   5) Resolution to `proforma_completo_xml` when no payment evidence
+ *      exists in the body.
+ */
+import { describe, it, expect } from '@jest/globals';
+
+import { extractDocumentFields } from '../../src/document-type-shared.js';
+import { composeArelaPath } from '../../src/file-detection.js';
+
+// ---------------------------------------------------------------------------
+// Test fixtures
+// ---------------------------------------------------------------------------
+
+/**
+ * Build a minimal VUCEM consultarPedimentoCompletoRespuesta XML.
+ * Only the tags the matcher actually reads are included.
+ */
+function buildXml({
+  rfc = 'CEM090106MU3',
+  pedimento = '5063036',
+  claveDocumento = 'V1',
+  tipoOperacionDesc = 'Exportacion',
+  aduanaClave = '70',
+  presentationDate = '2025-12-01-06:00',
+  paymentDate = '2026-01-07-06:00',
+  rectFechaPago = null,
+  facturas = ['V1-FUJIKURA MEX-202512'],
+  edDocs = [],
+} = {}) {
+  const fechas = [];
+  if (presentationDate) {
+    fechas.push(
+      `<ns2:fechas><ns2:fecha>${presentationDate}</ns2:fecha><ns2:tipo><ns2:clave>5</ns2:clave><ns2:descripcion>FECHA DE PRESENTACION</ns2:descripcion></ns2:tipo></ns2:fechas>`,
+    );
+  }
+  if (paymentDate) {
+    fechas.push(
+      `<ns2:fechas><ns2:fecha>${paymentDate}</ns2:fecha><ns2:tipo><ns2:clave>2</ns2:clave><ns2:descripcion>FECHA DE PAGO</ns2:descripcion></ns2:tipo></ns2:fechas>`,
+    );
+  }
+
+  const rect = rectFechaPago
+    ? `<ns2:rectificacion><ns2:fechaPago>${rectFechaPago}</ns2:fechaPago></ns2:rectificacion>`
+    : '';
+
+  const facturasXml = facturas
+    .map(
+      (num) =>
+        `<ns2:facturas><ns2:numero>${num}</ns2:numero></ns2:facturas>`,
+    )
+    .join('');
+
+  const identificadoresXml =
+    edDocs.length === 0
+      ? ''
+      : `<ns2:identificadores>${edDocs
+          .map(
+            (code) =>
+              `<ns2:identificadores><claveIdentificador><clave>ED</clave></claveIdentificador><complemento1>${code}</complemento1></ns2:identificadores>`,
+          )
+          .join('')}</ns2:identificadores>`;
+
+  return `<?xml version="1.0" encoding="UTF-8"?>
+<S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/">
+<S:Body>
+<ns2:consultarPedimentoCompletoRespuesta xmlns:ns2="http://x">
+<ns2:pedimento>
+<ns2:pedimento>${pedimento}</ns2:pedimento>
+<ns2:encabezado>
+<ns2:claveDocumento><ns2:clave>${claveDocumento}</ns2:clave></ns2:claveDocumento>
+<ns2:tipoOperacion><ns2:clave>2</ns2:clave><ns2:descripcion>${tipoOperacionDesc}</ns2:descripcion></ns2:tipoOperacion>
+<ns2:aduanaEntradaSalida><ns2:clave>${aduanaClave}</ns2:clave></ns2:aduanaEntradaSalida>
+</ns2:encabezado>
+<ns2:importadorExportador>
+<ns2:rfc>${rfc}</ns2:rfc>
+${fechas.join('\n')}
+</ns2:importadorExportador>
+${rect}
+${facturasXml}
+${identificadoresXml}
+</ns2:pedimento>
+</ns2:consultarPedimentoCompletoRespuesta>
+</S:Body>
+</S:Envelope>`;
+}
+
+// ---------------------------------------------------------------------------
+// Tests
+// ---------------------------------------------------------------------------
+
+describe('pedimento_completo_xml matcher', () => {
+  it('detects, extracts, and composes arela_path for a basic export pedimento', () => {
+    const xml = buildXml({
+      rfc: 'CEM090106MU3',
+      pedimento: '5063036',
+      aduanaClave: '70',
+      presentationDate: '2025-06-15-06:00',
+      paymentDate: '2025-06-20-06:00',
+    });
+    // 15-digit filename pattern: YY=25 AA=07 PPPP=3429 NNNNNNN=5063036
+    const filePath = '/x/2025/250734295063036_250734295063036.xml';
+
+    const [type, fields, ped, year] = extractDocumentFields(
+      xml,
+      'xml',
+      filePath,
+    );
+
+    expect(type).toBe('pedimento_completo_xml');
+    expect(ped).toBe('250734295063036');
+    expect(year).toBe(2025);
+    expect(fields.find((f) => f.name === 'rfc')?.value).toBe('CEM090106MU3');
+    expect(fields.find((f) => f.name === 'aduanaEntradaSalida')?.value).toBe(
+      '07',
+    );
+    // Backfill check: numPedimento must be exposed as a field so
+    // composeArelaPath can find it.
+    expect(fields.find((f) => f.name === 'numPedimento')?.value).toBe(
+      '250734295063036',
+    );
+
+    const arela = composeArelaPath(type, fields, year, filePath);
+    expect(arela).toBe('CEM090106MU3/2025/3429/07/250734295063036/');
+  });
+
+  it('uses presentation date (not payment date) for YY when payment crosses calendar year', () => {
+    // Pedimento opened Dec 2025, paid Jan 2026 — the YY must be 25.
+    const xml = buildXml({
+      pedimento: '5063036',
+      aduanaClave: '70',
+      presentationDate: '2025-12-01-06:00',
+      paymentDate: '2026-01-07-06:00',
+    });
+    // Use the 3-part filename pattern (no YY in filename) so YY comes from XML body.
+    const filePath = '/x/070-3429-5063036.xml';
+
+    const [type, , ped, year] = extractDocumentFields(xml, 'xml', filePath);
+
+    expect(type).toBe('pedimento_completo_xml');
+    expect(ped).toBe('250734295063036');
+    expect(year).toBe(2025);
+  });
+
+  it('falls back to payment date YY when presentation date is missing', () => {
+    const xml = buildXml({
+      pedimento: '5063036',
+      aduanaClave: '70',
+      presentationDate: null, // No clave=5 block
+      paymentDate: '2026-01-07-06:00',
+    });
+    const filePath = '/x/070-3429-5063036.xml';
+
+    const [, , ped, year] = extractDocumentFields(xml, 'xml', filePath);
+
+    expect(ped).toBe('260734295063036');
+    expect(year).toBe(2026);
+  });
+
+  it('prefers filename YY over body fechas (VUCEM-stamped truth)', () => {
+    // Filename says YY=24 but body has presentation=2025. Filename wins.
+    const xml = buildXml({
+      pedimento: '5063036',
+      aduanaClave: '70',
+      presentationDate: '2025-12-01-06:00',
+      paymentDate: '2026-01-07-06:00',
+    });
+    const filePath = '/x/240734295063036_240734295063036.xml';
+
+    const [, , ped, year] = extractDocumentFields(xml, 'xml', filePath);
+
+    expect(ped).toBe('240734295063036');
+    expect(year).toBe(2024);
+  });
+
+  it('pads VUCEM aduana correctly: 70 -> 07, 750 -> 75, 40 -> 04', () => {
+    const cases = [
+      { aduanaClave: '70', expected: '07', // Cd. Juárez (3-digit canonical: 070)
+        filename: '/x/070-3429-5000001.xml' },
+      { aduanaClave: '750', expected: '75', // Puebla
+        filename: '/x/750-3429-5000002.xml' },
+      { aduanaClave: '40', expected: '04', // Lázaro Cárdenas (canonical: 040)
+        filename: '/x/040-3429-5000003.xml' },
+    ];
+
+    for (const c of cases) {
+      const xml = buildXml({
+        pedimento: c.filename.match(/-(\d{7})\.xml$/)[1],
+        aduanaClave: c.aduanaClave,
+        presentationDate: '2025-06-15-06:00',
+        paymentDate: '2025-06-20-06:00',
+      });
+      const [, fields, ped] = extractDocumentFields(xml, 'xml', c.filename);
+      expect(fields.find((f) => f.name === 'aduanaEntradaSalida')?.value).toBe(
+        c.expected,
+      );
+      // Positions 2-3 of the composed 15-digit pedimento must equal the
+      // aduana prefix.
+      expect(ped.substring(2, 4)).toBe(c.expected);
+    }
+  });
+
+  it('resolves to proforma_completo_xml when no payment evidence exists', () => {
+    const xml = buildXml({
+      pedimento: '5063036',
+      aduanaClave: '70',
+      presentationDate: '2025-12-01-06:00',
+      paymentDate: null, // No payment, no rectificacion
+    });
+    const filePath = '/x/070-3429-5063036.xml';
+
+    const [type] = extractDocumentFields(xml, 'xml', filePath);
+
+    expect(type).toBe('proforma_completo_xml');
+  });
+
+  it('extracts cove and rfc correctly', () => {
+    const xml = buildXml({
+      rfc: 'CEM090106MU3',
+      facturas: ['V1-FUJIKURA MEX-202512', 'INV-2'],
+    });
+    const filePath = '/x/250734295063036_250734295063036.xml';
+
+    const [, fields] = extractDocumentFields(xml, 'xml', filePath);
+
+    expect(fields.find((f) => f.name === 'rfc')?.value).toBe('CEM090106MU3');
+    expect(fields.find((f) => f.name === 'cove')?.value).toBe(
+      '[V1-FUJIKURA MEX-202512,INV-2]',
+    );
+  });
+
+  it('returns null arela_path when filename is unrecognized (no patente)', () => {
+    const xml = buildXml({
+      pedimento: '5063036',
+      aduanaClave: '70',
+      presentationDate: '2025-06-15-06:00',
+      paymentDate: '2025-06-20-06:00',
+    });
+    // Unrecognized filename — no patente derivable.
+    const filePath = '/x/random_name.xml';
+
+    const [type, fields, ped, year] = extractDocumentFields(
+      xml,
+      'xml',
+      filePath,
+    );
+
+    expect(type).toBe('pedimento_completo_xml');
+    expect(ped).toBeNull();
+    expect(year).toBeNull();
+    // composeArelaPath returns null because patente is missing.
+    expect(composeArelaPath(type, fields, year, filePath)).toBeNull();
+  });
+});

package/tests/unit/pedimento-simplificado-matcher.test.js

@@ -0,0 +1,185 @@
+/**
+ * Regression tests for the pedimento_simplificado matcher.
+ *
+ * Covers PDF layouts where:
+ *   - The header reads "FORMA SIMPLIFICADA DEL PEDIMENTO" (with DEL),
+ *     not the canonical "DE PEDIMENTO".
+ *   - The header trio prints "T. OPER" WITHOUT a trailing colon
+ *     (the value sits in a separate table cell).
+ *
+ * Real-world example: REF NQR26-079, Aduana 640 (Querétaro), patente 3458.
+ * Before this regression test, the matcher fell through to
+ * `facturas_comerciales` because the word "FACTURA" appears in the
+ * "OBSERVACIONES" block.
+ */
+import { describe, it, expect } from '@jest/globals';
+
+// Importing only the dispatcher avoids circular-init issues caused by
+// `_pedimento-shared-extractors.js` pulling FieldResult from document-type-shared.
+import { extractDocumentFields } from '../../src/document-type-shared.js';
+
+// REAL pdf-parse output from the NQR26-079 simplificado PDF
+// (CSM9204097Q1, patente 3458, aduana 640).
+// Captured verbatim with `PDFParse({data}).getText()` — pdf-parse extracts
+// table cells out of visual order, so labels and values often live on
+// different lines (see the FECHA DE PAGO block: label appears, then a few
+// unrelated cells, then the date sits on its own line with the importe).
+// This is exactly what the matchers and extractors see in production.
+const SIMP_DEL_NQR26079_TEXT = `A1      CVE. PEDIMENTO: IMP     T. OPER 26 64 3458 6000079      NUM. PEDIMENTO:
+CERTIFICACIONES
+ADUANA E/S:
+DATOS DEL IMPORTADOR / EXPORTADOR
+RFC: CURP:
+CÓDIGO DE
+ACEPTACIÓN
+640
+CSM9204097Q1
+FECHAS:
+17/03/2026
+Ped. 6000079
+CLAVE DE LA SECCION ADUANERA
+DE DESPACHO:
+QUERETARO, EL MARQUES Y
+COLON, QUERETARO.
+640
+DESTINO: 9 PESO BRUTO: 5.350
+MARCAS,NUMEROS Y TOTAL DE BULTOS: 1
+04/03/2026
+        ENTRADA
+PAGO
+3PW4CLHE
+S/M S/N
+CODIGO DE BARRAS
+0326 0132 XMP1 4914 6243 989
+*** PAGO ELECTRONICO ***
+DEPÓSITO REFERENCIADO - LÍNEA DE CAPTURA
+PATENTE:
+NOMBRE DE LA INSTITUCIÓN BANCARIA:
+LÍNEA DE CAPTURA:
+IMPORTE PAGADO:
+NÚMERO DE OPERACIÓN BANCARIA:
+NÚMERO DE TRANSACCIÓN SAT:
+MEDIO DE PRESENTACIÓN:
+MEDIO DE RECEPCIÓN/COBRO:
+OTROS MEDIOS ELECTRÓNICOS (PAGO ELECTRÓNICO)
+EFECTIVO (CARGO A CUENTA)
+PEDIMENTO: ADUANA:
+FECHA DE PAGO:
+0326 0132 XMP1 4914 6243
+6000079 640
+17/03/2026      $989
+Banco Nacional de México, S.A.
+00000000703543
+3458
+40124170320261403012
+NUMERO (GUIA/ORDEN EMBARQUE)/ID: 023-51315051 M 490453269837 H
+NÚMERO DE ACUSE DE VALOR COVE268074HT1
+NÚMERO DE E-DOCUMENT: 0438261DOG9W3 01702619TYEU7
+OBSERVACIONES
+FACTURA DE ACUERDO AL ARTÍCULO 36-A DE LA LEY ADUANERA VIGENTE Y A LA REGLA 3.1.
+8. DE LAS REGLAS
+GENERALES DE COMERCIO EXTERIOR VIGENTES.
+SE TRANSMITE PREVIAMENTE A VENTANILLA DIGITAL CONFORME A LA REGLA 1.9.18. DE LAS
+ REGLAS GENERALES DE
+COMERCIO EXTERIOR VIGENTES.
+SE EFECTÚA LA TRANSMISIÓN DIGITAL DE CONFORMIDAD A LA REGLA 3.1.17. Y 3.1.31. DE
+ LAS REGLAS GENERALES
+DE COMERCIO EXTERIOR VIGENTES.
+LA INFORMACIÓN CONTENIDA EN ESTE PEDIMENTO FUE SUMINISTRADA POR EL IMPORTADOR DE
+ CONFORMIDAD CON EL
+ARTICULO 54 DE LA LEY ADUANERA EN VIGOR.
+SE EXIME NOM-024-SCFI-2013 EN TERMINOS DEL NUMERAL 10, FRACC. X INCISO H, IMPORT
+ACIÓN DEFINITIVA,
+TRATÁNDOSE DE IMPORTADORES QUE CUENTEN CON UN PROSEC.
+SE EXIME NOM-003-SCFI-2014 EN TERMINOS DEL NUMERAL 10, FRACC. X INCISO H, IMPORT
+ACIÓN DEFINITIVA,
+TRATÁNDOSE DE IMPORTADORES QUE CUENTEN CON UN PROSEC.
+JOAQUIN GOMEZ ABAD
+AGENTE ADUANAL, AGENCIA ADUANAL, APODERADO ADUANAL O DE ALMACEN
+NOMBRE O RAZ. SOC.:
+RFC: GAA1003111U6 GOAJ641219HDFMBQ09    CURP:
+e.firma:
+NUMERO DE SERIE DEL CERTIFICADO: 00001000000705949781
+GOAJ641219QT5   RFC:
+DECLARO BAJO PROTESTA DE DECIR VERDAD, EN LOS TERMINOS
+DE LO DISPUESTO ARTICULO 81 DE LA LEY: PATENTE O
+AUTORIZACIÓN: 3458      GOMEZ ABAD ASESORES EN COMERCIO EXTERIOR S.C.
+FORMA SIMPLIFICADA DEL PEDIMENTO
+SEGUNDA COPIA: IMPORTADOR EXPORTADOR DESTINO/ORIGEN: INTERIOR DEL PAÍS
+REF: NQR26-079 Página 1 de 2
+
+-- 1 of 2 --
+
+FORMA SIMPLIFICADA DEL PEDIMENTO
+SEGUNDA COPIA: IMPORTADOR EXPORTADOR DESTINO/ORIGEN: INTERIOR DEL PAÍS
+REF: NQR26-079 Página 1 de 2
+A1      CVE. PEDIMENTO: IMP     T. OPER 26 64 3458 6000079      NUM. PEDIMENTO:
+CURP:
+RFC: CSM9204097Q1
+****** ****** **********        ********** FIN DE PEDIMENTO NUM. TOTAL DE PARTID
+AS: CLAVE PREVALIDADOR: 010     1
+ANEXO DEL PEDIMENTO
+SEGUNDA COPIA: IMPORTADOR EXPORTADOR DESTINO/ORIGEN: INTERIOR DEL PAÍS
+REF: NQR26-079 Página 2 de 2`;
+
+describe('pedimento_simplificado matcher — DEL PEDIMENTO variant', () => {
+  it('dispatcher resolves NQR26-079 (DEL PEDIMENTO) as pedimento_simplificado', () => {
+    const [detectedType, , pedimento] = extractDocumentFields(
+      SIMP_DEL_NQR26079_TEXT,
+      'pdf',
+      '/scans/CSM9204097Q1/NQR26-079.pdf',
+    );
+
+    // Regression: previously this resolved to `factura_comercial` because
+    // (1) the title regex demanded "DE PEDIMENTO" (this PDF says "DEL") and
+    // (2) the header trio required a colon after "T. OPER" (this PDF omits it).
+    expect(detectedType).toBe('pedimento_simplificado');
+    expect(pedimento).toBe('266434586000079');
+  });
+});
+
+describe('pedimento_simplificado matcher — header trio without colon after T. OPER', () => {
+  // Minimal text: title is the canonical "DE PEDIMENTO" so the fast path
+  // does NOT apply; only the fallback that requires the header trio runs.
+  // The trio MUST tolerate "T. OPER" without a trailing colon, because
+  // many printable PDFs render OPER as a column header (value in next cell).
+  const FALLBACK_TEXT = `FORMA SIMPLIFICADA DE PEDIMENTO
+NUM. PEDIMENTO: 22 07 3429 2002089 T. OPER IMP CVE. PEDIMENTO: A1
+DATOS DEL IMPORTADOR
+PATENTE: 3429 PEDIMENTO: 2002089 ADUANA: 070
+FECHA DE PAGO: 01/02/2023`;
+
+  it('resolves via fast-path "FORMA SIMPLIFICADA DE PEDIMENTO" header', () => {
+    const [detectedType] = extractDocumentFields(
+      FALLBACK_TEXT,
+      'pdf',
+      '/scans/SAMPLE/pedimento.pdf',
+    );
+    expect(detectedType).toBe('pedimento_simplificado');
+  });
+});
+
+describe('pedimento_simplificado matcher — title accepts both DE and DEL', () => {
+  // Same minimal body, only the title differs. Both variants are produced
+  // by different prevalidators / agencias in the wild, and BOTH must
+  // resolve to pedimento_simplificado.
+  const body = `
+NUM. PEDIMENTO: 22 07 3429 2002089 T. OPER IMP CVE. PEDIMENTO: A1
+DATOS DEL IMPORTADOR
+PATENTE: 3429 PEDIMENTO: 2002089 ADUANA: 070
+FECHA DE PAGO: 01/02/2023`;
+
+  it.each([
+    ['FORMA SIMPLIFICADA DE PEDIMENTO', 'pedimento_simplificado'],
+    ['FORMA SIMPLIFICADA DEL PEDIMENTO', 'pedimento_simplificado'],
+    ['forma simplificada de pedimento', 'pedimento_simplificado'], // case-insensitive
+    ['FORMA  SIMPLIFICADA   DEL   PEDIMENTO', 'pedimento_simplificado'], // extra spaces
+  ])('title "%s" resolves to %s', (title, expected) => {
+    const [detectedType] = extractDocumentFields(
+      `${title}\n${body}`,
+      'pdf',
+      '/scans/SAMPLE/pedimento.pdf',
+    );
+    expect(detectedType).toBe(expected);
+  });
+});