diff --git a/9p b/9p
index c4e1950..21b0cf1 160000
--- a/9p
+++ b/9p
@@ -1 +1 @@
-Subproject commit c4e1950f8ca735f7699b1031df68588174a706f3
+Subproject commit 21b0cf154387def5649f3617f66cd196ef7277dd
diff --git a/agents/copilot.json b/agents/copilot.json
index 4d0bd51..80abdd8 100644
--- a/agents/copilot.json
+++ b/agents/copilot.json
@@ -1,7 +1,7 @@
 {
   "prompt": [
-    "$OLLIE_CFG_PATH/scripts/x/prime agent-copilot",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-file"
+    "/home/lkn/.config/ollie/prompts/agent-copilot.md",
+    "/home/lkn/.config/ollie/prompts/tools-file.md"
   ],
   "tools": true,
   "allowExecutors": ["call_tool"],
diff --git a/agents/default.json b/agents/default.json
index f036651..a1bd314 100644
--- a/agents/default.json
+++ b/agents/default.json
@@ -1,13 +1,13 @@
 {
   "prompt": [
-    "$OLLIE_CFG_PATH/scripts/x/prime SYSTEM_PROMPT",
-    "$OLLIE_CFG_PATH/scripts/x/prime session",
-    "$OLLIE_CFG_PATH/scripts/x/prime agent-coding",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-file",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-lsp",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-reasoning",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-memory",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-elevate",
+    "/home/lkn/.config/ollie/prompts/SYSTEM_PROMPT.md",
+    "/home/lkn/.config/ollie/prompts/session.md",
+    "/home/lkn/.config/ollie/prompts/agent-coding.md",
+    "/home/lkn/.config/ollie/prompts/tools-file.md",
+    "/home/lkn/.config/ollie/prompts/tools-lsp.md",
+    "/home/lkn/.config/ollie/prompts/tools-reasoning.md",
+    "/home/lkn/.config/ollie/prompts/tools-memory.md",
+    "/home/lkn/.config/ollie/prompts/tools-elevate.md",
     "bash -c 'd=$PWD; while [ \"$d\" != / ]; do [ -d \"$d/.beads\" ] && exec bd prime; [ ! -e \"$d/.git\" ] && break; d=$(dirname \"$d\"); done' 2>/dev/null || true"
   ],
   "maxSteps": 50,
diff --git a/agents/explorer.json b/agents/explorer.json
index efe4fc4..d7a800f 100644
--- a/agents/explorer.json
+++ b/agents/explorer.json
@@ -1,13 +1,13 @@
 {
   "prompt": [
-    "$OLLIE_CFG_PATH/scripts/x/prime SYSTEM_PROMPT",
-    "$OLLIE_CFG_PATH/scripts/x/prime session",
-    "$OLLIE_CFG_PATH/scripts/x/prime agent-explorer",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-file",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-lsp",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-reasoning",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-memory",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-elevate"
+    "/home/lkn/.config/ollie/prompts/SYSTEM_PROMPT.md",
+    "/home/lkn/.config/ollie/prompts/session.md",
+    "/home/lkn/.config/ollie/prompts/agent-explorer.md",
+    "/home/lkn/.config/ollie/prompts/tools-file.md",
+    "/home/lkn/.config/ollie/prompts/tools-lsp.md",
+    "/home/lkn/.config/ollie/prompts/tools-reasoning.md",
+    "/home/lkn/.config/ollie/prompts/tools-memory.md",
+    "/home/lkn/.config/ollie/prompts/tools-elevate.md"
   ],
   "maxSteps": 40,
   "temperature": 0.3,
diff --git a/agents/librarian.json b/agents/librarian.json
index e0fedde..2345596 100644
--- a/agents/librarian.json
+++ b/agents/librarian.json
@@ -1,10 +1,10 @@
 {
   "prompt": [
-    "$OLLIE_CFG_PATH/scripts/x/prime SYSTEM_PROMPT",
-    "$OLLIE_CFG_PATH/scripts/x/prime session",
-    "$OLLIE_CFG_PATH/scripts/x/prime agent-librarian",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-file",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-memory"
+    "/home/lkn/.config/ollie/prompts/SYSTEM_PROMPT.md",
+    "/home/lkn/.config/ollie/prompts/session.md",
+    "/home/lkn/.config/ollie/prompts/agent-librarian.md",
+    "/home/lkn/.config/ollie/prompts/tools-file.md",
+    "/home/lkn/.config/ollie/prompts/tools-memory.md"
   ],
   "maxSteps": 20,
   "temperature": 0.3,
diff --git a/agents/partner.json b/agents/partner.json
index aef3328..448239f 100644
--- a/agents/partner.json
+++ b/agents/partner.json
@@ -1,13 +1,13 @@
 {
   "prompt": [
-    "$OLLIE_CFG_PATH/scripts/x/prime SYSTEM_PROMPT",
-    "$OLLIE_CFG_PATH/scripts/x/prime session",
-    "$OLLIE_CFG_PATH/scripts/x/prime agent-partner",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-file",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-lsp",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-reasoning",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-memory",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-elevate"
+    "/home/lkn/.config/ollie/prompts/SYSTEM_PROMPT.md",
+    "/home/lkn/.config/ollie/prompts/session.md",
+    "/home/lkn/.config/ollie/prompts/agent-partner.md",
+    "/home/lkn/.config/ollie/prompts/tools-file.md",
+    "/home/lkn/.config/ollie/prompts/tools-lsp.md",
+    "/home/lkn/.config/ollie/prompts/tools-reasoning.md",
+    "/home/lkn/.config/ollie/prompts/tools-memory.md",
+    "/home/lkn/.config/ollie/prompts/tools-elevate.md"
   ],
   "maxSteps": 30,
   "temperature": 0.5,
diff --git a/agents/taskmanager.json b/agents/taskmanager.json
index 1099d7e..b24dc99 100644
--- a/agents/taskmanager.json
+++ b/agents/taskmanager.json
@@ -1,9 +1,9 @@
 {
   "prompt": [
-    "$OLLIE_CFG_PATH/scripts/x/prime SYSTEM_PROMPT",
-    "$OLLIE_CFG_PATH/scripts/x/prime session",
-    "$OLLIE_CFG_PATH/scripts/x/prime agent-taskmanager",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-file"
+    "/home/lkn/.config/ollie/prompts/SYSTEM_PROMPT.md",
+    "/home/lkn/.config/ollie/prompts/session.md",
+    "/home/lkn/.config/ollie/prompts/agent-taskmanager.md",
+    "/home/lkn/.config/ollie/prompts/tools-file.md"
   ],
   "maxSteps": 20,
   "temperature": 0.3,
diff --git a/agents/theo.json b/agents/theo.json
index 076848d..170ada4 100644
--- a/agents/theo.json
+++ b/agents/theo.json
@@ -1,13 +1,13 @@
 {
   "prompt": [
-    "$OLLIE_CFG_PATH/scripts/x/prime SYSTEM_PROMPT",
-    "$OLLIE_CFG_PATH/scripts/x/prime session",
-    "$OLLIE_CFG_PATH/scripts/x/prime agent-theo",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-file",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-lsp",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-reasoning",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-memory",
-    "$OLLIE_CFG_PATH/scripts/x/prime tools-elevate"
+    "/home/lkn/.config/ollie/prompts/SYSTEM_PROMPT.md",
+    "/home/lkn/.config/ollie/prompts/session.md",
+    "/home/lkn/.config/ollie/prompts/agent-theo.md",
+    "/home/lkn/.config/ollie/prompts/tools-file.md",
+    "/home/lkn/.config/ollie/prompts/tools-lsp.md",
+    "/home/lkn/.config/ollie/prompts/tools-reasoning.md",
+    "/home/lkn/.config/ollie/prompts/tools-memory.md",
+    "/home/lkn/.config/ollie/prompts/tools-elevate.md"
   ],
   "maxSteps": 30,
   "temperature": 0.3,
diff --git a/core b/core
index 663311d..05e43b9 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 663311daa03038dab7e448eeb736806cb0e3a470
+Subproject commit 05e43b9a7c346670d058137f55d40178be671225
diff --git a/scripts/x/prime b/scripts/x/prime
index 12d8a1f..569bd0e 100755
--- a/scripts/x/prime
+++ b/scripts/x/prime
@@ -1,8 +1,8 @@
 #!/bin/bash
 # Print a prompt file from $OLLIE_PROMPTS_PATH to stdout.
 # Usage: prime <name>  (resolves <name> or <name>.md under OLLIE_PROMPTS_PATH)
-# All PRIME_* variables are expected from the caller environment
-# (set by BuildRuntime via PromptEnv). Only PRIME_DATE is computed here.
+# Resolution and variable expansion is now handled by the Go prompt resolver;
+# this script is a convenience wrapper for manual/CLI use.
 set -euo pipefail
 
 PROMPTS_PATH="${OLLIE_PROMPTS_PATH:-${HOME}/.config/ollie/prompts}"
@@ -19,8 +19,7 @@ for dir in "${DIRS[@]}"; do
     [ -z "$dir" ] && continue
     for path in "$dir/$NAME" "$dir/$NAME.md"; do
         if [ -f "$path" ]; then
-            export PRIME_DATE="$(date +%Y-%m-%d)"
-            envsubst < "$path"
+            cat "$path"
             exit 0
         fi
     done