@fairfox/polly 0.37.0 → 0.38.1

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

@@ -401,6 +401,32 @@ async function generateTLA(config, analysis) {
   const generator = new TLAGenerator;
   return await generator.generate(config, analysis);
 }
+function applySubsystemBounds(messages, subsystem, handlerNames) {
+  if (messages.perMessageBounds) {
+    const filtered = {};
+    for (const [msg, bound] of Object.entries(messages.perMessageBounds)) {
+      if (handlerNames.has(msg)) {
+        filtered[msg] = bound;
+      }
+    }
+    messages.perMessageBounds = filtered;
+  }
+  const override = subsystem.bounds;
+  if (!override)
+    return;
+  if (override.maxInFlight !== undefined) {
+    messages.maxInFlight = override.maxInFlight;
+  }
+  if (override.perMessageBounds) {
+    const merged = { ...messages.perMessageBounds ?? {} };
+    for (const [msg, bound] of Object.entries(override.perMessageBounds)) {
+      if (handlerNames.has(msg)) {
+        merged[msg] = bound;
+      }
+    }
+    messages.perMessageBounds = merged;
+  }
+}
 async function generateSubsystemTLA(_subsystemName, subsystem, config, analysis) {
   const stateFields = new Set(subsystem.state);
   const handlerNames = new Set(subsystem.handlers);
@@ -415,15 +441,7 @@ async function generateSubsystemTLA(_subsystemName, subsystem, config, analysis)
     include: subsystem.handlers
   };
   filteredMessages.exclude = undefined;
-  if (filteredMessages.perMessageBounds) {
-    const filteredBounds = {};
-    for (const [msg, bound] of Object.entries(filteredMessages.perMessageBounds)) {
-      if (handlerNames.has(msg)) {
-        filteredBounds[msg] = bound;
-      }
-    }
-    filteredMessages.perMessageBounds = filteredBounds;
-  }
+  applySubsystemBounds(filteredMessages, subsystem, handlerNames);
   const filteredConfig = {
     ...config,
     state: filteredState,
@@ -3613,7 +3631,7 @@ class ConfigValidator {
       this.validateTier2Optimizations(config.tier2);
     }
     if (config.subsystems) {
-      this.validateSubsystems(config.subsystems, config.state);
+      this.validateSubsystems(config.subsystems, config.state, config.messages);
     }
   }
   findNullPlaceholders(obj, path2) {
@@ -3931,7 +3949,7 @@ class ConfigValidator {
       }
     }
   }
-  validateSubsystems(subsystems, stateConfig) {
+  validateSubsystems(subsystems, stateConfig, messages) {
     const stateFieldNames = Object.keys(stateConfig);
     const allAssignedHandlers = new Map;
     const allAssignedFields = new Map;
@@ -3991,6 +4009,69 @@ class ConfigValidator {
           suggestion: "Add at least one state field to the subsystem"
         });
       }
+      if (subsystem.bounds) {
+        this.validateSubsystemBounds(subsystemName, subsystem, messages);
+      }
+    }
+  }
+  validateSubsystemBounds(subsystemName, subsystem, messages) {
+    const bounds = subsystem.bounds;
+    if (!bounds)
+      return;
+    const effectiveMaxInFlight = bounds.maxInFlight === undefined ? messages.maxInFlight ?? 3 : bounds.maxInFlight;
+    if (bounds.maxInFlight !== undefined && bounds.maxInFlight < 1) {
+      this.issues.push({
+        type: "invalid_value",
+        severity: "error",
+        field: `subsystems.${subsystemName}.bounds.maxInFlight`,
+        message: `bounds.maxInFlight must be at least 1, got ${bounds.maxInFlight}`,
+        suggestion: "Use 1 to keep the global value, or 2+ to exercise multi-step ensures"
+      });
+    }
+    if (bounds.maxInFlight !== undefined && bounds.maxInFlight > 20) {
+      this.issues.push({
+        type: "unrealistic_bound",
+        severity: "warning",
+        field: `subsystems.${subsystemName}.bounds.maxInFlight`,
+        message: `Very high bounds.maxInFlight (${bounds.maxInFlight}) will slow this subsystem's verification significantly`,
+        suggestion: "Use 2-4 for most multi-step ensures cases"
+      });
+    }
+    if (bounds.perMessageBounds) {
+      const handlerSet = new Set(subsystem.handlers);
+      for (const [msg, bound] of Object.entries(bounds.perMessageBounds)) {
+        this.validatePerMessageBound(subsystemName, msg, bound, effectiveMaxInFlight, handlerSet);
+      }
+    }
+  }
+  validatePerMessageBound(subsystemName, msg, bound, effectiveMaxInFlight, handlerSet) {
+    const field = `subsystems.${subsystemName}.bounds.perMessageBounds.${msg}`;
+    if (bound < 1) {
+      this.issues.push({
+        type: "invalid_value",
+        severity: "error",
+        field,
+        message: `perMessageBounds[${msg}] must be at least 1, got ${bound}`,
+        suggestion: "Remove the entry to inherit from the global bound, or set 1+"
+      });
+    }
+    if (bound > effectiveMaxInFlight) {
+      this.issues.push({
+        type: "invalid_value",
+        severity: "error",
+        field,
+        message: `perMessageBounds[${msg}] = ${bound} exceeds effective maxInFlight = ${effectiveMaxInFlight}; the bound is unreachable and ${msg} will not be explored`,
+        suggestion: `Lower perMessageBounds[${msg}] to ≤ ${effectiveMaxInFlight}, or raise bounds.maxInFlight`
+      });
+    }
+    if (!handlerSet.has(msg)) {
+      this.issues.push({
+        type: "invalid_value",
+        severity: "warning",
+        field,
+        message: `perMessageBounds[${msg}] is set on subsystem "${subsystemName}" but ${msg} is not in its handlers list; the override will be silently dropped`,
+        suggestion: `Move ${msg} into subsystems.${subsystemName}.handlers, or remove the override`
+      });
     }
   }
 }
@@ -7435,6 +7516,7 @@ async function runSubsystemVerification(config, analysis) {
     const startTime = Date.now();
     console.log(color(`⚙️  Verifying subsystem: ${name}...`, COLORS.blue));
     const { spec, cfg } = await generateSubsystemTLA2(name, sub, config, analysis);
+    const ensuresCount = (spec.match(/^EnsuresAfter_\w+ ==/gm) ?? []).length;
     const specDir = path4.join(process.cwd(), "specs", "tla", "generated", name);
     if (!fs4.existsSync(specDir)) {
       fs4.mkdirSync(specDir, { recursive: true });
@@ -7454,6 +7536,7 @@ async function runSubsystemVerification(config, analysis) {
       name,
       success: result.success,
       handlerCount: sub.handlers.length,
+      ensuresCount,
       stateCount: result.stats?.distinctStates ?? 0,
       elapsed,
       stats: result.stats,
@@ -7474,6 +7557,16 @@ async function runSubsystemVerification(config, analysis) {
   console.log();
   displayCompositionalReport(results, interference.valid);
 }
+function displayEnsuresSummary(results) {
+  const totalEnsures = results.reduce((sum, r) => sum + r.ensuresCount, 0);
+  if (totalEnsures === 0)
+    return;
+  const subsystemWord = `subsystem${results.length === 1 ? "" : "s"}`;
+  console.log();
+  console.log(color(`  ${totalEnsures} ensures step-properties registered across ${results.length} ${subsystemWord}.`, COLORS.gray));
+  console.log(color("  A property only fires at states where its handler is enabled — raise", COLORS.gray));
+  console.log(color("  bounds.maxInFlight on a subsystem to reach multi-step-reachable handlers.", COLORS.gray));
+}
 function displayCompositionalReport(results, nonInterferenceValid) {
   console.log(color(`Subsystem verification results:
 `, COLORS.blue));
@@ -7481,10 +7574,12 @@ function displayCompositionalReport(results, nonInterferenceValid) {
     const status = r.success ? color("✓", COLORS.green) : color("✗", COLORS.red);
     const name = r.name.padEnd(20);
     const handlers = `${r.handlerCount} handler${r.handlerCount === 1 ? "" : "s"}`;
+    const ensures = `${r.ensuresCount} ensures`;
     const states = `${r.stateCount} states`;
     const time = `${r.elapsed.toFixed(1)}s`;
-    console.log(`  ${status} ${name} ${handlers.padEnd(14)} ${states.padEnd(14)} ${time}`);
+    console.log(`  ${status} ${name} ${handlers.padEnd(14)} ${ensures.padEnd(12)} ${states.padEnd(14)} ${time}`);
   }
+  displayEnsuresSummary(results);
   console.log();
   const nonIntLabel = nonInterferenceValid ? color("✓ verified (no cross-subsystem state writes)", COLORS.green) : color("⚠ violations detected", COLORS.yellow);
   console.log(`  Non-interference: ${nonIntLabel}`);
@@ -7724,4 +7819,4 @@ main().catch((error) => {
   process.exit(1);
 });
 
-//# debugId=550B2383F1F1827964756E2164756E21
+//# debugId=17E54E7016FB5CE064756E2164756E21