ibex 0.2.0 → 0.3.0

data/lib/ibex/watch/source_snapshot.rb

@@ -7,12 +7,16 @@ module Ibex
   module Watch
     # Stable metadata and content fingerprints for watched source paths.
     class SourceSnapshot
+      # @rbs!
+      #   type fingerprint_value = Symbol | String | Integer | nil | Hash[Symbol, fingerprint_value]
+      #   type fingerprint = Hash[Symbol, fingerprint_value]
+
       attr_reader :paths #: Array[String]
 
       # @rbs (Array[String] paths) -> void
       def initialize(paths)
         @paths = paths.map { |path| File.expand_path(path) }.uniq.sort.freeze
-        @entries = @paths.to_h { |path| [path, fingerprint(path)] }.freeze #: Hash[String, Hash[Symbol, untyped]]
+        @entries = @paths.to_h { |path| [path, fingerprint(path)] }.freeze #: Hash[String, fingerprint]
         freeze
       end
 
@@ -31,16 +35,16 @@ module Ibex
 
       protected
 
-      attr_reader :entries #: Hash[String, Hash[Symbol, untyped]]
+      attr_reader :entries #: Hash[String, fingerprint]
 
-      # @rbs (String path) -> Hash[Symbol, untyped]?
+      # @rbs (String path) -> fingerprint?
       def entry(path)
         @entries[path]
       end
 
       private
 
-      # @rbs (String path) -> Hash[Symbol, untyped]
+      # @rbs (String path) -> fingerprint
       def fingerprint(path)
         stat = File.lstat(path)
         value = stat_signature(stat)
@@ -56,7 +60,7 @@ module Ibex
         { kind: :error, error: e.class.name, errno: e.respond_to?(:errno) ? e.errno : nil }
       end
 
-      # @rbs (File::Stat stat) -> Hash[Symbol, untyped]
+      # @rbs (File::Stat stat) -> fingerprint
       def stat_signature(stat)
         {
           kind: file_kind(stat), dev: stat.dev, ino: stat.ino, size: stat.size,
@@ -78,13 +82,14 @@ module Ibex
         (time.to_i * 1_000_000_000) + time.nsec
       end
 
-      # @rbs (Hash[Symbol, untyped] value, String path) -> void
+      # @rbs (fingerprint value, String path) -> void
       def add_resolved_target(value, path)
         target = File.realpath(path)
         stat = File.stat(target)
         value[:resolved_path] = target
-        value[:resolved] = stat_signature(stat)
-        value[:resolved][:sha256] = Digest::SHA256.file(target).hexdigest if stat.file?
+        resolved = stat_signature(stat)
+        resolved[:sha256] = Digest::SHA256.file(target).hexdigest if stat.file?
+        value[:resolved] = resolved
       rescue SystemCallError => e
         value[:resolved] = { kind: :error, error: e.class.name, errno: e.respond_to?(:errno) ? e.errno : nil }
       end

data/lib/ibex.rb

@@ -3,6 +3,8 @@
 
 require_relative "ibex/version"
 require_relative "ibex/error"
+require_relative "ibex/configuration"
+require_relative "ibex/messages"
 require_relative "ibex/location"
 require_relative "ibex/error_messages"
 require_relative "ibex/artifact_set"
@@ -19,6 +21,14 @@ require_relative "ibex/ir"
 require_relative "ibex/normalize"
 require_relative "ibex/analysis"
 require_relative "ibex/samples"
+require_relative "ibex/fuzz"
+require_relative "ibex/delta_reducer"
+require_relative "ibex/verify"
+require_relative "ibex/equiv"
+require_relative "ibex/diff"
+require_relative "ibex/metrics"
+require_relative "ibex/fix"
+require_relative "ibex/bison_import"
 require_relative "ibex/grammar_tests"
 require_relative "ibex/racc_migration"
 require_relative "ibex/lalr"

data/schema/{automaton-ir-v1.schema.json → automaton-ir-definitions.schema.json}

@@ -1,8 +1,8 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://raw.githubusercontent.com/ydah/ibex/main/schema/automaton-ir-v1.schema.json",
-  "title": "Ibex Automaton IR version 1",
-  "description": "The self-contained parser automaton exchanged between Ibex analysis and code generation stages.",
+  "$id": "https://raw.githubusercontent.com/ydah/ibex/main/schema/automaton-ir-definitions.schema.json",
+  "title": "Ibex Automaton IR shared definitions",
+  "description": "Shared definitions used by the current Automaton IR schema.",
   "type": "object",
   "required": [
     "ibex_ir",
@@ -33,7 +33,7 @@
       "pattern": "^sha256:[0-9a-f]{64}$"
     },
     "grammar": {
-      "$ref": "grammar-ir-v1.schema.json"
+      "$ref": "grammar-ir-foundation.schema.json"
     },
     "states": {
       "type": "array",
@@ -230,7 +230,7 @@
           "type": "array",
           "minItems": 1,
           "items": {
-            "$ref": "grammar-ir-v1.schema.json#/$defs/location"
+            "$ref": "grammar-ir-foundation.schema.json#/$defs/location"
           }
         },
         "entries": {
@@ -280,7 +280,7 @@
           "type": "array",
           "minItems": 1,
           "items": {
-            "$ref": "grammar-ir-v1.schema.json#/$defs/location"
+            "$ref": "grammar-ir-foundation.schema.json#/$defs/location"
           }
         },
         "entries": {

data/schema/{automaton-ir-v2.schema.json → automaton-ir.schema.json}

@@ -1,13 +1,14 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://raw.githubusercontent.com/ydah/ibex/main/schema/automaton-ir-v2.schema.json",
-  "title": "Ibex Automaton IR version 2",
-  "description": "A self-contained parser automaton embedding Grammar IR version 2.",
+  "$id": "https://raw.githubusercontent.com/ydah/ibex/main/schema/automaton-ir.schema.json",
+  "title": "Ibex current Automaton IR",
+  "description": "A self-contained parser automaton embedding the current Grammar IR and its parser contract.",
   "type": "object",
   "required": [
     "ibex_ir",
     "schema_version",
     "algorithm",
+    "entry_construction",
     "grammar_digest",
     "grammar",
     "states",
@@ -18,7 +19,7 @@
       "const": "automaton"
     },
     "schema_version": {
-      "const": 2
+      "const": 1
     },
     "algorithm": {
       "enum": [
@@ -28,12 +29,18 @@
         "lr1"
       ]
     },
+    "entry_construction": {
+      "enum": [
+        "shared",
+        "isolated"
+      ]
+    },
     "grammar_digest": {
       "type": "string",
       "pattern": "^sha256:[0-9a-f]{64}$"
     },
     "grammar": {
-      "$ref": "grammar-ir-v2.schema.json"
+      "$ref": "grammar-ir.schema.json"
     },
     "entry_states": {
       "type": "object",
@@ -47,11 +54,11 @@
       "type": "array",
       "minItems": 1,
       "items": {
-        "$ref": "automaton-ir-v1.schema.json#/$defs/state"
+        "$ref": "automaton-ir-definitions.schema.json#/$defs/state"
       }
     },
     "conflict_summary": {
-      "$ref": "automaton-ir-v1.schema.json#/$defs/conflict_summary"
+      "$ref": "automaton-ir-definitions.schema.json#/$defs/conflict_summary"
     }
   },
   "additionalProperties": false

data/schema/bison-import-v1.schema.json

@@ -0,0 +1,106 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://raw.githubusercontent.com/ydah/ibex/main/schema/bison-import-v1.schema.json",
+  "title": "Ibex Bison import report v1",
+  "type": "object",
+  "required": [
+    "ibex_report",
+    "schema_version",
+    "result",
+    "file",
+    "class_name",
+    "generated_source",
+    "directive_contract",
+    "directives",
+    "unsupported",
+    "structurally_complete",
+    "structural_unsupported",
+    "actions",
+    "counts",
+    "bounds",
+    "statement"
+  ],
+  "properties": {
+    "ibex_report": { "const": "bison_import" },
+    "schema_version": { "const": 1 },
+    "result": { "enum": ["imported", "imported_with_unsupported"] },
+    "file": { "type": "string" },
+    "class_name": { "type": "string" },
+    "generated_source": { "type": "string" },
+    "directive_contract": {
+      "type": "object",
+      "additionalProperties": {
+        "enum": ["converted", "recognized_metadata", "unsupported"]
+      }
+    },
+    "directives": {
+      "type": "array",
+      "items": { "$ref": "#/$defs/directive" }
+    },
+    "unsupported": {
+      "type": "array",
+      "items": { "$ref": "#/$defs/directive" }
+    },
+    "structurally_complete": { "type": "boolean" },
+    "structural_unsupported": {
+      "type": "array",
+      "items": { "$ref": "#/$defs/directive" }
+    },
+    "actions": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "required": ["id", "line", "column", "original", "transformed", "source_encoding"],
+        "properties": {
+          "id": { "type": "integer", "minimum": 1 },
+          "line": { "type": "integer", "minimum": 1 },
+          "column": { "type": "integer", "minimum": 1 },
+          "original": { "type": "string" },
+          "transformed": { "type": "string" },
+          "source_encoding": { "const": "hex_sentinel" }
+        },
+        "additionalProperties": false
+      }
+    },
+    "counts": {
+      "type": "object",
+      "required": ["rules", "actions", "unsupported_directives", "structural_unsupported_directives"],
+      "properties": {
+        "rules": { "type": "integer", "minimum": 1 },
+        "actions": { "type": "integer", "minimum": 0 },
+        "unsupported_directives": { "type": "integer", "minimum": 0 },
+        "structural_unsupported_directives": { "type": "integer", "minimum": 0 }
+      },
+      "additionalProperties": false
+    },
+    "bounds": {
+      "type": "object",
+      "required": ["max_bytes", "max_tokens", "max_rules", "max_actions"],
+      "properties": {
+        "max_bytes": { "type": "integer", "minimum": 1 },
+        "max_tokens": { "type": "integer", "minimum": 1 },
+        "max_rules": { "type": "integer", "minimum": 1 },
+        "max_actions": { "type": "integer", "minimum": 1 }
+      },
+      "additionalProperties": false
+    },
+    "statement": {
+      "const": "C semantic actions are opaque analysis data; Ruby generation is refused."
+    }
+  },
+  "$defs": {
+    "directive": {
+      "type": "object",
+      "required": ["name", "status", "line", "column", "detail"],
+      "properties": {
+        "name": { "type": "string" },
+        "status": { "enum": ["converted", "recognized_metadata", "unsupported"] },
+        "line": { "type": "integer", "minimum": 1 },
+        "column": { "type": "integer", "minimum": 1 },
+        "detail": { "type": "string" }
+      },
+      "additionalProperties": false
+    }
+  },
+  "additionalProperties": false
+}

data/schema/conflict-explanation-review-v1.schema.json

@@ -0,0 +1,196 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://raw.githubusercontent.com/ydah/ibex/main/schema/conflict-explanation-review-v1.schema.json",
+  "title": "Ibex H004 independent conflict-explanation review registry version 1",
+  "type": "object",
+  "required": [
+    "schema_version",
+    "gate_id",
+    "status",
+    "review_phase",
+    "reason",
+    "study_path",
+    "study_sha256",
+    "blind_artifact_path",
+    "blind_artifact_sha256",
+    "records",
+    "disagreement_summary"
+  ],
+  "properties": {
+    "schema_version": { "const": 1 },
+    "gate_id": { "const": "H004-subjective-usefulness" },
+    "status": { "enum": ["HOLD", "PASS"] },
+    "review_phase": { "enum": ["blind_collection", "reveal_comparison", "review_complete"] },
+    "reason": { "type": "string", "minLength": 1 },
+    "study_path": { "const": "test/fixtures/conflict_explanations/study-v1.json" },
+    "study_sha256": { "type": "string", "pattern": "^[0-9a-f]{64}$" },
+    "blind_artifact_path": {
+      "const": "docs/conflict-explanation-reviews/v1/blind-study-v1.json"
+    },
+    "blind_artifact_sha256": { "type": "string", "pattern": "^[0-9a-f]{64}$" },
+    "records": {
+      "type": "array",
+      "items": { "$ref": "#/$defs/review_record" }
+    },
+    "disagreement_summary": { "type": "string", "minLength": 1 }
+  },
+  "additionalProperties": false,
+  "allOf": [
+    {
+      "if": { "properties": { "status": { "const": "PASS" } } },
+      "then": {
+        "properties": {
+          "review_phase": { "const": "review_complete" },
+          "records": { "minItems": 2 }
+        }
+      }
+    },
+    {
+      "if": { "properties": { "review_phase": { "const": "blind_collection" } } },
+      "then": {
+        "properties": {
+          "status": { "const": "HOLD" },
+          "records": {
+            "items": {
+              "properties": {
+                "reveal_comparison": {
+                  "properties": { "status": { "const": "pending" } }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    {
+      "if": { "properties": { "review_phase": { "const": "reveal_comparison" } } },
+      "then": {
+        "properties": {
+          "status": { "const": "HOLD" },
+          "records": { "minItems": 2 }
+        }
+      }
+    },
+    {
+      "if": { "properties": { "review_phase": { "const": "review_complete" } } },
+      "then": {
+        "properties": {
+          "status": { "const": "PASS" },
+          "records": {
+            "minItems": 2,
+            "items": {
+              "properties": {
+                "reveal_comparison": { "$ref": "#/$defs/completed_reveal_comparison" }
+              }
+            }
+          }
+        }
+      }
+    }
+  ],
+  "$defs": {
+    "review_record": {
+      "type": "object",
+      "required": [
+        "reviewer",
+        "reviewed_at",
+        "independent_of_implementation",
+        "blind_artifact_sha256",
+        "submitted_before_reveal",
+        "case_reviews",
+        "reveal_comparison",
+        "disagreement_summary"
+      ],
+      "properties": {
+        "reviewer": { "type": "string", "minLength": 1 },
+        "reviewed_at": { "type": "string", "format": "date" },
+        "independent_of_implementation": { "const": true },
+        "blind_artifact_sha256": { "type": "string", "pattern": "^[0-9a-f]{64}$" },
+        "submitted_before_reveal": { "const": true },
+        "case_reviews": {
+          "type": "array",
+          "minItems": 4,
+          "maxItems": 4,
+          "items": { "$ref": "#/$defs/case_review" }
+        },
+        "reveal_comparison": { "$ref": "#/$defs/reveal_comparison" },
+        "disagreement_summary": { "type": "string", "minLength": 1 }
+      },
+      "additionalProperties": false
+    },
+    "case_review": {
+      "type": "object",
+      "required": [
+        "case_id",
+        "identified_cause",
+        "chosen_edit",
+        "explanation_usefulness",
+        "repair_usefulness",
+        "rationale"
+      ],
+      "properties": {
+        "case_id": { "enum": ["H004-BLIND-01", "H004-BLIND-02", "H004-BLIND-03", "H004-BLIND-04"] },
+        "identified_cause": { "type": "string", "minLength": 1 },
+        "chosen_edit": { "type": "string", "minLength": 1 },
+        "explanation_usefulness": { "enum": ["useful", "not_useful", "unclear"] },
+        "repair_usefulness": { "enum": ["useful", "not_useful", "no_verified_repair", "unclear"] },
+        "rationale": { "type": "string", "minLength": 1 }
+      },
+      "additionalProperties": false
+    },
+    "reveal_comparison": {
+      "oneOf": [
+        {
+          "type": "object",
+          "required": ["status"],
+          "properties": { "status": { "const": "pending" } },
+          "additionalProperties": false
+        },
+        { "$ref": "#/$defs/completed_reveal_comparison" }
+      ]
+    },
+    "completed_reveal_comparison": {
+      "type": "object",
+      "required": [
+        "status",
+        "revealed_at",
+        "revealed_after_submission",
+        "study_sha256",
+        "case_comparisons"
+      ],
+      "properties": {
+        "status": { "const": "compared" },
+        "revealed_at": { "type": "string", "format": "date" },
+        "revealed_after_submission": { "const": true },
+        "study_sha256": { "type": "string", "pattern": "^[0-9a-f]{64}$" },
+        "case_comparisons": {
+          "type": "array",
+          "minItems": 4,
+          "maxItems": 4,
+          "items": { "$ref": "#/$defs/case_comparison" }
+        }
+      },
+      "additionalProperties": false
+    },
+    "case_comparison": {
+      "type": "object",
+      "required": [
+        "blind_case_id",
+        "study_case_id",
+        "cause_alignment",
+        "edit_alignment",
+        "notes"
+      ],
+      "properties": {
+        "blind_case_id": {
+          "enum": ["H004-BLIND-01", "H004-BLIND-02", "H004-BLIND-03", "H004-BLIND-04"]
+        },
+        "study_case_id": { "enum": ["H004-EXPR", "H004-ELSE", "H004-RR", "H004-MERGE"] },
+        "cause_alignment": { "enum": ["match", "partial", "mismatch", "unclear"] },
+        "edit_alignment": { "enum": ["match", "partial", "mismatch", "unclear"] },
+        "notes": { "type": "string", "minLength": 1 }
+      },
+      "additionalProperties": false
+    }
+  }
+}