From 194408442645f5cfec8bcca7ba51cb4bfed53e61 Mon Sep 17 00:00:00 2001
From: Amr Gharbeia <amr@gharbeia.net>
Date: Sun, 19 Apr 2026 15:56:44 -0400
Subject: [PATCH] fix(kernel): Refine jailing logic and bouncer dependencies
 for cleaner boot

---
 fix_memory_sanitized.org     | 48 ++++++++++++++++++++++++++++++++++++
 skills/org-skill-bouncer.org |  1 +
 src/skills.lisp              |  2 +-
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 fix_memory_sanitized.org

diff --git a/fix_memory_sanitized.org b/fix_memory_sanitized.org
new file mode 100644
index 0000000..742d580
--- /dev/null
+++ b/fix_memory_sanitized.org
@@ -0,0 +1,48 @@
+:PROPERTIES:
+:ID:       homoiconic-memory-skill
+:CREATED:  [2026-04-10 Fri]
+:END:
+#+TITLE: SKILL: Homoiconic Memory (Merkle-Org Management)
+#+STARTUP: content
+#+FILETAGS: :memory:org:merkle:infrastructure:autonomy:
+
+* Overview
+The *Homoiconic Memory* skill provides the core persistence layer for OpenCortex, treating Org-mode files as a versioned, Merkle-structured AST.
+
+* Implementation
+
+#+begin_src lisp
+(in-package :cl-user)
+(defpackage :opencortex.skills.org-skill-homoiconic-memory
+  (:use :cl :opencortex))
+(in-package :opencortex.skills.org-skill-homoiconic-memory)
+
+(defun memory-org-to-json (source)
+  "Converts Org-mode source to JSON AST."
+  (declare (ignore source))
+  "")
+
+(defun memory-json-to-org (ast)
+  "Converts JSON AST back to Org-mode text."
+  (declare (ignore ast))
+  "")
+
+(defun memory-normalize-ast (ast)
+  "Recursively ensures ID uniqueness across the AST."
+  (declare (ignore ast))
+  nil)
+
+(defun make-memory-node (headline &key content properties children)
+  "Constructor for a normalized Org node alist."
+  (declare (ignore headline))
+  (list :TYPE :HEADLINE 
+        :PROPERTIES (or properties nil)
+        :CONTENT content 
+        :CONTENTS children))
+
+(defskill :skill-homoiconic-memory
+  :priority 100
+  :trigger (lambda (ctx) (declare (ignore ctx)) nil)
+  :probabilistic nil
+  :deterministic (lambda (action ctx) (declare (ignore ctx)) action))
+#+end_src
diff --git a/skills/org-skill-bouncer.org b/skills/org-skill-bouncer.org
index f83691c..e8582ac 100644
--- a/skills/org-skill-bouncer.org
+++ b/skills/org-skill-bouncer.org
@@ -3,6 +3,7 @@
 :CREATED:  [2026-04-11 Sat 15:20]
 :EDITED:   [2026-04-13 Mon 18:35]
 :END:
+#+DEPENDS_ON: org-skill-credentials-vault
 #+TITLE: SKILL: Deterministic Engine Bouncer (Authorization Gate)
 #+STARTUP: content
 #+FILETAGS: :system:bouncer:authorization:autonomy:
diff --git a/src/skills.lisp b/src/skills.lisp
index 812d504..5017496 100644
--- a/src/skills.lisp
+++ b/src/skills.lisp
@@ -151,7 +151,7 @@
                 (harness-log "HARNESS: Jailing skill '~a' in package ~a" skill-base-name pkg-name)
                 (unless (find-package pkg-name)
                   (let ((new-pkg (make-package pkg-name :use '(:cl))))
-                    (do-external-symbols (sym (find-package :opencortex)) (shadowing-import sym new-pkg))))
+                    (do-external-symbols (sym (find-package :opencortex)) (import sym new-pkg))))
                 (let ((*read-eval* nil) (*package* (find-package pkg-name)))
                   (eval (read-from-string (format nil "(progn ~a)" lisp-code))))
                 (setf (skill-entry-status entry) :ready)