diff --git a/.gitignore b/.gitignore
index f81b5a5..26d4060 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,8 @@
 # Claude Code
 .conductor/
 .claude/cache/
+.claude/settings.local.json
+CLAUDE.local.md
 
 # IDE
 .vscode/
diff --git a/README.md b/README.md
index 44c851f..3aef888 100644
--- a/README.md
+++ b/README.md
@@ -2,17 +2,25 @@
 
 A complete personal knowledge management system that combines Obsidian's powerful note-taking with Claude Code's AI assistance. Go from zero to a fully functional PKM in 15 minutes or less.
 
+**v2.0** - Now with hooks, custom agents, skills, and modular rules.
+
 ## ✨ Features
 
+### Core PKM
 - **🎯 Goal-Aligned System** - Cascading goals from 3-year vision to daily tasks
-- **🤖 AI-Powered Workflows** - Claude Code integration for intelligent note management
 - **📅 Daily Notes System** - Structured daily planning and reflection
 - **📱 Mobile Ready** - GitHub integration for notes on any device
 - **🔄 Version Controlled** - Never lose a thought with automatic Git backups
-- **⚡ Automated Commands** - Custom slash commands for common workflows
-- **🧠 Output Styles** - Pre-configured AI personalities including a Productivity Coach
 - **🎨 Fully Customizable** - Adapt templates and structure to your needs
 
+### AI-Powered (v2.0)
+- **🪝 Hooks** - Auto-commit on save, session initialization
+- **🤖 Custom Agents** - Note organizer, weekly reviewer, goal aligner, inbox processor
+- **⚡ Skills** - Auto-discovered capabilities for vault ops, goal tracking, daily workflows
+- **📏 Modular Rules** - Path-specific conventions for markdown, productivity, projects
+- **🧠 Output Styles** - Productivity Coach for accountability
+- **📊 Status Line** - Vault stats in terminal (note count, inbox, uncommitted changes)
+
 ## 🚀 Quick Start
 
 ### Prerequisites
@@ -63,16 +71,38 @@ cp -r vault-template ~/Documents/ObsidianPKM
 
 ```
 Your Vault/
-├── CLAUDE.md           # AI context and navigation
+├── CLAUDE.md                    # AI context and navigation
+├── CLAUDE.local.md.template     # Template for personal overrides
+├── .claude-plugin/
+│   └── plugin.json              # Plugin manifest
 ├── .claude/
-│   ├── commands/       # Custom slash commands
-│   └── output-styles/  # AI personality modes
-│       └── coach.md    # Productivity Coach style
-├── Daily Notes/        # Your daily journal
-├── Goals/              # Cascading goal system
-├── Projects/           # Active project folders
-├── Templates/          # Reusable note templates
-└── Archives/           # Historical content
+│   ├── commands/                # Slash commands (/daily, /weekly, /push, /onboard)
+│   ├── agents/                  # Custom AI agents (NEW)
+│   │   ├── note-organizer.md
+│   │   ├── weekly-reviewer.md
+│   │   ├── goal-aligner.md
+│   │   └── inbox-processor.md
+│   ├── skills/                  # Auto-discovered capabilities (NEW)
+│   │   ├── obsidian-vault-ops/
+│   │   ├── goal-tracking/
+│   │   └── daily-workflow/
+│   ├── hooks/                   # Event automation (NEW)
+│   │   ├── session-init.sh
+│   │   └── auto-commit.sh
+│   ├── rules/                   # Path-specific conventions (NEW)
+│   │   ├── markdown-standards.md
+│   │   ├── productivity-workflow.md
+│   │   └── project-management.md
+│   ├── scripts/
+│   │   └── statusline.sh        # Terminal status display (NEW)
+│   ├── output-styles/
+│   │   └── coach.md             # Productivity Coach
+│   └── settings.json            # Permissions and config (NEW)
+├── Daily Notes/
+├── Goals/
+├── Projects/
+├── Templates/
+└── Archives/
 ```
 
 ## 🧠 Output Styles
@@ -93,6 +123,47 @@ To use the coach style in Claude Code:
 
 Learn more about [customizing output styles](docs/CUSTOMIZATION.md#output-styles).
 
+## 🤖 Custom Agents (v2.0)
+
+Ask Claude to use specialized agents for common PKM tasks:
+
+```bash
+# Organize your vault and fix broken links
+claude "Use the note-organizer agent to audit my vault"
+
+# Facilitate weekly review aligned with goals
+claude "Use the weekly-reviewer agent for my weekly review"
+
+# Check if daily work aligns with long-term goals
+claude "Use the goal-aligner agent to analyze my recent activity"
+
+# Process inbox items using GTD principles
+claude "Use the inbox-processor agent to clear my inbox"
+```
+
+## 🔄 Upgrading from v1.x
+
+If you have an existing vault from v1.x:
+
+```bash
+# 1. Copy new directories to your vault
+cp -r vault-template/.claude-plugin your-vault/
+cp -r vault-template/.claude/agents your-vault/.claude/
+cp -r vault-template/.claude/skills your-vault/.claude/
+cp -r vault-template/.claude/hooks your-vault/.claude/
+cp -r vault-template/.claude/rules your-vault/.claude/
+cp -r vault-template/.claude/scripts your-vault/.claude/
+cp vault-template/.claude/settings.json your-vault/.claude/
+cp vault-template/CLAUDE.local.md.template your-vault/
+
+# 2. Review and merge CLAUDE.md changes
+# Your customizations are preserved, just add references to new features
+
+# 3. Make hook scripts executable
+chmod +x your-vault/.claude/hooks/*.sh
+chmod +x your-vault/.claude/scripts/*.sh
+```
+
 ## 🤝 Contributing
 
 Found a bug or have a feature idea? Please open an issue or submit a PR!
diff --git a/docs/CUSTOMIZATION.md b/docs/CUSTOMIZATION.md
index cdc8377..f4e8329 100644
--- a/docs/CUSTOMIZATION.md
+++ b/docs/CUSTOMIZATION.md
@@ -599,6 +599,123 @@ Use Tasker or Automate for:
 - [ ] [Task from external system]
 ```
 
+## v2.0 Features: Hooks, Agents, Skills & Rules
+
+### Hooks (Automatic Behaviors)
+
+Hooks are automatic behaviors triggered by Claude Code events. Located in `.claude/settings.json`:
+
+#### Disabling Auto-Commit
+```json
+{
+  "hooks": {
+    "PostToolUse": []
+  }
+}
+```
+
+#### Adding Custom Hooks
+```json
+{
+  "hooks": {
+    "PostToolUse": [
+      {
+        "matcher": "Write|Edit",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "your-script.sh"
+          }
+        ]
+      }
+    ]
+  }
+}
+```
+
+### Custom Agents
+
+Agents are specialized AI assistants. Located in `.claude/agents/`:
+
+#### Creating a Custom Agent
+Create `.claude/agents/my-agent.md`:
+```markdown
+---
+name: my-agent
+description: What this agent does. Claude uses this to decide when to invoke it.
+tools: Read, Write, Edit, Glob, Grep
+model: sonnet
+---
+
+# Agent Instructions
+
+[Detailed instructions for the agent's behavior]
+```
+
+#### Included Agents
+- `note-organizer` - Vault organization and link maintenance
+- `weekly-reviewer` - Weekly review facilitation
+- `goal-aligner` - Goal-activity alignment analysis
+- `inbox-processor` - GTD-style inbox processing
+
+### Skills (Auto-Discovered Capabilities)
+
+Skills are capabilities Claude discovers and uses automatically. Located in `.claude/skills/`:
+
+#### Creating a Custom Skill
+Create `.claude/skills/my-skill/SKILL.md`:
+```markdown
+---
+name: my-skill
+description: What this skill does. Use for [specific situations].
+allowed-tools: Read, Write, Edit
+---
+
+# Skill Instructions
+
+[How to use this skill]
+```
+
+#### Included Skills
+- `obsidian-vault-ops` - Vault file operations
+- `goal-tracking` - Goal cascade management
+- `daily-workflow` - Daily routine structure
+
+### Modular Rules
+
+Rules are path-specific conventions. Located in `.claude/rules/`:
+
+#### Creating Custom Rules
+Create `.claude/rules/my-rules.md`:
+```markdown
+---
+paths: "MyFolder/**/*.md"
+---
+
+# Rules for MyFolder
+
+[Specific conventions for files matching the pattern]
+```
+
+#### Included Rules
+- `markdown-standards.md` - File naming, tags, frontmatter
+- `productivity-workflow.md` - Goal cascade, planning
+- `project-management.md` - Project structure, status tracking
+
+### Personal Overrides (CLAUDE.local.md)
+
+For personal customizations that shouldn't be committed:
+
+```bash
+cp CLAUDE.local.md.template CLAUDE.local.md
+```
+
+This file is gitignored. Use it for:
+- Personal mission statement
+- Working style preferences
+- Private goals
+- Custom coaching intensity
+
 ## Best Practices
 
 ### Start Simple
diff --git a/docs/SETUP_GUIDE.md b/docs/SETUP_GUIDE.md
index 56ddfe3..31dff26 100644
--- a/docs/SETUP_GUIDE.md
+++ b/docs/SETUP_GUIDE.md
@@ -99,6 +99,20 @@ When prompted:
 
 ## Phase 3: Claude Code Integration (10 minutes)
 
+### New in v2.0: Plugin Features
+
+Your vault now includes a full Claude Code plugin with advanced features:
+
+| Feature | Description |
+|---------|-------------|
+| **Hooks** | Auto-commit on file changes, session initialization |
+| **Agents** | Specialized AI assistants for note organization, weekly review, goal alignment |
+| **Skills** | Auto-discovered capabilities for vault operations, goal tracking, daily workflows |
+| **Rules** | Path-specific conventions for markdown, productivity, projects |
+| **Status Line** | Terminal display of vault stats (note count, inbox, uncommitted changes) |
+
+These work automatically once your vault is set up.
+
 ### Step 1: Configure Claude Code
 
 ```bash
@@ -154,7 +168,25 @@ claude
 
 Your style preference is automatically saved in `.claude/settings.local.json`. The output style file is located at `.claude/output-styles/coach.md` if you want to customize it.
 
-### Step 5: Customize Context
+### Step 5: Using Agents (New in v2.0)
+
+The vault includes 4 specialized agents for common PKM tasks:
+
+```bash
+# Organize your vault, fix broken links
+claude "Use the note-organizer agent to audit my vault"
+
+# Run a guided weekly review
+claude "Use the weekly-reviewer agent to help with my weekly review"
+
+# Check goal alignment
+claude "Use the goal-aligner agent to analyze my recent activity"
+
+# Process your inbox
+claude "Use the inbox-processor agent to clear my inbox"
+```
+
+### Step 6: Customize Context
 
 Edit `CLAUDE.md` in your vault root:
 1. Add your personal mission statement
@@ -162,6 +194,8 @@ Edit `CLAUDE.md` in your vault root:
 3. Set your current focus areas
 4. Add any specific instructions for Claude
 
+For personal overrides, copy `CLAUDE.local.md.template` to `CLAUDE.local.md` (gitignored).
+
 ## Phase 4: Git Setup (5 minutes)
 
 ### Step 1: Initialize Repository
diff --git a/vault-template/.claude-plugin/plugin.json b/vault-template/.claude-plugin/plugin.json
new file mode 100644
index 0000000..a29ecf0
--- /dev/null
+++ b/vault-template/.claude-plugin/plugin.json
@@ -0,0 +1,28 @@
+{
+  "name": "obsidian-pkm",
+  "version": "2.0.0",
+  "description": "Personal Knowledge Management system for Obsidian with AI-powered workflows, goal tracking, and productivity coaching",
+  "author": {
+    "name": "Bill Allred",
+    "url": "https://github.com/ballred"
+  },
+  "repository": "https://github.com/ballred/obsidian-claude-pkm",
+  "license": "MIT",
+  "capabilities": {
+    "commands": true,
+    "agents": true,
+    "skills": true,
+    "hooks": true,
+    "outputStyles": true,
+    "rules": true
+  },
+  "keywords": [
+    "obsidian",
+    "pkm",
+    "productivity",
+    "goals",
+    "daily-notes",
+    "weekly-review",
+    "gtd"
+  ]
+}
diff --git a/vault-template/.claude/agents/goal-aligner.md b/vault-template/.claude/agents/goal-aligner.md
new file mode 100644
index 0000000..3a58949
--- /dev/null
+++ b/vault-template/.claude/agents/goal-aligner.md
@@ -0,0 +1,90 @@
+---
+name: goal-aligner
+description: Analyze alignment between daily activities and long-term goals. Identify gaps, over/under-investment, and suggest rebalancing. Use for goal audits and priority checks.
+tools: Read, Grep, Glob
+model: sonnet
+---
+
+# Goal Aligner Agent
+
+You analyze the alignment between daily activities and stated goals at all levels, helping users ensure their time investment matches their priorities.
+
+## Analysis Framework
+
+### 1. Goal Cascade Review
+Read and understand the goal hierarchy:
+```
+3-Year Vision
+  -> Annual Objectives
+      -> Monthly Priorities
+          -> Weekly Focus
+              -> Daily Tasks
+```
+
+### 2. Activity Audit
+Scan recent daily notes (7-30 days) to categorize time spent:
+- **Goal-aligned deep work** (high value)
+- **Maintenance tasks** (necessary)
+- **Reactive work** (unavoidable)
+- **Misaligned activities** (potential waste)
+
+### 3. Gap Analysis
+Identify disconnects:
+- Goals with zero recent activity
+- Activities not connected to any goal
+- Over-investment in low-priority areas
+- Under-investment in stated priorities
+
+### 4. Recommendations
+Provide actionable suggestions:
+- Specific tasks to add/remove
+- Time reallocation recommendations
+- Goal adjustments if consistently ignored
+- Quick wins to build momentum
+
+## Output Format
+
+```markdown
+## Goal Alignment Report
+
+### Alignment Score: X/10
+
+### Well-Aligned Areas
+| Goal | Evidence | Time Invested |
+|------|----------|---------------|
+| [Goal] | [Recent activity] | [Hours/week] |
+
+### Misalignment Detected
+| Goal | Last Activity | Gap (days) | Risk |
+|------|---------------|------------|------|
+| [Goal] | [Date] | [N] | [High/Med/Low] |
+
+### Activity Analysis
+- Goal-aligned work: X%
+- Maintenance: X%
+- Reactive: X%
+- Unaligned: X%
+
+### Recommendations
+1. **Start:** [Specific action to add]
+2. **Stop:** [Activity to reduce/eliminate]
+3. **Continue:** [What's working well]
+
+### Questions to Consider
+- [Probing question about priorities]
+- [Question about avoided work]
+```
+
+## Probing Questions
+
+When analyzing, surface these insights:
+- "Your stated #1 priority hasn't appeared in daily tasks this week."
+- "You're spending 3x more time on [X] than [Y], but [Y] is ranked higher."
+- "This goal has been 'in progress' for 6 weeks with no measurable advancement."
+
+## Integration
+
+Works well with:
+- Weekly Reviewer agent for regular check-ins
+- Productivity Coach output style for accountability
+- `/onboard` command for full context
diff --git a/vault-template/.claude/agents/inbox-processor.md b/vault-template/.claude/agents/inbox-processor.md
new file mode 100644
index 0000000..f3d25f5
--- /dev/null
+++ b/vault-template/.claude/agents/inbox-processor.md
@@ -0,0 +1,117 @@
+---
+name: inbox-processor
+description: Process inbox items using GTD principles. Categorize, clarify, and organize captured notes into actionable items. Use for inbox zero and capture processing.
+tools: Read, Write, Edit, Glob, Bash
+model: sonnet
+---
+
+# Inbox Processor Agent
+
+You process inbox items using Getting Things Done (GTD) principles adapted for this Obsidian vault.
+
+## Inbox Sources
+
+1. `Inbox/` folder (if present)
+2. Items tagged with `#inbox` in any file
+3. Quick capture notes without proper categorization
+4. Uncategorized notes in root directory
+
+## Processing Algorithm
+
+For each item, apply the GTD flowchart:
+
+```
+1. What is it?
+   - Understand the item fully
+
+2. Is it actionable?
+   NO -> Reference (move to relevant area)
+      -> Someday/Maybe (tag #someday)
+      -> Trash (delete or archive)
+   YES -> Continue
+
+3. What's the next action?
+   - If < 2 minutes -> Do it now
+   - If delegatable -> Add #waiting tag
+   - If multi-step -> Create project
+   - Otherwise -> Add to appropriate list
+```
+
+## Action Categories
+
+Apply these tags:
+- `#next-action` - Single next steps ready to do
+- `#project` - Multi-step outcomes requiring planning
+- `#waiting` - Delegated or waiting on external input
+- `#someday` - Future possibilities, not committed
+- `#reference` - Information to keep, not actionable
+
+## Vault Integration
+
+Route items appropriately:
+- Tasks -> Today's daily note or appropriate project
+- Reference material -> Relevant project or Resources area
+- Multi-step outcomes -> New folder in Projects/
+- Ideas -> Capture in appropriate area with links
+
+## Processing Session
+
+1. Scan all inbox sources
+2. Present summary: "[N] items to process"
+3. For each item:
+   - Show the item
+   - Suggest categorization
+   - Ask for confirmation or adjustment
+4. Execute moves and updates
+5. Generate processing report
+
+## Output Format
+
+### During Processing
+```markdown
+## Item: [Title or first line]
+
+**Content:** [Brief summary]
+
+**Suggested Action:** [Move to X / Tag as Y / Delete]
+
+**Reasoning:** [Why this categorization]
+
+Confirm? (y/n/modify)
+```
+
+### After Processing
+```markdown
+## Inbox Processing Complete
+
+- Items processed: N
+- Actions created: N
+- Projects created: N
+- Reference filed: N
+- Deleted/Archived: N
+
+### New Actions
+- [ ] [Action 1] #next-action
+- [ ] [Action 2] #next-action
+
+### New Projects
+- [[Project Name]] - [Brief description]
+
+### Waiting For
+- [ ] [Item] #waiting - [Who/What]
+```
+
+## Best Practices
+
+1. Process to empty - don't leave items half-categorized
+2. Clarify ambiguous items before filing
+3. Create projects when 2+ actions are needed
+4. Link to relevant goals when possible
+5. Add context tags for filtering (#work, #personal, etc.)
+
+## Integration
+
+Works well with:
+- Note Organizer agent for vault maintenance
+- `/daily` command for routing to today's note
+- Weekly review for processing backlog
diff --git a/vault-template/.claude/agents/note-organizer.md b/vault-template/.claude/agents/note-organizer.md
new file mode 100644
index 0000000..7f82ccc
--- /dev/null
+++ b/vault-template/.claude/agents/note-organizer.md
@@ -0,0 +1,73 @@
+---
+name: note-organizer
+description: Organize and restructure vault notes. Fix broken links, consolidate duplicates, suggest connections, and maintain vault hygiene. Use when managing vault organization or cleaning up notes.
+tools: Read, Write, Edit, Glob, Grep, Bash
+model: sonnet
+---
+
+# Note Organizer Agent
+
+You are a specialized agent for organizing and maintaining an Obsidian vault. Your responsibilities include restructuring notes, fixing links, and maintaining vault hygiene.
+
+## Core Functions
+
+### 1. Inbox Processing
+- Review files in the Inbox folder (if present)
+- Categorize notes by topic, project, or area
+- Move notes to appropriate locations
+- Add appropriate tags and links
+
+### 2. Link Maintenance
+- Identify orphan notes (no incoming links)
+- Suggest connections between related notes
+- Fix broken wiki-links `[[like this]]`
+- Create index notes for clusters of related content
+
+### 3. Tag Standardization
+- Audit existing tags for consistency
+- Suggest tag consolidation (e.g., #work vs #professional)
+- Apply hierarchical tag structures (e.g., #project/client-a)
+
+### 4. Archive Management
+- Identify stale notes (no edits in 90+ days)
+- Move completed projects to Archives
+- Maintain archive index
+
+## Workflow
+
+1. Start by scanning the vault structure with Glob
+2. Read CLAUDE.md for vault conventions
+3. Report findings before making changes
+4. Confirm reorganization plan with user
+5. Execute changes incrementally
+6. Update any affected links
+
+## Output Format
+
+Always provide a summary of proposed changes before executing:
+
+```markdown
+## Proposed Changes
+
+### Files to Move
+- [source] -> [destination]
+
+### Tags to Update
+- [old tag] -> [new tag] (N files affected)
+
+### Links to Fix
+- [[broken link]] in [file]
+
+### Estimated Impact
+- Files affected: N
+- Links updated: N
+```
+
+Wait for user confirmation before making changes.
+
+## Integration
+
+Works well with:
+- `/onboard` command for initial context
+- Productivity Coach output style for guidance
+- Weekly review workflow for regular maintenance
diff --git a/vault-template/.claude/agents/weekly-reviewer.md b/vault-template/.claude/agents/weekly-reviewer.md
new file mode 100644
index 0000000..4391463
--- /dev/null
+++ b/vault-template/.claude/agents/weekly-reviewer.md
@@ -0,0 +1,87 @@
+---
+name: weekly-reviewer
+description: Facilitate comprehensive weekly review process. Analyze past week's daily notes, calculate goal progress, and help plan next week. Use for Sunday/Monday weekly reviews.
+tools: Read, Write, Edit, Glob, Grep
+model: sonnet
+---
+
+# Weekly Reviewer Agent
+
+You facilitate the weekly review process for a personal knowledge management system, helping users reflect on the past week and plan the next one.
+
+## Review Process
+
+### Phase 1: Collect (10 minutes)
+1. Read all daily notes from the past 7 days
+2. Extract completed tasks, wins, and challenges
+3. Identify patterns in productivity and mood
+4. Gather incomplete tasks for carry-forward decision
+
+### Phase 2: Reflect (10 minutes)
+1. Read current Goals files (Monthly, Yearly, 3-Year)
+2. Calculate progress toward each goal
+3. Identify goal-action alignment gaps
+4. Note what worked and what did not
+
+### Phase 3: Plan (10 minutes)
+1. Identify the ONE Big Thing for next week
+2. Break down into daily focus areas
+3. Set specific, measurable targets
+4. Anticipate obstacles and plan responses
+
+## Data Sources
+
+Always read these files:
+- `Goals/0. Three Year Goals.md` - Long-term vision
+- `Goals/1. Yearly Goals.md` - Annual objectives
+- `Goals/2. Monthly Goals.md` - Current month priorities
+- `Goals/3. Weekly Review.md` - Previous reviews
+- `Daily Notes/*.md` - Past 7 days of notes
+
+## Output Format
+
+Generate a structured weekly review:
+
+```markdown
+## Week of [DATE RANGE]
+
+### Wins
+- [Quantified accomplishment]
+
+### Challenges
+- [What got in the way]
+
+### Patterns Noticed
+- [Recurring themes]
+
+### Goal Progress
+| Goal | Progress | Notes |
+|------|----------|-------|
+| [Goal 1] | [X%] | [Status] |
+
+### Next Week
+
+**ONE Big Thing:** [Priority]
+
+| Day | Focus |
+|-----|-------|
+| Mon | [Task] |
+| ... | ... |
+
+### Carry Forward
+- [ ] [Task from this week]
+```
+
+## Coaching Integration
+
+When Productivity Coach output style is active, include probing questions:
+- "What did you avoid this week that you knew was important?"
+- "How does next week's plan differ from patterns that didn't work?"
+- "What's the ONE thing that would make everything else easier?"
+
+## Integration
+
+Works well with:
+- `/weekly` command for structured workflow
+- Goal Aligner agent for deep analysis
+- Note Organizer agent for archiving old notes
diff --git a/vault-template/.claude/hooks/auto-commit.sh b/vault-template/.claude/hooks/auto-commit.sh
new file mode 100755
index 0000000..ae9c8db
--- /dev/null
+++ b/vault-template/.claude/hooks/auto-commit.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+# Auto-commit hook for vault changes
+# Called after Write/Edit operations on vault files
+
+VAULT_PATH="${VAULT_PATH:-$(pwd)}"
+MODIFIED_FILE="${1:-unknown}"
+
+# Only run if auto-commit is enabled
+if [ "${GIT_AUTO_COMMIT}" != "true" ]; then
+    exit 0
+fi
+
+cd "$VAULT_PATH" || exit 0
+
+# Check if this is a git repository
+if [ ! -d .git ]; then
+    exit 0
+fi
+
+# Check if there are changes to commit
+if git diff --quiet && git diff --staged --quiet; then
+    exit 0
+fi
+
+# Generate commit message based on file location
+TIMESTAMP=$(date +"%Y-%m-%d %H:%M")
+
+if [[ "$MODIFIED_FILE" == *"Daily Notes"* ]]; then
+    MSG="Update daily note - $TIMESTAMP"
+elif [[ "$MODIFIED_FILE" == *"Goals"* ]]; then
+    MSG="Update goals - $TIMESTAMP"
+elif [[ "$MODIFIED_FILE" == *"Projects"* ]]; then
+    PROJECT=$(echo "$MODIFIED_FILE" | sed 's|.*/Projects/\([^/]*\)/.*|\1|')
+    MSG="Update project: $PROJECT - $TIMESTAMP"
+elif [[ "$MODIFIED_FILE" == *"Templates"* ]]; then
+    MSG="Update template - $TIMESTAMP"
+else
+    MSG="Vault update - $TIMESTAMP"
+fi
+
+# Stage and commit
+git add .
+git commit -m "$MSG" --quiet 2>/dev/null
+
+if [ $? -eq 0 ]; then
+    echo "Auto-committed: $MSG"
+fi
diff --git a/vault-template/.claude/hooks/session-init.sh b/vault-template/.claude/hooks/session-init.sh
new file mode 100755
index 0000000..614558a
--- /dev/null
+++ b/vault-template/.claude/hooks/session-init.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+# Session initialization hook for Obsidian PKM vault
+# Sets up environment variables for the Claude Code session
+
+# Set vault path (defaults to current directory)
+export VAULT_PATH="${VAULT_PATH:-$(pwd)}"
+
+# Date variables for daily operations
+export TODAY=$(date +%Y-%m-%d)
+export YESTERDAY=$(date -v-1d +%Y-%m-%d 2>/dev/null || date -d "yesterday" +%Y-%m-%d)
+export CURRENT_WEEK=$(date +%Y-W%V)
+
+# Daily note path
+export DAILY_NOTE="$VAULT_PATH/Daily Notes/$TODAY.md"
+
+# Verify vault structure
+if [ ! -f "$VAULT_PATH/CLAUDE.md" ]; then
+    echo "Note: Not in a vault root directory (no CLAUDE.md found)"
+fi
+
+# Output session info
+echo "PKM Session initialized"
+echo "  Vault: $VAULT_PATH"
+echo "  Today: $TODAY"
diff --git a/vault-template/.claude/rules/markdown-standards.md b/vault-template/.claude/rules/markdown-standards.md
new file mode 100644
index 0000000..ec11107
--- /dev/null
+++ b/vault-template/.claude/rules/markdown-standards.md
@@ -0,0 +1,108 @@
+---
+paths: "**/*.md"
+---
+
+# Markdown Standards for Vault
+
+These conventions apply to all markdown files in the vault.
+
+## File Naming
+
+- **Daily notes:** `YYYY-MM-DD.md` (e.g., `2024-01-15.md`)
+- **Project folders:** PascalCase (e.g., `MyProject/`)
+- **General notes:** kebab-case (e.g., `meeting-notes.md`)
+- **Templates:** Title Case with space (e.g., `Daily Template.md`)
+
+## Heading Structure
+
+- H1 (`#`) for note title only - one per file
+- H2 (`##`) for major sections
+- H3 (`###`) for subsections
+- Never skip heading levels (no H1 -> H3)
+
+## Links
+
+### Internal Links (Wiki-style)
+```markdown
+[[Note Name]]                    # Link to note
+[[Note Name|Display Text]]       # Link with alias
+[[Note Name#Section]]            # Link to heading
+[[Folder/Note Name]]             # Link with path
+```
+
+### External Links
+```markdown
+[Display Text](https://url.com)
+```
+
+## Tags
+
+### Standard Tag Hierarchy
+```
+#priority/high
+#priority/medium
+#priority/low
+
+#status/active
+#status/waiting
+#status/completed
+#status/archived
+
+#context/work
+#context/personal
+#context/health
+#context/learning
+#context/family
+```
+
+### Tag Placement
+- In YAML frontmatter: `tags: [tag1, tag2]`
+- Inline: at end of relevant line or paragraph
+
+## Task Format
+
+```markdown
+- [ ] Incomplete task
+- [x] Completed task
+- [ ] Task with context #work @home
+- [ ] Task with due date 📅 2024-01-20
+```
+
+## YAML Frontmatter
+
+All notes should include frontmatter:
+```yaml
+---
+date: YYYY-MM-DD
+tags: [relevant, tags]
+status: active|completed|archived
+---
+```
+
+## Text Formatting
+
+- **Bold** for emphasis and key terms
+- *Italic* for subtle emphasis
+- `Code` for commands, paths, technical terms
+- > Blockquotes for important callouts
+
+## Lists
+
+- Use `-` for unordered lists
+- Use `1.` for ordered lists
+- Indent with 2 spaces for nested items
+
+## Code Blocks
+
+Use fenced code blocks with language:
+```javascript
+const example = "code";
+```
+
+## Best Practices
+
+1. One idea per paragraph
+2. Use blank lines between sections
+3. Keep lines under 100 characters when possible
+4. Include links to related notes
+5. Add meaningful frontmatter
diff --git a/vault-template/.claude/rules/productivity-workflow.md b/vault-template/.claude/rules/productivity-workflow.md
new file mode 100644
index 0000000..f635a85
--- /dev/null
+++ b/vault-template/.claude/rules/productivity-workflow.md
@@ -0,0 +1,123 @@
+---
+paths: "Goals/**/*.md, Daily Notes/**/*.md"
+---
+
+# Productivity Workflow Rules
+
+These conventions apply to goal files and daily notes.
+
+## Goal Cascade Principle
+
+Goals flow from long-term vision to daily actions:
+```
+3-Year Vision (life direction)
+    → Yearly Goals (annual objectives)
+        → Monthly Goals (current focus)
+            → Weekly Review (this week's plan)
+                → Daily Tasks (today's actions)
+```
+
+## Goal Setting Standards
+
+### SMART Goals
+Every goal should be:
+- **S**pecific - Clear and well-defined
+- **M**easurable - Has quantifiable outcomes
+- **A**chievable - Realistic given constraints
+- **R**elevant - Aligned with higher-level goals
+- **T**ime-bound - Has a deadline
+
+### Goal Limits
+- Maximum 3 active high-priority goals at once
+- Each goal should have clear success criteria
+- Goals without action in 14+ days need review
+
+## Daily Planning Rules
+
+### Morning (5 minutes)
+1. Create daily note or open existing
+2. Identify ONE Big Thing for the day
+3. Review yesterday's incomplete tasks
+4. Set realistic time blocks
+
+### The ONE Thing
+> "What's the ONE thing I can do today such that by doing it everything else will be easier or unnecessary?"
+
+Always answer this question in the Focus section.
+
+### Task Prioritization
+1. Must Do Today - Non-negotiable, deadline-driven
+2. Should Do - Important but flexible timing
+3. Could Do - Nice to have if time permits
+4. Won't Do - Explicitly dropped (acknowledge trade-offs)
+
+## Weekly Review Rules
+
+### When: Sunday or Monday
+### Duration: 30 minutes minimum
+
+### Required Elements
+1. **Collect** - Gather all loose ends
+2. **Process** - Decide on each item
+3. **Review** - Check goal progress
+4. **Plan** - Set next week's priorities
+
+### Checklist
+- [ ] All inboxes emptied
+- [ ] All daily notes from week reviewed
+- [ ] Goal progress calculated
+- [ ] Next week's ONE Big Thing identified
+- [ ] Calendar reviewed for commitments
+
+## Progress Tracking
+
+### Checkbox Format
+```markdown
+- [ ] Not started
+- [/] In progress (optional)
+- [x] Completed
+```
+
+### Percentage Updates
+Update percentages when progress is made:
+```markdown
+- [ ] Learn Spanish (25% → 30%)
+```
+
+### Milestone Dates
+Record significant progress:
+```markdown
+- [x] Complete course Module 1 ✓ 2024-01-15
+```
+
+## Time Management
+
+### Time Blocks
+Structure days around energy:
+- 🌅 Morning: High-focus work (9-12)
+- ☀️ Afternoon: Meetings, admin (12-5)
+- 🌙 Evening: Light tasks, learning (5+)
+
+### Energy Tracking
+Log energy levels daily (1-10):
+```markdown
+**Energy:** 7/10 - Good morning, afternoon slump
+```
+
+## Archive Rules
+
+Move to Archives when:
+- Project completed
+- Goal achieved or abandoned
+- Daily notes older than 30 days (optional)
+
+Archive format:
+```
+Archives/
+├── Projects/
+│   └── Completed-Project-2024/
+├── Goals/
+│   └── 2023-Goals.md
+└── Daily Notes/
+    └── 2024-01/
+```
diff --git a/vault-template/.claude/rules/project-management.md b/vault-template/.claude/rules/project-management.md
new file mode 100644
index 0000000..135a100
--- /dev/null
+++ b/vault-template/.claude/rules/project-management.md
@@ -0,0 +1,137 @@
+---
+paths: "Projects/**/*.md"
+---
+
+# Project Management Rules
+
+These conventions apply to project folders and documentation.
+
+## Project Structure
+
+Each project gets its own folder:
+```
+Projects/
+└── Project-Name/
+    ├── CLAUDE.md           # Required: Project context for AI
+    ├── README.md           # Optional: Overview if complex
+    ├── notes/              # Optional: Related notes
+    └── resources/          # Optional: Reference materials
+```
+
+## Project CLAUDE.md
+
+Every project must have a CLAUDE.md file with:
+
+```markdown
+# Project: [Name]
+
+## Overview
+[1-2 sentence description of what this project is]
+
+## Status
+- **Phase:** Planning | Active | On Hold | Complete
+- **Progress:** X%
+- **Started:** YYYY-MM-DD
+- **Target:** YYYY-MM-DD
+
+## Goals
+What success looks like for this project.
+
+## Current Focus
+What I'm actively working on right now.
+
+## Key Decisions
+Important decisions made and their rationale.
+
+## Next Actions
+- [ ] Immediate next step
+- [ ] Following step
+
+## Blockers
+Anything preventing progress.
+
+## Resources
+- [[Related Note]]
+- [External Link](url)
+
+## Notes for Claude
+[Any specific context Claude should know when helping with this project]
+```
+
+## Project Status Values
+
+Use consistent status labels:
+- `Planning` - Defining scope and approach
+- `Active` - Currently being worked on
+- `On Hold` - Temporarily paused (note reason)
+- `Blocked` - Waiting on external dependency
+- `Review` - Work complete, needs review
+- `Complete` - Done and ready for archive
+
+## Progress Tracking
+
+### Percentage Guidelines
+- 0-10%: Planning and setup
+- 10-30%: Initial implementation
+- 30-70%: Core work
+- 70-90%: Refinement and polish
+- 90-100%: Final review and completion
+
+### Update Frequency
+- Update progress weekly at minimum
+- Update status when it changes
+- Update blockers immediately
+
+## Linking Projects
+
+### To Goals
+Link projects to their parent goals:
+```markdown
+**Supports:** [[1. Yearly Goals#Goal Name]]
+```
+
+### To Daily Notes
+Reference project work in daily notes:
+```markdown
+## Work Log
+- Worked on [[Project Name]] - completed X
+```
+
+### Between Projects
+Link related projects:
+```markdown
+**Related:** [[Other Project]]
+```
+
+## Project Lifecycle
+
+### Starting a Project
+1. Create folder in `Projects/`
+2. Create CLAUDE.md from template
+3. Link to relevant goal
+4. Define first next action
+5. Set target completion date
+
+### During Project
+1. Update CLAUDE.md with progress
+2. Log work in daily notes
+3. Capture decisions and rationale
+4. Track blockers immediately
+5. Adjust timeline if needed
+
+### Completing a Project
+1. Update status to Complete
+2. Add completion date and summary
+3. Document lessons learned
+4. Move folder to Archives/Projects/
+5. Update goal progress
+
+## Best Practices
+
+1. Keep project scope realistic
+2. One primary focus at a time
+3. Break large projects into phases
+4. Review all active projects weekly
+5. Archive completed projects promptly
+6. Document decisions as they're made
+7. Link to relevant context liberally
diff --git a/vault-template/.claude/scripts/statusline.sh b/vault-template/.claude/scripts/statusline.sh
new file mode 100755
index 0000000..f9d8042
--- /dev/null
+++ b/vault-template/.claude/scripts/statusline.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+# Status line script for Claude Code
+# Shows vault statistics in the terminal status line
+
+VAULT_PATH="${VAULT_PATH:-$(pwd)}"
+
+# Count total notes (excluding hidden directories)
+TOTAL_NOTES=$(find "$VAULT_PATH" -name "*.md" -type f -not -path "*/\.*" 2>/dev/null | wc -l | tr -d ' ')
+
+# Count inbox items
+INBOX_COUNT=0
+if [ -d "$VAULT_PATH/Inbox" ]; then
+    INBOX_COUNT=$(find "$VAULT_PATH/Inbox" -name "*.md" -type f 2>/dev/null | wc -l | tr -d ' ')
+fi
+
+# Add notes tagged with #inbox (if grep available)
+if command -v grep &> /dev/null; then
+    TAGGED_INBOX=$(grep -rl "#inbox" "$VAULT_PATH" --include="*.md" 2>/dev/null | wc -l | tr -d ' ')
+    INBOX_COUNT=$((INBOX_COUNT + TAGGED_INBOX))
+fi
+
+# Count uncommitted changes (if in git repo)
+UNCOMMITTED="N/A"
+if [ -d "$VAULT_PATH/.git" ]; then
+    cd "$VAULT_PATH" || exit 1
+    UNCOMMITTED=$(git status --porcelain 2>/dev/null | wc -l | tr -d ' ')
+fi
+
+# Check if today's note exists
+TODAY=$(date +%Y-%m-%d)
+if [ -f "$VAULT_PATH/Daily Notes/$TODAY.md" ]; then
+    TODAY_STATUS="Yes"
+else
+    TODAY_STATUS="No"
+fi
+
+# Output status line (simple format)
+echo "Notes: $TOTAL_NOTES | Inbox: $INBOX_COUNT | Uncommitted: $UNCOMMITTED | Today: $TODAY_STATUS"
diff --git a/vault-template/.claude/settings.json b/vault-template/.claude/settings.json
new file mode 100644
index 0000000..b3ac27e
--- /dev/null
+++ b/vault-template/.claude/settings.json
@@ -0,0 +1,60 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(git:*)",
+      "Bash(ls:*)",
+      "Bash(mkdir:*)",
+      "Bash(date:*)",
+      "Bash(wc:*)",
+      "Bash(find:*)",
+      "Read(*)",
+      "Write(Daily Notes/**)",
+      "Write(Goals/**)",
+      "Write(Projects/**)",
+      "Write(Archives/**)",
+      "Write(Templates/**)",
+      "Write(Inbox/**)",
+      "Edit(Daily Notes/**)",
+      "Edit(Goals/**)",
+      "Edit(Projects/**)",
+      "Edit(Templates/**)"
+    ],
+    "deny": [
+      "Edit(.claude/**)",
+      "Write(.git/**)",
+      "Bash(rm -rf:*)"
+    ]
+  },
+  "env": {
+    "VAULT_PATH": "${cwd}",
+    "DAILY_NOTES_DIR": "Daily Notes",
+    "GOALS_DIR": "Goals",
+    "PROJECTS_DIR": "Projects",
+    "TEMPLATES_DIR": "Templates",
+    "ARCHIVES_DIR": "Archives",
+    "GIT_AUTO_COMMIT": "true"
+  },
+  "hooks": {
+    "SessionStart": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": ".claude/hooks/session-init.sh"
+          }
+        ]
+      }
+    ],
+    "PostToolUse": [
+      {
+        "matcher": "Write|Edit",
+        "hooks": [
+          {
+            "type": "command",
+            "command": ".claude/hooks/auto-commit.sh \"$TOOL_INPUT_FILE_PATH\""
+          }
+        ]
+      }
+    ]
+  }
+}
diff --git a/vault-template/.claude/skills/daily-workflow/SKILL.md b/vault-template/.claude/skills/daily-workflow/SKILL.md
new file mode 100644
index 0000000..83e91d7
--- /dev/null
+++ b/vault-template/.claude/skills/daily-workflow/SKILL.md
@@ -0,0 +1,130 @@
+---
+name: daily-workflow
+description: Morning routine, midday check-in, and evening shutdown workflows. Structure daily planning, task review, and end-of-day reflection. Use for daily productivity routines.
+allowed-tools: Read, Write, Edit, Glob, Grep
+---
+
+# Daily Workflow Skill
+
+Structured workflows for morning planning, midday check-ins, and evening shutdowns.
+
+## Morning Routine (5-10 minutes)
+
+### Automated Steps
+1. Create today's daily note (if not exists)
+2. Pull incomplete tasks from yesterday
+3. Review weekly goals for today's priority
+4. Surface any calendar events or deadlines
+
+### Interactive Prompts
+- "What's your ONE thing for today?"
+- "What might get in the way?"
+- "How do you want to feel at end of day?"
+
+### Morning Checklist
+- [ ] Daily note created
+- [ ] Yesterday's incomplete tasks reviewed
+- [ ] ONE priority identified
+- [ ] Time blocks set
+- [ ] Potential obstacles identified
+
+## Midday Check-in (2-3 minutes)
+
+### Quick Review
+1. Check morning task completion
+2. Compare actual vs planned time use
+3. Assess energy level
+4. Identify afternoon priorities
+
+### Adjustments
+- Reschedule incomplete morning tasks
+- Add urgent items that emerged
+- Reorder by current energy level
+- Note any blockers
+
+### Midday Questions
+- "How's your energy right now?"
+- "What's the most important thing for this afternoon?"
+- "What can you let go of today?"
+
+## Evening Shutdown (5 minutes)
+
+### Capture
+1. Mark completed tasks with [x]
+2. Add notes and learnings
+3. Log energy levels (1-10)
+4. Record gratitude items
+
+### Reflect
+- What went well today?
+- What could be better?
+- What did I learn?
+- What am I grateful for?
+
+### Prepare
+1. Identify tomorrow's priority (preview)
+2. Move incomplete tasks to tomorrow or delete
+3. Commit changes to git (`/push`)
+
+### Shutdown Checklist
+- [ ] All tasks updated (done/moved/deleted)
+- [ ] Reflection completed
+- [ ] Tomorrow's priority identified
+- [ ] Changes committed
+
+## Daily Note Sections
+
+Standard daily note structure:
+
+```markdown
+# {{date}}
+
+## Focus
+> What's the ONE thing that would make today successful?
+
+## Time Blocks
+- 🌅 Morning (9-12):
+- ☀️ Afternoon (12-5):
+- 🌙 Evening (5+):
+
+## Tasks
+### Must Do Today
+- [ ]
+
+### Work
+- [ ]
+
+### Personal
+- [ ]
+
+## Notes
+[Capture thoughts, meeting notes, ideas]
+
+## Reflection
+- **Wins:**
+- **Challenges:**
+- **Learned:**
+- **Grateful for:**
+- **Energy:** /10
+- **Tomorrow's priority:**
+```
+
+## Time Block Strategies
+
+### Energy-Based
+- High energy tasks in morning
+- Administrative work after lunch
+- Creative work when naturally alert
+
+### Context-Based
+- Batch similar tasks together
+- Minimize context switching
+- Protect deep work blocks
+
+## Integration
+
+Works with:
+- `/daily` command for note creation
+- `/push` command for end-of-day commit
+- Productivity Coach for accountability
+- Goal Tracking skill for alignment
diff --git a/vault-template/.claude/skills/goal-tracking/SKILL.md b/vault-template/.claude/skills/goal-tracking/SKILL.md
new file mode 100644
index 0000000..6292045
--- /dev/null
+++ b/vault-template/.claude/skills/goal-tracking/SKILL.md
@@ -0,0 +1,127 @@
+---
+name: goal-tracking
+description: Track progress toward 3-year, yearly, monthly, and weekly goals. Calculate completion percentages, surface stalled goals, connect daily tasks to objectives. Use for goal reviews and progress tracking.
+allowed-tools: Read, Grep, Glob, Edit
+---
+
+# Goal Tracking Skill
+
+Track and manage the cascading goal system from long-term vision to daily tasks.
+
+## Goal Hierarchy
+
+```
+Goals/0. Three Year Goals.md   <- Vision (Life areas)
+    ↓
+Goals/1. Yearly Goals.md       <- Annual objectives
+    ↓
+Goals/2. Monthly Goals.md      <- Current month focus
+    ↓
+Goals/3. Weekly Review.md      <- Weekly planning
+    ↓
+Daily Notes/*.md               <- Daily tasks and actions
+```
+
+## Goal File Formats
+
+### Three Year Goals
+```markdown
+## Life Areas
+- Career: [Vision statement]
+- Health: [Vision statement]
+- Relationships: [Vision statement]
+- Financial: [Vision statement]
+- Learning: [Vision statement]
+- Personal: [Vision statement]
+```
+
+### Yearly Goals
+```markdown
+## 2024 Goals
+- [ ] Goal 1 (XX% complete)
+- [ ] Goal 2 (XX% complete)
+- [x] Goal 3 (100% complete)
+```
+
+### Monthly Goals
+```markdown
+## This Month's Focus
+1. **Primary:** [Main focus]
+2. **Secondary:** [Supporting goal]
+3. **Stretch:** [If time permits]
+
+### Key Results
+- [ ] Measurable outcome 1
+- [ ] Measurable outcome 2
+```
+
+## Progress Calculation
+
+### Checklist-Based Goals
+```
+Progress = (Completed checkboxes / Total checkboxes) * 100
+```
+
+### Metric-Based Goals
+```
+Progress = (Current value / Target value) * 100
+```
+
+### Time-Based Goals
+```
+Progress = (Days elapsed / Total days) * 100
+```
+
+## Common Operations
+
+### View Goal Progress
+1. Read all goal files
+2. Parse checkbox completion rates
+3. Calculate overall and per-goal progress
+4. Identify stalled or at-risk goals
+
+### Update Goal Status
+1. Find goal in appropriate file
+2. Update checkbox or percentage
+3. Add date stamp for significant milestones
+4. Update related weekly review
+
+### Connect Task to Goal
+When adding tasks to daily notes:
+1. Identify which goal the task supports
+2. Add goal reference: `Supports: [[1. Yearly Goals#Goal Name]]`
+3. Use appropriate priority tag
+
+### Surface Stalled Goals
+1. Check last activity date for each goal
+2. Flag goals with no progress in 14+ days
+3. Suggest actions to restart momentum
+
+## Progress Report Format
+
+```markdown
+## Goal Progress Report
+
+### Overall: XX%
+
+### By Goal
+| Goal | Progress | Last Activity | Status |
+|------|----------|---------------|--------|
+| Goal 1 | 75% | 2 days ago | On Track |
+| Goal 2 | 30% | 14 days ago | Stalled |
+
+### This Week's Contributions
+- [Task] -> [[Goal 1]]
+- [Task] -> [[Goal 2]]
+
+### Recommended Focus
+1. [Stalled goal needs attention]
+2. [Nearly complete goal - finish it]
+```
+
+## Integration Points
+
+- Weekly review: Full progress assessment
+- Daily planning: Surface relevant goals
+- Monthly review: Adjust goals as needed
+- Quarterly review: Cascade from 3-year vision
diff --git a/vault-template/.claude/skills/obsidian-vault-ops/SKILL.md b/vault-template/.claude/skills/obsidian-vault-ops/SKILL.md
new file mode 100644
index 0000000..7289b9f
--- /dev/null
+++ b/vault-template/.claude/skills/obsidian-vault-ops/SKILL.md
@@ -0,0 +1,95 @@
+---
+name: obsidian-vault-ops
+description: Read and write Obsidian vault files, manage wiki-links, process markdown with YAML frontmatter. Use when working with vault file operations, creating notes, or managing links.
+allowed-tools: Read, Write, Edit, Glob, Grep
+---
+
+# Obsidian Vault Operations Skill
+
+Core operations for reading, writing, and managing files in an Obsidian vault.
+
+## Vault Structure
+
+```
+vault-root/
+├── CLAUDE.md           # Main context (always read first)
+├── Daily Notes/        # YYYY-MM-DD.md format
+├── Goals/              # Goal cascade files
+├── Projects/           # Project folders with CLAUDE.md
+├── Templates/          # Reusable note structures
+└── Archives/           # Completed/inactive content
+```
+
+## File Operations
+
+### Reading Notes
+- Use Glob to find files: `*.md`, `Daily Notes/*.md`
+- Read CLAUDE.md first for vault context
+- Check for wiki-links to related notes
+
+### Creating Notes
+1. Check if note already exists
+2. Use appropriate template if available
+3. Add YAML frontmatter with date and tags
+4. Insert wiki-links to related notes
+
+### Editing Notes
+- Preserve YAML frontmatter structure
+- Maintain existing wiki-links
+- Use consistent heading hierarchy
+- Apply standard tag format
+
+## Wiki-Link Format
+
+```markdown
+[[Note Name]]                    # Simple link
+[[Note Name|Display Text]]       # Link with alias
+[[Note Name#Section]]            # Link to section
+```
+
+## YAML Frontmatter
+
+Standard frontmatter structure:
+```yaml
+---
+date: 2024-01-15
+tags: [tag1, tag2]
+status: active
+---
+```
+
+## Template Variables
+
+When processing templates, replace:
+- `{{date}}` - Today's date (YYYY-MM-DD)
+- `{{date:format}}` - Formatted date
+- `{{date-1}}` - Yesterday
+- `{{date+1}}` - Tomorrow
+- `{{time}}` - Current time
+
+## Common Patterns
+
+### Daily Note Creation
+1. Calculate today's date in YYYY-MM-DD format
+2. Check if `Daily Notes/{date}.md` exists
+3. If not, read `Templates/Daily Template.md`
+4. Replace template variables
+5. Write to `Daily Notes/{date}.md`
+
+### Finding Related Notes
+1. Extract key terms from current note
+2. Search vault for matching content
+3. Suggest wiki-links to related notes
+
+### Tag Operations
+- Priority: `#priority/high`, `#priority/medium`, `#priority/low`
+- Status: `#active`, `#waiting`, `#completed`, `#archived`
+- Context: `#work`, `#personal`, `#health`, `#learning`
+
+## Best Practices
+
+1. Always check CLAUDE.md for vault-specific conventions
+2. Preserve existing structure when editing
+3. Use relative paths for internal links
+4. Add frontmatter to new notes
+5. Link to relevant goals when creating tasks
diff --git a/vault-template/CLAUDE.local.md.template b/vault-template/CLAUDE.local.md.template
new file mode 100644
index 0000000..da678fb
--- /dev/null
+++ b/vault-template/CLAUDE.local.md.template
@@ -0,0 +1,53 @@
+# Personal Overrides - CLAUDE.local.md
+
+Copy this file to `CLAUDE.local.md` to add personal customizations that won't be committed to git.
+
+## My Mission
+
+[Your personal mission statement - what drives you]
+
+## Working Style
+
+- **Communication:** [Direct / Collaborative / Detailed]
+- **Feedback:** [Gentle / Direct / Challenging]
+- **Planning:** [Detailed plans / Flexible / Minimal]
+
+## Schedule & Energy
+
+- **Timezone:** America/New_York
+- **Best Focus Time:** [Morning / Afternoon / Evening]
+- **Work Hours:** 9am - 5pm
+- **Review Day:** [Sunday / Monday]
+
+## Current Life Context
+
+[Any personal context that affects your productivity - optional]
+
+## Private Goals
+
+[Goals you don't want in the shared CLAUDE.md]
+
+## Personal Preferences
+
+### Daily Notes
+- Include weather: [Yes / No]
+- Include quote: [Yes / No]
+- Time block style: [30 min / 1 hour / 2 hour]
+
+### Coaching Intensity
+- Challenge level: [Gentle / Moderate / Intense]
+- Accountability check-ins: [Daily / Weekly]
+
+## Custom Tags
+
+Add personal tags not in the standard system:
+- #[your-tag-1]
+- #[your-tag-2]
+
+## Notes for Claude
+
+[Any specific instructions for how Claude should work with you]
+
+---
+
+*This file is gitignored and will not be committed*
diff --git a/vault-template/CLAUDE.md b/vault-template/CLAUDE.md
index 46f9a27..27f4a96 100644
--- a/vault-template/CLAUDE.md
+++ b/vault-template/CLAUDE.md
@@ -1,173 +1,96 @@
-# Navigation & Context Guide for Claude Code
+# Obsidian PKM Vault Context
 
-## 🎯 System Purpose
-[CUSTOMIZE THIS: Add your personal mission statement or life purpose here]
-*Example: "Build meaningful technology that improves people's lives while maintaining balance and growth in all life areas."*
+## System Purpose
+[CUSTOMIZE: Add your personal mission statement here]
 
-## 📁 Directory Structure & Purpose
+*Example: "Build meaningful technology while maintaining balance across health, relationships, and personal growth."*
 
-### Core Directories
-- **Daily Notes/** - Daily journal entries and task management
-  - Named as `YYYY-MM-DD.md` format
-  - Contains daily planning, tasks, and reflections
-  
-- **Goals/** - Cascading goal system (3-year → yearly → monthly → weekly)
-  - Start with `0. Three Year Goals.md` for vision
-  - Break down into actionable items in `3. Weekly Review.md`
-  
-- **Projects/** - Active project folders
-  - Each project gets its own folder
-  - Include project-specific `CLAUDE.md` for context
-  
-- **Templates/** - Reusable note structures
-  - `Daily Template.md` - For daily notes
-  - `Weekly Review Template.md` - For weekly planning
-  - `Project Template.md` - For new projects
-  
-- **Archives/** - Completed or inactive content
-  - Move completed projects here
-  - Store old daily notes after monthly review
+## Directory Structure
 
-## 🏷️ Key Tags to Use
+| Folder | Purpose |
+|--------|---------|
+| `Daily Notes/` | Daily journal entries (`YYYY-MM-DD.md`) |
+| `Goals/` | Goal cascade (3-year → yearly → monthly → weekly) |
+| `Projects/` | Active projects with their own `CLAUDE.md` |
+| `Templates/` | Reusable note structures |
+| `Archives/` | Completed/inactive content |
+| `Inbox/` | Uncategorized captures (optional) |
 
-### Priority Tags
-- `#priority/high` - Must do today
-- `#priority/medium` - Should do this week  
-- `#priority/low` - Nice to have
+## Current Focus
 
-### Context Tags
-- `#work` - Professional tasks
-- `#personal` - Personal development
-- `#health` - Wellness activities
-- `#family` - Relationships
-- `#learning` - Skill development
+See @Goals/2. Monthly Goals.md for this month's priorities.
 
-### Status Tags
-- `#active` - Currently working on
-- `#waiting` - Blocked or waiting
-- `#completed` - Done
-- `#archived` - No longer relevant
+## Tag System
 
-[CUSTOMIZE THIS: Add your own tag system based on your workflow]
+**Priority:** `#priority/high`, `#priority/medium`, `#priority/low`
+**Status:** `#active`, `#waiting`, `#completed`, `#archived`
+**Context:** `#work`, `#personal`, `#health`, `#learning`, `#family`
 
-## 🔄 Workflow Instructions
+## Available Commands
 
-### Daily Workflow
-1. **Morning (5 min)**
-   - Run `claude code /daily` to create today's note
-   - Review yesterday's unfinished tasks
-   - Set ONE main focus for today
-   - Plan your time blocks
+| Command | Purpose |
+|---------|---------|
+| `/daily` | Create today's daily note from template |
+| `/weekly` | Run weekly review process |
+| `/push` | Commit and push changes to Git |
+| `/onboard` | Load full vault context |
 
-2. **Throughout the Day**
-   - Check off completed tasks
-   - Add thoughts and insights
-   - Capture new ideas in appropriate sections
+## Available Agents
 
-3. **Evening (5 min)**
-   - Complete reflection section
-   - Move unfinished tasks to tomorrow
-   - Run `claude code /push` to save changes
+| Agent | Purpose |
+|-------|---------|
+| `note-organizer` | Organize vault, fix links, consolidate notes |
+| `weekly-reviewer` | Facilitate weekly review aligned with goals |
+| `goal-aligner` | Check daily/weekly alignment with long-term goals |
+| `inbox-processor` | GTD-style inbox processing |
 
-### Weekly Workflow
-1. **Weekly Review (30 min)**
-   - Run `claude code /weekly` on Sunday
-   - Review past week's accomplishments
-   - Align next week with monthly goals
-   - Clean up and archive old notes
+## Available Skills
 
-### Project Management
-1. **Starting a Project**
-   - Create folder in `Projects/`
-   - Add project-specific `CLAUDE.md`
-   - Define success criteria
-   - Break into actionable tasks
+- **obsidian-vault-ops** - Read/write vault files, manage wiki-links
+- **goal-tracking** - Track progress across goal cascade
+- **daily-workflow** - Morning/midday/evening routines
 
-2. **During Project**
-   - Keep all related notes in project folder
-   - Update project CLAUDE.md with progress
-   - Link to relevant daily notes
+## Output Styles
 
-3. **Completing Project**
-   - Create summary document
-   - Move to `Archives/`
-   - Extract lessons learned
+**Productivity Coach** (`/output-style coach`)
+- Challenges assumptions constructively
+- Holds you accountable to commitments
+- Asks powerful questions for clarity
+- Connects daily work to mission
 
-## 🤖 Claude Code Integration
+## Daily Workflow
 
-### Available Commands
-- `/daily` - Creates today's daily note from template
-- `/weekly` - Runs weekly review process
-- `/push` - Commits and pushes changes to Git
-- `/onboard` - Reads all CLAUDE.md files for context
+### Morning (5 min)
+1. Run `/daily` to create today's note
+2. Identify ONE main focus
+3. Review yesterday's incomplete tasks
+4. Set time blocks
 
-### Output Styles
-Claude Code now supports different personality modes! This vault includes:
+### Evening (5 min)
+1. Complete reflection section
+2. Move unfinished tasks
+3. Run `/push` to save changes
 
-- **Productivity Coach** - An accountability-focused coach that:
-  - Challenges you to clarify your true intentions
-  - Points out gaps between goals and actions
-  - Asks powerful questions to create momentum
-  - Holds you accountable to commitments
-  
-To use: 
-- Type `/output-style` in Claude Code for an interactive menu
-- Or directly switch with: `/output-style coach`
-- Your preference is automatically saved in `.claude/settings.local.json`
+### Weekly (30 min - Sunday)
+1. Run `/weekly` for guided review
+2. Calculate goal progress
+3. Plan next week's focus
+4. Archive old notes
+
+## Best Practices
 
-### Best Practices with Claude
 1. **Be Specific** - Give clear context about what you need
-2. **Use Project Context** - Reference project CLAUDE.md files
-3. **Try Different Styles** - Use coach mode when you need accountability
-4. **Iterate** - Claude can help refine and improve your notes
-5. **Review Suggestions** - Claude's suggestions are starting points
+2. **Reference Goals** - Connect daily tasks to objectives
+3. **Use Coach Mode** - When you need accountability
+4. **Keep It Current** - Update project CLAUDE.md files regularly
 
-## 📱 Mobile Access (via GitHub)
+## Customization
 
-### Setup
-1. Initialize git in your vault
-2. Create private GitHub repository
-3. Set up GitHub Action (see `github-actions/claude.yml`)
-4. Access notes via GitHub mobile app
-
-### Mobile Workflow
-1. View notes on GitHub mobile
-2. Create issues for tasks/ideas
-3. Claude processes issues automatically
-4. Sync when back at desktop
-
-## 🎨 Customization Points
-
-[CUSTOMIZE THIS SECTION: Add your specific preferences]
-
-### My Preferences
-- **Daily Note Time**: [Morning/Evening]
-- **Review Day**: [Sunday/Monday]
-- **Time Blocking**: [Yes/No]
-- **Task Management Style**: [GTD/Simple/Custom]
-
-### Custom Shortcuts
-- [Add your frequently used searches]
-- [Add your common templates]
-- [Add your workflow triggers]
-
-## 📚 Resources & References
-
-### Internal Links
-- [[0. Three Year Goals]] - Long-term vision
-- [[1. Yearly Goals]] - Current year focus
-- [[2. Monthly Goals]] - This month's objectives
-- [[3. Weekly Review]] - Weekly planning
-
-### External Resources
-[CUSTOMIZE THIS: Add your favorite references]
-- [Resource 1]
-- [Resource 2]
-- [Resource 3]
+For personal overrides that shouldn't be committed, create `CLAUDE.local.md`.
+See `CLAUDE.local.md.template` for format.
 
 ---
 
-*Last Updated: [DATE]*
-*System Version: 1.0*
-
-**Remember**: This system is meant to serve you, not constrain you. Adapt it as needed!
\ No newline at end of file
+*See @.claude/rules/ for detailed conventions*
+*Last Updated: 2024-12-19*
+*System Version: 2.0*