Enable calling procedures in contracts

.github/actions/check-copyright-headers/action.yml

@@ -0,0 +1,20 @@
+# Copyright Strata Contributors
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+name: Check copyright headers
+description: >
+  Verify that all .lean files have the expected copyright header.
+  Downstream repos can add their own checks for other file types.
+
+inputs:
+  directory:
+    description: Root directory to scan (relative to the workspace).
+    required: false
+    default: "."
+
+runs:
+  using: composite
+  steps:
+    - name: Check copyright headers
+      shell: bash
+      run: |
+        python3 "${{ github.action_path }}/../../scripts/check_copyright_headers.py" "${{ inputs.directory }}"

.github/actions/check-lean-import/action.yml

@@ -0,0 +1,20 @@
+# Copyright Strata Contributors
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+name: Check Lean import
+description: >
+  Ensure no .lean file uses a bare "import Lean" statement. Encourages
+  importing only the specific parts of Lean that are needed.
+
+inputs:
+  directory:
+    description: Directory to scan for .lean files (relative to the workspace).
+    required: false
+    default: "."
+
+runs:
+  using: composite
+  steps:
+    - name: Check for bare import Lean
+      shell: bash
+      run: |
+        "${{ github.action_path }}/../../scripts/checkLeanImport.sh" "${{ inputs.directory }}"

.github/actions/check-no-panic/action.yml

@@ -0,0 +1,24 @@
+# Copyright Strata Contributors
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+name: Check no panic
+description: >
+  Detect net-new panic! calls introduced in a PR. Only fails when more
+  panics are added than removed. Suppression: add "-- nopanic:ok" on a line.
+  Requires actions/checkout with fetch-depth: 0 (needs full git history to
+  compute the merge base).
+
+inputs:
+  base-ref:
+    description: >
+      Git ref to diff against (e.g. "origin/main"). The script computes
+      the merge base automatically.
+    required: false
+    default: "origin/main"
+
+runs:
+  using: composite
+  steps:
+    - name: Check for new panic! usage
+      shell: bash
+      run: |
+        "${{ github.action_path }}/../../scripts/checkNoPanic.sh" "${{ inputs.base-ref }}"

.github/actions/lint-whitespace/action.yml

@@ -0,0 +1,19 @@
+# Copyright Strata Contributors
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+name: Lint whitespace
+description: >
+  Check .lean files for trailing whitespace and missing final newlines.
+
+inputs:
+  directory:
+    description: Directory to scan for .lean files (relative to the workspace).
+    required: false
+    default: "Strata"
+
+runs:
+  using: composite
+  steps:
+    - name: Check for trailing whitespace
+      shell: bash
+      run: |
+        "${{ github.action_path }}/../../scripts/lintWhitespace.sh" "${{ inputs.directory }}"

.github/actions/restore-lake-cache/action.yml

@@ -66,9 +66,9 @@ runs:
       uses: actions/cache/restore@v5
       with:
         path: ${{ inputs.path }}
-        key: ${{ inputs.key-prefix }}-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('lean-toolchain') }}-${{ hashFiles('lake-manifest.json') }}-${{ hashFiles('**/*.st') }}-${{ github.sha }}
+        key: ${{ inputs.key-prefix }}-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('lean-toolchain') }}-${{ hashFiles('lake-manifest.json') }}-${{ hashFiles('[^.]*/**/*.st', '*.st') }}-${{ github.sha }}
         restore-keys: |
-          ${{ inputs.key-prefix }}-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('lean-toolchain') }}-${{ hashFiles('lake-manifest.json') }}-${{ hashFiles('**/*.st') }}
+          ${{ inputs.key-prefix }}-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('lean-toolchain') }}-${{ hashFiles('lake-manifest.json') }}-${{ hashFiles('[^.]*/**/*.st', '*.st') }}
           ${{ inputs.key-prefix }}-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('lean-toolchain') }}-${{ hashFiles('lake-manifest.json') }}
           ${{ inputs.key-prefix }}-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('lean-toolchain') }}
         fail-on-cache-miss: ${{ inputs.fail-on-cache-miss }}
@@ -78,5 +78,5 @@ runs:
       uses: actions/cache/restore@v5
       with:
         path: ${{ inputs.path }}
-        key: ${{ inputs.key-prefix }}-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('lean-toolchain') }}-${{ hashFiles('lake-manifest.json') }}-${{ hashFiles('**/*.st') }}-${{ github.sha }}
+        key: ${{ inputs.key-prefix }}-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('lean-toolchain') }}-${{ hashFiles('lake-manifest.json') }}-${{ hashFiles('[^.]*/**/*.st', '*.st') }}-${{ github.sha }}
         fail-on-cache-miss: ${{ inputs.fail-on-cache-miss }}

.github/actions/save-lake-cache/action.yml

@@ -32,4 +32,4 @@ runs:
       uses: actions/cache/save@v5
       with:
         path: ${{ inputs.path }}
-        key: ${{ inputs.key-prefix }}-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('lean-toolchain') }}-${{ hashFiles('lake-manifest.json') }}-${{ hashFiles('**/*.st') }}-${{ github.sha }}
+        key: ${{ inputs.key-prefix }}-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('lean-toolchain') }}-${{ hashFiles('lake-manifest.json') }}-${{ hashFiles('[^.]*/**/*.st', '*.st') }}-${{ github.sha }}

.github/labeler.yml

@@ -2,7 +2,8 @@ Python:
   - changed-files:
       - any-glob-to-any-file:
           - 'StrataPython/**'
-          - 'Tools/Python/**'
+          - 'Tools/Python-base/**'
+          - 'StrataPython/Tools/strata-python/**'
 
 Laurel:
   - changed-files:
@@ -41,7 +42,8 @@ dependencies:
           - 'lake-manifest.json'
           - 'lakefile.toml'
           - 'lean-toolchain'
-          - 'Tools/Python/pyproject.toml'
+          - 'Tools/Python-base/pyproject.toml'
+          - 'StrataPython/Tools/strata-python/pyproject.toml'
           - 'Tools/BoogieToStrata/**/*.csproj'
           - 'Tools/BoogieToStrata/**/*.sln'
 

.github/scripts/checkLeanImport.sh

@@ -2,4 +2,6 @@
 # Check to identify modules that inadvertently import all of Lean.
 # We want to encourage only importing parts of Lean when needed.
 
-! (find . -name "*.lean" -type f -print0 | xargs -0 grep -E -n '^import Lean$')
+LINT_DIR="${1:-.}"
+
+! (find "$LINT_DIR" -name "*.lean" -type f -print0 | xargs -0 grep -E -n '^import Lean$')

.github/scripts/check_copyright_headers.py

@@ -59,12 +59,6 @@ def check_all_source_files(directory: Path, ext: str, header: str) -> bool:
   SPDX-License-Identifier: Apache-2.0 OR MIT
 -/"""
 
-python_copyright_header = """\
-# Copyright Strata Contributors
-#
-#  SPDX-License-Identifier: Apache-2.0 OR MIT
-"""
-
 def main():
     """Main function to handle command line arguments"""
     if len(sys.argv) != 2:
@@ -73,15 +67,7 @@ def main():
         sys.exit(1)
 
     directory_path = Path(sys.argv[1])
-    success = True
-
-    if not check_all_source_files(directory_path, ext=".lean", header=lean_copyright_header):
-        success = False
-
-    if not check_all_source_files(directory_path / 'Tools', ext=".py", header=python_copyright_header):
-        success = False
-
-    # Exit with appropriate code
+    success = check_all_source_files(directory_path, ext=".lean", header=lean_copyright_header)
     sys.exit(0 if success else 1)
 
 if __name__ == "__main__":

.github/scripts/lintWhitespace.sh

@@ -1,9 +1,12 @@
 #!/bin/bash
+set -e
+
+LINT_DIR="${1:-Strata}"
 
 tmpfile=$(mktemp)
 issues_found=0
 
-find Strata -type f -name "*.lean" | while IFS= read -r file; do
+find "$LINT_DIR" -type f -name "*.lean" | while IFS= read -r file; do
     # Check for trailing whitespace and print line number if found
     while IFS=: read -r line_num line; do
         echo "Trailing whitespace found in $file at line $line_num: $line"

.github/workflows/cbmc.yml

@@ -82,7 +82,8 @@ jobs:
       - name: Run Python CBMC pipeline tests
         shell: bash
         run: |
-          pip install ./Tools/Python
+          pip install ./Tools/Python-base
+          pip install ./StrataPython/Tools/strata-python
           ./StrataPython/StrataPythonTest/run_py_cbmc_tests.sh
       - name: Run property summary tests
         shell: bash

.github/workflows/ci.yml

@@ -115,8 +115,9 @@ jobs:
         with:
           python-version: '3.14'
       - name: Build using pip
-        run: pip install .
-        working-directory: Tools/Python
+        run: |
+          pip install ./Tools/Python-base
+          pip install ./StrataPython/Tools/strata-python
       - name: Run pyInterpret golden-file tests
         working-directory: StrataPython/StrataPythonTest
         shell: bash
@@ -145,8 +146,9 @@ jobs:
       with:
         python-version: '3.14'
     - name: Build using pip
-      run: pip install .
-      working-directory: Tools/Python
+      run: |
+        pip install ./Tools/Python-base
+        pip install ./StrataPython/Tools/strata-python
     - name: Restore Lean build cache
       # The cache is safe to use here because we just saved it for this exact SHA
       # in the build_and_test_lean job
@@ -261,8 +263,9 @@ jobs:
       with:
         python-version: ${{ matrix.python_version }}
     - name: Build using pip
-      run: pip install .
-      working-directory: Tools/Python
+      run: |
+        pip install ./Tools/Python-base
+        pip install ./StrataPython/Tools/strata-python
     - name: Restore Lean build cache
       # The cache is safe to use here because we just saved it for this exact SHA
       # in the build_and_test_lean job from ci.yml
@@ -304,7 +307,7 @@ jobs:
       working-directory: StrataPython
     - name: Run test script
       run: FAIL_FAST=1 ./scripts/run_cpython_tests.sh ${{ matrix.python_version }}
-      working-directory: Tools/Python
+      working-directory: StrataPython/Tools/strata-python
 
   cbmc:
     needs: build_and_test_lean

.kiro/steering/structure.md

@@ -15,8 +15,6 @@ Strata is a Lean4 verification framework using **dialects** as composable langua
 - `Strata/` - Core implementation (DDM, dialects, languages, transforms, backends)
 - `StrataTest/` - Unit tests (mirrors Strata/ structure)
 - `Examples/` - Sample programs (`.st` files, naming: `<name>.<dialect>.st`)
-- `Tools/` - External tools (BoogieToStrata, Python utilities)
-- `vcs/` - Generated SMT2 verification conditions
 
 ### Core Components
 
@@ -34,9 +32,7 @@ Strata is a Lean4 verification framework using **dialects** as composable langua
 - `Core/` - Primary verification language (procedures, contracts, VCG, SMT encoding)
 - `C_Simp/` - Simplified C-like language
 - `Dyn/` - Dynamic language example
-- `Laurel/` - A common representation for front-end languages like Java, Python and JavaScript.
-Translated to Core.
-- `Python/` - The well-known Python language
+- `Laurel/` - A common representation for front-end languages like Java, Python and JavaScript. Translated to Core.
 
 **`Strata/Transform/`** - Program Transformations
 - Each transformation has implementation + optional correctness proof (`*Correct.lean`)

Examples/CFGNondet.core.st

@@ -0,0 +1,23 @@
+program Core;
+
+// Nondeterministic CFG: y is set to either 1 or 2.
+procedure NondetChoice(out y : int)
+spec {
+  ensures (y == 1 || y == 2);
+}
+cfg entry {
+  entry: {
+    goto left, right;
+  }
+  left: {
+    y := 1;
+    goto done;
+  }
+  right: {
+    y := 2;
+    goto done;
+  }
+  done: {
+    return;
+  }
+};

Examples/CFGSimple.core.st

@@ -0,0 +1,48 @@
+program Core;
+
+// A simple deterministic CFG: compute max of two integers.
+procedure Max(x : int, y : int, out m : int)
+spec {
+  ensures (m >= x);
+  ensures (m >= y);
+  ensures (m == x || m == y);
+}
+cfg entry {
+  entry: {
+    branch (x >= y) goto then_branch else goto else_branch;
+  }
+  then_branch: {
+    m := x;
+    goto done;
+  }
+  else_branch: {
+    m := y;
+    goto done;
+  }
+  done: {
+    return;
+  }
+};
+
+// A CFG with a simple loop: increment y until it reaches n.
+procedure CountUp(n : int, out y : int)
+spec {
+  requires (n >= 0);
+  ensures (y == n);
+}
+cfg entry {
+  entry: {
+    y := 0;
+    goto loop;
+  }
+  loop: {
+    branch (y < n) goto body else goto done;
+  }
+  body: {
+    y := y + 1;
+    goto loop;
+  }
+  done: {
+    return;
+  }
+};