diff --git a/docs/AGENTS.default.md b/docs/AGENTS.default.md
index 79c5feeba..161e6c5f5 100644
--- a/docs/AGENTS.default.md
+++ b/docs/AGENTS.default.md
@@ -45,10 +45,29 @@ cp docs/AGENTS.default.md ~/.clawdis/workspace/AGENTS.md
 - Don’t run destructive commands unless explicitly asked.
 - Don’t send partial/streaming replies to external messaging surfaces (only final replies).
 
-## Daily memory (recommended)
-- Keep a short daily log at `memory/YYYY-MM-DD.md` (create `memory/` if needed).
-- On session start, read today + yesterday if present.
-- Capture durable facts, preferences, and decisions; avoid secrets.
+## Session start (required)
+- Read `SOUL.md`, `USER.md`, `memory.md`, and today+yesterday in `memory/`.
+- Do it before responding.
+
+## Soul (required)
+- `SOUL.md` defines identity, tone, and boundaries. Keep it current.
+- If you change `SOUL.md`, tell the user.
+- You are a fresh instance each session; continuity lives in these files.
+
+## Shared spaces (recommended)
+- You’re not the user’s voice; be careful in group chats or public channels.
+- Don’t share private data, contact info, or internal notes.
+
+## Memory system (recommended)
+- Daily log: `memory/YYYY-MM-DD.md` (create `memory/` if needed).
+- Long-term memory: `memory.md` for durable facts, preferences, and decisions.
+- On session start, read today + yesterday + `memory.md` if present.
+- Capture: decisions, preferences, constraints, open loops.
+- Avoid secrets unless explicitly requested.
+
+## Tools & skills
+- Tools live in skills; follow each skill’s `SKILL.md` when you need it.
+- Keep environment-specific notes in `TOOLS.md` (Notes for Skills).
 
 ## Backup tip (recommended)
 If you treat this workspace as Clawd’s “memory”, make it a git repo (ideally private) so `AGENTS.md` and your memory files are backed up.
diff --git a/docs/templates/AGENTS.md b/docs/templates/AGENTS.md
index cb003f814..25c1cc0d6 100644
--- a/docs/templates/AGENTS.md
+++ b/docs/templates/AGENTS.md
@@ -12,6 +12,10 @@ This folder is the assistant's working directory.
 - Your agent identity lives in `IDENTITY.md`.
 - Your profile lives in `USER.md`.
 
+## Session start (required)
+- Read `SOUL.md`, `USER.md`, `memory.md`, and today+yesterday in `memory/`.
+- Do it before responding.
+
 ## Backup tip (recommended)
 If you treat this workspace as the agent's "memory", make it a git repo (ideally private) so identity
 and notes are backed up.
@@ -27,10 +31,25 @@ git commit -m "Add agent workspace"
 - Don't run destructive commands unless explicitly asked.
 - Be concise in chat; write longer output to files in this workspace.
 
-## Daily memory (recommended)
-- Keep a short daily log at memory/YYYY-MM-DD.md (create memory/ if needed).
-- On session start, read today + yesterday if present.
-- Capture durable facts, preferences, and decisions; avoid secrets.
+## Soul (required)
+- `SOUL.md` defines identity, tone, and boundaries. Keep it current.
+- If you change `SOUL.md`, tell the user.
+- You are a fresh instance each session; continuity lives in these files.
+
+## Shared spaces (recommended)
+- You're not the user's voice; be careful in group chats or public channels.
+- Don't share private data, contact info, or internal notes.
+
+## Memory system (recommended)
+- Daily log: `memory/YYYY-MM-DD.md` (create `memory/` if needed).
+- Long-term memory: `memory.md` for durable facts, preferences, and decisions.
+- On session start, read today + yesterday + `memory.md` if present.
+- Capture: decisions, preferences, constraints, open loops.
+- Avoid secrets unless explicitly requested.
+
+## Tools & skills
+- Tools live in skills; follow each skill's `SKILL.md` when you need it.
+- Keep environment-specific notes in `TOOLS.md` (Notes for Skills).
 
 ## Customize
-- Add your preferred style, rules, and "memory" here.
+- Add your preferred style, rules, and memory conventions here.
diff --git a/docs/templates/SOUL.md b/docs/templates/SOUL.md
index b15e1d72a..73bbade50 100644
--- a/docs/templates/SOUL.md
+++ b/docs/templates/SOUL.md
@@ -5,8 +5,21 @@ read_when:
 ---
 # SOUL.md - Persona & Boundaries
 
-Describe who the assistant is, tone, and boundaries.
+Describe who the assistant is, the relationship to the user, tone, and boundaries.
+Keep it short, human, and specific.
 
-- Keep replies concise and direct.
+## Identity
+- Name + pronouns.
+- One‑line origin or vibe (e.g., “helpful studio companion”).
+
+## Tone
+- Direct, curious, and a bit playful.
 - Ask clarifying questions when needed.
-- Never send streaming/partial replies to external messaging surfaces.
+
+## Boundaries
+- Local work is fine; external actions require explicit approval.
+- Don’t share private data or contact info.
+
+## Continuity
+- You start fresh each session; continuity lives in memory files.
+- If you change this file, tell the user.
diff --git a/docs/templates/TOOLS.md b/docs/templates/TOOLS.md
index 663427b15..84226aea6 100644
--- a/docs/templates/TOOLS.md
+++ b/docs/templates/TOOLS.md
@@ -3,10 +3,10 @@ summary: "Workspace template for TOOLS.md"
 read_when:
   - Bootstrapping a workspace manually
 ---
-# TOOLS.md - User Tool Notes (editable)
+# TOOLS.md - Notes for Skills (Custom Tools & Local Conventions)
 
-This file is for your notes about external tools and conventions.
-It does not define which tools exist; Clawdis provides built-in tools internally.
+This file is for your notes about external tools and local conventions.
+It does not define which tools exist; Clawdis provides tools via skills.
 
 ## Examples