diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index 41cb739..f257647 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -48,7 +48,7 @@
         "search-precedence",
         "tool-disclosure"
       ],
-      "version": "0.3.1"
+      "version": "0.4.0"
     }
   ]
 }
diff --git a/README.md b/README.md
index acbd3dd..37a3e32 100644
--- a/README.md
+++ b/README.md
@@ -162,7 +162,7 @@ this repo - install them from their own repo instead.
 The semantic rows above need a language server installed (here `terraform-ls`).
 Without one the plugin still helps: it discloses the `rg` fallback on the first
 line instead of pretending the text search was exhaustive. Check your setup
-with `/code-intelligence:doctor`.
+with `/code-intelligence:setup-code-intelligence`.
 
 ```bash
 /plugin install code-intelligence@antonbabenko
@@ -176,7 +176,7 @@ Try:
 - `Is output.cluster_endpoint used anywhere before I change its type?`
 - `Did you really find all the references, or just text matches?`
 
-Check your setup (Claude Code): `/code-intelligence:doctor`
+Check your setup (Claude Code): `/code-intelligence:setup-code-intelligence`
 
 ### [terraform-skill](https://github.com/antonbabenko/terraform-skill)
 
diff --git a/plugins/code-intelligence/.codex-plugin/plugin.json b/plugins/code-intelligence/.codex-plugin/plugin.json
index cadbb60..f4e375d 100644
--- a/plugins/code-intelligence/.codex-plugin/plugin.json
+++ b/plugins/code-intelligence/.codex-plugin/plugin.json
@@ -30,5 +30,5 @@
   "name": "code-intelligence",
   "repository": "https://github.com/antonbabenko/agent-plugins",
   "skills": "./skills",
-  "version": "0.3.1"
+  "version": "0.4.0"
 }
diff --git a/plugins/code-intelligence/CHANGELOG.md b/plugins/code-intelligence/CHANGELOG.md
index 44acfac..8ac2058 100644
--- a/plugins/code-intelligence/CHANGELOG.md
+++ b/plugins/code-intelligence/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to the `code-intelligence` plugin are documented here. This file is managed by the per-plugin release pipeline; entries are prepended on release.
 
+## code-intelligence-v0.4.0 (2026-05-17)
+
+### BREAKING CHANGES
+
+* The `doctor` command is renamed to `setup-code-intelligence`. Its bare name
+  shadowed Claude Code's built-in `/doctor`; invoke the readiness check as
+  `/code-intelligence:setup-code-intelligence`.
+
 ## code-intelligence-v0.3.1 (2026-05-17) ([compare](https://github.com/antonbabenko/agent-plugins/compare/code-intelligence-v0.3.0...code-intelligence-v0.3.1))
 
 ### Bug Fixes
diff --git a/plugins/code-intelligence/commands/doctor.md b/plugins/code-intelligence/commands/setup-code-intelligence.md
similarity index 97%
rename from plugins/code-intelligence/commands/doctor.md
rename to plugins/code-intelligence/commands/setup-code-intelligence.md
index acb0696..9f7147b 100644
--- a/plugins/code-intelligence/commands/doctor.md
+++ b/plugins/code-intelligence/commands/setup-code-intelligence.md
@@ -1,10 +1,10 @@
 ---
-name: doctor
+name: setup-code-intelligence
 description: Check code-intelligence prerequisites (ripgrep + a language server) and print install hints
 allowed-tools: Bash, AskUserQuestion
 ---
 
-# code-intelligence doctor
+# code-intelligence: setup & readiness check
 
 Run a one-shot readiness check for the `code-intelligence` skill, then offer an
 optional star. The skill picks LSP vs exact-text vs fuzzy search by task; it
diff --git a/plugins/code-intelligence/skills/code-intelligence/SKILL.md b/plugins/code-intelligence/skills/code-intelligence/SKILL.md
index 17f8b50..4b31172 100644
--- a/plugins/code-intelligence/skills/code-intelligence/SKILL.md
+++ b/plugins/code-intelligence/skills/code-intelligence/SKILL.md
@@ -4,7 +4,7 @@ description: Use when navigating or refactoring code with a language server - ch
 license: Apache-2.0
 metadata:
   author: Anton Babenko
-  version: 0.3.1
+  version: 0.4.0
 ---
 
 # Code Intelligence
diff --git a/plugins/code-intelligence/tests/baseline-scenarios.md b/plugins/code-intelligence/tests/baseline-scenarios.md
index 5348b7a..5db680d 100644
--- a/plugins/code-intelligence/tests/baseline-scenarios.md
+++ b/plugins/code-intelligence/tests/baseline-scenarios.md
@@ -142,16 +142,16 @@ Where in this codebase is user authentication handled?
 
 ---
 
-## Scenario 4: Doctor Command Readiness Check
+## Scenario 4: Setup Command Readiness Check
 
-**Objective:** Verify the `/code-intelligence:doctor` command reports
+**Objective:** Verify the `/code-intelligence:setup-code-intelligence` command reports
 prerequisites accurately and the optional star step is consent-gated and
 stateless.
 
 ### Test Prompt
 
 ```text
-/code-intelligence:doctor
+/code-intelligence:setup-code-intelligence
 ```
 
 ### Expected Baseline Behavior (WITHOUT skill)