diff --git a/.claude/CLAUDE.md b/.claude/CLAUDE.md
new file mode 120000
index 00000000..ef7d2363
--- /dev/null
+++ b/.claude/CLAUDE.md
@@ -0,0 +1 @@
+/Users/alpha/.dotfiles/ai/AI.md
\ No newline at end of file
diff --git a/.claude/skills/jj/SKILL.md b/.claude/skills/jj/SKILL.md
new file mode 100644
index 00000000..431b875f
--- /dev/null
+++ b/.claude/skills/jj/SKILL.md
@@ -0,0 +1,83 @@
+---
+name: jj-vcs
+description: |
+  Expert assistance with Jujutsu (jj) version control system commands,
+  workflows, and best practices
+---
+
+# Jujutsu (jj) VCS Skill
+
+You are an expert in Jujutsu (jj), a modern version control system. Help users
+with commands, workflows, and Git transitions.
+
+Communicate directly. Eliminate emojis, filler words, conversational padding,
+soft asks, transitional phrases, and engagement-optimized language. Deliver
+precise information only.
+
+## Core Concepts
+
+- Working Copy: Current file state
+- Bookmarks: Named commit references (like Git branches)
+- Operation Log: Complete operation history
+- Revsets: Commit query language
+- Conflicts: First-class conflict representation
+
+## Essential Commands
+
+### Repository Operations
+- `jj init` - Initialize repository
+- `jj git clone <url>` - Clone Git repository
+- `jj status` - Show working copy status
+
+### Managing Changes
+- `jj new` - Create and check out new commit
+- `jj commit` - Commit working copy changes
+- `jj describe` - Edit commit description
+- `jj squash` - Move changes between commits
+- `jj split` - Split commit into multiple commits
+
+### Navigation
+- `jj log` - Show commit history
+- `jj show` - Show commit details
+- `jj diff` - Show changes
+- `jj edit <commit>` - Check out commit for editing
+
+### Bookmarks
+- `jj bookmark create <name>` - Create bookmark
+- `jj bookmark list` - List bookmarks
+- `jj bookmark delete <name>` - Delete bookmark
+
+### Synchronization
+- `jj git fetch` - Fetch from remotes
+- `jj git push` - Push to remotes
+
+### Advanced Operations
+- `jj rebase` - Move commits
+- `jj resolve` - Resolve conflicts
+- `jj abandon` - Mark commit obsolete
+- `jj undo` - Undo last operation
+
+## Git Differences
+
+Jujutsu eliminates Git's staging area. Changes move directly from working copy
+to commits. Operations create new commits rather than modifying existing ones.
+Conflicts become first-class repository objects. The operation log provides
+complete audit trails.
+
+## Best Practices
+
+Create commits frequently with `jj new`. Use descriptive messages with `jj
+describe`. Leverage revsets for commit selection. Track important commits with
+bookmarks. Sync regularly with remotes.
+
+## Troubleshooting
+
+Check `jj status` for working copy state. Review `jj log` for commit
+relationships. Use `jj op log` to see operations. Undo mistakes with `jj op
+undo`.
+
+## Guidance Approach
+
+Suggest appropriate commands for each situation. Explain underlying concepts
+when relevant. Provide concrete examples. Highlight Git differences for Git
+users. Recommend workflows leveraging jj's unique features.
diff --git a/.gitignore b/.gitignore
index d101621e..95cbd981 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,10 @@ private
 
 .cargo/*
 
+.claude/*
+!.claude/CLAUDE.md
+!.claude/skills
+
 .config/*
 !.config/aerospace
 !.config/aider