@mr.dj2u/cli 0.1.3 → 0.1.7

package/bundles/codex/skills/workflow-wrap-up/SKILL.md

@@ -0,0 +1,79 @@
+---
+name: "MDS Wrap Up"
+description: "Use when the user has finished testing and wants Mr. DJ's Dev Suite to run the final wrap-up workflow (Doctor, git inclusion checks, PR loop, CI fix retries, and merge policy guardrails)."
+---
+
+# Codex Workflow Routing
+
+- This is a Mr. DJ's Dev Suite plugin workflow. Prefer the bundled MCP tools before terminal fallbacks.
+- When an MCP tool named in this workflow is available, call that tool directly instead of running app-local npm scripts.
+- Do not use stale package names such as `@mrdj/cli`. The CLI package is `@mr.dj2u/cli`; the executable is `mds`.
+- If the MCP server is unavailable, prefer `mds <command>` from PATH, then `npx -y -p @mr.dj2u/cli@latest mds <command>`.
+
+# /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/vscode-copilot/.github/prompts/continue-development.prompt.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/vscode-copilot/.github/prompts/create-expo-super-stack.prompt.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/vscode-copilot/.github/prompts/fix-seo.prompt.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/vscode-copilot/.github/prompts/prepare-deploy.prompt.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/vscode-copilot/.github/prompts/project-research-plan.prompt.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/vscode-copilot/.github/prompts/push-merge-loop.prompt.md

@@ -0,0 +1,30 @@
+---
+mode: "agent"
+description: "Run the MDS Push Merge Loop workflow with MCP-first diagnostics and CLI fallback."
+---
+
+# /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/vscode-copilot/.github/prompts/review-expo-project.prompt.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/vscode-copilot/.github/prompts/run-doctor.prompt.md

@@ -18,20 +18,26 @@ Run MDS Doctor as the primary health check for an Expo project.
 1. Confirm the `mds` 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/vscode-copilot/.github/prompts/wrap-up.prompt.md

@@ -0,0 +1,72 @@
+---
+mode: "agent"
+description: "Run the MDS Wrap Up workflow with MCP-first diagnostics and CLI fallback."
+---
+
+# /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/vscode-copilot/.vscode/mcp.json

@@ -4,7 +4,7 @@
       "command": "npx",
       "args": [
         "-y",
-        "@mr.dj2u/mcp-server"
+        "@mr.dj2u/mcp-server@0.1.2"
       ]
     }
   }

package/bundles/vscode-copilot/user/.copilot/skills/workflow-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/vscode-copilot/user/.copilot/skills/workflow-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/vscode-copilot/user/.copilot/skills/workflow-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/vscode-copilot/user/.copilot/skills/workflow-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/vscode-copilot/user/.copilot/skills/workflow-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/vscode-copilot/user/.copilot/skills/workflow-push-merge-loop/SKILL.md

@@ -0,0 +1,30 @@
+---
+name: "MDS Push Merge Loop"
+description: "Run the MDS Push Merge Loop workflow in VS Code Copilot user scope."
+---
+
+# /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/vscode-copilot/user/.copilot/skills/workflow-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/vscode-copilot/user/.copilot/skills/workflow-run-doctor/SKILL.md

@@ -18,20 +18,26 @@ Run MDS Doctor as the primary health check for an Expo project.
 1. Confirm the `mds` 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/vscode-copilot/user/.copilot/skills/workflow-wrap-up/SKILL.md

@@ -0,0 +1,72 @@
+---
+name: "MDS Wrap Up"
+description: "Run the MDS Wrap Up workflow in VS Code Copilot user scope."
+---
+
+# /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/dist/cli.js

@@ -162,6 +162,10 @@ async function main() {
         .option('core-flows', {
         describe: 'Primary user flows',
         type: 'string',
+    })
+        .option('screens', {
+        describe: 'Known screens that must be included in planning/implementation',
+        type: 'string',
     })
         .option('data-needs', {
         describe: 'Expected data/backend needs',
@@ -186,6 +190,10 @@ async function main() {
         .option('custom-backend-entry', {
         describe: 'Entry point for the custom backend server (e.g. server.js, api-server.ts)',
         type: 'string',
+    })
+        .option('save-defaults', {
+        describe: 'Persist selected onboarding defaults globally for future app generation (interactive runs ask unless this is set)',
+        type: 'boolean',
     }), async (argv) => {
         await runOnboardCommand(argv);
     })
@@ -373,7 +381,7 @@ async function main() {
     }), async (argv) => {
         await runReportCommand(argv);
     })
-        .command(['test-and-iterate [branch]', 'ship [branch]'], 'Plan the push, PR, CI polling, fix, and merge-to-test workflow', (builder) => builder
+        .command(['test-and-iterate [branch]', 'ship [branch]', 'push-merge-loop [branch]'], 'Plan the push, PR, CI polling, fix, and merge-to-test workflow', (builder) => builder
         .positional('branch', {
         describe: 'Feature branch to push',
         type: 'string',