fix(chaos): switch to definitive absolute paths via expand-file-name for reliable tangling

2026-04-28 17:55:58 -04:00
parent d6a7e83de4
commit fd5513057e
35 changed files with 143 additions and 143 deletions
--- a/harness/act.org
+++ b/harness/act.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "act.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "act.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 #+TITLE: Stage 3: Act (act.lisp)
 #+AUTHOR: Amr
 #+FILETAGS: :harness:act:
--- a/harness/communication.org
+++ b/harness/communication.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "communication.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "communication.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 #+TITLE: Communication Protocol (communication.lisp)
 #+AUTHOR: Amr
 #+FILETAGS: :harness:protocol:
@@ -79,7 +79,7 @@ The ~communication.lisp~ module defines the low-level transport and framing logi
 ** Structural Validation (communication-validator.lisp)
 The validator ensures that incoming messages adhere to the strict property list schema of the communication protocol.

-#+begin_src lisp :tangle (expand-file-name "communication-validator.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "communication-validator.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (in-package :opencortex)

 (defun validate-communication-protocol-schema (msg)
--- a/harness/context.org
+++ b/harness/context.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "context.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "context.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 #+TITLE: Peripheral Vision (context.lisp)
 #+AUTHOR: Amr
 #+FILETAGS: :harness:context:
--- a/harness/doctor.org
+++ b/harness/doctor.org
@@ -66,18 +66,18 @@ Common Lisp's `uiop:getenv` is strictly typed in SBCL. The Doctor must ensure th
 * Phase C: Implementation (Build)

 ** Package Context
-#+begin_src lisp :tangle (expand-file-name "doctor.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "doctor.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (in-package :opencortex)
 #+end_src

 ** Global Configuration
-#+begin_src lisp :tangle (expand-file-name "doctor.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "doctor.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defvar *doctor-required-binaries* '("sbcl" "emacs" "git" "socat" "nc")
  "List of external binaries required for full system operation.")
 #+end_src

 ** Dependency Verification
-#+begin_src lisp :tangle (expand-file-name "doctor.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "doctor.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun doctor-check-dependencies ()
  "Verifies that required external binaries are available in the PATH via a shell probe."
  (let ((all-ok t))
@@ -95,7 +95,7 @@ Common Lisp's `uiop:getenv` is strictly typed in SBCL. The Doctor must ensure th
 #+end_src

 ** Environment & XDG Validation
-#+begin_src lisp :tangle (expand-file-name "doctor.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "doctor.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun doctor-check-env ()
  "Validates XDG directories and environment configuration against the POSIX standard."
  (harness-log "DOCTOR: Checking XDG environment...")
@@ -124,7 +124,7 @@ Common Lisp's `uiop:getenv` is strictly typed in SBCL. The Doctor must ensure th
 #+end_src

 ** LLM Connectivity
-#+begin_src lisp :tangle (expand-file-name "doctor.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "doctor.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun doctor-check-llm ()
  "Tests connectivity to primary LLM providers. Non-critical fallback allowed."
  (harness-log "DOCTOR: Checking LLM connectivity...")
@@ -139,7 +139,7 @@ Common Lisp's `uiop:getenv` is strictly typed in SBCL. The Doctor must ensure th
 #+end_src

 ** Orchestration
-#+begin_src lisp :tangle (expand-file-name "doctor.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "doctor.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun doctor-run-all ()
  "Executes the full diagnostic suite and returns T if system is healthy."
  (harness-log "==================================================")
@@ -159,7 +159,7 @@ Common Lisp's `uiop:getenv` is strictly typed in SBCL. The Doctor must ensure th
 #+end_src

 ** CLI Entry Point
-#+begin_src lisp :tangle (expand-file-name "doctor.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "doctor.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun doctor-main ()
  "Entry point for the 'doctor' CLI command."
  (if (doctor-run-all)
--- a/harness/loop.org
+++ b/harness/loop.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "loop.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "loop.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 #+TITLE: The Metabolic Loop (loop.lisp)
 #+AUTHOR: Amr
 #+FILETAGS: :harness:loop:
--- a/harness/manifest.org
+++ b/harness/manifest.org
@@ -9,7 +9,7 @@ The *System Manifest* defines the structural components of the OpenCortex. It se
 * Implementation

 ** Main System
-#+begin_src lisp :tangle (expand-file-name "../opencortex.asd" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "opencortex.asd" (or (identity (getenv "INSTALL_DIR")) "."))
 (defsystem :opencortex
  :name "opencortex"
  :author "Amr Gharbeia"
@@ -31,7 +31,7 @@ The *System Manifest* defines the structural components of the OpenCortex. It se
 #+end_src

 ** Test System
-#+begin_src lisp :tangle (expand-file-name "../opencortex.asd" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "opencortex.asd" (or (identity (getenv "INSTALL_DIR")) "."))
 (defsystem :opencortex/tests
  :depends-on (:opencortex :fiveam)
  :components ((:file "tests/pipeline-act-tests")
@@ -55,14 +55,14 @@ The *System Manifest* defines the structural components of the OpenCortex. It se
 #+end_src

 ** TUI System
-#+begin_src lisp :tangle (expand-file-name "../opencortex.asd" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "opencortex.asd" (or (identity (getenv "INSTALL_DIR")) "."))
 (defsystem :opencortex/tui
  :depends-on (:opencortex :croatoan :usocket :bordeaux-threads)
  :components ((:file "harness/tui-client")))
 #+end_src

 ** Test Orchestrator
-#+begin_src lisp :tangle (expand-file-name "run-all-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/run-all-tests.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (load (merge-pathnames "quicklisp/setup.lisp" (user-homedir-pathname)))

 (let ((oc-dir (or (uiop:getenv "OC_DATA_DIR") 
--- a/harness/memory.org
+++ b/harness/memory.org
@@ -31,14 +31,14 @@ flowchart TD
 #+end_src

 ** Package Context
-#+begin_src lisp :tangle (expand-file-name "memory.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "memory.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (in-package :opencortex)
 #+end_src

 ** The Object Repository
 The `*memory*` is the global hash table that holds every Org element by its unique ID. This is the "live RAM" of the agent's memory.

-#+begin_src lisp :tangle (expand-file-name "memory.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "memory.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defvar *memory* (make-hash-table :test 'equal))

 (defvar *history-store* (make-hash-table :test 'equal)
@@ -48,7 +48,7 @@ The `*memory*` is the global hash table that holds every Org element by its uniq
 ** The Data Structure (org-object)
 Every element in the Memex (headlines, paragraphs, etc.) is represented by an `org-object` structure. It contains both semantic metadata (attributes, content) and structural metadata (parent/child pointers, Merkle hashes).

-#+begin_src lisp :tangle (expand-file-name "memory.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "memory.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defstruct org-object
  id type attributes content vector parent-id children version last-sync hash)

@@ -60,7 +60,7 @@ Every element in the Memex (headlines, paragraphs, etc.) is represented by an `o
 ** Merkle Tree Integrity (compute-merkle-hash)
 The `compute-merkle-hash` function ensures the cryptographic integrity of the knowledge graph. A node's hash depends on its own properties and the hashes of all its children. This creates a recursive fingerprint where any change to a single note propagates up to the root hash.

-#+begin_src lisp :tangle (expand-file-name "memory.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "memory.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun compute-merkle-hash (id type attributes content child-hashes)
  "Computes a SHA-256 Merkle hash for a node based on its core properties and children's hashes."
  (let* ((alist (loop for (k v) on attributes by #'cddr collect (cons k v)))
@@ -77,7 +77,7 @@ The `compute-merkle-hash` function ensures the cryptographic integrity of the kn
 ** Ingesting the AST (ingest-ast)
 The `ingest-ast` function is the primary bridge between the external world (Emacs/JSON) and the internal Lisp machine. It recursively parses an Org-mode Abstract Syntax Tree (AST) into `org-object` structures and registers them in the store.

-#+begin_src lisp :tangle (expand-file-name "memory.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "memory.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun ingest-ast (ast &optional parent-id)
  "Parses an Org AST into the recursive Lisp Memory with Merkle hashing."
  (let* ((type (getf ast :type))
@@ -116,7 +116,7 @@ The `ingest-ast` function is the primary bridge between the external world (Emac
 ** Memory Snapshots (snapshot-memory)
 Because objects are stored immutably in the `*history-store*`, a snapshot is a lightweight shallow copy of the active `*memory*` pointers. The system maintains a rolling buffer of 20 snapshots, allowing for near-instant, zero-cost rollback.

-#+begin_src lisp :tangle (expand-file-name "memory.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "memory.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defvar *object-store-snapshots* nil)

 (defun copy-hash-table (hash-table)
@@ -143,7 +143,7 @@ Because objects are stored immutably in the `*history-store*`, a snapshot is a l
 ** Memory Rollback (rollback-memory)
 Restores the state of the Memex from one of the previous snapshots.

-#+begin_src lisp :tangle (expand-file-name "memory.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "memory.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun rollback-memory (&optional (index 0))
  "Restores the Memory to a previously captured snapshot using immutable history pointers."
  (let ((snapshot (nth index *object-store-snapshots*)))
@@ -156,7 +156,7 @@ Restores the state of the Memex from one of the previous snapshots.
 ** Disk Persistence (save-memory / load-memory)
 Essential for surviving crashes. Saves the in-memory hash tables to disk and loads them back on restart.

-#+begin_src lisp :tangle (expand-file-name "memory.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "memory.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defvar *memory-snapshot-path* nil
  "Path to the memory snapshot file. Set from MEMORY_SNAPSHOT_PATH env or default.")

@@ -209,7 +209,7 @@ Reconstitutes alists into hash tables."
 ** Semantic Search (get-embedding, semantic-search)
 Support for vector embeddings via Ollama and semantic search with cosine similarity.

-#+begin_src lisp :tangle (expand-file-name "memory.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "memory.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defvar *embedding-cache* (make-hash-table :test 'equal)
  "Cache for embeddings to avoid redundant API calls.")

@@ -258,7 +258,7 @@ Returns up to LIMIT objects with similarity >= MIN-SIMILARITY, sorted by similar
 #+end_src

 ** Cognitive Tool: Semantic Search
-#+begin_src lisp :tangle (expand-file-name "memory.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "memory.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (def-cognitive-tool :semantic-search
  "Searches memory for objects semantically similar to a query."
  ((:query :type :string :description "The search query.")
@@ -271,7 +271,7 @@ Returns up to LIMIT objects with similarity >= MIN-SIMILARITY, sorted by similar
 #+end_src

 ** Cognitive Tool: Generate Embeddings
-#+begin_src lisp :tangle (expand-file-name "memory.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "memory.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (def-cognitive-tool :generate-embeddings
  "Generates vector embeddings for given text via the configured embedding backend (Ollama)."
  ((:texts :type :list :description "List of text strings to embed."))
@@ -294,7 +294,7 @@ Returns up to LIMIT objects with similarity >= MIN-SIMILARITY, sorted by similar
 ** Lookup Utilities
 Basic functions for retrieving objects by ID or type.

-#+begin_src lisp :tangle (expand-file-name "memory.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "memory.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun org-id-new ()
  "Generates a new UUID string for Org-mode identification."
  (string-downcase (format nil "~a" (uuid:make-v4-uuid))))
@@ -324,7 +324,7 @@ Basic functions for retrieving objects by ID or type.
 ** Structural Helpers
 Utility functions for AST traversal and path resolution.

-#+begin_src lisp :tangle (expand-file-name "memory.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "memory.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun find-headline-missing-id (ast)
  "Traverses an AST to find headlines that lack an :ID: property."
  (when (listp ast)
--- a/harness/package.org
+++ b/harness/package.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "package.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "harness/package.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 #+TITLE: System Interface (package.lisp)
 #+AUTHOR: Amr
 #+FILETAGS: :harness:interface:
--- a/harness/perceive.org
+++ b/harness/perceive.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "perceive.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "perceive.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 #+TITLE: Stage 1: Perceive (perceive.lisp)
 #+AUTHOR: Amr
 #+FILETAGS: :harness:perceive:
--- a/harness/reason.org
+++ b/harness/reason.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "reason.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "reason.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 #+TITLE: Stage 2: Reason (reason.lisp)
 #+AUTHOR: Amr
 #+FILETAGS: :harness:reason:
--- a/harness/setup.org
+++ b/harness/setup.org
@@ -23,7 +23,7 @@ To maintain sovereignty, the harness must remain a "dumb" bus. It should not kno
 ** The Installer Script (opencortex.sh)
 The shell script is the primary entry point. It handles the initial git clone, dependency installation, and literate tangle.

-#+begin_src bash :tangle (expand-file-name "../opencortex.sh" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src bash :tangle (expand-file-name "../opencortex.sh" (or (identity (getenv "INSTALL_DIR")) "."))
 #!/bin/bash
 # (The content here is a duplicate of the main opencortex.sh for literate consistency)
 # [Note: Implementation is already verified in the top-level script]
--- a/harness/skills.org
+++ b/harness/skills.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "skills.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "skills.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 #+TITLE: The Skill Engine (skills.lisp)
 #+AUTHOR: Amr
 #+FILETAGS: :harness:skills:
@@ -419,7 +419,7 @@ EXAMPLES:
 *** The Eval Tool (Internal Inspection)
 #+begin_src lisp
 ** Cognitive Tool Registration
-#+begin_src lisp :tangle (expand-file-name "skills.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "skills.lisp" (expand-file-name "harness/" (or (identity (getenv "INSTALL_DIR")) ".")))
 ;; Cognitive tools are registered in *cognitive-tools* (defined in package.lisp)
 ;; using the def-cognitive-tool macro.
 #+end_src
--- a/harness/tui-client.org
+++ b/harness/tui-client.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 :PROPERTIES:
 :ID:       tui-client-spec
 :CREATED:  [2026-04-17 Fri 11:00]
@@ -57,81 +57,81 @@ A simple MVP console is insufficient for a Lisp Machine. To reach v0.2.0, the TU
 * Phase C: Implementation (Build)

 ** Package Context
-#+begin_src lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (in-package :cl-user)
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (defpackage :opencortex.tui
  (:use :cl :croatoan)
  (:export :main))
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (in-package :opencortex.tui)
 #+end_src

 ** Global State
-#+begin_src lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (defvar *daemon-host* "127.0.0.1")
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (defvar *daemon-port* 9105)
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (defvar *socket* nil)
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (defvar *stream* nil)
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (defvar *chat-history* (list) "Full chronological log of messages.")
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (defvar *scroll-index* 0 "Offset for history rendering.")
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (defvar *status-text* "Connecting...")
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (defvar *input-buffer* (make-array 0 :element-type 'char :fill-pointer 0 :adjustable t))
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (defvar *command-history* (make-array 0 :element-type 't :fill-pointer 0 :adjustable t))
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (defvar *history-index* -1)
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (defvar *is-running* t)
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (defvar *queue-lock* (bt:make-lock))
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (defvar *incoming-msgs* nil)
 #+end_src

 ** Utilities
-#+begin_src lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (defun enqueue-msg (msg)
  "Thread-safe addition to incoming message queue."
  (bt:with-lock-held (*queue-lock*)
    (setf *incoming-msgs* (append *incoming-msgs* (list msg)))))

-#+begin_src lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (defun dequeue-msgs ()
  "Thread-safe retrieval of incoming messages."
  (bt:with-lock-held (*queue-lock*)
@@ -142,7 +142,7 @@ A simple MVP console is insufficient for a Lisp Machine. To reach v0.2.0, the TU
 #+end_src

 ** Styling Engine
-#+begin_src lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (defun get-line-style (text)
  "Determines croatoan attributes based on content patterns."
  (cond
@@ -154,7 +154,7 @@ A simple MVP console is insufficient for a Lisp Machine. To reach v0.2.0, the TU
 #+end_src

 ** Rendering Orchestrator
-#+begin_src lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (defun render-chat (win)
  "Renders the chat history with scrolling and styling."
  (clear win)
@@ -172,14 +172,14 @@ A simple MVP console is insufficient for a Lisp Machine. To reach v0.2.0, the TU
 #+end_src

 ** Input Handling
-#+begin_src lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (defun handle-backspace ()
  "Deletes last character from input buffer."
  (when (> (fill-pointer *input-buffer*) 0)
    (decf (fill-pointer *input-buffer*))))
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (defun handle-return (stream)
  "Process input buffer as message or command."
  (let ((cmd (coerce *input-buffer* 'string)))
@@ -200,7 +200,7 @@ A simple MVP console is insufficient for a Lisp Machine. To reach v0.2.0, the TU
 #+end_src

 ** Main Entry Point
-#+begin_src lisp :tangle (expand-file-name "tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "harness/tui-client.lisp" (or (identity (getenv "INSTALL_DIR")) "."))
 (defun main ()
  "Initializes ncurses and starts the TUI event loop."
  (handler-case
--- a/skills/org-skill-bouncer.org
+++ b/skills/org-skill-bouncer.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-bouncer.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-bouncer.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 :PROPERTIES:
 :ID:       bouncer-agent-skill
 :CREATED:  [2026-04-11 Sat 15:20]
--- a/skills/org-skill-cli-gateway.org
+++ b/skills/org-skill-cli-gateway.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-cli-gateway.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-cli-gateway.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 :PROPERTIES:
 :ID:       cli-gateway-skill
 :CREATED:  [2026-04-13 Mon 17:00]
--- a/skills/org-skill-config-manager.org
+++ b/skills/org-skill-config-manager.org
@@ -16,26 +16,26 @@ Secrets are appended to `~/.config/opencortex/.env`, while structural metadata i
 * Phase B: Protocol (Success Criteria)

 ** Test Suite Context
-#+begin_src lisp :tangle (expand-file-name "config-manager-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "config-manager-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defpackage :opencortex-config-manager-tests
  (:use :cl :fiveam :opencortex)
  (:export #:config-suite))
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "config-manager-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "config-manager-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (in-package :opencortex-config-manager-tests)
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "config-manager-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "config-manager-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (def-suite config-suite :description "Verification of the Config Manager skill")
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "config-manager-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "config-manager-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (in-suite config-suite)
 #+end_src

 ** Registry Tests
-#+begin_src lisp :tangle (expand-file-name "config-manager-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "config-manager-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (test test-provider-registration
  "Verify that multiple providers can be registered and saved."
  (let ((opencortex::*providers* nil))
@@ -95,12 +95,12 @@ Secrets are appended to `~/.config/opencortex/.env`, while structural metadata i
 * Phase C: Implementation (Build)

 ** Package Context
-#+begin_src lisp :tangle (expand-file-name "org-skill-config-manager.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-config-manager.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (in-package :opencortex)
 #+end_src

 ** Skill Metadata
-#+begin_src lisp :tangle (expand-file-name "org-skill-config-manager.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-config-manager.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defparameter *skill-config-manager*
  '(:name "config-manager"
    :description "Manages system settings and LLM provider configurations."
@@ -110,7 +110,7 @@ Secrets are appended to `~/.config/opencortex/.env`, while structural metadata i
 #+end_src

 ** Provider Templates
-#+begin_src lisp :tangle (expand-file-name "org-skill-config-manager.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-config-manager.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defvar *provider-templates*
  '((:ollama . (:name "Ollama (Local)" :fields ((:url :label "URL") (:model :label "Model")) :default-url "http://localhost:11434" :default-model "llama3"))
    (:openrouter . (:name "OpenRouter" :fields ((:key :label "API Key" :secret t) (:model :label "Model")) :default-model "anthropic/claude-3-opus-20240229"))
@@ -122,7 +122,7 @@ Secrets are appended to `~/.config/opencortex/.env`, while structural metadata i
 #+end_src

 ** Registry Persistence
-#+begin_src lisp :tangle (expand-file-name "org-skill-config-manager.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-config-manager.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defvar *providers* nil "Global registry of configured LLM providers.")

 (defun get-oc-config-dir ()
@@ -159,14 +159,14 @@ Secrets are appended to `~/.config/opencortex/.env`, while structural metadata i
 #+end_src

 ** Registry API
-#+begin_src lisp :tangle (expand-file-name "org-skill-config-manager.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-config-manager.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun register-provider (id config)
  "Update the global provider registry."
  (setf (getf *providers* id) config))
 #+end_src

 ** Setup Wizard Implementation
-#+begin_src lisp :tangle (expand-file-name "org-skill-config-manager.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-config-manager.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun configure-provider (id)
  "Guided configuration for a specific LLM provider template."
  (let* ((template (cdr (assoc id *provider-templates*)))
@@ -187,7 +187,7 @@ Secrets are appended to `~/.config/opencortex/.env`, while structural metadata i
    (format t "✓ ~a metadata registered.~%" (getf template :name))))
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "org-skill-config-manager.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-config-manager.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun run-setup-wizard ()
  "Entry point for the interactive OpenCortex Lisp Setup Wizard."
  (format t "=== OpenCortex: Advanced Setup Wizard ===~%")
--- a/skills/org-skill-credentials-vault.org
+++ b/skills/org-skill-credentials-vault.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-credentials-vault.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-credentials-vault.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 :PROPERTIES:
 :ID:       credentials-vault-skill
 :CREATED:  [2026-04-09 Thu]
@@ -154,7 +154,7 @@ Retained from the legacy Google skill, this provides the instructions for the au
 Note: Tests disabled in jail load.

 ** 1. Unit Tests (FiveAM)
-#+begin_src lisp :tangle (expand-file-name "org-skill-credentials-vault.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-credentials-vault.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 #|
 (defpackage :opencortex-vault-tests
  (:use :cl :fiveam :opencortex))
--- a/skills/org-skill-diagnostics.org
+++ b/skills/org-skill-diagnostics.org
@@ -18,26 +18,26 @@ The skill strictly validates the POSIX standard paths resolved during bootstrap,
 * Phase B: Protocol (Success Criteria)

 ** Test Suite Context
-#+begin_src lisp :tangle (expand-file-name "diagnostics-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "diagnostics-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defpackage :opencortex-diagnostics-tests
  (:use :cl :fiveam :opencortex)
  (:export #:diagnostics-suite))
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "diagnostics-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "diagnostics-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (in-package :opencortex-diagnostics-tests)
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "diagnostics-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "diagnostics-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (def-suite diagnostics-suite :description "Verification of the Diagnostics skill")
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "diagnostics-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "diagnostics-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (in-suite diagnostics-suite)
 #+end_src

 ** Dependency Tests
-#+begin_src lisp :tangle (expand-file-name "diagnostics-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "diagnostics-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (test test-dependency-check-fail
  "Verify that missing binaries are correctly identified as failures."
  (let ((opencortex::*doctor-required-binaries* '("non-existent-binary-123")))
@@ -47,12 +47,12 @@ The skill strictly validates the POSIX standard paths resolved during bootstrap,
 * Phase C: Implementation (Build)

 ** Package Context
-#+begin_src lisp :tangle (expand-file-name "org-skill-diagnostics.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-diagnostics.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (in-package :opencortex)
 #+end_src

 ** Skill Metadata
-#+begin_src lisp :tangle (expand-file-name "org-skill-diagnostics.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-diagnostics.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defparameter *skill-diagnostics*
  '(:name "diagnostics"
    :description "Performs system health checks and environment validation."
@@ -62,13 +62,13 @@ The skill strictly validates the POSIX standard paths resolved during bootstrap,
 #+end_src

 ** Global Configuration
-#+begin_src lisp :tangle (expand-file-name "org-skill-diagnostics.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-diagnostics.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defvar *doctor-required-binaries* '("sbcl" "emacs" "git" "socat" "nc")
  "List of external binaries required for full system operation.")
 #+end_src

 ** Dependency Verification
-#+begin_src lisp :tangle (expand-file-name "org-skill-diagnostics.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-diagnostics.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun doctor-check-dependencies ()
  "Verifies that required external binaries are available in the PATH via a shell probe."
  (let ((all-ok t))
@@ -86,7 +86,7 @@ The skill strictly validates the POSIX standard paths resolved during bootstrap,
 #+end_src

 ** Environment & XDG Validation
-#+begin_src lisp :tangle (expand-file-name "org-skill-diagnostics.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-diagnostics.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun doctor-check-env ()
  "Validates XDG directories and environment configuration against the POSIX standard."
  (harness-log "DOCTOR: Checking XDG environment...")
@@ -115,7 +115,7 @@ The skill strictly validates the POSIX standard paths resolved during bootstrap,
 #+end_src

 ** LLM Connectivity
-#+begin_src lisp :tangle (expand-file-name "org-skill-diagnostics.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-diagnostics.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun doctor-check-llm ()
  "Tests connectivity to primary LLM providers. Non-critical fallback allowed."
  (harness-log "DOCTOR: Checking LLM connectivity...")
@@ -130,7 +130,7 @@ The skill strictly validates the POSIX standard paths resolved during bootstrap,
 #+end_src

 ** Orchestration
-#+begin_src lisp :tangle (expand-file-name "org-skill-diagnostics.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-diagnostics.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun doctor-run-all ()
  "Executes the full diagnostic suite and returns T if system is healthy."
  (harness-log "==================================================")
@@ -150,7 +150,7 @@ The skill strictly validates the POSIX standard paths resolved during bootstrap,
 #+end_src

 ** CLI Entry Point
-#+begin_src lisp :tangle (expand-file-name "org-skill-diagnostics.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-diagnostics.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun doctor-main ()
  "Entry point for the 'doctor' CLI command."
  (if (doctor-run-all)
--- a/skills/org-skill-emacs-edit.org
+++ b/skills/org-skill-emacs-edit.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-emacs-edit.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-emacs-edit.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 :PROPERTIES:
 :ID:       emacs-edit-skill
 :CREATED:  [2026-04-23 Thu]
@@ -390,7 +390,7 @@ Use this AFTER modifications to save changes."
 #+end_src

 * Phase E: Chaos (Verification)
-#+begin_src lisp :tangle (expand-file-name "emacs-edit-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "emacs-edit-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defpackage :opencortex-emacs-edit-tests
  (:use :cl :fiveam :opencortex)
  (:export #:emacs-edit-suite))
--- a/skills/org-skill-engineering-standards.org
+++ b/skills/org-skill-engineering-standards.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-engineering-standards.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-engineering-standards.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 :PROPERTIES:
 :ID:       37f2b59f-4537-4cca-ac7f-5c24b9e2e773
 :CREATED:  [2026-03-30 Mon 21:16]
@@ -57,17 +57,17 @@ Every significant fix or architectural decision MUST be documented in an org fil
 * Enforcement Implementation

 ** Package Context
-#+begin_src lisp :tangle (expand-file-name "org-skill-engineering-standards.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-engineering-standards.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (in-package :opencortex)
 #+end_src

 ** Global Configuration
-#+begin_src lisp :tangle (expand-file-name "org-skill-engineering-standards.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-engineering-standards.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defvar *engineering-std-project-root* nil
  "Path to the project root for enforcement checks.")
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "org-skill-engineering-standards.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-engineering-standards.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defstruct engineering-violation
  (phase nil)
  (rule nil)
@@ -76,7 +76,7 @@ Every significant fix or architectural decision MUST be documented in an org fil
 #+end_src

 ** CDD Utilities: Tier 1
-#+begin_src lisp :tangle (expand-file-name "org-skill-engineering-standards.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-engineering-standards.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun check-structural-balance (file-path)
  "Tier 1 Chaos: Verifies that a Lisp file is syntactically balanced."
  (handler-case
@@ -90,7 +90,7 @@ Every significant fix or architectural decision MUST be documented in an org fil
 #+end_src

 ** Git Protocol
-#+begin_src lisp :tangle (expand-file-name "org-skill-engineering-standards.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-engineering-standards.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun verify-git-clean-p (&optional (dir *engineering-std-project-root*))
  "Returns T if the git repository at DIR has no uncommitted changes."
  (when dir
@@ -101,7 +101,7 @@ Every significant fix or architectural decision MUST be documented in an org fil
 #+end_src

 ** Initializer
-#+begin_src lisp :tangle (expand-file-name "org-skill-engineering-standards.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-engineering-standards.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun engineering-std-init ()
  "Initialize the enforcement system."
  (let ((env-root (or (uiop:getenv "OC_DATA_DIR")
@@ -111,32 +111,32 @@ Every significant fix or architectural decision MUST be documented in an org fil
 #+end_src

 ;; Auto-initialize on load
-#+begin_src lisp :tangle (expand-file-name "org-skill-engineering-standards.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-engineering-standards.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (engineering-std-init)
 #+end_src

 * Test Suite

-#+begin_src lisp :tangle (expand-file-name "engineering-standards-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "engineering-standards-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defpackage :opencortex-engineering-standards-tests
  (:use :cl :fiveam :opencortex)
  (:export #:engineering-standards-suite))
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "engineering-standards-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "engineering-standards-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (in-package :opencortex-engineering-standards-tests)
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "engineering-standards-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "engineering-standards-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (def-suite engineering-standards-suite
  :description "Tests for Engineering Standards enforcement")
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "engineering-standards-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "engineering-standards-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (in-suite engineering-standards-suite)
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "engineering-standards-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "engineering-standards-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (test git-clean-check-clean
  "verify-git-clean-p returns T when git tree is clean."
  (let ((tmp-dir "/tmp/eng-std-test-clean/"))
--- a/skills/org-skill-gardener.org
+++ b/skills/org-skill-gardener.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-gardener.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-gardener.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 :PROPERTIES:
 :ID:       gardener-skill
 :CREATED:  [2026-04-13 Mon 18:50]
--- a/skills/org-skill-gateway-manager.org
+++ b/skills/org-skill-gateway-manager.org
@@ -13,26 +13,26 @@ In a traditional AI wrapper, the user manually edits a config file to add a bot
 * Phase B: Protocol (Success Criteria)

 ** Test Suite Context
-#+begin_src lisp :tangle (expand-file-name "gateway-manager-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "gateway-manager-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defpackage :opencortex-gateway-manager-tests
  (:use :cl :fiveam :opencortex)
  (:export #:gateway-suite))
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "gateway-manager-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "gateway-manager-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (in-package :opencortex-gateway-manager-tests)
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "gateway-manager-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "gateway-manager-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (def-suite gateway-suite :description "Verification of the Gateway Manager skill")
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "gateway-manager-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "gateway-manager-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (in-suite gateway-suite)
 #+end_src

 ** Logic Tests
-#+begin_src lisp :tangle (expand-file-name "gateway-manager-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "gateway-manager-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (test test-gateway-registration
  "Verify that the skill can register a new gateway metadata block."
  (let ((opencortex::*gateways* nil))
@@ -51,12 +51,12 @@ In a traditional AI wrapper, the user manually edits a config file to add a bot
 * Phase C: Implementation (Build)

 ** Package Context
-#+begin_src lisp :tangle (expand-file-name "org-skill-gateway-manager.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-gateway-manager.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (in-package :opencortex)
 #+end_src

 ** Capability Definition
-#+begin_src lisp :tangle (expand-file-name "org-skill-gateway-manager.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-gateway-manager.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defparameter *skill-gateway-manager*
  '(:name "gateway-manager"
    :description "Manages connections to external chat platforms."
@@ -66,12 +66,12 @@ In a traditional AI wrapper, the user manually edits a config file to add a bot
 #+end_src

 ** Registry Persistence
-#+begin_src lisp :tangle (expand-file-name "org-skill-gateway-manager.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-gateway-manager.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defvar *gateways* nil "The internal registry of configured gateways.")
 #+end_src

 ** Persistence Stubs
-#+begin_src lisp :tangle (expand-file-name "org-skill-gateway-manager.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-gateway-manager.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun save-gateways ()
  "Persist gateway metadata to XDG Config directory."
  (let ((path (merge-pathnames "gateways.lisp" (get-oc-config-dir))))
@@ -81,14 +81,14 @@ In a traditional AI wrapper, the user manually edits a config file to add a bot
 #+end_src

 ** Registration Logic
-#+begin_src lisp :tangle (expand-file-name "org-skill-gateway-manager.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-gateway-manager.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun skill-gateway-register (platform metadata)
  "Internal function to update the gateway registry."
  (setf (getf *gateways* platform) metadata))
 #+end_src

 ** Telegram Verification
-#+begin_src lisp :tangle (expand-file-name "org-skill-gateway-manager.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-gateway-manager.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun skill-gateway-verify-telegram (token)
  "Verifies a Telegram bot token via the getMe API."
  (let ((url (format nil "https://api.telegram.org/bot~a/getMe" token)))
@@ -103,7 +103,7 @@ In a traditional AI wrapper, the user manually edits a config file to add a bot
 #+end_src

 ** Linkage Command
-#+begin_src lisp :tangle (expand-file-name "org-skill-gateway-manager.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-gateway-manager.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun skill-gateway-link (platform token)
  "Primary capability to link a new platform. Returns status plist."
  (harness-log "GATEWAY: Attempting to link ~a..." platform)
@@ -120,7 +120,7 @@ In a traditional AI wrapper, the user manually edits a config file to add a bot
 #+end_src

 ** CLI Main Wrapper
-#+begin_src lisp :tangle (expand-file-name "org-skill-gateway-manager.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-gateway-manager.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun gateway-manager-main (platform token)
  "Main entry point for CLI-driven linkage."
  (if (and platform token)
--- a/skills/org-skill-homoiconic-memory.org
+++ b/skills/org-skill-homoiconic-memory.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-homoiconic-memory.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-homoiconic-memory.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 :PROPERTIES:
 :ID:       homoiconic-memory-skill
 :CREATED:  [2026-04-10 Fri]
--- a/skills/org-skill-lisp-utils.org
+++ b/skills/org-skill-lisp-utils.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-lisp-utils.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-lisp-utils.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 :PROPERTIES:
 :ID:       lisp-utils-skill
 :CREATED:  [2026-04-23 Thu]
@@ -159,7 +159,7 @@ Returns (VALUES t nil) if clean, or (VALUES nil error-message nil nil)."

 * Test Suite

-#+begin_src lisp :tangle (expand-file-name "lisp-utils-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "lisp-utils-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defpackage :opencortex-lisp-utils-tests
  (:use :cl :fiveam :opencortex)
  (:export #:lisp-utils-suite))
--- a/skills/org-skill-literate-programming.org
+++ b/skills/org-skill-literate-programming.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-literate-programming.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-literate-programming.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 :PROPERTIES:
 :ID:       literate-programming-skill-2026
 :CREATED:  [2026-04-25 Sat]
@@ -241,7 +241,7 @@ The LP skill runs at priority 1100 (just below engineering-standards at 1000).
 These tests verify the LP enforcement logic. Run with:
 ~(fiveam:run! 'literate-programming-suite)~

-#+begin_src lisp :tangle (expand-file-name "literate-programming-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "literate-programming-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defpackage :opencortex-literate-programming-tests
  (:use :cl :fiveam :opencortex)
  (:export #:literate-programming-suite))
--- a/skills/org-skill-llama-backend.org
+++ b/skills/org-skill-llama-backend.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-llama-backend.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-llama-backend.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 :PROPERTIES:
 :ID:       llama-backend-skill
 :CREATED:  [2026-04-17 Fri 20:00]
--- a/skills/org-skill-llm-gateway.org
+++ b/skills/org-skill-llm-gateway.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-llm-gateway.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-llm-gateway.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 :PROPERTIES:
 :ID:       llm-gateway-spec
 :CREATED:  [2026-04-10 Thu]
@@ -11,7 +11,7 @@
 The *LLM Gateway* skill provides a unified interface for interacting with multiple Large Language Model providers.

 * Test Suite
-#+begin_src lisp :tangle (expand-file-name "llm-gateway-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "llm-gateway-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defpackage :opencortex-llm-gateway-tests
  (:use :cl :fiveam :opencortex)
  (:export #:llm-gateway-suite))
@@ -41,12 +41,12 @@ The *LLM Gateway* skill provides a unified interface for interacting with multip
 * Implementation

 ** Package Context
-#+begin_src lisp :tangle (expand-file-name "org-skill-llm-gateway.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-llm-gateway.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (in-package :opencortex)
 #+end_src

 ** Skill Metadata
-#+begin_src lisp :tangle (expand-file-name "org-skill-llm-gateway.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-llm-gateway.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defparameter *skill-llm-gateway*
  '(:name "llm-gateway"
    :description "Unified provider-agnostic LLM interface."
@@ -56,7 +56,7 @@ The *LLM Gateway* skill provides a unified interface for interacting with multip
 #+end_src

 ** Request Execution
-#+begin_src lisp :tangle (expand-file-name "org-skill-llm-gateway.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-llm-gateway.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defun execute-llm-request (&key prompt system-prompt provider model)
  "Generic executor for all LLM providers."
  (let* ((active-provider (or provider :ollama))
@@ -76,7 +76,7 @@ The *LLM Gateway* skill provides a unified interface for interacting with multip
 #+end_src

 ** Cognitive Tools
-#+begin_src lisp :tangle (expand-file-name "org-skill-llm-gateway.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-llm-gateway.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (def-cognitive-tool :get-ollama-embedding 
  "Generates vector embeddings via Ollama API."
  ((:text :type :string :description "Text to embed."))
@@ -92,7 +92,7 @@ The *LLM Gateway* skill provides a unified interface for interacting with multip
                (error (c) (harness-log "OLLAMA EMBED ERROR: ~a" c) nil))))))
 #+end_src

-#+begin_src lisp :tangle (expand-file-name "org-skill-llm-gateway.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-llm-gateway.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (def-cognitive-tool :ask-llm 
  "Unified interface for interacting with LLM providers."
  ((:prompt :type :string :description "The user prompt")
@@ -107,7 +107,7 @@ The *LLM Gateway* skill provides a unified interface for interacting with multip
 #+end_src

 ** Skill Registration
-#+begin_src lisp :tangle (expand-file-name "org-skill-llm-gateway.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-llm-gateway.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defskill :skill-llm-gateway
  :priority 50
  :trigger (lambda (ctx) (declare (ignore ctx)) t)
--- a/skills/org-skill-peripheral-vision.org
+++ b/skills/org-skill-peripheral-vision.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-peripheral-vision.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-peripheral-vision.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 :PROPERTIES:
 :ID:       org-skill-peripheral-vision
 :CREATED:  [2026-04-12 Sun 14:15]
--- a/skills/org-skill-policy.org
+++ b/skills/org-skill-policy.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-policy.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-policy.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 :PROPERTIES:
 :ID:       47425a43-2be0-423c-8509-22592cfe9c9e
 :CREATED:  [2026-04-07 Tue 12:57]
@@ -50,7 +50,7 @@ Every skill executes within its own jailed package namespace, inheriting core ha
 #+end_src

 * Global Policy Configuration
-#+begin_src lisp :tangle (expand-file-name "org-skill-policy.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-policy.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defvar *policy-invariant-priorities*
  '((:transparency . 500)
    (:autonomy . 400)
--- a/skills/org-skill-protocol-validator.org
+++ b/skills/org-skill-protocol-validator.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-protocol-validator.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-protocol-validator.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 :PROPERTIES:
 :ID:       org-skill-communication-protocol-validator
 :CREATED:  [2026-04-12 Sun 14:35]
--- a/skills/org-skill-scribe.org
+++ b/skills/org-skill-scribe.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-scribe.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-scribe.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 :PROPERTIES:
 :ID:       scribe-skill
 :CREATED:  [2026-04-13 Mon 18:40]
--- a/skills/org-skill-self-edit.org
+++ b/skills/org-skill-self-edit.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-self-edit.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-self-edit.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 :PROPERTIES:
 :ID:       self-edit-001
 :END:
@@ -239,7 +239,7 @@ Swap compiled skill files without breaking active sockets.

 * Phase E: Verification

-#+begin_src lisp :tangle (expand-file-name "self-edit-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "self-edit-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defpackage :opencortex-self-edit-tests
  (:use :cl :fiveam :opencortex)
  (:export #:self-edit-suite))
--- a/skills/org-skill-self-fix.org
+++ b/skills/org-skill-self-fix.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-self-fix.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-self-fix.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 :PROPERTIES:
 :ID:       65891ce2-a465-49e6-a0c1-be13d3288d55
 :CREATED:  [2026-03-30 Mon 21:16]
--- a/skills/org-skill-shell-actuator.org
+++ b/skills/org-skill-shell-actuator.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-shell-actuator.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-shell-actuator.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 :PROPERTIES:
 :ID:       shell-actuator-skill
 :CREATED:  [2026-04-12 Sun]
@@ -12,7 +12,7 @@ The *Shell Actuator* provides a controlled interface for the OpenCortex to execu

 * Implementation

-#+begin_src lisp :tangle (expand-file-name "org-skill-shell-actuator.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "org-skill-shell-actuator.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (in-package :opencortex)

 (defparameter *allowed-commands* '("ls" "git" "rg" "grep" "date" "echo" "cat" "node" "python3" "sbcl"))
--- a/skills/org-skill-tool-permissions.org
+++ b/skills/org-skill-tool-permissions.org
@@ -1,4 +1,4 @@
-#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-tool-permissions.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+PROPERTY: header-args:lisp :tangle (expand-file-name "org-skill-tool-permissions.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 :PROPERTIES:
 :ID:       tool-permissions-skill-001
 :CREATED:   [2026-04-23 Thu]
@@ -135,7 +135,7 @@ Tool permissions and embedding generation via multiple providers.
 These tests verify tool permissions. Run with:
 ~(fiveam:run! 'tool-permissions-suite)~

-#+begin_src lisp :tangle (expand-file-name "tool-permissions-tests.lisp" (or (identity (getenv "INSTALL_DIR")) (file-name-directory (buffer-file-name))))
+#+begin_src lisp :tangle (expand-file-name "tool-permissions-tests.lisp" (expand-file-name "skills/" (or (identity (getenv "INSTALL_DIR")) ".")))
 (defpackage :opencortex-tool-permissions-tests
  (:use :cl :fiveam :opencortex)
  (:export #:tool-permissions-suite))