@fairfox/polly 0.15.6 → 0.15.8

package/dist/tools/verify/specs/tla/MessageRouter.cfg

@@ -4,7 +4,7 @@ SPECIFICATION Spec
 CONSTANTS
     Contexts = {background, content, popup}
     MaxMessages = 4
-    MaxTabId = 2
+    Tabs = {0, 1, 2}
     TimeoutLimit = 3
 
 \* Invariants to check

package/dist/tools/verify/specs/tla/MessageRouter.tla

@@ -19,7 +19,7 @@ EXTENDS Integers, Sequences, FiniteSets, TLC
 CONSTANTS
     Contexts,           \* Set of all contexts: {"background", "content", "popup", ...}
     MaxMessages,        \* Bound on number of messages (for model checking)
-    MaxTabId,           \* Maximum tab ID
+    Tabs,               \* Set of tab identifiers (integers or model values for symmetry)
     TimeoutLimit        \* Message timeout threshold
 
 VARIABLES
@@ -156,7 +156,7 @@ TimeoutMessage(msgIndex) ==
 Next ==
     \/ \E c \in Contexts : ConnectPort(c)
     \/ \E c \in Contexts : DisconnectPort(c)
-    \/ \E src \in Contexts : \E targetSet \in (SUBSET Contexts \ {{}}) : \E tab \in 0..MaxTabId : \E msgType \in {"msg1", "msg2"} : SendMessage(src, targetSet, tab, msgType)
+    \/ \E src \in Contexts : \E targetSet \in (SUBSET Contexts \ {{}}) : \E tab \in Tabs : \E msgType \in {"msg1", "msg2"} : SendMessage(src, targetSet, tab, msgType)
     \/ \E i \in 1..Len(messages) : RouteMessage(i)
     \/ CompleteRouting
     \/ \E i \in 1..Len(messages) : TimeoutMessage(i)

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

@@ -371,6 +371,8 @@ class TLAGenerator {
   temporalProperties = [];
   symmetrySets = [];
   resolvedActionNames = new Map;
+  tabSymmetryEnabled = false;
+  tabCount = 0;
   constructor(options) {
     this.options = options;
   }
@@ -531,6 +533,7 @@ class TLAGenerator {
     this.addExtends();
     this.addConstants(config);
     this.addMessageTypes(config, analysis);
+    this.addTabSymmetry(config);
     this.addStateType(config, analysis);
     this.addVariables();
     if (this.temporalProperties.length > 0) {
@@ -596,12 +599,19 @@ class TLAGenerator {
       lines.push(`  MaxClients = ${messages.maxClients}`);
       hasProjectConstant = true;
     }
-    if ("maxTabs" in messages && messages.maxTabs !== undefined) {
-      lines.push(`  MaxTabId = ${messages.maxTabs}`);
+    if (this.tabSymmetryEnabled) {
+      for (let i = 0;i < this.tabCount; i++) {
+        lines.push(`  Tab${i} = Tab${i}`);
+      }
+      const tabValues = Array.from({ length: this.tabCount }, (_, i) => `Tab${i}`).join(", ");
+      lines.push(`  Tabs = {${tabValues}}`);
+    } else if ("maxTabs" in messages && messages.maxTabs !== undefined) {
+      const tabValues = Array.from({ length: messages.maxTabs + 1 }, (_, i) => i).join(", ");
+      lines.push(`  Tabs = {${tabValues}}`);
     } else if (hasProjectConstant) {
-      lines.push("  MaxTabId = 0");
+      lines.push("  Tabs = {0}");
     } else {
-      lines.push("  MaxTabId = 1");
+      lines.push("  Tabs = {0, 1}");
     }
     lines.push("  TimeoutLimit = 3");
   }
@@ -930,6 +940,37 @@ class TLAGenerator {
     this.symmetrySets = ["Symmetry"];
     this.line("");
   }
+  addTabSymmetry(config) {
+    if (!config.messages.tabSymmetry) {
+      return;
+    }
+    const maxTabs = config.messages.maxTabs ?? 1;
+    this.tabCount = maxTabs + 1;
+    this.tabSymmetryEnabled = true;
+    this.line("\\* Tab symmetry constants for state space reduction (Tier 1 optimization)");
+    this.line("CONSTANTS");
+    this.indent++;
+    const tabConstants = [];
+    for (let i = 0;i <= maxTabs; i++) {
+      tabConstants.push(`Tab${i}`);
+    }
+    this.line(tabConstants.join(", "));
+    this.indent--;
+    this.line("");
+    this.line("TabSymmetry == Permutations(Tabs)");
+    this.line("");
+    const hasMessageSymmetry = this.symmetrySets.length > 0 && this.symmetrySets[0] === "Symmetry";
+    if (hasMessageSymmetry) {
+      this.line("\\* Combined symmetry: message types and tabs");
+      this.line("AllSymmetry == Symmetry \\cup TabSymmetry");
+      this.line("");
+      this.symmetrySets = ["AllSymmetry"];
+      console.log(`[INFO] [TLAGenerator] Combined symmetry: message symmetry + ${this.tabCount} tabs as model values`);
+    } else {
+      this.symmetrySets = ["TabSymmetry"];
+      console.log(`[INFO] [TLAGenerator] Tab symmetry enabled: ${this.tabCount} tabs as model values`);
+    }
+  }
   addVariables() {
     this.line("\\* Application state per context");
     this.line("VARIABLE contextStates");
@@ -1684,7 +1725,7 @@ class TLAGenerator {
     if (hasValidHandlers) {
       this.line("\\/ \\E c \\in Contexts : ConnectPort(c) /\\ UNCHANGED <<contextStates, payload>>");
       this.line("\\/ \\E c \\in Contexts : DisconnectPort(c) /\\ UNCHANGED <<contextStates, payload>>");
-      this.line("\\/ \\E src \\in Contexts : \\E targetSet \\in (SUBSET Contexts \\ {{}}) : \\E tab \\in 0..MaxTabId : \\E msgType \\in UserMessageTypes :");
+      this.line("\\/ \\E src \\in Contexts : \\E targetSet \\in (SUBSET Contexts \\ {{}}) : \\E tab \\in Tabs : \\E msgType \\in UserMessageTypes :");
       this.indent++;
       this.line("SendMessage(src, targetSet, tab, msgType) /\\ UNCHANGED <<contextStates, payload>>");
       this.indent--;
@@ -2111,9 +2152,12 @@ class DockerRunner {
       "tlc",
       "-workers",
       `${options?.workers || 1}`,
-      "-cleanup",
-      `${specName}.tla`
+      "-cleanup"
     ];
+    if (options?.maxDepth !== undefined && options.maxDepth > 0) {
+      args.push("-depth", `${options.maxDepth}`);
+    }
+    args.push(`${specName}.tla`);
     const result = await this.runCommand("docker", args, {
       timeout: options?.timeout
     });
@@ -3037,6 +3081,26 @@ class ConfigValidator {
         }
       }
     }
+    if (messages.tabSymmetry !== undefined) {
+      if (typeof messages.tabSymmetry !== "boolean") {
+        this.issues.push({
+          type: "invalid_value",
+          severity: "error",
+          field: "messages.tabSymmetry",
+          message: "tabSymmetry must be a boolean",
+          suggestion: "Use true or false"
+        });
+      }
+      if (messages.tabSymmetry && (messages.maxTabs === undefined || messages.maxTabs === null)) {
+        this.issues.push({
+          type: "invalid_value",
+          severity: "warning",
+          field: "messages.tabSymmetry",
+          message: "tabSymmetry enabled but maxTabs not set",
+          suggestion: "Set maxTabs to define the number of tabs for symmetry reduction"
+        });
+      }
+    }
   }
   validateVerificationOptions(verification) {
     if (verification.timeout !== undefined) {
@@ -5920,6 +5984,12 @@ function getTimeout(config) {
 function getWorkers(config) {
   return config.verification?.workers ?? 1;
 }
+function getMaxDepth(config) {
+  if ("tier2" in config && config.tier2?.boundedExploration?.maxDepth) {
+    return config.tier2.boundedExploration.maxDepth;
+  }
+  return;
+}
 async function runFullVerification(configPath) {
   const config = await loadVerificationConfig(configPath);
   const analysis = await runCodebaseAnalysis();
@@ -5931,6 +6001,7 @@ async function runFullVerification(configPath) {
   const docker = await setupDocker();
   const timeoutSeconds = getTimeout(config);
   const workers = getWorkers(config);
+  const maxDepth = getMaxDepth(config);
   console.log(color("⚙️  Running TLC model checker...", COLORS.blue));
   if (timeoutSeconds === 0) {
     console.log(color("   No timeout set - will run until completion", COLORS.gray));
@@ -5939,10 +6010,14 @@ async function runFullVerification(configPath) {
     const timeoutLabel = timeoutMinutes > 0 ? `${timeoutMinutes} minute${timeoutMinutes > 1 ? "s" : ""}` : `${timeoutSeconds} seconds`;
     console.log(color(`   Timeout: ${timeoutLabel}`, COLORS.gray));
   }
+  if (maxDepth !== undefined) {
+    console.log(color(`   Max depth: ${maxDepth}`, COLORS.gray));
+  }
   console.log();
   const result = await docker.runTLC(specPath, {
     workers,
-    timeout: timeoutSeconds > 0 ? timeoutSeconds * 1000 : undefined
+    timeout: timeoutSeconds > 0 ? timeoutSeconds * 1000 : undefined,
+    maxDepth
   });
   displayVerificationResults(result, specDir);
 }
@@ -6159,4 +6234,4 @@ main().catch((error) => {
   process.exit(1);
 });
 
-//# debugId=3EB612577B3C8CF564756E2164756E21
+//# debugId=30BEA370D0E300CD64756E2164756E21