diff --git a/.claude/skills/controller-cli-development/SKILL.md b/.claude/skills/controller-cli-development/SKILL.md
new file mode 100644
index 0000000..cce2359
--- /dev/null
+++ b/.claude/skills/controller-cli-development/SKILL.md
@@ -0,0 +1,35 @@
+---
+name: controller-cli-development
+description: Contributor workflow for cartridge-gg/controller-cli. Use when implementing or reviewing CLI command behavior, output contracts, install/release scripts, and Rust quality checks in this repository.
+---
+
+# Controller CLI Development
+
+Use this skill to build and validate changes in `cartridge-gg/controller-cli`.
+
+## Core Workflow
+
+1. Build and run locally:
+   - `cargo build`
+   - `cargo run -- <command>`
+2. Run standard validation gates:
+   - `cargo fmt`
+   - `cargo clippy -- -D warnings`
+   - `cargo test`
+3. Use consolidated Make targets when preferred:
+   - `make build`
+   - `make test`
+   - `make lint`
+   - `make check`
+
+## Behavioral Validation
+
+- Verify JSON output compatibility when changing CLI responses (`--json`).
+- Re-test register/execute/status flows when session/auth code is touched.
+- Keep `LLM_USAGE.md` and command examples aligned with behavior changes.
+
+## PR Checklist
+
+- Document command-level behavior changes and migration notes.
+- Include command outputs or structured examples for modified flags.
+- Report the exact validation commands that passed.
diff --git a/.claude/skills/controller-cli-development/agents/openai.yaml b/.claude/skills/controller-cli-development/agents/openai.yaml
new file mode 100644
index 0000000..4a1a4b1
--- /dev/null
+++ b/.claude/skills/controller-cli-development/agents/openai.yaml
@@ -0,0 +1,4 @@
+interface:
+  display_name: "Controller CLI Development"
+  short_description: "Contributor workflow for cartridge-gg/controller-cli"
+  default_prompt: "Use $controller-cli-development to implement and validate changes in controller-cli."