From 1b6bbd49dce49523f9f77a2729d72cb69f0adcf4 Mon Sep 17 00:00:00 2001
From: Ollie Agent <ollie@example.com>
Date: Sat, 15 Aug 2026 11:56:12 +0200
Subject: [PATCH] refactor: move user-preferences.md to data/agents, use
 userPrompts config

- Move user-preferences.md from data/prompts/ to data/agents/.
- Remove it from prompt arrays in all agent JSON configs.
- Add userPrompts field referencing the file via $XDG_CONFIG_HOME path.
- Update justfile install target accordingly.
---
 data/agents/copilot.json                     | 4 +++-
 data/agents/driver.json                      | 4 +++-
 data/agents/explorer.json                    | 4 +++-
 data/agents/librarian.json                   | 4 +++-
 data/agents/navigator.json                   | 4 +++-
 data/agents/taskmanager.json                 | 4 +++-
 data/agents/theo.json                        | 4 +++-
 data/{prompts => agents}/user-preferences.md | 0
 justfile                                     | 2 +-
 9 files changed, 22 insertions(+), 8 deletions(-)
 rename data/{prompts => agents}/user-preferences.md (100%)

diff --git a/data/agents/copilot.json b/data/agents/copilot.json
index ff5b4f1..671bde0 100644
--- a/data/agents/copilot.json
+++ b/data/agents/copilot.json
@@ -1,8 +1,10 @@
 {
   "prompt": [
-    "$XDG_CONFIG_HOME/ollie/prompts/user-preferences.md",
     "$XDG_CONFIG_HOME/ollie/prompts/agent-copilot.md"
   ],
+  "userPrompts": [
+    "$XDG_CONFIG_HOME/ollie/agents/user-preferences.md"
+  ],
   "autoLoad": [
     "shell",
     "subagent_spawn",
diff --git a/data/agents/driver.json b/data/agents/driver.json
index 47c054b..e8ee7c8 100644
--- a/data/agents/driver.json
+++ b/data/agents/driver.json
@@ -1,8 +1,10 @@
 {
   "prompt": [
-    "$XDG_CONFIG_HOME/ollie/prompts/user-preferences.md",
     "$XDG_CONFIG_HOME/ollie/prompts/agent-coding.md"
   ],
+  "userPrompts": [
+    "$XDG_CONFIG_HOME/ollie/agents/user-preferences.md"
+  ],
   "autoLoad": [
     "shell",
     "subagent_spawn",
diff --git a/data/agents/explorer.json b/data/agents/explorer.json
index 968c49b..9b29d39 100644
--- a/data/agents/explorer.json
+++ b/data/agents/explorer.json
@@ -1,8 +1,10 @@
 {
   "prompt": [
-    "$XDG_CONFIG_HOME/ollie/prompts/user-preferences.md",
     "$XDG_CONFIG_HOME/ollie/prompts/agent-explorer.md"
   ],
+  "userPrompts": [
+    "$XDG_CONFIG_HOME/ollie/agents/user-preferences.md"
+  ],
   "autoLoad": [
     "shell",
     "subagent_spawn",
diff --git a/data/agents/librarian.json b/data/agents/librarian.json
index 9a4ae5c..d88871c 100644
--- a/data/agents/librarian.json
+++ b/data/agents/librarian.json
@@ -1,8 +1,10 @@
 {
   "prompt": [
-    "$XDG_CONFIG_HOME/ollie/prompts/user-preferences.md",
     "$XDG_CONFIG_HOME/ollie/prompts/agent-librarian.md"
   ],
+  "userPrompts": [
+    "$XDG_CONFIG_HOME/ollie/agents/user-preferences.md"
+  ],
   "autoLoad": [
     "shell",
     "subagent_spawn",
diff --git a/data/agents/navigator.json b/data/agents/navigator.json
index 9d98446..c4545a9 100644
--- a/data/agents/navigator.json
+++ b/data/agents/navigator.json
@@ -1,8 +1,10 @@
 {
   "prompt": [
-    "$XDG_CONFIG_HOME/ollie/prompts/user-preferences.md",
     "$XDG_CONFIG_HOME/ollie/prompts/agent-navigator.md"
   ],
+  "userPrompts": [
+    "$XDG_CONFIG_HOME/ollie/agents/user-preferences.md"
+  ],
   "autoLoad": [
     "shell",
     "subagent_spawn",
diff --git a/data/agents/taskmanager.json b/data/agents/taskmanager.json
index 83b41fc..77fdaaf 100644
--- a/data/agents/taskmanager.json
+++ b/data/agents/taskmanager.json
@@ -1,8 +1,10 @@
 {
   "prompt": [
-    "$XDG_CONFIG_HOME/ollie/prompts/user-preferences.md",
     "$XDG_CONFIG_HOME/ollie/prompts/agent-taskmanager.md"
   ],
+  "userPrompts": [
+    "$XDG_CONFIG_HOME/ollie/agents/user-preferences.md"
+  ],
   "autoLoad": [
     "shell",
     "reasoning_think",
diff --git a/data/agents/theo.json b/data/agents/theo.json
index faf17ef..3ed20bc 100644
--- a/data/agents/theo.json
+++ b/data/agents/theo.json
@@ -1,8 +1,10 @@
 {
   "prompt": [
-    "$XDG_CONFIG_HOME/ollie/prompts/user-preferences.md",
     "$XDG_CONFIG_HOME/ollie/prompts/agent-theo.md"
   ],
+  "userPrompts": [
+    "$XDG_CONFIG_HOME/ollie/agents/user-preferences.md"
+  ],
   "autoLoad": [
     "shell",
     "subagent_spawn",
diff --git a/data/prompts/user-preferences.md b/data/agents/user-preferences.md
similarity index 100%
rename from data/prompts/user-preferences.md
rename to data/agents/user-preferences.md
diff --git a/justfile b/justfile
index 7d154af..c33cb94 100644
--- a/justfile
+++ b/justfile
@@ -126,7 +126,7 @@ install-data:
     install -m644 data/prompts/agent-taskmanager.md {{cfg}}/prompts/agent-taskmanager.md
     install -m644 data/prompts/agent-theo.md {{cfg}}/prompts/agent-theo.md
     install -m644 data/prompts/agent-observer.md {{cfg}}/prompts/agent-observer.md
-    install -m644 data/prompts/user-preferences.md {{cfg}}/prompts/user-preferences.md
+    install -m644 data/agents/user-preferences.md {{cfg}}/agents/user-preferences.md
     # Sandbox
     install -m644 cmd/toolsrv/internal/sandbox/sandbox.yaml {{cfg}}/sandbox.yaml
     # Skills