@kennethsolomon/shipkit 3.19.0 → 3.21.0

package/skills/sk:setup-claude/tests/test_apply_setup_claude.py

@@ -158,5 +158,272 @@ class TestApplySetupClaude(unittest.TestCase):
             self.assertIn("Notes:", buf.getvalue())
 
 
+    def test_laravel_detection_inertia_react(self):
+        mod = _load_apply_module()
+
+        with tempfile.TemporaryDirectory() as td:
+            repo_root = Path(td)
+            (repo_root / "composer.json").write_text(
+                json.dumps({
+                    "require": {"laravel/framework": "^12.0"},
+                    "require-dev": {
+                        "pestphp/pest": "^3.0",
+                        "inertiajs/inertia-laravel": "^2.0",
+                    },
+                }),
+                encoding="utf-8",
+            )
+            (repo_root / "package.json").write_text(
+                json.dumps({"dependencies": {"react": "^19.0"}}),
+                encoding="utf-8",
+            )
+            (repo_root / "database" / "migrations").mkdir(parents=True)
+
+            detection = mod.detect(repo_root)
+            self.assertEqual(detection.framework, "Laravel (Inertia + React)")
+            self.assertEqual(detection.language, "PHP")
+            self.assertEqual(detection.database, "Eloquent ORM")
+            self.assertEqual(detection.testing, "Pest")
+            self.assertEqual(detection.dev_cmd, "php artisan serve")
+            self.assertEqual(detection.lint_cmd, "vendor/bin/pint")
+            self.assertEqual(detection.test_cmd, "vendor/bin/pest")
+
+    def test_laravel_detection_livewire(self):
+        mod = _load_apply_module()
+
+        with tempfile.TemporaryDirectory() as td:
+            repo_root = Path(td)
+            (repo_root / "composer.json").write_text(
+                json.dumps({
+                    "require": {
+                        "laravel/framework": "^12.0",
+                        "livewire/livewire": "^3.0",
+                    },
+                }),
+                encoding="utf-8",
+            )
+
+            detection = mod.detect(repo_root)
+            self.assertEqual(detection.framework, "Laravel (Livewire)")
+
+    def test_laravel_detection_api_only(self):
+        mod = _load_apply_module()
+
+        with tempfile.TemporaryDirectory() as td:
+            repo_root = Path(td)
+            (repo_root / "composer.json").write_text(
+                json.dumps({"require": {"laravel/framework": "^12.0"}}),
+                encoding="utf-8",
+            )
+
+            detection = mod.detect(repo_root)
+            self.assertEqual(detection.framework, "Laravel (API)")
+
+    def test_mcp_json_created_for_laravel(self):
+        mod = _load_apply_module()
+        skill_root = Path(__file__).resolve().parents[1]
+
+        with tempfile.TemporaryDirectory() as td:
+            repo_root = Path(td)
+            (repo_root / "composer.json").write_text(
+                json.dumps({"require": {"laravel/framework": "^12.0"}}),
+                encoding="utf-8",
+            )
+
+            buf = io.StringIO()
+            with contextlib.redirect_stdout(buf):
+                mod.apply(
+                    repo_root,
+                    skill_root,
+                    update_generated=False,
+                    dry_run=False,
+                    detection=mod.detect(repo_root),
+                )
+
+            mcp_path = repo_root / ".mcp.json"
+            self.assertTrue(mcp_path.exists())
+            mcp_data = json.loads(mcp_path.read_text(encoding="utf-8"))
+            self.assertIn("laravel-boost", mcp_data["mcpServers"])
+            self.assertEqual(mcp_data["mcpServers"]["laravel-boost"]["command"], "php")
+
+    def test_mcp_json_not_created_for_nextjs(self):
+        mod = _load_apply_module()
+        skill_root = Path(__file__).resolve().parents[1]
+
+        with tempfile.TemporaryDirectory() as td:
+            repo_root = Path(td)
+            (repo_root / "package.json").write_text(
+                json.dumps({
+                    "name": "demo",
+                    "dependencies": {"next": "15.0.0", "react": "19.0.0"},
+                }),
+                encoding="utf-8",
+            )
+
+            buf = io.StringIO()
+            with contextlib.redirect_stdout(buf):
+                mod.apply(
+                    repo_root,
+                    skill_root,
+                    update_generated=False,
+                    dry_run=False,
+                    detection=mod.detect(repo_root),
+                )
+
+            mcp_path = repo_root / ".mcp.json"
+            if mcp_path.exists():
+                mcp_data = json.loads(mcp_path.read_text(encoding="utf-8"))
+                self.assertNotIn("laravel-boost", mcp_data.get("mcpServers", {}))
+
+    def test_mcp_json_removed_when_stack_changes(self):
+        mod = _load_apply_module()
+        skill_root = Path(__file__).resolve().parents[1]
+
+        with tempfile.TemporaryDirectory() as td:
+            repo_root = Path(td)
+
+            # Start with Laravel — creates .mcp.json with laravel-boost
+            (repo_root / "composer.json").write_text(
+                json.dumps({"require": {"laravel/framework": "^12.0"}}),
+                encoding="utf-8",
+            )
+            laravel_detection = mod.detect(repo_root)
+
+            buf = io.StringIO()
+            with contextlib.redirect_stdout(buf):
+                mod.apply(
+                    repo_root,
+                    skill_root,
+                    update_generated=False,
+                    dry_run=False,
+                    detection=laravel_detection,
+                )
+
+            mcp_path = repo_root / ".mcp.json"
+            self.assertTrue(mcp_path.exists())
+            mcp_data = json.loads(mcp_path.read_text(encoding="utf-8"))
+            self.assertIn("laravel-boost", mcp_data["mcpServers"])
+
+            # Switch to Next.js — laravel-boost should be removed
+            (repo_root / "composer.json").unlink()
+            (repo_root / "package.json").write_text(
+                json.dumps({
+                    "name": "demo",
+                    "dependencies": {"next": "15.0.0", "react": "19.0.0"},
+                }),
+                encoding="utf-8",
+            )
+            nextjs_detection = mod.detect(repo_root)
+
+            buf = io.StringIO()
+            with contextlib.redirect_stdout(buf):
+                mod.apply(
+                    repo_root,
+                    skill_root,
+                    update_generated=False,
+                    dry_run=False,
+                    detection=nextjs_detection,
+                )
+
+            mcp_data = json.loads(mcp_path.read_text(encoding="utf-8"))
+            self.assertNotIn("laravel-boost", mcp_data.get("mcpServers", {}))
+
+    def test_mcp_json_sail_detection(self):
+        mod = _load_apply_module()
+        skill_root = Path(__file__).resolve().parents[1]
+
+        with tempfile.TemporaryDirectory() as td:
+            repo_root = Path(td)
+            (repo_root / "composer.json").write_text(
+                json.dumps({"require": {"laravel/framework": "^12.0"}}),
+                encoding="utf-8",
+            )
+            # Simulate Sail being present
+            (repo_root / "vendor" / "bin").mkdir(parents=True)
+            (repo_root / "vendor" / "bin" / "sail").write_text("#!/bin/sh\n", encoding="utf-8")
+
+            buf = io.StringIO()
+            with contextlib.redirect_stdout(buf):
+                mod.apply(
+                    repo_root,
+                    skill_root,
+                    update_generated=False,
+                    dry_run=False,
+                    detection=mod.detect(repo_root),
+                )
+
+            mcp_path = repo_root / ".mcp.json"
+            mcp_data = json.loads(mcp_path.read_text(encoding="utf-8"))
+            self.assertEqual(
+                mcp_data["mcpServers"]["laravel-boost"]["command"],
+                "vendor/bin/sail",
+            )
+
+    def test_mcp_json_preserves_user_entries(self):
+        mod = _load_apply_module()
+        skill_root = Path(__file__).resolve().parents[1]
+
+        with tempfile.TemporaryDirectory() as td:
+            repo_root = Path(td)
+            (repo_root / "composer.json").write_text(
+                json.dumps({"require": {"laravel/framework": "^12.0"}}),
+                encoding="utf-8",
+            )
+
+            # Pre-existing user MCP entry
+            (repo_root / ".mcp.json").write_text(
+                json.dumps({
+                    "mcpServers": {
+                        "my-custom-server": {"command": "node", "args": ["server.js"]},
+                    },
+                }),
+                encoding="utf-8",
+            )
+
+            buf = io.StringIO()
+            with contextlib.redirect_stdout(buf):
+                mod.apply(
+                    repo_root,
+                    skill_root,
+                    update_generated=False,
+                    dry_run=False,
+                    detection=mod.detect(repo_root),
+                )
+
+            mcp_data = json.loads((repo_root / ".mcp.json").read_text(encoding="utf-8"))
+            self.assertIn("my-custom-server", mcp_data["mcpServers"])
+            self.assertIn("laravel-boost", mcp_data["mcpServers"])
+
+    def test_laravel_rules_filter(self):
+        mod = _load_apply_module()
+
+        with tempfile.TemporaryDirectory() as td:
+            repo_root = Path(td)
+            (repo_root / "composer.json").write_text(
+                json.dumps({"require": {"laravel/framework": "^12.0"}}),
+                encoding="utf-8",
+            )
+            detection = mod.detect(repo_root)
+            rule_filter = mod._rules_filter(detection)
+            self.assertTrue(rule_filter("laravel.md.template"))
+            self.assertTrue(rule_filter("tests.md.template"))
+
+    def test_nextjs_rules_filter_excludes_laravel(self):
+        mod = _load_apply_module()
+
+        with tempfile.TemporaryDirectory() as td:
+            repo_root = Path(td)
+            (repo_root / "package.json").write_text(
+                json.dumps({
+                    "dependencies": {"next": "15.0.0", "react": "19.0.0"},
+                }),
+                encoding="utf-8",
+            )
+            detection = mod.detect(repo_root)
+            rule_filter = mod._rules_filter(detection)
+            self.assertFalse(rule_filter("laravel.md.template"))
+            self.assertTrue(rule_filter("react.md.template"))
+
+
 if __name__ == "__main__":
     unittest.main()

package/skills/sk:setup-optimizer/SKILL.md

@@ -55,6 +55,89 @@ Before making any changes, runs a diagnostic pass on the existing CLAUDE.md:
 
 Reports findings before proceeding. If issues are found, they inform subsequent steps.
 
+### Step 0.5: Re-detect Stack + Sync Skills/Agents/Rules
+
+After diagnosis, re-detect the project stack and sync installed skills, agents, and rules.
+
+**Reference:** Read `~/.claude/skills/sk:setup-claude/references/skill-profiles.md` for the categorization matrix.
+
+#### 1. Re-detect stack
+
+Run the same detection logic as `sk:setup-claude` Phase 0.5:
+- Scan for stack indicators (composer.json, package.json, go.mod, etc.)
+- Sub-detect database capability (Prisma, Drizzle, Laravel migrations, etc.)
+- Compare new detection against `.shipkit/config.json` current values
+
+#### 2. Diff and display changes
+
+If the detected stack or capabilities changed, display a diff:
+
+```
+Stack re-detection:
+  Stack: nextjs (unchanged)
+  Capabilities: web → web, database (prisma/schema.prisma detected)
+
+Skill changes:
+  + sk:schema-migrate  (database capability detected)
+  No removals.
+
+Agent changes:
+  + database-architect  (database capability detected)
+  No removals.
+
+Rule changes:
+  + migrations.md  (database paths)
+  No removals.
+
+Project MCP changes:
+  - laravel-boost  (stack is no longer laravel)
+  No additions.
+
+Apply changes? (y/n)
+```
+
+If no changes detected, report `Stack: [stack] — no changes detected` and skip to Step 1.
+
+#### 3. Sync on confirmation
+
+If the user confirms:
+
+**Skills sync:**
+- Add newly relevant skills: copy from `~/.claude/skills/` to `.claude/skills/` in the project
+- Remove stale skills: delete from `.claude/skills/` in the project if they no longer match the detected stack
+- Never touch skills in `config.skills.extra` (user manually added)
+- Never touch skills in `config.skills.disabled` (user manually excluded)
+
+**Agent sync:**
+- Add newly relevant agents: copy from `~/.claude/agents/` to `.claude/agents/` in the project
+- Remove stale agents: delete from `.claude/agents/` in the project if they no longer match
+- Never remove user-customized agents (detect via content that differs from the template — check if file hash differs from template hash, or if file contains `<!-- EDITED -->` marker)
+
+**Rule sync:**
+- Add newly relevant rules: copy from `~/.claude/rules/` to `.claude/rules/` in the project
+- Remove stale rules: delete from `.claude/rules/` in the project if they no longer match
+- Never remove user-customized rules (same detection as agents)
+
+**Project-level MCP sync** (sole owner of `.mcp.json` managed entries — Step 1.7 only handles global MCP):
+- Read the MCP Server → Stack Mapping from `skill-profiles.md`
+- **Add:** MCP entries to `.mcp.json` when stack matches and entry is missing
+- **Remove:** MCP entries from `.mcp.json` when stack no longer matches (e.g., `laravel-boost` removed if stack changed from Laravel to Next.js). Only remove entries whose key matches the mapping table — never touch other entries.
+- **Update:** If entry exists but command is stale (e.g., Sail added/removed since last setup — `vendor/bin/sail` exists but entry uses `php`, or vice versa), update the command to match current state
+- For Laravel Boost Sail detection: use `vendor/bin/sail` command variant if `vendor/bin/sail` exists in the project
+
+**Config update:**
+- Update `.shipkit/config.json` with new `stack.detected`, `stack.detected_at`, `stack.capabilities`
+
+**CLAUDE.md commands table:**
+- Regenerate the Commands table to list only currently installed skills
+
+#### 4. Upgrade path handling
+
+- If project has no `stack` field in config → treat as auto-detect (backwards compatible)
+- If capabilities expanded (e.g., added database) → suggest new skills
+- If capabilities reduced (e.g., removed a dependency) → suggest removing irrelevant skills
+- Display: `Capabilities changed: [old] → [new]. [N] skills affected. Apply? (y/n)`
+
 ### Step 1: Update Workflow
 
 If the workflow section is outdated or missing, replace it with the latest version:
@@ -173,9 +256,11 @@ After hooks deployment, check and configure LSP tooling:
 
 **Idempotency:** Never overwrite existing hook files — the user may have customized them. Only deploy hooks that don't exist yet. For settings.json, merge additively.
 
-### Step 1.7: MCP Servers & Plugin Check
+### Step 1.7: Global MCP Servers & Plugin Check
+
+After LSP check, verify the three recommended **global** tools are configured.
 
-After LSP check, verify the three recommended tools are configured:
+> **Note:** Project-level MCP (`.mcp.json`) is managed exclusively by Step 0.5 during stack sync. This step only handles global MCP/plugins.
 
 1. **Sequential Thinking MCP** — grep `~/.mcp.json` for `sequential-thinking`
 2. **Context7 plugin** — grep `~/.claude/settings.json` for `context7@claude-plugins-official` in `enabledPlugins`
@@ -183,7 +268,7 @@ After LSP check, verify the three recommended tools are configured:
 
 **Report status and prompt:**
 
-> "MCP/Plugins: [X/3] configured
+> "Global MCP/Plugins: [X/3] configured
 >   sequential-thinking: [✓ configured / ✗ missing]
 >   context7:            [✓ configured / ✗ missing]
 >   ccstatusline:        [✓ configured / ✗ missing]
@@ -200,28 +285,27 @@ After LSP check, verify the three recommended tools are configured:
 
 ### Step 1.8: Agents & Rules Check
 
-After MCP check, verify the project has formal agent definitions and path-scoped rules:
+After MCP check, verify the project has the correct agents and rules for its detected stack.
+
+**Reference:** Read `~/.claude/skills/sk:setup-claude/references/skill-profiles.md` for agent→stack and rule→stack mappings.
 
 **Agents check:**
 
 1. Check if `.claude/agents/` directory exists
-2. Check for the 13 core agents:
-   - **Implementation:** `backend-dev.md`, `frontend-dev.md`, `mobile-dev.md`
-   - **Quality:** `qa-engineer.md`, `code-reviewer.md`, `security-reviewer.md`, `performance-optimizer.md`
-   - **Design:** `architect.md`, `database-architect.md`
-   - **Operations:** `devops-engineer.md`
-   - **Maintenance:** `debugger.md`, `refactor-specialist.md`, `tech-writer.md`
-3. For each existing agent, check if it has `memory:` and `model:` in frontmatter (older agents may be missing these)
+2. Read detected stack from `.shipkit/config.json` (or re-detect if not present)
+3. Using the agent→stack mapping from `skill-profiles.md`, determine which agents this project should have:
+   - Universal agents (all projects): architect, qa-engineer, debugger, code-reviewer, security-reviewer, performance-optimizer, refactor-specialist, tech-writer, devops-engineer
+   - Stack-specific: backend-dev (backend stacks), frontend-dev (web stacks), mobile-dev (mobile stacks), database-architect (database capability)
+4. For each expected agent, check if it exists in `.claude/agents/`
+5. For each existing agent, check if it has `memory:` and `model:` in frontmatter (older agents may be missing these)
 
 **Rules check:**
 
 1. Check if `.claude/rules/` directory exists
-2. Detect project stack from `CLAUDE.md`, `package.json`, `composer.json`
-3. Check for relevant rule files based on detected stack:
-   - Laravel/PHP detected → check for `laravel.md`, `api.md`, `migrations.md`
-   - React/Next.js detected → check for `react.md`, `tests.md`, `api.md`
-   - Vue/Nuxt detected → check for `vue.md`, `tests.md`, `api.md`
-   - Any stack → check for `tests.md`
+2. Using the rule→stack mapping from `skill-profiles.md`, determine which rules this project should have:
+   - Universal rules (all projects): tests.md, api.md
+   - Stack-specific: laravel.md (Laravel), react.md (React/Next.js), vue.md (Vue/Nuxt), migrations.md (database capability)
+3. Check for each expected rule file
 
 **Report status and prompt:**