@fairfox/polly 0.7.1 → 0.7.4

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

@@ -1,6 +1,21 @@
 #!/usr/bin/env bun
 import { createRequire } from "node:module";
+var __create = Object.create;
+var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __toESM = (mod, isNodeMode, target) => {
+  target = mod != null ? __create(__getProtoOf(mod)) : {};
+  const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
+  for (let key of __getOwnPropNames(mod))
+    if (!__hasOwnProp.call(to, key))
+      __defProp(to, key, {
+        get: () => mod[key],
+        enumerable: true
+      });
+  return to;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
@@ -687,6 +702,17 @@ class TLAGenerator {
     return isFirst;
   }
   addStateType(config, _analysis) {
+    this.defineValueTypes();
+    this.line("\\* Application state type definition");
+    this.line("State == [");
+    this.indent++;
+    const stateFields = this.collectStateFields(config, _analysis);
+    this.writeStateFields(stateFields);
+    this.indent--;
+    this.line("]");
+    this.line("");
+  }
+  defineValueTypes() {
     this.line("\\* Generic value type for sequences and maps");
     this.line("\\* Bounded to allow model checking");
     this.line('Value == {"v1", "v2", "v3"}');
@@ -695,9 +721,8 @@ class TLAGenerator {
     this.line("\\* Bounded to allow model checking");
     this.line('Keys == {"k1", "k2", "k3"}');
     this.line("");
-    this.line("\\* Application state type definition");
-    this.line("State == [");
-    this.indent++;
+  }
+  collectStateFields(config, _analysis) {
     const stateFields = [];
     for (const [fieldPath, fieldConfig] of Object.entries(config.state)) {
       if (typeof fieldConfig !== "object" || fieldConfig === null)
@@ -707,24 +732,26 @@ class TLAGenerator {
       stateFields.push(`${fieldName}: ${tlaType}`);
     }
     for (const fieldAnalysis of _analysis.fields) {
-      if (!fieldAnalysis.path || typeof fieldAnalysis.path !== "string") {
+      if (!fieldAnalysis.path || typeof fieldAnalysis.path !== "string")
         continue;
-      }
       const fieldName = this.sanitizeFieldName(fieldAnalysis.path);
-      if (stateFields.some((f) => f.startsWith(`${fieldName}:`))) {
+      if (stateFields.some((f) => f.startsWith(`${fieldName}:`)))
         continue;
-      }
       const tlaType = this.inferTLATypeFromAnalysis(fieldAnalysis);
       stateFields.push(`${fieldName}: ${tlaType}`);
     }
-    for (let i = 0;i < stateFields.length; i++) {
-      const field = stateFields[i];
-      const suffix = i < stateFields.length - 1 ? "," : "";
+    return stateFields;
+  }
+  writeStateFields(fields) {
+    if (fields.length === 0) {
+      this.line("dummy: BOOLEAN  \\* Placeholder for empty state");
+      return;
+    }
+    for (let i = 0;i < fields.length; i++) {
+      const field = fields[i];
+      const suffix = i < fields.length - 1 ? "," : "";
       this.line(`${field}${suffix}`);
     }
-    this.indent--;
-    this.line("]");
-    this.line("");
   }
   addMessageTypes(_config, analysis) {
     if (analysis.messageTypes.length === 0) {
@@ -765,6 +792,20 @@ class TLAGenerator {
     this.line("\\* Initial application state");
     this.line("InitialState == [");
     this.indent++;
+    const fields = this.collectInitialStateFields(config, _analysis);
+    this.writeInitialStateFields(fields);
+    this.indent--;
+    this.line("]");
+    this.line("");
+    this.line("\\* Initial state (extends MessageRouter)");
+    this.line("UserInit ==");
+    this.indent++;
+    this.line("/\\ Init  \\* MessageRouter's init");
+    this.line("/\\ contextStates = [c \\in Contexts |-> InitialState]");
+    this.indent--;
+    this.line("");
+  }
+  collectInitialStateFields(config, _analysis) {
     const fields = [];
     for (const [fieldPath, fieldConfig] of Object.entries(config.state)) {
       if (typeof fieldConfig !== "object" || fieldConfig === null)
@@ -774,31 +815,26 @@ class TLAGenerator {
       fields.push(`${fieldName} |-> ${initialValue}`);
     }
     for (const fieldAnalysis of _analysis.fields) {
-      if (!fieldAnalysis.path || typeof fieldAnalysis.path !== "string") {
+      if (!fieldAnalysis.path || typeof fieldAnalysis.path !== "string")
         continue;
-      }
       const fieldName = this.sanitizeFieldName(fieldAnalysis.path);
-      if (fields.some((f) => f.startsWith(`${fieldName} |->`))) {
+      if (fields.some((f) => f.startsWith(`${fieldName} |->`)))
         continue;
-      }
       const initialValue = this.getInitialValueFromAnalysis(fieldAnalysis);
       fields.push(`${fieldName} |-> ${initialValue}`);
     }
+    return fields;
+  }
+  writeInitialStateFields(fields) {
+    if (fields.length === 0) {
+      this.line("dummy |-> FALSE  \\* Placeholder for empty state");
+      return;
+    }
     for (let i = 0;i < fields.length; i++) {
       const field = fields[i];
       const suffix = i < fields.length - 1 ? "," : "";
       this.line(`${field}${suffix}`);
     }
-    this.indent--;
-    this.line("]");
-    this.line("");
-    this.line("\\* Initial state (extends MessageRouter)");
-    this.line("UserInit ==");
-    this.indent++;
-    this.line("/\\ Init  \\* MessageRouter's init");
-    this.line("/\\ contextStates = [c \\in Contexts |-> InitialState]");
-    this.indent--;
-    this.line("");
   }
   addActions(config, analysis) {
     this.line("\\* =============================================================================");
@@ -1024,10 +1060,10 @@ class TLAGenerator {
     const _indexMap = new Map;
     result = result.replace(/(\w+(?:\.\w+)*)\[(\d+)\]|\]\[(\d+)\]/g, (_match, identPart, index1, index2) => {
       if (identPart) {
-        const newIndex2 = Number.parseInt(index1) + 1;
+        const newIndex2 = Number.parseInt(index1, 10) + 1;
         return `${identPart}[${newIndex2}]`;
       }
-      const newIndex = Number.parseInt(index2) + 1;
+      const newIndex = Number.parseInt(index2, 10) + 1;
       return `][${newIndex}]`;
     });
     result = result.replace(/(\w+(?:\.\w+)*)\.some\(\(?(\w+)\)?\s*=>\s*([^)]+)\)/g, (_match, arrayRef, param, condition) => {
@@ -1056,9 +1092,9 @@ class TLAGenerator {
       return `\\E i \\in 1..Len(${strRef}) : SubSeq(${strRef}, i, i+${substring.length}-1) = "${substring}"`;
     });
     result = result.replace(/(\w+(?:\.\w+)*)\.slice\((-?\d+)(?:,\s*(-?\d+))?\)\.length/g, (_match, strRef, start, end) => {
-      const startNum = Number.parseInt(start);
+      const startNum = Number.parseInt(start, 10);
       if (end !== undefined) {
-        const endNum = Number.parseInt(end);
+        const endNum = Number.parseInt(end, 10);
         if (startNum < 0 && endNum < 0) {
           return `Len(SubSeq(${strRef}, Len(${strRef}) - ${Math.abs(startNum)} + 1, Len(${strRef}) - ${Math.abs(endNum)}))`;
         }
@@ -1076,9 +1112,9 @@ class TLAGenerator {
       return `Len(SubSeq(${strRef}, ${startNum + 1}, Len(${strRef})))`;
     });
     result = result.replace(/(\w+(?:\.\w+)*)\.substring\((\d+)(?:,\s*(\d+))?\)\.length/g, (_match, strRef, start, end) => {
-      const startNum = Number.parseInt(start);
+      const startNum = Number.parseInt(start, 10);
       if (end !== undefined) {
-        const endNum = Number.parseInt(end);
+        const endNum = Number.parseInt(end, 10);
         if (startNum > endNum) {
           return `Len(SubSeq(${strRef}, ${endNum + 1}, ${startNum}))`;
         }
@@ -1087,15 +1123,15 @@ class TLAGenerator {
       return `Len(SubSeq(${strRef}, ${startNum + 1}, Len(${strRef})))`;
     });
     result = result.replace(/(\w+(?:\.\w+)*)\.slice\((-?\d+)\)(?!,)/g, (_match, strRef, start) => {
-      const startNum = Number.parseInt(start);
+      const startNum = Number.parseInt(start, 10);
       if (startNum < 0) {
         return `SubSeq(${strRef}, Len(${strRef}) - ${Math.abs(startNum)} + 1, Len(${strRef}))`;
       }
       return `SubSeq(${strRef}, ${startNum + 1}, Len(${strRef}))`;
     });
     result = result.replace(/(\w+(?:\.\w+)*)\.slice\((-?\d+),\s*(-?\d+)\)/g, (_match, strRef, start, end) => {
-      const startNum = Number.parseInt(start);
-      const endNum = Number.parseInt(end);
+      const startNum = Number.parseInt(start, 10);
+      const endNum = Number.parseInt(end, 10);
       if (startNum < 0 && endNum < 0) {
         return `SubSeq(${strRef}, Len(${strRef}) - ${Math.abs(startNum)} + 1, Len(${strRef}) - ${Math.abs(endNum)})`;
       }
@@ -1108,12 +1144,12 @@ class TLAGenerator {
       return `SubSeq(${strRef}, ${startNum + 1}, ${endNum})`;
     });
     result = result.replace(/(\w+(?:\.\w+)*)\.substring\((\d+)\)(?!,)/g, (_match, strRef, start) => {
-      const startNum = Number.parseInt(start);
+      const startNum = Number.parseInt(start, 10);
       return `SubSeq(${strRef}, ${startNum + 1}, Len(${strRef}))`;
     });
     result = result.replace(/(\w+(?:\.\w+)*)\.substring\((\d+),\s*(\d+)\)/g, (_match, strRef, start, end) => {
-      const startNum = Number.parseInt(start);
-      const endNum = Number.parseInt(end);
+      const startNum = Number.parseInt(start, 10);
+      const endNum = Number.parseInt(end, 10);
       if (startNum > endNum) {
         return `SubSeq(${strRef}, ${endNum + 1}, ${startNum})`;
       }
@@ -1189,7 +1225,7 @@ class TLAGenerator {
       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+(?:\.\w+)*)\?\.\[(\d+)\]/g, (_match, obj, index) => {
-        const tlaIndex = Number.parseInt(index) + 1;
+        const tlaIndex = Number.parseInt(index, 10) + 1;
         return `IF ${obj} # NULL THEN ${obj}[${tlaIndex}] ELSE NULL`;
       });
       result = result.replace(/(\w+(?:\.\w+)*)\?\.\[['"](\w+)['"]\]/g, (_match, obj, prop) => `IF ${obj} # NULL THEN ${obj}.${prop} ELSE NULL`);
@@ -1670,8 +1706,8 @@ class DockerRunner {
     return {
       success: true,
       stats: {
-        statesGenerated: statesMatch?.[1] ? Number.parseInt(statesMatch[1]) : 0,
-        distinctStates: distinctMatch?.[1] ? Number.parseInt(distinctMatch[1]) : 0
+        statesGenerated: statesMatch?.[1] ? Number.parseInt(statesMatch[1], 10) : 0,
+        distinctStates: distinctMatch?.[1] ? Number.parseInt(distinctMatch[1], 10) : 0
       },
       output
     };
@@ -1718,10 +1754,11 @@ class DockerRunner {
       proc.stderr.on("data", (data) => {
         stderr += data.toString();
       });
-      const timeout = options?.timeout ? setTimeout(() => {
+      const timeoutValue = options?.timeout ?? 0;
+      const timeout = timeoutValue > 0 ? setTimeout(() => {
         proc.kill();
-        reject(new Error(`Command timed out after ${options.timeout}ms`));
-      }, options.timeout) : null;
+        reject(new Error(`Command timed out after ${Math.floor(timeoutValue / 1000)}s. TLC was still making progress. Consider increasing the timeout or using preset: 'thorough' for no timeout.`));
+      }, timeoutValue) : null;
       proc.on("close", (exitCode) => {
         if (timeout)
           clearTimeout(timeout);
@@ -2114,6 +2151,22 @@ class ConfigGenerator {
     this.line("//   • 'off' - Skip verification");
     this.line("//");
     this.line("onRelease: 'error',");
+    this.line("");
+    this.line("// Verification options (optional)");
+    this.line("// ─────────────────────");
+    this.line("//");
+    this.line("// Presets provide quick configuration:");
+    this.line("//   • 'quick': 1 minute timeout, 1 worker");
+    this.line("//   • 'balanced': 5 minutes timeout, 2 workers (default)");
+    this.line("//   • 'thorough': No timeout, 4 workers");
+    this.line("//");
+    this.line("// Or customize with verification options:");
+    this.line("//   verification: {");
+    this.line("//     timeout: 300,  // Timeout in seconds (0 = no timeout)");
+    this.line("//     workers: 2,    // Number of TLC workers");
+    this.line("//   }");
+    this.line("//");
+    this.line("// preset: 'balanced',");
   }
   formatTypeName(type) {
     let typeName;
@@ -2226,6 +2279,9 @@ class ConfigValidator {
         const lineNumber = source.substring(0, position).split(`
 `).length;
         const line = lines[lineNumber - 1];
+        if (line?.trim().startsWith("//")) {
+          continue;
+        }
         const fieldMatch = line?.match(/"([^"]+)":\s*{/);
         const fieldName = fieldMatch ? fieldMatch[1] : "unknown";
         locations.push({
@@ -2235,21 +2291,23 @@ class ConfigValidator {
           context: fieldName ?? "unknown"
         });
       }
-      this.issues.push({
-        type: "incomplete",
-        severity: "error",
-        message: `Found ${matches.length} incomplete configuration marker(s)`,
-        suggestion: "Replace all /* CONFIGURE */ markers with actual values"
-      });
-      for (const loc of locations) {
+      if (locations.length > 0) {
         this.issues.push({
           type: "incomplete",
           severity: "error",
-          field: loc.context,
-          location: { line: loc.line, column: loc.column },
-          message: `Incomplete configuration at line ${loc.line}`,
-          suggestion: `Fill in value for "${loc.context}"`
+          message: `Found ${locations.length} incomplete configuration marker(s)`,
+          suggestion: "Replace all /* CONFIGURE */ markers with actual values"
         });
+        for (const loc of locations) {
+          this.issues.push({
+            type: "incomplete",
+            severity: "error",
+            field: loc.context,
+            location: { line: loc.line, column: loc.column },
+            message: `Incomplete configuration at line ${loc.line}`,
+            suggestion: `Fill in value for "${loc.context}"`
+          });
+        }
       }
     }
   }
@@ -2257,12 +2315,23 @@ class ConfigValidator {
     const reviewRegex = /\/\*\s*REVIEW\s*\*\//g;
     const matches = [...source.matchAll(reviewRegex)];
     if (matches.length > 0) {
-      this.issues.push({
-        type: "incomplete",
-        severity: "warning",
-        message: `Found ${matches.length} value(s) that should be reviewed`,
-        suggestion: "Review auto-generated values marked with /* REVIEW */"
+      const lines = source.split(`
+`);
+      const validMatches = [...matches].filter((match) => {
+        const position = match.index ?? 0;
+        const lineNumber = source.substring(0, position).split(`
+`).length;
+        const line = lines[lineNumber - 1];
+        return !line?.trim().startsWith("//");
       });
+      if (validMatches.length > 0) {
+        this.issues.push({
+          type: "incomplete",
+          severity: "warning",
+          message: `Found ${validMatches.length} value(s) that should be reviewed`,
+          suggestion: "Review auto-generated values marked with /* REVIEW */"
+        });
+      }
     }
   }
   loadConfig(configPath) {
@@ -3051,7 +3120,7 @@ class HandlerExtractor {
     const index = indexExpr ? indexExpr.getText() : "0";
     const value = this.extractValue(right);
     if (value !== undefined) {
-      const tlaIndex = this.isNumericLiteral(index) ? (Number.parseInt(index) + 1).toString() : `${index} + 1`;
+      const tlaIndex = this.isNumericLiteral(index) ? (Number.parseInt(index, 10) + 1).toString() : `${index} + 1`;
       assignments.push({
         field: `${field}[${tlaIndex}]`,
         value
@@ -4327,10 +4396,55 @@ async function verifyCommand() {
   console.log();
   try {
     await runFullVerification(configPath);
-  } catch (_error) {
+  } catch (error) {
+    console.error(color(`
+❌ Verification error:`, COLORS.red));
+    if (error instanceof Error) {
+      console.error(color(error.message, COLORS.red));
+      if (process.env.POLLY_DEBUG) {
+        console.error(color(`
+Stack trace:`, COLORS.gray));
+        console.error(error.stack);
+      }
+    } else {
+      console.error(String(error));
+    }
+    console.error();
     process.exit(1);
   }
 }
+function getTimeout(config) {
+  if (config.verification?.timeout !== undefined) {
+    return config.verification.timeout;
+  }
+  const preset = config.preset || "balanced";
+  switch (preset) {
+    case "quick":
+      return 60;
+    case "balanced":
+      return 300;
+    case "thorough":
+      return 0;
+    default:
+      return 300;
+  }
+}
+function getWorkers(config) {
+  if (config.verification?.workers !== undefined) {
+    return config.verification.workers;
+  }
+  const preset = config.preset || "balanced";
+  switch (preset) {
+    case "quick":
+      return 1;
+    case "balanced":
+      return 2;
+    case "thorough":
+      return 4;
+    default:
+      return 2;
+  }
+}
 async function runFullVerification(configPath) {
   const config = await loadVerificationConfig(configPath);
   const analysis = await runCodebaseAnalysis();
@@ -4340,19 +4454,27 @@ async function runFullVerification(configPath) {
   console.log(color(`   ${specPath}`, COLORS.gray));
   console.log();
   const docker = await setupDocker();
+  const timeoutSeconds = getTimeout(config);
+  const workers = getWorkers(config);
   console.log(color("⚙️  Running TLC model checker...", COLORS.blue));
-  console.log(color("   This may take a minute...", COLORS.gray));
+  if (timeoutSeconds === 0) {
+    console.log(color("   No timeout set - will run until completion", COLORS.gray));
+  } else {
+    const timeoutMinutes = Math.floor(timeoutSeconds / 60);
+    const timeoutLabel = timeoutMinutes > 0 ? `${timeoutMinutes} minute${timeoutMinutes > 1 ? "s" : ""}` : `${timeoutSeconds} seconds`;
+    console.log(color(`   Timeout: ${timeoutLabel}`, COLORS.gray));
+  }
   console.log();
   const result = await docker.runTLC(specPath, {
-    workers: 2,
-    timeout: 120000
+    workers,
+    timeout: timeoutSeconds > 0 ? timeoutSeconds * 1000 : undefined
   });
   displayVerificationResults(result, specDir);
 }
 async function loadVerificationConfig(configPath) {
   const resolvedPath = path4.resolve(configPath);
   const configModule = await import(`file://${resolvedPath}?t=${Date.now()}`);
-  return configModule.default;
+  return configModule.verificationConfig || configModule.default;
 }
 async function runCodebaseAnalysis() {
   console.log(color("\uD83D\uDCCA Analyzing codebase...", COLORS.blue));
@@ -4526,4 +4648,4 @@ main().catch((error) => {
   process.exit(1);
 });
 
-//# debugId=3B4BC06E615961E764756E2164756E21
+//# debugId=487C3279544257BF64756E2164756E21