@fairfox/polly 0.71.0 → 0.72.0

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

@@ -89,10 +89,12 @@ function isNullable(configEntry) {
   }
   return false;
 }
-function checkUnmodeledFields(expression, configKeys, stateConfig, messageType, conditionType, location) {
+function checkUnmodeledFields(expression, configKeys, stateConfig, messageType, conditionType, location, meshSignalNames) {
   const warnings = [];
   const refs = extractFieldRefs(expression);
   for (const ref of refs) {
+    if (meshSignalNames.has(ref.split(".")[0] ?? ref))
+      continue;
     if (!fieldInConfig(ref, configKeys, stateConfig)) {
       warnings.push({
         kind: "unmodeled_field",
@@ -195,7 +197,7 @@ function checkWeakPostconditions(expression, handler, messageType, conditionType
   }
   return [];
 }
-function validateExpressions(handlers, stateConfig) {
+function validateExpressions(handlers, stateConfig, meshSignalNames = new Set) {
   const warnings = [];
   let validCount = 0;
   const configKeys = new Set(Object.keys(stateConfig));
@@ -220,7 +222,7 @@ function validateExpressions(handlers, stateConfig) {
       };
       const condWarnings = [];
       if (!isPayloadOnly) {
-        condWarnings.push(...checkUnmodeledFields(cond.expression, configKeys, stateConfig, handler.messageType, type, loc));
+        condWarnings.push(...checkUnmodeledFields(cond.expression, configKeys, stateConfig, handler.messageType, type, loc, meshSignalNames));
       }
       condWarnings.push(...checkUnsupportedMethods(cond.expression, configKeys, stateConfig, handler.messageType, type, loc));
       condWarnings.push(...checkOptionalChaining(cond.expression, handler.messageType, type, loc));
@@ -1216,13 +1218,15 @@ var init_tla = __esm(() => {
           fieldLines.push(`${this.sanitizeFieldName(fieldName)}: ${tlaType}`);
         }
         this.line(`\\* Document type for ${docId}`);
-        this.line(`MeshDoc_${this.sanitizeFieldName(docId)} == [${fieldLines.join(", ")}]`);
+        this.line(`MeshDoc_${this.sanitizeIdentifier(docId)} == [${fieldLines.join(", ")}]`);
         this.line("");
       }
-      this.line("\\* Initial mesh-document values (one record per declared docId)");
-      this.line("InitialMesh == [");
+      this.line("\\* Initial mesh-document values — a function keyed by docId");
+      this.line("InitialMesh ==");
+      this.indent++;
+      this.line("[d \\in MeshDocs |->");
       this.indent++;
-      const initLines = [];
+      const caseArms = [];
       for (const docId of docIds) {
         const fields = mesh[docId];
         if (!fields)
@@ -1232,15 +1236,19 @@ var init_tla = __esm(() => {
           const initVal = this.fieldConfigInitialValue(`${docId}_${fieldName}`, fieldConfig, config);
           inner.push(`${this.sanitizeFieldName(fieldName)} |-> ${initVal}`);
         }
-        initLines.push(`"${docId}" |-> [${inner.join(", ")}]`);
+        caseArms.push(`d = "${docId}" -> [${inner.join(", ")}]`);
       }
-      initLines.forEach((line, i) => {
-        this.line(line + (i < initLines.length - 1 ? "," : ""));
+      caseArms.forEach((arm, i) => {
+        const prefix = i === 0 ? "CASE " : "  [] ";
+        const suffix = i === caseArms.length - 1 ? "]" : "";
+        this.line(prefix + arm + suffix);
       });
-      this.indent--;
-      this.line("]");
+      this.indent -= 2;
       this.line("");
     }
+    sanitizeIdentifier(key) {
+      return key.replace(/[^A-Za-z0-9_]/g, "_");
+    }
     fieldConfigInitialValue(_path, fieldConfig, _config) {
       const fc = fieldConfig;
       if (fc["type"] === "boolean")
@@ -2049,7 +2057,7 @@ var init_tla = __esm(() => {
       if (typeof expr !== "string")
         return null;
       const trimmed = expr.trim();
-      const match = trimmed.match(/^(forAllPeers|somePeer)\s*\(\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*=>\s*([\s\S]+)\)\s*$/);
+      const match = trimmed.match(/^(forAllPeers|somePeer)\s*\(\s*\(?\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*\)?\s*=>\s*([\s\S]+)\)\s*$/);
       if (!match)
         return null;
       const fn = match[1];
@@ -3217,6 +3225,42 @@ init_expression_validator();
 import * as fs4 from "node:fs";
 import * as path4 from "node:path";
 
+// tools/verify/src/analysis/mesh-signal-warnings.ts
+function computeMeshOrPeerSignalFindings(analysis, declaredMeshDocs) {
+  const signals = analysis.meshOrPeerSignals ?? [];
+  if (signals.length === 0)
+    return [];
+  const unverified = signals.filter((s) => !(s.kind === "mesh" && declaredMeshDocs.has(s.key)));
+  if (unverified.length === 0)
+    return [];
+  const findings = [];
+  for (const handler of analysis.handlers) {
+    const scan = (conditions, kind) => {
+      for (const cond of conditions) {
+        for (const sig of unverified) {
+          const pattern = new RegExp(`\\b${sig.variableName}\\.value\\b`);
+          if (pattern.test(cond.expression)) {
+            findings.push({
+              handler: handler.messageType,
+              kind,
+              expression: cond.expression,
+              signalName: sig.variableName,
+              signalKind: sig.kind,
+              location: {
+                file: handler.location?.file ?? sig.filePath,
+                line: cond.location?.line ?? handler.location?.line ?? sig.line
+              }
+            });
+          }
+        }
+      }
+    };
+    scan(handler.preconditions, "precondition");
+    scan(handler.postconditions, "postcondition");
+  }
+  return findings;
+}
+
 // tools/verify/src/config/types.ts
 function isAdapterConfig(config) {
   return "adapter" in config;
@@ -7657,7 +7701,8 @@ async function estimateCommand() {
   const analysis = await runCodebaseAnalysis();
   const typedConfig = config;
   const typedAnalysis = analysis;
-  const exprValidation = validateExpressions(typedAnalysis.handlers, typedConfig.state);
+  const meshSignalNames = new Set((typedAnalysis.meshOrPeerSignals ?? []).map((s) => s.variableName));
+  const exprValidation = validateExpressions(typedAnalysis.handlers, typedConfig.state, meshSignalNames);
   if (exprValidation.warnings.length > 0) {
     displayExpressionWarnings(exprValidation);
   }
@@ -7744,44 +7789,28 @@ function displayExpressionWarnings(result) {
     console.log();
   }
 }
-function displayMeshOrPeerSignalWarnings(analysis) {
-  const signals = analysis.meshOrPeerSignals ?? [];
-  if (signals.length === 0)
-    return;
-  const findings = [];
-  for (const handler of analysis.handlers) {
-    const scanConditions = (conditions, kind) => {
-      for (const cond of conditions) {
-        for (const sig of signals) {
-          const pattern = new RegExp(`\\b${sig.variableName}\\.value\\b`);
-          if (pattern.test(cond.expression)) {
-            findings.push({
-              handler: handler.messageType,
-              kind,
-              expression: cond.expression,
-              signalName: sig.variableName,
-              signalKind: sig.kind,
-              location: {
-                file: handler.location.file,
-                line: cond.location?.line ?? handler.location.line
-              }
-            });
-          }
-        }
-      }
-    };
-    scanConditions(handler.preconditions, "precondition");
-    scanConditions(handler.postconditions, "postcondition");
-  }
+function displayMeshOrPeerSignalWarnings(analysis, declaredMeshDocs) {
+  const findings = computeMeshOrPeerSignalFindings(analysis, declaredMeshDocs);
   if (findings.length === 0)
     return;
+  const hasUndeclaredMesh = findings.some((f) => f.signalKind === "mesh");
+  const hasPeer = findings.some((f) => f.signalKind === "peer");
   console.log(color(`
-⚠️  ${findings.length} predicate(s) reference a $meshState/$peerState signal (polly#117):`, COLORS.yellow));
-  console.log(color("   The verifier currently treats these the same as $sharedState — single-context local state.", COLORS.gray));
-  console.log(color(`   Cross-peer semantics are NOT verified. A green run does not prove the claim across peers.
-`, COLORS.gray));
+⚠️  ${findings.length} predicate(s) reference an unverified $meshState/$peerState signal (polly#117):`, COLORS.yellow));
+  console.log(color("   These signals are flattened to single-context local state, so a green run", COLORS.gray));
+  console.log(color("   does NOT prove the claim holds across peers.", COLORS.gray));
+  if (hasUndeclaredMesh) {
+    console.log(color("   Fix ($meshState): declare the document key under `mesh: { ... }` in your", COLORS.gray));
+    console.log(color("   verification config. Declared mesh docs are routed through the meshState", COLORS.gray));
+    console.log(color("   namespace with a PropagateMeshOp action, so `forAllPeers(...)` claims are checked.", COLORS.gray));
+  }
+  if (hasPeer) {
+    console.log(color("   $peerState signals have no cross-peer verification model yet.", COLORS.gray));
+  }
+  console.log();
   for (const f of findings) {
-    console.log(color(`   ⚠  ${f.handler} ${f.kind}: ${f.signalName} is $${f.signalKind}State, not single-context`, COLORS.yellow));
+    const remedy = f.signalKind === "mesh" ? "not declared in config.mesh" : "$peerState — no cross-peer model";
+    console.log(color(`   ⚠  ${f.handler} ${f.kind}: ${f.signalName} (${remedy})`, COLORS.yellow));
     console.log(color(`      ${f.expression}`, COLORS.gray));
     console.log(color(`      at ${f.location.file}:${f.location.line}`, COLORS.gray));
     console.log();
@@ -7851,11 +7880,13 @@ async function runFullVerification(configPath) {
   const analysis = await runCodebaseAnalysis();
   const typedConfig = config;
   const typedAnalysis = analysis;
-  const exprValidation = validateExpressions(typedAnalysis.handlers, typedConfig.state);
+  const meshSignalNames = new Set((typedAnalysis.meshOrPeerSignals ?? []).map((s) => s.variableName));
+  const exprValidation = validateExpressions(typedAnalysis.handlers, typedConfig.state, meshSignalNames);
   if (exprValidation.warnings.length > 0) {
     displayExpressionWarnings(exprValidation);
   }
-  displayMeshOrPeerSignalWarnings(typedAnalysis);
+  const declaredMeshDocs = new Set(Object.keys(typedConfig.mesh ?? {}));
+  displayMeshOrPeerSignalWarnings(typedAnalysis, declaredMeshDocs);
   if (typedConfig.subsystems && Object.keys(typedConfig.subsystems).length > 0) {
     await runSubsystemVerification(typedConfig, typedAnalysis);
     return;
@@ -8256,4 +8287,4 @@ main().catch((error) => {
   process.exit(1);
 });
 
-//# debugId=E07763C4D9F04C6264756E2164756E21
+//# debugId=15266168B7768F5064756E2164756E21