hyperpolymath · Jul 4, 2026 · Jul 4, 2026
diff --git a/.github/workflows/generator-generic-ossf-slsa3-publish.yml b/.github/workflows/generator-generic-ossf-slsa3-publish.yml
@@ -27,11 +27,7 @@ jobs:
       digests: ${{ steps.hash.outputs.digests }}
 
     steps:
-<<<<<<< HEAD
-      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
-=======
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
->>>>>>> d09ab6f (chore: batch RSR compliance)
 
       # ========================================================
       #

diff --git a/.machine_readable/6a2/AGENTIC.a2ml b/.machine_readable/6a2/AGENTIC.a2ml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # SPDX-License-Identifier: MPL-2.0
 # Copyright (c) 2026 Jonathan D.A. Jewell (hyperpolymath) <j.d.a.jewell@open.ac.uk>
 #
@@ -23,21 +22,3 @@ can-create-files = true
 # - Never use banned languages (TypeScript, Python, Go, etc.)
 # - Never place state files in repository root (must be in .machine_readable/)
 # - Never use AGPL license (use MPL-2.0)
-=======
-;; SPDX-License-Identifier: MPL-2.0
-;; AGENTIC.scm - AI agent interaction patterns for grim-repo
-
-(define agentic-config
-  `((version . "1.0.0")
-    (claude-code
-      ((model . "claude-opus-4-5-20251101")
-       (tools . ("read" "edit" "bash" "grep" "glob"))
-       (permissions . "read-all")))
-    (patterns
-      ((code-review . "thorough")
-       (refactoring . "conservative")
-       (testing . "comprehensive")))
-    (constraints
-      ((languages . ())
-       (banned . ("typescript" "go" "python" "makefile"))))))
->>>>>>> d09ab6f (chore: batch RSR compliance)
diff --git a/.machine_readable/6a2/ECOSYSTEM.a2ml b/.machine_readable/6a2/ECOSYSTEM.a2ml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # SPDX-License-Identifier: MPL-2.0
 # ECOSYSTEM.a2ml — Ecosystem position
 # Converted from ECOSYSTEM.scm on 2026-03-15
@@ -9,25 +8,3 @@ ecosystem = "hyperpolymath"
 
 [position]
 type = "component"
-=======
-;; SPDX-License-Identifier: MPL-2.0
-;; ECOSYSTEM.scm - Ecosystem position for grim-repo
-;; Media-Type: application/vnd.ecosystem+scm
-
-(ecosystem
-  (version "1.0")
-  (name "grim-repo")
-  (type "")
-  (purpose "")
-
-  (position-in-ecosystem
-    (category "")
-    (subcategory "")
-    (unique-value ()))
-
-  (related-projects ())
-
-  (what-this-is ())
-
-  (what-this-is-not ()))
->>>>>>> d09ab6f (chore: batch RSR compliance)
diff --git a/.machine_readable/6a2/META.a2ml b/.machine_readable/6a2/META.a2ml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # SPDX-License-Identifier: MPL-2.0
 # META.a2ml — Project meta-information
 # Converted from META.scm on 2026-03-15
@@ -8,22 +7,3 @@ project = "grim-repo"
 author = "Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>"
 license = "MPL-2.0"
 standard = "RSR 2026"
-=======
-;; SPDX-License-Identifier: MPL-2.0
-;; META.scm - Meta-level information for grim-repo
-;; Media-Type: application/meta+scheme
-
-(meta
-  (architecture-decisions ())
-
-  (development-practices
-    (code-style ())
-    (security
-      (principle "Defense in depth"))
-    (testing ())
-    (versioning "SemVer")
-    (documentation "AsciiDoc")
-    (branching "main for stable"))
-
-  (design-rationale ()))
->>>>>>> d09ab6f (chore: batch RSR compliance)
diff --git a/.machine_readable/6a2/NEUROSYM.a2ml b/.machine_readable/6a2/NEUROSYM.a2ml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # SPDX-License-Identifier: MPL-2.0
 # Copyright (c) 2026 Jonathan D.A. Jewell (hyperpolymath) <j.d.a.jewell@open.ac.uk>
 #
@@ -13,18 +12,3 @@ last-updated = "2026-03-16"
 scan-enabled = true
 scan-depth = "standard"
 report-format = "logtalk"
-=======
-;; SPDX-License-Identifier: MPL-2.0
-;; NEUROSYM.scm - Neurosymbolic integration config for grim-repo
-
-(define neurosym-config
-  `((version . "1.0.0")
-    (symbolic-layer
-      ((type . "scheme")
-       (reasoning . "deductive")
-       (verification . "formal")))
-    (neural-layer
-      ((embeddings . false)
-       (fine-tuning . false)))
-    (integration . ())))
->>>>>>> d09ab6f (chore: batch RSR compliance)
diff --git a/.machine_readable/6a2/PLAYBOOK.a2ml b/.machine_readable/6a2/PLAYBOOK.a2ml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # SPDX-License-Identifier: MPL-2.0
 # Copyright (c) 2026 Jonathan D.A. Jewell (hyperpolymath) <j.d.a.jewell@open.ac.uk>
 #
@@ -22,18 +21,3 @@ last-updated = "2026-03-16"
 # 1. Update version in STATE.a2ml, META.a2ml
 # 2. Run just quality (format, lint, test)
 # 3. Tag and push
-=======
-;; SPDX-License-Identifier: MPL-2.0
-;; PLAYBOOK.scm - Operational runbook for grim-repo
-
-(define playbook
-  `((version . "1.0.0")
-    (procedures
-      ((deploy . (("build" . "just build")
-                  ("test" . "just test")
-                  ("release" . "just release")))
-       (rollback . ())
-       (debug . ())))
-    (alerts . ())
-    (contacts . ())))
->>>>>>> d09ab6f (chore: batch RSR compliance)
diff --git a/.machine_readable/6a2/STATE.a2ml b/.machine_readable/6a2/STATE.a2ml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # SPDX-License-Identifier: MPL-2.0
 # STATE.a2ml — Project state checkpoint
 # Converted from STATE.scm on 2026-03-15
@@ -13,44 +12,3 @@ status = "active"
 name = "grim-repo"
 completion-percentage = 0
 phase = "In development"
-=======
-;; SPDX-License-Identifier: MPL-2.0
-;; STATE.scm - Project state for grim-repo
-;; Media-Type: application/vnd.state+scm
-
-(state
-  (metadata
-    (version "0.0.1")
-    (schema-version "1.0")
-    (created "2026-01-03")
-    (updated "2026-01-03")
-    (project "grim-repo")
-    (repo "github.com/hyperpolymath/grim-repo"))
-
-  (project-context
-    (name "grim-repo")
-    (tagline "")
-    (tech-stack ()))
-
-  (current-position
-    (phase "initial")
-    (overall-completion 0)
-    (components ())
-    (working-features ()))
-
-  (route-to-mvp
-    (milestones ()))
-
-  (blockers-and-issues
-    (critical)
-    (high)
-    (medium)
-    (low))
-
-  (critical-next-actions
-    (immediate)
-    (this-week)
-    (this-month))
-
-  (session-history ()))
->>>>>>> d09ab6f (chore: batch RSR compliance)
diff --git a/scripts/.machine_readable/6a2/AGENTIC.a2ml b/scripts/.machine_readable/6a2/AGENTIC.a2ml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # SPDX-License-Identifier: MPL-2.0
 # Copyright (c) 2026 Jonathan D.A. Jewell (hyperpolymath) <j.d.a.jewell@open.ac.uk>
 #
@@ -33,21 +32,3 @@ release-claim-requires-hard-pass = true
 # on-enter: Read 0-AI-MANIFEST.a2ml, then STATE.a2ml
 # on-exit: Update STATE.a2ml with session outcomes
 # on-commit: Run just validate-rsr
-=======
-;; SPDX-License-Identifier: MPL-2.0
-;; AGENTIC.scm - AI agent interaction patterns for grimrepo-scripts
-
-(define agentic-config
-  `((version . "1.0.0")
-    (claude-code
-      ((model . "claude-opus-4-5-20251101")
-       (tools . ("read" "edit" "bash" "grep" "glob"))
-       (permissions . "read-all")))
-    (patterns
-      ((code-review . "thorough")
-       (refactoring . "conservative")
-       (testing . "comprehensive")))
-    (constraints
-      ((languages . ())
-       (banned . ("typescript" "go" "python" "makefile"))))))
->>>>>>> d09ab6f (chore: batch RSR compliance)
diff --git a/scripts/.machine_readable/6a2/ECOSYSTEM.a2ml b/scripts/.machine_readable/6a2/ECOSYSTEM.a2ml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # SPDX-License-Identifier: MPL-2.0
 # Copyright (c) 2026 Jonathan D.A. Jewell (hyperpolymath) <j.d.a.jewell@open.ac.uk>
 #
@@ -19,25 +18,3 @@ category = ""
 projects = [
   # No related projects recorded
 ]
-=======
-;; SPDX-License-Identifier: MPL-2.0
-;; ECOSYSTEM.scm - Ecosystem position for grimrepo-scripts
-;; Media-Type: application/vnd.ecosystem+scm
-
-(ecosystem
-  (version "1.0")
-  (name "grimrepo-scripts")
-  (type "")
-  (purpose "")
-
-  (position-in-ecosystem
-    (category "")
-    (subcategory "")
-    (unique-value ()))
-
-  (related-projects ())
-
-  (what-this-is ())
-
-  (what-this-is-not ()))
->>>>>>> d09ab6f (chore: batch RSR compliance)
diff --git a/scripts/.machine_readable/6a2/META.a2ml b/scripts/.machine_readable/6a2/META.a2ml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # SPDX-License-Identifier: MPL-2.0
 # Copyright (c) 2026 Jonathan D.A. Jewell (hyperpolymath) <j.d.a.jewell@open.ac.uk>
 #
@@ -26,22 +25,3 @@ scoping-first = true
 axis-1 = "must > intend > like"
 axis-2 = "corrective > adaptive > perfective"
 axis-3 = "systems > compliance > effects"
-=======
-;; SPDX-License-Identifier: MPL-2.0
-;; META.scm - Meta-level information for grimrepo-scripts
-;; Media-Type: application/meta+scheme
-
-(meta
-  (architecture-decisions ())
-
-  (development-practices
-    (code-style ())
-    (security
-      (principle "Defense in depth"))
-    (testing ())
-    (versioning "SemVer")
-    (documentation "AsciiDoc")
-    (branching "main for stable"))
-
-  (design-rationale ()))
->>>>>>> d09ab6f (chore: batch RSR compliance)
diff --git a/scripts/.machine_readable/6a2/NEUROSYM.a2ml b/scripts/.machine_readable/6a2/NEUROSYM.a2ml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # SPDX-License-Identifier: MPL-2.0
 # Copyright (c) 2026 Jonathan D.A. Jewell (hyperpolymath) <j.d.a.jewell@open.ac.uk>
 #
@@ -20,18 +19,3 @@ report-format = "logtalk"
 # Neural pattern detection settings
 # confidence-threshold = 0.85
 # model = "hypatia-v2"
-=======
-;; SPDX-License-Identifier: MPL-2.0
-;; NEUROSYM.scm - Neurosymbolic integration config for grimrepo-scripts
-
-(define neurosym-config
-  `((version . "1.0.0")
-    (symbolic-layer
-      ((type . "scheme")
-       (reasoning . "deductive")
-       (verification . "formal")))
-    (neural-layer
-      ((embeddings . false)
-       (fine-tuning . false)))
-    (integration . ())))
->>>>>>> d09ab6f (chore: batch RSR compliance)
diff --git a/scripts/.machine_readable/6a2/PLAYBOOK.a2ml b/scripts/.machine_readable/6a2/PLAYBOOK.a2ml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # SPDX-License-Identifier: MPL-2.0
 # Copyright (c) 2026 Jonathan D.A. Jewell (hyperpolymath) <j.d.a.jewell@open.ac.uk>
 #
@@ -25,18 +24,3 @@ last-updated = "2026-04-11"
 [maintenance-operations]
 # Baseline audit: just maint-audit
 # Hard release gate: just maint-hard-pass
-=======
-;; SPDX-License-Identifier: MPL-2.0
-;; PLAYBOOK.scm - Operational runbook for grimrepo-scripts
-
-(define playbook
-  `((version . "1.0.0")
-    (procedures
-      ((deploy . (("build" . "just build")
-                  ("test" . "just test")
-                  ("release" . "just release")))
-       (rollback . ())
-       (debug . ())))
-    (alerts . ())
-    (contacts . ())))
->>>>>>> d09ab6f (chore: batch RSR compliance)
diff --git a/scripts/.machine_readable/6a2/STATE.a2ml b/scripts/.machine_readable/6a2/STATE.a2ml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # SPDX-License-Identifier: MPL-2.0
 # Copyright (c) 2026 Jonathan D.A. Jewell (hyperpolymath) <j.d.a.jewell@open.ac.uk>
 #
@@ -37,44 +36,3 @@ actions = [
 [maintenance-status]
 last-run-utc = "2026-01-03T00:00:00Z"
 last-result = "unknown"  # unknown | pass | warn | fail
-=======
-;; SPDX-License-Identifier: MPL-2.0
-;; STATE.scm - Project state for grimrepo-scripts
-;; Media-Type: application/vnd.state+scm
-
-(state
-  (metadata
-    (version "0.0.1")
-    (schema-version "1.0")
-    (created "2026-01-03")
-    (updated "2026-01-03")
-    (project "grimrepo-scripts")
-    (repo "github.com/hyperpolymath/grimrepo-scripts"))
-
-  (project-context
-    (name "grimrepo-scripts")
-    (tagline "")
-    (tech-stack ()))
-
-  (current-position
-    (phase "initial")
-    (overall-completion 0)
-    (components ())
-    (working-features ()))
-
-  (route-to-mvp
-    (milestones ()))
-
-  (blockers-and-issues
-    (critical)
-    (high)
-    (medium)
-    (low))
-
-  (critical-next-actions
-    (immediate)
-    (this-week)
-    (this-month))
-
-  (session-history ()))
->>>>>>> d09ab6f (chore: batch RSR compliance)