@mr.dj2u/cli 0.1.3 → 0.1.7

package/bundles/claude-code/.claude-plugin/plugin.json

@@ -1,12 +1,20 @@
-{
-  "name": "mds-dev-suite",
-  "description": "Expo project intelligence for Claude Code: Doctor diagnostics, architecture skills, MCP tools, custom MDS agent, and project-memory commands for Expo Router apps.",
-  "version": "0.1.0",
-  "author": {
-    "name": "David Grimsley",
-    "url": "https://github.com/DavidJGrimsley"
-  },
-  "homepage": "https://github.com/DavidJGrimsley/mds-dev-suite",
-  "repository": "https://github.com/DavidJGrimsley/mds-dev-suite",
-  "license": "MIT"
-}
+{
+  "name": "mr-djs-dev-suite",
+  "displayName": "Mr. DJ's Dev Suite",
+  "version": "0.1.6",
+  "description": "MCP-first Expo review, Doctor, onboarding, deployment readiness, and project continuation workflows for Claude Code.",
+  "author": {
+    "name": "DJ Grimsley",
+    "url": "https://davidjgrimsley.com"
+  },
+  "homepage": "https://github.com/DavidJGrimsley/mrdj-dev-suite",
+  "repository": "https://github.com/DavidJGrimsley/mrdj-dev-suite",
+  "license": "MIT",
+  "keywords": [
+    "expo",
+    "react-native",
+    "mcp",
+    "doctor",
+    "claude-code"
+  ]
+}

package/bundles/claude-code/.mcp.json

@@ -1,8 +1,11 @@
-{
-  "mcpServers": {
-    "mds-dev-suite": {
-      "command": "npx",
-      "args": ["-y", "@mr.dj2u/mcp-server"]
-    }
-  }
-}
+{
+  "mcpServers": {
+    "mr-djs-dev-suite": {
+      "command": "npx",
+      "args": [
+        "-y",
+        "@mr.dj2u/mcp-server@0.1.2"
+      ]
+    }
+  }
+}

package/bundles/claude-code/README.md

@@ -1,34 +1,54 @@
 # Mr. DJ's Dev Suite - Claude Code Plugin
 
-Gives Claude Code native MDS behavior for Expo projects: MCP tools, a custom `mds` agent, slash commands, generated skills, and project instructions.
+Gives Claude Code native MDS behavior for Expo projects: MCP tools, a custom `mds` agent, slash commands, generated skills, and install-time project instructions.
 
 ## What's Included
 
 | Path | Purpose |
 |------|---------|
-| `CLAUDE.md` | Instructions merged into project `CLAUDE.md` or user `~/.claude/CLAUDE.md` |
-| `.mcp.json` | Pre-configured MCP server example for `mr-djs-dev-suite` |
+| `.claude-plugin/plugin.json` | Claude plugin identity and display metadata |
+| `.mcp.json` | Plugin MCP server config for `mr-djs-dev-suite` |
+| `settings.json` | Enables the plugin's `mds` agent by default when installed as a Claude plugin |
 | `agents/mds.md` | Claude Code custom agent for MDS workflows |
-| `commands/*.md` | Slash command markdown files copied to `.claude/commands/` |
+| `commands/*.md` | Flat command files; plugin install exposes namespaced commands |
 | `skills/*/SKILL.md` | Build-generated skills sourced from `packages/knowledge` |
+| `CLAUDE.md` | Instructions merged only by `mds agent install --client claude` |
 
-## One-Command Install
+Claude Code plugin installs do not load a plugin-root `CLAUDE.md` as context. The packaged plugin behavior lives in `agents/`, `skills/`, `commands/`, `.mcp.json`, and `settings.json`; the CLI installer also merges `CLAUDE.md` into the target project or user profile for standalone `.claude` installs.
 
-Project scope installs MCP, instructions, the custom agent, slash commands, and generated skills into one Expo app:
+## Recommended Install
+
+Project scope installs MCP, instructions, the custom agent, short slash commands, and generated skills into one Expo app:
 
 ```sh
 mds agent install --client claude --scope project --target /path/to/your/expo-app
-mds agent verify --client claude --target /path/to/your/expo-app
+mds agent verify --client claude --scope project --target /path/to/your/expo-app
 ```
 
 User scope installs MCP plus reusable assets into `~/.claude`:
 
 ```sh
 mds agent install --client claude --scope user
-mds agent install --client claude --scope user --dry-run
+mds agent verify --client claude --scope user
 ```
 
-After install, restart Claude Code or reopen the workspace, run `/mcp`, and confirm `mr-djs-dev-suite` is listed. Then use the `mds` agent or slash commands such as `/run-doctor`, `/review-expo-project`, and `/prepare-deploy`.
+After install, restart Claude Code or run `/reload-plugins`, then run `/mcp` and confirm `mr-djs-dev-suite` is listed. Use the `mds` agent or short commands such as `/run-doctor`, `/continue-development`, `/review-expo-project`, and `/prepare-deploy`.
+
+## True Claude Plugin Test
+
+When loaded with Claude's plugin system, command names are namespaced by plugin name:
+
+```sh
+claude --plugin-dir ./plugins/claude-code
+```
+
+Then test:
+
+```text
+/mr-djs-dev-suite:run-doctor
+/mr-djs-dev-suite:continue-development
+/mr-djs-dev-suite:prepare-deploy
+```
 
 ## MCP-Only Fallback
 
@@ -41,11 +61,11 @@ mds mcp install --client claude --scope user
 
 ## Generated Assets
 
-Skills are sourced from `packages/knowledge/src/content/skills/` and generated into `plugins/claude-code/skills/` at build time. Slash commands are copied from `commands-src/` into `commands/` during the same build.
+Skills are sourced from `packages/knowledge/src/content/skills/`. Slash commands and command skills are generated from the canonical prompt specs in `packages/knowledge/src/content/prompts/` plus `buildCommandFiles()` in `packages/knowledge/scripts/generate-codex-plugin.mjs`.
 
 ```sh
 pnpm --filter @mr.dj2u/knowledge build
 ```
 
-Do not edit generated `commands/` or `skills/` files directly; update the knowledge source or command source and rebuild.
+Do not edit generated `commands/` or `skills/` files directly; update the knowledge source or command generator and rebuild.
 

package/bundles/claude-code/commands/continue-development.md

@@ -13,13 +13,21 @@ Resume work on an onboarded project by following MDS phase order from `project/t
 3. Pull `get_skill` for `continue-development` to enforce phase-first sequencing.
 4. If blockers appear, use `doctor_scan_project` and `doctor_explain_result` for targeted remediation before feature work.
 
+## MDS Routing Guardrails
+
+- Treat a request to continue development with MDS as a request for the MDS MCP tool and phase rules first.
+- Do not jump directly into app edits until `continue_project` or the CLI fallback has identified the active phase and blockers.
+- Never invoke `@mrdj/cli`; that package name is wrong. The published CLI package is `@mr.dj2u/cli` and its executable is `mds`.
+
 ## CLI / Manual Fallback
 
 1. If MCP is not configured, install it manually:
-   - `mds mcp install --client codex --scope project`
+   - `mds mcp install --client <client> --scope project`
 2. Direct CLI flow:
    - `mds continue <projectPath>`
    - `mds doctor <projectPath>` when blockers are unclear.
+3. If `mds` is not on PATH, invoke the published CLI by binary name:
+   - `npx -y -p @mr.dj2u/cli@latest mds continue <projectPath>`
 
 ## Verification And Output
 

package/bundles/claude-code/commands/create-expo-super-stack.md

@@ -18,7 +18,7 @@ Create a new Expo app with the MDS Super Stack flow, using this knowledge packag
 ## CLI / Manual Fallback
 
 1. If MCP is not configured, install it manually:
-   - `mds mcp install --client codex --scope project`
+   - `mds mcp install --client <client> --scope project`
 2. Direct CLI generation:
    - `npx -y create-expo-super-stack <appName>`
 3. Then onboard/continue from inside the generated app using the current CLI behavior:

package/bundles/claude-code/commands/fix-seo.md

@@ -18,7 +18,7 @@ Apply SEO metadata fixes for Expo web routes with MCP guidance and post-fix veri
 ## CLI / Manual Fallback
 
 1. If MCP is not configured, install it manually:
-   - `mds mcp install --client codex --scope project`
+   - `mds mcp install --client <client> --scope project`
 2. Direct CLI checks:
    - `mds doctor <projectPath> --ci`
    - Run project-specific web build/preview commands to verify metadata output.

package/bundles/claude-code/commands/prepare-deploy.md

@@ -13,13 +13,12 @@ Prepare an Expo project for release using deployment-focused skills plus Doctor
 2. Run `doctor_scan_project` in `ci` mode for release parity.
 3. Pull `get_skill` for `deployment`; if web is involved also pull `seo-metadata`.
 4. Use `knowledge_list_resources` (`kind: "rule"`) to confirm env hygiene, SSR safety, and metadata requirements.
-5. Call `generate_deploy_checklist` so SEO, scripts, and release-readiness gaps are reflected in the next steps.
-6. Produce a release checklist mapped to current failing checks.
+5. Produce a release checklist mapped to current failing checks.
 
 ## CLI / Manual Fallback
 
 1. If MCP is not configured, install it manually:
-   - `mds mcp install --client codex --scope project`
+   - `mds mcp install --client <client> --scope project`
 2. Direct CLI path:
    - `mds doctor <projectPath> --ci`
    - Run project scripts: `lint`, `type-check`, `test`, and production build/profile scripts.
@@ -27,5 +26,4 @@ Prepare an Expo project for release using deployment-focused skills plus Doctor
 ## Verification And Output
 
 - Re-run `doctor_scan_project` (or CLI equivalent) until blockers are cleared.
-- Keep the response user-facing and checklist-driven; avoid internal tool chatter and avoid asking for a PR unless the user requested GitHub workflow.
 - Output: release readiness status, unresolved blockers, and rollback/readiness notes.

package/bundles/claude-code/commands/project-research-plan.md

@@ -18,7 +18,7 @@ Turn rough product notes/research into actionable MDS project memory and next-ph
 ## CLI / Manual Fallback
 
 1. If MCP is not configured, install it manually:
-   - `mds mcp install --client codex --scope project`
+   - `mds mcp install --client <client> --scope project`
 2. Direct CLI fallback:
    - Use `mds onboard <projectPath>` for structured intake when memory files are missing.
    - Use `mds continue <projectPath>` after memory normalization to select the next task.

package/bundles/claude-code/commands/push-merge-loop.md

@@ -0,0 +1,25 @@
+# /push-merge-loop
+
+Execute the short PR iteration loop for the test branch with strict quality gates.
+
+## Goal
+
+Push intentional changes with a meaningful commit message, open/update a PR to `test`, poll for feedback and failed checks, fix issues, and merge to `test` once all checks are green.
+
+## Loop Rules
+
+1. Run `mds doctor --ci` before any git mutation.
+2. Stage only intentional files and create a meaningful commit message.
+3. Push branch and open or update a PR targeting `test`.
+4. Wait about 2 minutes, then poll PR comments, review threads, and failed checks.
+5. Fix issues locally, rerun Doctor, push updates, and poll again.
+6. Repeat polling/fix cycles up to 5 total iterations.
+7. Merge to `test` only when all required checks are green and no unresolved blocking feedback remains.
+
+## Guardrails
+
+- Do not merge when required checks are failing.
+- Do not skip Doctor between fix cycles.
+- Keep a concise changelog per iteration: what failed, what was changed, what passed.
+- If still failing after 5 cycles, stop and summarize remaining blockers with concrete next actions.
+

package/bundles/claude-code/commands/review-expo-project.md

@@ -13,20 +13,17 @@ Review an Expo project with MCP-first diagnostics and skill-guided remediation.
 2. Call `continue_project` to summarize current project state and blockers.
 3. Call `doctor_scan_project` with `projectPath` and `mode`.
 4. For each warning/error, call `doctor_explain_result`, then pull targeted guidance with `get_skill` (for example: `project-onboarding`, `debugging`, `deployment`).
-5. If the findings affect release readiness, call `generate_deploy_checklist` so the next steps stay checklist-driven instead of PR-driven.
-6. Call `knowledge_list_resources` with `kind: "guide"` if extra reference context is needed.
+5. Call `knowledge_list_resources` with `kind: "guide"` if extra reference context is needed.
 
 ## CLI / Manual Fallback
 
 1. If MCP is not configured, install it manually:
-   - `mds mcp install --client codex --scope project`
+   - `mds mcp install --client <client> --scope project`
 2. If MCP still cannot run, use direct CLI flows:
    - `mds continue <projectPath>`
    - `mds doctor <projectPath> --ci`
 
 ## Verification And Output
 
-- Keep the response user-facing: summarize findings and next steps without echoing internal tool chatter or file-read noise.
 - Re-run `doctor_scan_project` (or `mds doctor --ci`) after fixes.
-- If the user is validating an installed agent bundle, include `mds agent verify --client <client> --target <path>` in the follow-up commands.
-- Output: blocker summary, failing checks, recommended next task, and concrete follow-up commands. Avoid proposing a PR unless the user explicitly asks for a GitHub workflow.
+- Output: blocker summary, failing checks, recommended next task, and concrete follow-up commands.

package/bundles/claude-code/commands/run-doctor.md

@@ -13,20 +13,26 @@ Run MDS Doctor as the primary health check for an Expo project.
 1. Confirm the `mr-djs-dev-suite` MCP server is available.
 2. Call `doctor_scan_project` with selected arguments.
 3. For each non-pass result, call `doctor_explain_result`.
-4. If the check is release-related or web-facing, call `generate_deploy_checklist` before giving next steps.
-5. Pull targeted implementation guidance with `get_skill` (typically `deployment`, `debugging`, or `dev-server-management`).
+4. Pull targeted implementation guidance with `get_skill` (typically `deployment`, `debugging`, or `dev-server-management`).
+
+## MDS Routing Guardrails
+
+- Treat a request to run MDS Doctor as a request for the MDS MCP tool, not as a request to run app-local npm scripts.
+- Do not run `npm run mds:doctor`, `npm run doctor`, or other project package scripts as the MDS Doctor path unless the user explicitly asks for app scripts.
+- Never invoke `@mrdj/cli`; that package name is wrong. The published CLI package is `@mr.dj2u/cli` and its executable is `mds`.
 
 ## CLI / Manual Fallback
 
 1. If MCP is not configured, install it manually:
-   - `mds mcp install --client codex --scope project`
+   - `mds mcp install --client <client> --scope project`
 2. Direct CLI alternatives:
    - `mds doctor <projectPath>`
    - `mds doctor <projectPath> --ci`
    - `mds doctor <projectPath> --json`
+3. If `mds` is not on PATH, invoke the published CLI by binary name:
+   - `npx -y -p @mr.dj2u/cli@latest mds doctor <projectPath> --ci`
 
 ## Verification And Output
 
 - Re-run Doctor after each fix batch.
-- Keep the response concise and user-facing; do not surface internal tool chatter or intermediate file reads.
 - Output: check summary, blocking errors first, and the exact command used for re-check.

package/bundles/claude-code/commands/wrap-up.md

@@ -0,0 +1,67 @@
+# /wrap-up
+
+Run the post-testing release wrap-up flow: final local checks, git inclusion confirmation, PR loop, and merge handling.
+
+## Goal
+
+When the developer says testing is complete, finish the handoff safely by:
+
+1. Marking completed todo items.
+2. Running `mds doctor --ci`.
+3. Reviewing `git status` and confirming intentionally excluded files.
+4. Running the publish/PR/check loop.
+5. Handling merge according to policy defaults and repo overrides.
+
+## Required Flow Order
+
+1. Update `project/todo.md` only for tasks clearly completed in this session.
+2. Run `mds doctor --ci` before any git mutation.
+3. Review `git status --short` and list changed files.
+4. Confirm any intentionally omitted files with the developer before staging.
+5. Publish through GitHub flow (branch push + PR).
+6. Poll checks and unresolved feedback.
+7. Fix failures locally, rerun Doctor, push updates, and poll again.
+8. Repeat up to 5 cycles total.
+
+## GitHub Skill Routing
+
+Use GitHub workflows in this order when available:
+
+1. `github` for repo/PR context and routing.
+2. `yeet` for commit/push/open-or-update PR flow.
+3. `gh-fix-ci` for failed checks/log inspection and CI-driven fix loops.
+4. `gh-address-comments` when unresolved review threads are blocking merge.
+
+## Merge Policy
+
+Evaluate policy in this order:
+
+1. Explicit user instruction in the current session.
+2. Optional repo config at `project/release-policy.json`.
+3. Defaults if config is absent.
+
+Supported repo config shape:
+
+```json
+{
+  "wrapUp": {
+    "autoMergeTest": true,
+    "autoMergeMain": false
+  }
+}
+```
+
+Default behavior:
+
+- Auto-merge to `test`: enabled.
+- Per-repo override: allowed.
+- Auto-merge to `main`: never allowed.
+
+If the workflow targets `main` directly (no `test` branch flow), stop before merge and tell the developer to merge manually.
+
+## Guardrails
+
+- Never auto-merge to `main`.
+- Do not skip `mds doctor --ci` between fix cycles.
+- Do not assume omitted files are intentional; confirm them.
+- If checks or blocking threads still fail after 5 cycles, stop and request human help with a concise blocker summary.

package/bundles/claude-code/skills/continue-development/SKILL.md

@@ -18,13 +18,21 @@ Resume work on an onboarded project by following MDS phase order from `project/t
 3. Pull `get_skill` for `continue-development` to enforce phase-first sequencing.
 4. If blockers appear, use `doctor_scan_project` and `doctor_explain_result` for targeted remediation before feature work.
 
+## MDS Routing Guardrails
+
+- Treat a request to continue development with MDS as a request for the MDS MCP tool and phase rules first.
+- Do not jump directly into app edits until `continue_project` or the CLI fallback has identified the active phase and blockers.
+- Never invoke `@mrdj/cli`; that package name is wrong. The published CLI package is `@mr.dj2u/cli` and its executable is `mds`.
+
 ## CLI / Manual Fallback
 
 1. If MCP is not configured, install it manually:
-   - `mds mcp install --client codex --scope project`
+   - `mds mcp install --client <client> --scope project`
 2. Direct CLI flow:
    - `mds continue <projectPath>`
    - `mds doctor <projectPath>` when blockers are unclear.
+3. If `mds` is not on PATH, invoke the published CLI by binary name:
+   - `npx -y -p @mr.dj2u/cli@latest mds continue <projectPath>`
 
 ## Verification And Output
 

package/bundles/claude-code/skills/create-expo-super-stack/SKILL.md

@@ -23,7 +23,7 @@ Create a new Expo app with the MDS Super Stack flow, using this knowledge packag
 ## CLI / Manual Fallback
 
 1. If MCP is not configured, install it manually:
-   - `mds mcp install --client codex --scope project`
+   - `mds mcp install --client <client> --scope project`
 2. Direct CLI generation:
    - `npx -y create-expo-super-stack <appName>`
 3. Then onboard/continue from inside the generated app using the current CLI behavior:

package/bundles/claude-code/skills/dev-server-management/SKILL.md

@@ -13,7 +13,7 @@ Use a deterministic reset path first; do not work around unstable server state w
 ## Checks
 
 - Run `mds clear-expo-start`  before manual troubleshooting.
-- If a conflict remains, run `mds free-port <port...>` for blocked ports.
+- If a conflict remains, run `mds free-port <port...>` for blocked ports.
 - Confirm Expo/Metro caches are cleared before retrying startup.
 - Treat fallback to port `8082` as an unresolved state that requires full reset.
 - Confirm the same recovery scripts are available to teammates and automation.

package/bundles/claude-code/skills/fix-seo/SKILL.md

@@ -23,7 +23,7 @@ Apply SEO metadata fixes for Expo web routes with MCP guidance and post-fix veri
 ## CLI / Manual Fallback
 
 1. If MCP is not configured, install it manually:
-   - `mds mcp install --client codex --scope project`
+   - `mds mcp install --client <client> --scope project`
 2. Direct CLI checks:
    - `mds doctor <projectPath> --ci`
    - Run project-specific web build/preview commands to verify metadata output.

package/bundles/claude-code/skills/prepare-deploy/SKILL.md

@@ -18,13 +18,12 @@ Prepare an Expo project for release using deployment-focused skills plus Doctor
 2. Run `doctor_scan_project` in `ci` mode for release parity.
 3. Pull `get_skill` for `deployment`; if web is involved also pull `seo-metadata`.
 4. Use `knowledge_list_resources` (`kind: "rule"`) to confirm env hygiene, SSR safety, and metadata requirements.
-5. Call `generate_deploy_checklist` so SEO, scripts, and release-readiness gaps are reflected in the next steps.
-6. Produce a release checklist mapped to current failing checks.
+5. Produce a release checklist mapped to current failing checks.
 
 ## CLI / Manual Fallback
 
 1. If MCP is not configured, install it manually:
-   - `mds mcp install --client codex --scope project`
+   - `mds mcp install --client <client> --scope project`
 2. Direct CLI path:
    - `mds doctor <projectPath> --ci`
    - Run project scripts: `lint`, `type-check`, `test`, and production build/profile scripts.
@@ -32,5 +31,4 @@ Prepare an Expo project for release using deployment-focused skills plus Doctor
 ## Verification And Output
 
 - Re-run `doctor_scan_project` (or CLI equivalent) until blockers are cleared.
-- Keep the response user-facing and checklist-driven; avoid internal tool chatter and avoid asking for a PR unless the user requested GitHub workflow.
 - Output: release readiness status, unresolved blockers, and rollback/readiness notes.

package/bundles/claude-code/skills/project-research-plan/SKILL.md

@@ -23,7 +23,7 @@ Turn rough product notes/research into actionable MDS project memory and next-ph
 ## CLI / Manual Fallback
 
 1. If MCP is not configured, install it manually:
-   - `mds mcp install --client codex --scope project`
+   - `mds mcp install --client <client> --scope project`
 2. Direct CLI fallback:
    - Use `mds onboard <projectPath>` for structured intake when memory files are missing.
    - Use `mds continue <projectPath>` after memory normalization to select the next task.

package/bundles/claude-code/skills/push-merge-loop/SKILL.md

@@ -0,0 +1,30 @@
+---
+description: Execute the short PR iteration loop for the test branch with strict quality gates.
+disable-model-invocation: true
+---
+
+# /push-merge-loop
+
+Execute the short PR iteration loop for the test branch with strict quality gates.
+
+## Goal
+
+Push intentional changes with a meaningful commit message, open/update a PR to `test`, poll for feedback and failed checks, fix issues, and merge to `test` once all checks are green.
+
+## Loop Rules
+
+1. Run `mds doctor --ci` before any git mutation.
+2. Stage only intentional files and create a meaningful commit message.
+3. Push branch and open or update a PR targeting `test`.
+4. Wait about 2 minutes, then poll PR comments, review threads, and failed checks.
+5. Fix issues locally, rerun Doctor, push updates, and poll again.
+6. Repeat polling/fix cycles up to 5 total iterations.
+7. Merge to `test` only when all required checks are green and no unresolved blocking feedback remains.
+
+## Guardrails
+
+- Do not merge when required checks are failing.
+- Do not skip Doctor between fix cycles.
+- Keep a concise changelog per iteration: what failed, what was changed, what passed.
+- If still failing after 5 cycles, stop and summarize remaining blockers with concrete next actions.
+

package/bundles/claude-code/skills/review-expo-project/SKILL.md

@@ -18,20 +18,17 @@ Review an Expo project with MCP-first diagnostics and skill-guided remediation.
 2. Call `continue_project` to summarize current project state and blockers.
 3. Call `doctor_scan_project` with `projectPath` and `mode`.
 4. For each warning/error, call `doctor_explain_result`, then pull targeted guidance with `get_skill` (for example: `project-onboarding`, `debugging`, `deployment`).
-5. If the findings affect release readiness, call `generate_deploy_checklist` so the next steps stay checklist-driven instead of PR-driven.
-6. Call `knowledge_list_resources` with `kind: "guide"` if extra reference context is needed.
+5. Call `knowledge_list_resources` with `kind: "guide"` if extra reference context is needed.
 
 ## CLI / Manual Fallback
 
 1. If MCP is not configured, install it manually:
-   - `mds mcp install --client codex --scope project`
+   - `mds mcp install --client <client> --scope project`
 2. If MCP still cannot run, use direct CLI flows:
    - `mds continue <projectPath>`
    - `mds doctor <projectPath> --ci`
 
 ## Verification And Output
 
-- Keep the response user-facing: summarize findings and next steps without echoing internal tool chatter or file-read noise.
 - Re-run `doctor_scan_project` (or `mds doctor --ci`) after fixes.
-- If the user is validating an installed agent bundle, include `mds agent verify --client <client> --target <path>` in the follow-up commands.
-- Output: blocker summary, failing checks, recommended next task, and concrete follow-up commands. Avoid proposing a PR unless the user explicitly asks for a GitHub workflow.
+- Output: blocker summary, failing checks, recommended next task, and concrete follow-up commands.

package/bundles/claude-code/skills/run-doctor/SKILL.md

@@ -18,20 +18,26 @@ Run MDS Doctor as the primary health check for an Expo project.
 1. Confirm the `mr-djs-dev-suite` MCP server is available.
 2. Call `doctor_scan_project` with selected arguments.
 3. For each non-pass result, call `doctor_explain_result`.
-4. If the check is release-related or web-facing, call `generate_deploy_checklist` before giving next steps.
-5. Pull targeted implementation guidance with `get_skill` (typically `deployment`, `debugging`, or `dev-server-management`).
+4. Pull targeted implementation guidance with `get_skill` (typically `deployment`, `debugging`, or `dev-server-management`).
+
+## MDS Routing Guardrails
+
+- Treat a request to run MDS Doctor as a request for the MDS MCP tool, not as a request to run app-local npm scripts.
+- Do not run `npm run mds:doctor`, `npm run doctor`, or other project package scripts as the MDS Doctor path unless the user explicitly asks for app scripts.
+- Never invoke `@mrdj/cli`; that package name is wrong. The published CLI package is `@mr.dj2u/cli` and its executable is `mds`.
 
 ## CLI / Manual Fallback
 
 1. If MCP is not configured, install it manually:
-   - `mds mcp install --client codex --scope project`
+   - `mds mcp install --client <client> --scope project`
 2. Direct CLI alternatives:
    - `mds doctor <projectPath>`
    - `mds doctor <projectPath> --ci`
    - `mds doctor <projectPath> --json`
+3. If `mds` is not on PATH, invoke the published CLI by binary name:
+   - `npx -y -p @mr.dj2u/cli@latest mds doctor <projectPath> --ci`
 
 ## Verification And Output
 
 - Re-run Doctor after each fix batch.
-- Keep the response concise and user-facing; do not surface internal tool chatter or intermediate file reads.
 - Output: check summary, blocking errors first, and the exact command used for re-check.

package/bundles/claude-code/skills/wrap-up/SKILL.md

@@ -0,0 +1,72 @@
+---
+description: Run the post-testing release wrap-up flow: final local checks, git inclusion confirmation, PR loop, and merge handling.
+disable-model-invocation: true
+---
+
+# /wrap-up
+
+Run the post-testing release wrap-up flow: final local checks, git inclusion confirmation, PR loop, and merge handling.
+
+## Goal
+
+When the developer says testing is complete, finish the handoff safely by:
+
+1. Marking completed todo items.
+2. Running `mds doctor --ci`.
+3. Reviewing `git status` and confirming intentionally excluded files.
+4. Running the publish/PR/check loop.
+5. Handling merge according to policy defaults and repo overrides.
+
+## Required Flow Order
+
+1. Update `project/todo.md` only for tasks clearly completed in this session.
+2. Run `mds doctor --ci` before any git mutation.
+3. Review `git status --short` and list changed files.
+4. Confirm any intentionally omitted files with the developer before staging.
+5. Publish through GitHub flow (branch push + PR).
+6. Poll checks and unresolved feedback.
+7. Fix failures locally, rerun Doctor, push updates, and poll again.
+8. Repeat up to 5 cycles total.
+
+## GitHub Skill Routing
+
+Use GitHub workflows in this order when available:
+
+1. `github` for repo/PR context and routing.
+2. `yeet` for commit/push/open-or-update PR flow.
+3. `gh-fix-ci` for failed checks/log inspection and CI-driven fix loops.
+4. `gh-address-comments` when unresolved review threads are blocking merge.
+
+## Merge Policy
+
+Evaluate policy in this order:
+
+1. Explicit user instruction in the current session.
+2. Optional repo config at `project/release-policy.json`.
+3. Defaults if config is absent.
+
+Supported repo config shape:
+
+```json
+{
+  "wrapUp": {
+    "autoMergeTest": true,
+    "autoMergeMain": false
+  }
+}
+```
+
+Default behavior:
+
+- Auto-merge to `test`: enabled.
+- Per-repo override: allowed.
+- Auto-merge to `main`: never allowed.
+
+If the workflow targets `main` directly (no `test` branch flow), stop before merge and tell the developer to merge manually.
+
+## Guardrails
+
+- Never auto-merge to `main`.
+- Do not skip `mds doctor --ci` between fix cycles.
+- Do not assume omitted files are intentional; confirm them.
+- If checks or blocking threads still fail after 5 cycles, stop and request human help with a concise blocker summary.

package/bundles/codex/.codex-plugin/plugin.json

@@ -1,13 +1,13 @@
 {
   "name": "mr-djs-dev-suite",
-  "version": "0.1.3",
+  "version": "0.1.6",
   "description": "MDS Expo development workflows for review, onboarding, deployment readiness, and project continuation.",
   "author": {
     "name": "DJ Grimsley",
     "url": "https://davidjgrimsley.com"
   },
-  "homepage": "https://github.com/DavidJGrimsley/mr-djs-dev-suite",
-  "repository": "https://github.com/DavidJGrimsley/mr-djs-dev-suite",
+  "homepage": "https://github.com/DavidJGrimsley/mrdj-dev-suite",
+  "repository": "https://github.com/DavidJGrimsley/mrdj-dev-suite",
   "license": "MIT",
   "keywords": [
     "expo",
@@ -30,7 +30,7 @@
       "Read",
       "Write"
     ],
-    "websiteURL": "https://github.com/DavidJGrimsley/mr-djs-dev-suite",
+    "websiteURL": "https://github.com/DavidJGrimsley/mrdj-dev-suite",
     "defaultPrompt": [
       "Review my Expo project and give me the next safe implementation steps.",
       "Run a deployment-readiness check with Doctor and fix blockers first.",