@fairfox/polly 0.88.0 → 0.89.0

package/dist/tools/verify/src/cli.js

@@ -1,20 +1,16 @@
 #!/usr/bin/env bun
 import { createRequire } from "node:module";
-var __defProp = Object.defineProperty;
-var __returnValue = (v) => v;
-function __exportSetter(name, newValue) {
-  this[name] = __returnValue.bind(null, newValue);
-}
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, {
-      get: all[name],
-      enumerable: true,
-      configurable: true,
-      set: __exportSetter.bind(all, name)
-    });
+var __esm = (fn, res, err) => () => {
+  if (fn)
+    try {
+      res = fn(fn = 0);
+    } catch (e) {
+      err = [e];
+    }
+  if (err)
+    throw err[0];
+  return res;
 };
-var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 // tools/verify/src/analysis/expression-validator.ts
@@ -250,11 +246,6 @@ var init_expression_validator = __esm(() => {
 });
 
 // tools/verify/src/analysis/model-coverage.ts
-var exports_model_coverage = {};
-__export(exports_model_coverage, {
-  computeModelCoverage: () => computeModelCoverage,
-  strictCoverageReasons: () => strictCoverageReasons
-});
 function norm(field) {
   return field.replace(/_/g, ".");
 }
@@ -344,10 +335,6 @@ function strictCoverageReasons(report, meshFindingCount) {
 }
 
 // tools/verify/src/analysis/coupled-fields.ts
-var exports_coupled_fields = {};
-__export(exports_coupled_fields, {
-  checkCoupledFields: () => checkCoupledFields
-});
 function norm2(field) {
   return field.replace(/_/g, ".");
 }
@@ -388,10 +375,6 @@ function subsetViolation(group, groupSet, handler) {
 }
 
 // tools/verify/src/analysis/non-interference.ts
-var exports_non_interference = {};
-__export(exports_non_interference, {
-  checkNonInterference: () => checkNonInterference
-});
 function checkNonInterference(subsystems, handlers) {
   const violations = [];
   const fieldOwner = new Map;
@@ -430,10 +413,6 @@ function checkNonInterference(subsystems, handlers) {
 }
 
 // tools/verify/src/analysis/precondition-locality.ts
-var exports_precondition_locality = {};
-__export(exports_precondition_locality, {
-  checkPreconditionLocality: () => checkPreconditionLocality
-});
 function findOwner(fieldRef, fieldOwner) {
   const candidates = [fieldRef, fieldRef.replace(/\./g, "_"), fieldRef.replace(/_/g, ".")];
   for (const c of candidates) {
@@ -692,13 +671,6 @@ class TemporalTLAGenerator {
 var init_temporal = () => {};
 
 // tools/verify/src/codegen/tla.ts
-var exports_tla = {};
-__export(exports_tla, {
-  TLAGenerator: () => TLAGenerator,
-  TLAValidationError: () => TLAValidationError,
-  generateSubsystemTLA: () => generateSubsystemTLA,
-  generateTLA: () => generateTLA
-});
 import * as fs2 from "node:fs";
 import * as os from "node:os";
 import * as path2 from "node:path";
@@ -2083,14 +2055,14 @@ var init_tla = __esm(() => {
         const peerPrefix = isPrimed ? `contextStates'[${binder}]` : `contextStates[${binder}]`;
         let body = scoped.innerBody;
         const binderRe1 = new RegExp(`\\b${binder}\\.([a-zA-Z_][a-zA-Z0-9_]*)\\.value\\.([a-zA-Z_][a-zA-Z0-9_.]*)`, "g");
-        body = body.replace(binderRe1, (_m, sig, path3) => {
+        body = body.replace(binderRe1, (_m, sig, path) => {
           const meshDoc = this.meshSignalDocs.get(sig);
           if (meshDoc !== undefined) {
             const meshPeerPrefix = isPrimed ? `meshState'[${binder}]["${meshDoc}"]` : `meshState[${binder}]["${meshDoc}"]`;
-            const field = this.sanitizeFieldName(String(path3).replace(/\./g, "_"));
+            const field = this.sanitizeFieldName(String(path).replace(/\./g, "_"));
             return `${meshPeerPrefix}.${field}`;
           }
-          const flat = this.sanitizeFieldName(`${sig}_${String(path3).replace(/\./g, "_")}`);
+          const flat = this.sanitizeFieldName(`${sig}_${String(path).replace(/\./g, "_")}`);
           return `${peerPrefix}.${flat}`;
         });
         const binderRe2 = new RegExp(`\\b${binder}\\.([a-zA-Z_][a-zA-Z0-9_]*)\\.value\\b(?!\\.)`, "g");
@@ -2120,14 +2092,14 @@ var init_tla = __esm(() => {
         return expr;
       }
       tla = tla.replace(/'([^']+)'/g, '"$1"');
-      tla = tla.replace(/([a-zA-Z_][a-zA-Z0-9_]*)\.value\.([a-zA-Z_][a-zA-Z0-9_.]*)/g, (_match, stateName, path3) => {
+      tla = tla.replace(/([a-zA-Z_][a-zA-Z0-9_]*)\.value\.([a-zA-Z_][a-zA-Z0-9_.]*)/g, (_match, stateName, path) => {
         const meshDoc = this.meshSignalDocs.get(stateName);
         if (meshDoc !== undefined) {
           const meshPrefix = isPrimed ? `meshState'[ctx]["${meshDoc}"]` : `meshState[ctx]["${meshDoc}"]`;
-          const field = this.sanitizeFieldName(String(path3).replace(/\./g, "_"));
+          const field = this.sanitizeFieldName(String(path).replace(/\./g, "_"));
           return `${meshPrefix}.${field}`;
         }
-        const fullPath = `${stateName}_${path3.replace(/\./g, "_")}`;
+        const fullPath = `${stateName}_${path.replace(/\./g, "_")}`;
         return `${statePrefix}.${this.sanitizeFieldName(fullPath)}`;
       });
       tla = tla.replace(/([a-zA-Z_][a-zA-Z0-9_]*)\.value\b(?!\.)/g, (_match, stateName) => {
@@ -2137,11 +2109,11 @@ var init_tla = __esm(() => {
         }
         return `${statePrefix}.${stateName}`;
       });
-      tla = tla.replace(/state\.([a-zA-Z_][a-zA-Z0-9_.]*)/g, (_match, path3) => {
-        return `${statePrefix}.${this.sanitizeFieldName(path3)}`;
+      tla = tla.replace(/state\.([a-zA-Z_][a-zA-Z0-9_.]*)/g, (_match, path) => {
+        return `${statePrefix}.${this.sanitizeFieldName(path)}`;
       });
-      tla = tla.replace(/payload\.([a-zA-Z_][a-zA-Z0-9_.]*)/g, (_match, path3) => {
-        return `payload.${this.sanitizeFieldName(path3)}`;
+      tla = tla.replace(/payload\.([a-zA-Z_][a-zA-Z0-9_.]*)/g, (_match, path) => {
+        return `payload.${this.sanitizeFieldName(path)}`;
       });
       tla = tla.replace(/===/g, "=");
       tla = tla.replace(/!==/g, "#");
@@ -2262,8 +2234,8 @@ var init_tla = __esm(() => {
       });
       result = result.replace(/(\w+(?:\.\w+)*)\[(\d+)\]|\]\[(\d+)\]/g, (_match, identPart, index1, index2) => {
         if (identPart) {
-          const newIndex2 = Number.parseInt(index1, 10) + 1;
-          return `${identPart}[${newIndex2}]`;
+          const newIndex = Number.parseInt(index1, 10) + 1;
+          return `${identPart}[${newIndex}]`;
         }
         const newIndex = Number.parseInt(index2, 10) + 1;
         return `][${newIndex}]`;
@@ -2425,7 +2397,7 @@ var init_tla = __esm(() => {
       while (result.includes("?.") && iteration < maxIterations && result !== previousResult) {
         previousResult = result;
         result = result.replace(/(\w+(?:\.\w+)*)\?\.(\w+)(?!\?\.)/g, (_match, obj, prop) => `IF ${obj} # NULL THEN ${obj}.${prop} ELSE NULL`);
-        result = result.replace(/\(([^)]+)\)\?\.(\w+)/g, (_match, expr2, prop) => `IF (${expr2}) # NULL THEN (${expr2}).${prop} ELSE NULL`);
+        result = result.replace(/\(([^)]+)\)\?\.(\w+)/g, (_match, expr, prop) => `IF (${expr}) # NULL THEN (${expr}).${prop} ELSE NULL`);
         result = result.replace(/(\w+(?:\.\w+)*)\?\.\[(\d+)\]/g, (_match, obj, index) => {
           const tlaIndex = Number.parseInt(index, 10) + 1;
           return `IF ${obj} # NULL THEN ${obj}[${tlaIndex}] ELSE NULL`;
@@ -3164,9 +3136,9 @@ function parseFeatureText(text, file) {
     file
   };
 }
-async function parseFeatureFile(path3) {
-  const text = await Bun.file(path3).text();
-  return parseFeatureText(text, path3);
+async function parseFeatureFile(path) {
+  const text = await Bun.file(path).text();
+  return parseFeatureText(text, path);
 }
 var init_parse = () => {};
 
@@ -3212,10 +3184,6 @@ function registeredBindings() {
 }
 
 // tools/bdd/src/witness.ts
-var exports_witness = {};
-__export(exports_witness, {
-  extractWitnesses: () => extractWitnesses
-});
 async function loadStepModules(stepFiles) {
   resetRegistry();
   for (const file of stepFiles) {
@@ -3284,22 +3252,6 @@ var init_witness = __esm(() => {
 });
 
 // tools/verify/src/codegen/witness.ts
-var exports_witness2 = {};
-__export(exports_witness2, {
-  WITNESS_INVARIANT: () => WITNESS_INVARIANT,
-  WitnessTranslationError: () => WitnessTranslationError,
-  bareFieldRenderer: () => bareFieldRenderer,
-  bddPredicateToTLA: () => bddPredicateToTLA,
-  buildWitnessCfg: () => buildWitnessCfg,
-  buildWitnessInvariant: () => buildWitnessInvariant,
-  buildWitnessInvariantBare: () => buildWitnessInvariantBare,
-  buildWitnessModule: () => buildWitnessModule,
-  parseModuleName: () => parseModuleName,
-  routeWitness: () => routeWitness,
-  witnessPolarity: () => witnessPolarity,
-  witnessSpecLocation: () => witnessSpecLocation,
-  witnessVerdict: () => witnessVerdict
-});
 import * as path3 from "node:path";
 function witnessPolarity(tags) {
   return tags.includes("forbidden") ? "forbidden" : "positive";
@@ -3318,8 +3270,8 @@ function witnessVerdict(polarity, reachable) {
     message: "the model proves this outcome impossible (the scenario lies)"
   };
 }
-function flattenField(path4) {
-  return path4.split(".").join("_");
+function flattenField(path) {
+  return path.split(".").join("_");
 }
 function bareFieldRenderer(fields = {}) {
   return (fieldPath) => fields[fieldPath] ?? flattenField(fieldPath);
@@ -3521,13 +3473,6 @@ function sanitizeKind(kind) {
 var CONTAINER_NAME_PREFIX = "polly-tla-", counter = 0;
 
 // tools/verify/src/runner/docker.ts
-var exports_docker = {};
-__export(exports_docker, {
-  DockerRunner: () => DockerRunner,
-  removeContainer: () => removeContainer,
-  sweepOrphanedContainers: () => sweepOrphanedContainers,
-  sweepOrphanedContainersOnce: () => sweepOrphanedContainersOnce
-});
 import { spawn, spawnSync } from "node:child_process";
 import * as fs3 from "node:fs";
 import * as path4 from "node:path";
@@ -3709,7 +3654,7 @@ class DockerRunner {
     return "Unknown error occurred during model checking";
   }
   runCommand(command, args, options) {
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve, reject) => {
       const proc = spawn(command, args);
       let stdout = "";
       let stderr = "";
@@ -3730,7 +3675,7 @@ class DockerRunner {
       proc.on("close", (exitCode) => {
         if (timeout)
           clearTimeout(timeout);
-        resolve3({
+        resolve({
           exitCode: exitCode || 0,
           stdout,
           stderr
@@ -3744,7 +3689,7 @@ class DockerRunner {
     });
   }
   runCommandStreaming(command, args, onOutput, timeout) {
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve, reject) => {
       const proc = spawn(command, args);
       const timeoutHandle = timeout && timeout > 0 ? setTimeout(() => {
         proc.kill();
@@ -3776,7 +3721,7 @@ class DockerRunner {
         if (timeoutHandle)
           clearTimeout(timeoutHandle);
         if (exitCode === 0) {
-          resolve3();
+          resolve();
         } else {
           reject(new Error(`Command failed with exit code ${exitCode}`));
         }
@@ -4663,13 +4608,13 @@ class ConfigValidator {
     this.issues.push(...validateCapabilities(config.capabilities, config.state));
     this.issues.push(...validateCoupledFields(config.coupledFields, config.state));
   }
-  findNullPlaceholders(obj, path2) {
+  findNullPlaceholders(obj, path) {
     if (obj === null || obj === undefined) {
       this.issues.push({
         type: "null_placeholder",
         severity: "error",
-        field: path2,
-        message: `Configuration incomplete: ${path2}`,
+        field: path,
+        message: `Configuration incomplete: ${path}`,
         suggestion: "Replace null with a concrete value"
       });
       return;
@@ -4678,7 +4623,7 @@ class ConfigValidator {
       return;
     }
     for (const [key, value] of Object.entries(obj)) {
-      const fullPath = `${path2}.${key}`;
+      const fullPath = `${path}.${key}`;
       if (value === null) {
         this.issues.push({
           type: "null_placeholder",
@@ -5161,9 +5106,9 @@ class RelationshipExtractor {
       return;
     }
     if (Node.isPropertyAccessExpression(expr)) {
-      const rel2 = this.extractFromPropertyAccess(expr, handlerName);
-      if (rel2) {
-        relationships.push(rel2);
+      const rel = this.extractFromPropertyAccess(expr, handlerName);
+      if (rel) {
+        relationships.push(rel);
         return;
       }
     }
@@ -6491,9 +6436,9 @@ class HandlerExtractor {
       return;
     }
     if (Node2.isIdentifier(initializer)) {
-      const paramName2 = initializer.getText();
-      if (this.currentFunctionParams.includes(paramName2)) {
-        assignments.push({ field, value: `param:${paramName2}` });
+      const paramName = initializer.getText();
+      if (this.currentFunctionParams.includes(paramName)) {
+        assignments.push({ field, value: `param:${paramName}` });
         return;
       }
     }
@@ -7331,56 +7276,56 @@ class HandlerExtractor {
       if (filePath.startsWith(pathPrefix))
         return context;
     }
-    const path2 = filePath.toLowerCase();
-    return this.inferElectronContext(path2) || this.inferWorkerContext(path2) || this.inferServerAppContext(path2) || this.inferChromeExtensionContext(path2) || "unknown";
+    const path = filePath.toLowerCase();
+    return this.inferElectronContext(path) || this.inferWorkerContext(path) || this.inferServerAppContext(path) || this.inferChromeExtensionContext(path) || "unknown";
   }
-  inferElectronContext(path2) {
-    if (path2.includes("main.ts") || path2.includes("main.js") || path2.includes("/main/") || path2.includes("\\main\\")) {
+  inferElectronContext(path) {
+    if (path.includes("main.ts") || path.includes("main.js") || path.includes("/main/") || path.includes("\\main\\")) {
       return "main";
     }
-    if (path2.includes("/renderer/") || path2.includes("\\renderer\\") || path2.includes("renderer.ts") || path2.includes("renderer.js")) {
+    if (path.includes("/renderer/") || path.includes("\\renderer\\") || path.includes("renderer.ts") || path.includes("renderer.js")) {
       return "renderer";
     }
-    if (path2.includes("preload.ts") || path2.includes("preload.js")) {
+    if (path.includes("preload.ts") || path.includes("preload.js")) {
       return "preload";
     }
     return null;
   }
-  inferWorkerContext(path2) {
-    if (path2.includes("service-worker") || path2.includes("sw.ts") || path2.includes("sw.js")) {
+  inferWorkerContext(path) {
+    if (path.includes("service-worker") || path.includes("sw.ts") || path.includes("sw.js")) {
       return "worker";
     }
-    if (path2.includes("/worker/") || path2.includes("\\worker\\")) {
+    if (path.includes("/worker/") || path.includes("\\worker\\")) {
       return "worker";
     }
     return null;
   }
-  inferServerAppContext(path2) {
-    if (path2.includes("/server/") || path2.includes("\\server\\") || path2.includes("/server.") || path2.includes("server.ts") || path2.includes("server.js")) {
+  inferServerAppContext(path) {
+    if (path.includes("/server/") || path.includes("\\server\\") || path.includes("/server.") || path.includes("server.ts") || path.includes("server.js")) {
       return "server";
     }
-    if (path2.includes("/client/") || path2.includes("\\client\\") || path2.includes("/client.")) {
+    if (path.includes("/client/") || path.includes("\\client\\") || path.includes("/client.")) {
       return "client";
     }
     return null;
   }
-  inferChromeExtensionContext(path2) {
-    if (path2.includes("/background/") || path2.includes("\\background\\")) {
+  inferChromeExtensionContext(path) {
+    if (path.includes("/background/") || path.includes("\\background\\")) {
       return "background";
     }
-    if (path2.includes("/content/") || path2.includes("\\content\\")) {
+    if (path.includes("/content/") || path.includes("\\content\\")) {
       return "content";
     }
-    if (path2.includes("/popup/") || path2.includes("\\popup\\")) {
+    if (path.includes("/popup/") || path.includes("\\popup\\")) {
       return "popup";
     }
-    if (path2.includes("/devtools/") || path2.includes("\\devtools\\")) {
+    if (path.includes("/devtools/") || path.includes("\\devtools\\")) {
       return "devtools";
     }
-    if (path2.includes("/options/") || path2.includes("\\options\\")) {
+    if (path.includes("/options/") || path.includes("\\options\\")) {
       return "options";
     }
-    if (path2.includes("/offscreen/") || path2.includes("\\offscreen\\")) {
+    if (path.includes("/offscreen/") || path.includes("\\offscreen\\")) {
       return "offscreen";
     }
     return null;
@@ -7760,9 +7705,9 @@ class HandlerExtractor {
       const left = node.getLeft();
       if (!Node2.isPropertyAccessExpression(left))
         return;
-      const path2 = this.getPropertyPath(left);
+      const path = this.getPropertyPath(left);
       for (const varName of stateVarNames) {
-        if (path2 === `${varName}.value`) {
+        if (path === `${varName}.value`) {
           const right = node.getRight();
           if (Node2.isObjectLiteralExpression(right)) {
             this.extractObjectLiteralAssignments(right, mutations, varName);
@@ -7770,8 +7715,8 @@ class HandlerExtractor {
           break;
         }
         const fieldPrefix = `${varName}.value.`;
-        if (path2.startsWith(fieldPrefix)) {
-          const fieldName = path2.substring(fieldPrefix.length);
+        if (path.startsWith(fieldPrefix)) {
+          const fieldName = path.substring(fieldPrefix.length);
           const value = this.extractValue(node.getRight());
           mutations.push({ field: `${varName}_${fieldName}`, value: value ?? "@" });
           break;
@@ -7856,13 +7801,13 @@ class HandlerExtractor {
       return [{ field: match.signal, ...base }];
     return fields.map((f) => ({ field: `${match.signal}_${f}`, ...base }));
   }
-  matchVerifiedStateWrite(path2, stateVarNames) {
+  matchVerifiedStateWrite(path, stateVarNames) {
     for (const varName of stateVarNames) {
-      if (path2 === `${varName}.value`)
+      if (path === `${varName}.value`)
         return { signal: varName };
       const prefix = `${varName}.value.`;
-      if (path2.startsWith(prefix))
-        return { signal: varName, field: path2.substring(prefix.length) };
+      if (path.startsWith(prefix))
+        return { signal: varName, field: path.substring(prefix.length) };
     }
     return null;
   }
@@ -8377,20 +8322,20 @@ class TypeExtractor {
     const fields = [];
     if (stateType.kind === "object" && stateType.properties) {
       for (const [key, propType] of Object.entries(stateType.properties)) {
-        const path2 = prefix ? `${prefix}.${key}` : key;
+        const path = prefix ? `${prefix}.${key}` : key;
         if (propType.kind === "object") {
-          fields.push(...this.analyzeFields(propType, path2));
+          fields.push(...this.analyzeFields(propType, path));
         } else {
-          const analysis = this.analyzeField(path2, propType);
+          const analysis = this.analyzeField(path, propType);
           fields.push(analysis);
         }
       }
     }
     return fields;
   }
-  analyzeField(path2, type) {
+  analyzeField(path, type) {
     const analysis = {
-      path: path2,
+      path,
       type,
       confidence: "low",
       evidence: [],
@@ -8825,13 +8770,13 @@ function displayModelCoverage(report) {
   }
 }
 async function runModelCoverage(typedConfig, typedAnalysis, meshFindingCount) {
-  const { computeModelCoverage: computeModelCoverage2, strictCoverageReasons: strictCoverageReasons2 } = await Promise.resolve().then(() => exports_model_coverage);
+  await Promise.resolve();
   const stateFields = Object.keys(typedConfig.state ?? {});
-  const coverage = computeModelCoverage2(stateFields, typedAnalysis.handlers, typedAnalysis.offSurfaceMutations ?? []);
+  const coverage = computeModelCoverage(stateFields, typedAnalysis.handlers, typedAnalysis.offSurfaceMutations ?? []);
   displayModelCoverage(coverage);
   if (!isStrictMode())
     return;
-  const reasons = strictCoverageReasons2(coverage, meshFindingCount);
+  const reasons = strictCoverageReasons(coverage, meshFindingCount);
   if (reasons.length === 0) {
     console.log(color("✓ Strict mode: model coverage complete", COLORS.green));
     console.log();
@@ -8925,8 +8870,8 @@ async function runCoupledFieldsLint(config, analysis) {
   const groups = config.coupledFields ?? [];
   if (groups.length === 0)
     return;
-  const { checkCoupledFields: checkCoupledFields2 } = await Promise.resolve().then(() => exports_coupled_fields);
-  const result = checkCoupledFields2(groups, analysis.handlers);
+  await Promise.resolve();
+  const result = checkCoupledFields(groups, analysis.handlers);
   if (result.valid) {
     console.log(color("✓ Coupled fields: verified (no partial-subset writes)", COLORS.green));
     console.log();
@@ -9017,8 +8962,8 @@ async function runSubsystemVerification(config, analysis) {
   const subsystemNames = Object.keys(subsystems);
   console.log(color(`Subsystem-scoped verification (${subsystemNames.length} subsystems)
 `, COLORS.blue));
-  const { checkNonInterference: checkNonInterference2 } = await Promise.resolve().then(() => exports_non_interference);
-  const interference = checkNonInterference2(subsystems, analysis.handlers);
+  await Promise.resolve();
+  const interference = checkNonInterference(subsystems, analysis.handlers);
   if (interference.valid) {
     console.log(color("✓ Non-interference: verified (no cross-subsystem state writes)", COLORS.green));
     console.log();
@@ -9032,8 +8977,8 @@ async function runSubsystemVerification(config, analysis) {
     console.log(color("   Compositional verification may not be sound. Consider restructuring subsystem boundaries.", COLORS.yellow));
     console.log();
   }
-  const { checkPreconditionLocality: checkPreconditionLocality2 } = await Promise.resolve().then(() => (init_precondition_locality(), exports_precondition_locality));
-  const locality = checkPreconditionLocality2(subsystems, analysis.handlers);
+  await Promise.resolve().then(() => init_precondition_locality());
+  const locality = checkPreconditionLocality(subsystems, analysis.handlers);
   if (locality.valid) {
     console.log(color("✓ Precondition locality: verified (no cross-subsystem requires() reads)", COLORS.green));
     console.log();
@@ -9066,7 +9011,7 @@ async function runSubsystemVerification(config, analysis) {
   const timeoutSeconds = getTimeout(config);
   const workers = getWorkers(config);
   const maxDepth = getMaxDepth(config);
-  const { generateSubsystemTLA: generateSubsystemTLA2 } = await Promise.resolve().then(() => (init_tla(), exports_tla));
+  await Promise.resolve().then(() => init_tla());
   const results = [];
   const customTLAPaths = getCustomTLAPaths(config);
   for (const name of subsystemNames) {
@@ -9077,7 +9022,7 @@ async function runSubsystemVerification(config, analysis) {
       continue;
     }
     console.log(color(`⚙️  Verifying subsystem: ${name}...`, COLORS.blue));
-    const { spec, cfg } = await generateSubsystemTLA2(name, sub, config, analysis);
+    const { spec, cfg } = await generateSubsystemTLA(name, sub, config, analysis);
     const ensuresCount = (spec.match(/^EnsuresAfter_\w+ ==/gm) ?? []).length;
     const specDir = path5.join(process.cwd(), "specs", "tla", "generated", name);
     if (!fs4.existsSync(specDir)) {
@@ -9143,22 +9088,11 @@ async function runWitnessVerification(config) {
 `, COLORS.gray));
     return;
   }
-  const { extractWitnesses: extractWitnesses2 } = await Promise.resolve().then(() => (init_witness(), exports_witness));
-  const {
-    bareFieldRenderer: bareFieldRenderer2,
-    bddPredicateToTLA: bddPredicateToTLA2,
-    buildWitnessCfg: buildWitnessCfg2,
-    buildWitnessModule: buildWitnessModule2,
-    parseModuleName: parseModuleName2,
-    routeWitness: routeWitness2,
-    witnessPolarity: witnessPolarity2,
-    witnessSpecLocation: witnessSpecLocation2,
-    witnessVerdict: witnessVerdict2,
-    WITNESS_INVARIANT: WITNESS_INVARIANT2
-  } = await Promise.resolve().then(() => (init_witness2(), exports_witness2));
+  await Promise.resolve().then(() => init_witness());
+  await Promise.resolve().then(() => init_witness2());
   const subsystems = config.subsystems;
   const customTLAPaths = getCustomTLAPaths(config);
-  const witnesses = await extractWitnesses2(featureFiles, stepFiles);
+  const witnesses = await extractWitnesses(featureFiles, stepFiles);
   const docker = await setupDocker();
   const timeoutSeconds = getTimeout(config);
   const timeout = timeoutSeconds > 0 ? timeoutSeconds * 1000 : DEFAULT_WITNESS_TIMEOUT_MS;
@@ -9167,7 +9101,7 @@ async function runWitnessVerification(config) {
   let idx = 0;
   for (const w of witnesses) {
     const id = `${w.feature} › ${w.scenario}`;
-    const polarity = witnessPolarity2(w.tags);
+    const polarity = witnessPolarity(w.tags);
     if (!w.predicate) {
       results.push({
         id,
@@ -9177,7 +9111,7 @@ async function runWitnessVerification(config) {
       });
       continue;
     }
-    const subsystem = routeWitness2(w.fields, subsystems);
+    const subsystem = routeWitness(w.fields, subsystems);
     if (!subsystem) {
       results.push({
         id,
@@ -9202,7 +9136,7 @@ async function runWitnessVerification(config) {
         });
         continue;
       }
-      const module = custom.module ?? parseModuleName2(fs4.readFileSync(tlaAbs, "utf8"));
+      const module = custom.module ?? parseModuleName(fs4.readFileSync(tlaAbs, "utf8"));
       if (!module) {
         results.push({
           id,
@@ -9213,9 +9147,9 @@ async function runWitnessVerification(config) {
         });
         continue;
       }
-      location = witnessSpecLocation2(cwd, subsystem, custom, module);
+      location = witnessSpecLocation(cwd, subsystem, custom, module);
     } else {
-      location = witnessSpecLocation2(cwd, subsystem, undefined, "");
+      location = witnessSpecLocation(cwd, subsystem, undefined, "");
       if (!fs4.existsSync(location.tlaPath) || !fs4.existsSync(location.cfgPath)) {
         results.push({
           id,
@@ -9229,7 +9163,7 @@ async function runWitnessVerification(config) {
     }
     let tlaPredicate;
     try {
-      tlaPredicate = location.custom ? bddPredicateToTLA2(w.predicate, bareFieldRenderer2(custom?.fields)) : bddPredicateToTLA2(w.predicate);
+      tlaPredicate = location.custom ? bddPredicateToTLA(w.predicate, bareFieldRenderer(custom?.fields)) : bddPredicateToTLA(w.predicate);
     } catch (err) {
       results.push({
         id,
@@ -9242,8 +9176,8 @@ async function runWitnessVerification(config) {
     }
     const moduleName = `Witness_${subsystem}_${idx++}`;
     const witnessTla = path5.join(location.dir, `${moduleName}.tla`);
-    fs4.writeFileSync(witnessTla, buildWitnessModule2(moduleName, location.module, tlaPredicate, { bare: location.custom }));
-    fs4.writeFileSync(path5.join(location.dir, `${moduleName}.cfg`), buildWitnessCfg2(fs4.readFileSync(location.cfgPath, "utf8")));
+    fs4.writeFileSync(witnessTla, buildWitnessModule(moduleName, location.module, tlaPredicate, { bare: location.custom }));
+    fs4.writeFileSync(path5.join(location.dir, `${moduleName}.cfg`), buildWitnessCfg(fs4.readFileSync(location.cfgPath, "utf8")));
     const polarityTag = polarity === "forbidden" ? color("  [forbidden — must be unreachable]", COLORS.gray) : "";
     console.log(color(`⚙️  ${id}`, COLORS.blue) + polarityTag);
     console.log(color(`     ${subsystem} ⊨ ${w.predicate}`, COLORS.gray));
@@ -9263,7 +9197,7 @@ async function runWitnessVerification(config) {
       console.log(color("     ⚠ inconclusive — TLC did not finish (raise the config timeout)", COLORS.yellow));
       continue;
     }
-    const reachable = !tlc.success && tlc.violation?.name === WITNESS_INVARIANT2;
+    const reachable = !tlc.success && tlc.violation?.name === WITNESS_INVARIANT;
     if (!tlc.success && !reachable) {
       results.push({
         id,
@@ -9277,7 +9211,7 @@ async function runWitnessVerification(config) {
       fs4.writeFileSync(path5.join(location.dir, `${moduleName}.tlc-output.log`), tlc.output);
       continue;
     }
-    const verdict = witnessVerdict2(polarity, reachable);
+    const verdict = witnessVerdict(polarity, reachable);
     const note = reachable ? undefined : `${tlc.stats?.distinctStates ?? 0} distinct states explored`;
     results.push({
       id,
@@ -9400,9 +9334,9 @@ async function runCodebaseAnalysis() {
   return analysis;
 }
 async function generateAndWriteTLASpecs(config, analysis) {
-  const { generateTLA: generateTLA2 } = await Promise.resolve().then(() => (init_tla(), exports_tla));
+  await Promise.resolve().then(() => init_tla());
   console.log(color("\uD83D\uDCDD Generating TLA+ specification...", COLORS.blue));
-  const { spec, cfg } = await generateTLA2(config, analysis);
+  const { spec, cfg } = await generateTLA(config, analysis);
   const specDir = path5.join(process.cwd(), "specs", "tla", "generated");
   if (!fs4.existsSync(specDir)) {
     fs4.mkdirSync(specDir, { recursive: true });
@@ -9469,9 +9403,9 @@ async function runMeshSeedGuard(docker, specDir, config) {
   return docker.runTLC(path5.join(specDir, "MeshSeed.tla"), { workers: 1 });
 }
 async function setupDocker() {
-  const { DockerRunner: DockerRunner2 } = await Promise.resolve().then(() => (init_docker(), exports_docker));
+  await Promise.resolve().then(() => init_docker());
   console.log(color("\uD83D\uDC33 Checking Docker...", COLORS.blue));
-  const docker = new DockerRunner2;
+  const docker = new DockerRunner;
   try {
     if (!await docker.isDockerAvailable()) {
       console.log();
@@ -9640,4 +9574,4 @@ main().catch((error) => {
   process.exit(1);
 });
 
-//# debugId=D4D47405397BD18D64756E2164756E21
+//# debugId=92CAFBFCF98F237564756E2164756E21