diff --git a/.claude/skills/build-brightstaff/SKILL.md b/.claude/skills/build-brightstaff/SKILL.md
new file mode 100644
index 00000000..6fc97b19
--- /dev/null
+++ b/.claude/skills/build-brightstaff/SKILL.md
@@ -0,0 +1,12 @@
+---
+name: build-brightstaff
+description: Build the brightstaff native binary. Use when brightstaff code changes.
+---
+
+Build brightstaff:
+
+```
+cd crates && cargo build --release -p brightstaff
+```
+
+If the build fails, diagnose and fix the errors.
diff --git a/.claude/skills/build-cli/SKILL.md b/.claude/skills/build-cli/SKILL.md
new file mode 100644
index 00000000..0e2aec7f
--- /dev/null
+++ b/.claude/skills/build-cli/SKILL.md
@@ -0,0 +1,10 @@
+---
+name: build-cli
+description: Build and install the Python CLI (planoai). Use after making changes to cli/ code to install locally.
+---
+
+1. `cd cli && uv sync` — ensure dependencies are installed
+2. `cd cli && uv tool install --editable .` — install the CLI locally
+3. Verify the installation: `cd cli && uv run planoai --help`
+
+If the build or install fails, diagnose and fix the issues.