ARCH: Rename system manifest and decouple all behavioral skills

skills/org-skill-engineering-standards.org

@@ -50,8 +50,7 @@ The Engineering Standards skill provides the deterministic enforcement of the wo
 * Phase D: Build (Implementation)
 
 ** Git Status Enforcement
-#+begin_src lisp :tangle ../src/engineering-standards.lisp
-(in-package :org-agent)
+#+begin_src lisp
 
 (defun verify-git-clean-p (dir)
   "Returns T if the git repository at DIR has no uncommitted changes."
@@ -77,15 +76,6 @@ The Engineering Standards skill provides the deterministic enforcement of the wo
     action))
 #+end_src
 
-** Skill Definition
-#+begin_src lisp :tangle ../src/engineering-standards.lisp
-(org-agent:defskill :skill-engineering-standards
-  :priority 900 ; High priority, runs before most skills
-  :trigger (lambda (ctx) t) ; Always active
-  :probabilistic nil
-  :deterministic #'engineering-standards-gate)
-#+end_src
-
 * See Also
 - [[file:org-skill-system-invariants.org][System Policy]]
 - [[file:../README.org][org-agent README]]

skills/org-skill-policy.org

@@ -10,7 +10,7 @@
 * Overview
 The *Org-Agent* is a probabilistic-deterministic harness for a personal operating system. It uses Org-mode as its native memory and Common Lisp as its deterministic reasoning engine.
 
-#+begin_src lisp :tangle ../src/system-invariants.lisp
+#+begin_src lisp :tangle ../src/policy.lisp
 (in-package :org-agent)
 #+end_src
 
@@ -23,12 +23,23 @@ The Deterministic Engine uses these headlines as a "Moral Compass" during the de
 ** 1. Sovereignty Above All
 Every action must increase the user's independence from centralized, proprietary platforms. If a tool or library introduces a dependency on a non-sovereign entity, it must be flagged for replacement.
 
-#+begin_src lisp :tangle ../src/system-invariants.lisp
+#+begin_src lisp :tangle ../src/policy.lisp
 (defun policy-check-sovereignty (action context)
   "Ensures the action does not violate the Sovereignty invariant."
   (declare (ignore context))
   ;; Implementation placeholder
   action)
+
+(defun policy-deterministic-gate (action context)
+  "The main policy gate. Sub-calls engineering standards if available."
+  (let ((current-action (policy-check-sovereignty action context)))
+    (when current-action
+      (let ((eng-pkg (find-package :org-agent.skills.org-skill-engineering-standards)))
+        (when eng-pkg
+          (let ((eng-gate (find-symbol "ENGINEERING-STANDARDS-GATE" eng-pkg)))
+            (when (and eng-gate (fboundp eng-gate))
+              (setf current-action (funcall (symbol-function eng-gate) current-action context)))))))
+    current-action))
 #+end_src
 
 ** 2. Technical Mastery & Mentorship
@@ -46,10 +57,10 @@ Prioritize local, energy-efficient, and offline-first architectures. The "Memex"
 * Operational Mandates
 Every action performed by an agent in this environment must also adhere to the [[file:../../org-agent-contrib/org-skill-engineering-standards.org][Engineering Standards]].
 
-#+begin_src lisp :tangle ../src/system-invariants.lisp
+#+begin_src lisp :tangle ../src/policy.lisp
 (defskill :skill-policy
   :priority 100
   :trigger (lambda (ctx) t)
   :probabilistic nil
-  :deterministic #'policy-check-sovereignty)
+  :deterministic #'policy-deterministic-gate)
 #+end_src