@snappedly-tools/shipyard 0.5.0 → 0.6.0

package/dist/templates/parallel-planner/merge-prompt.md

@@ -1,26 +1,14 @@
-# TASK
+# Final integration for scope #{{TASK_ID}}: {{ISSUE_TITLE}}
 
-Merge the following branches into the current branch:
+On branch `{{BRANCH}}`, inspect its complete diff from `{{BASE_BRANCH}}` and the source issue. This is the planner's final integration stage and ends in one PR for this scope. Follow `/code-cleanup` and local `/code-review` appropriate to the issue, using the worker's existing valid check evidence. Run required integrated checks and reinstall candidate dependencies with `bash .shipyard/setup.sh` after manifest changes. Resolve findings, commit corrections and inspect the final branch.
 
-{{BRANCHES}}
+Do not close the issue, merge into the target, or publish the PR. If checks or review remain unresolved, explain why without completion. After a verified final commit, report `Checks: <commands and results>`, `Review: APPROVED`, and limitations:
 
-For each branch:
+<handoff>...</handoff>
+<promise>COMPLETE</promise>
 
-1. Run `git merge <branch> --no-edit`
-2. If there are merge conflicts, resolve them intelligently by reading both sides and choosing the correct resolution
-3. After resolving conflicts, read the repository's configured feedback-loop contract and run every applicable check for the merged change
-4. If a check fails, fix the issue before proceeding to the next branch
+For a planning spec, follow `/implement-spec` for whole-spec integration, cleanup, and final checks on the one spec branch. Read parent and all scoped child bodies and comments, inspect dependency order and merged commits, and resolve gaps before completion. Run `/code-review` here when this template has no separate reviewer stage. Never merge the target branch or close issues.
 
-After all branches are merged, make a single commit summarizing the merge.
-
-# CLOSE ISSUES
-
-For each branch that was merged, close its issue using the following command:
-
-`{{CLOSE_TASK_COMMAND}}`
-
-Here are all the issues:
-
-{{ISSUES}}
-
-Once you've merged everything you can, output <promise>COMPLETE</promise>.
+```json
+{{SCOPE}}
+```

package/dist/templates/parallel-planner/plan-prompt.md

@@ -1,37 +1,11 @@
-# ISSUES
-
-Here are the open issues in the repo:
+# Activated issue scopes
 
 <issues-json>
-
-!`{{LIST_TASKS_COMMAND}}`
-
+!`node .shipyard/select-issues.mjs`
 </issues-json>
 
-The list above has already been filtered to issues ready for work.
-
-# TASK
-
-Analyze the open issues and build a dependency graph. For each issue, determine whether it **blocks** or **is blocked by** any other open issue.
-
-An issue B is **blocked by** issue A if:
-
-- B requires code or infrastructure that A introduces
-- B and A modify overlapping files or modules, making concurrent work likely to produce merge conflicts
-- B's requirements depend on a decision or API shape that A will establish
-
-An issue is **unblocked** if it has zero blocking dependencies on other open issues.
-
-For each unblocked issue, assign a branch name using the exact format `shipyard/issue-{id}` (no slug or other suffix). This must be deterministic so that re-planning the same issue always produces the same branch name and accumulated progress is preserved.
-
-# OUTPUT
-
-Output your plan as a JSON object wrapped in `<plan>` tags:
-
-<plan>
-{"issues": [{"id": "42", "title": "Fix auth bug", "branch": "shipyard/issue-42"}]}
-</plan>
+Use exactly these resolved scopes as the ready frontier. `scope.tickets` contains only selected tickets with the `shipyard` label; other linked tickets are context and must not be implemented. For planning specs, follow `/implement-spec` when planning the selected scope, honoring child dependencies and overlapping files. The surrounding template will run ready tickets in parallel with scoped `/implement` workers, integrate each dependency wave into one spec branch, then perform integrated cleanup, review, and one PR handoff. Do not omit selected tickets, invent scope IDs, create PRs, merge to target, or close issues.
 
-Include only unblocked issues. If every issue is blocked, include the single highest-priority candidate (the one with the fewest or weakest dependencies).
+Emit each selected scope once, by its parent or standalone ID. If no scope is ready, emit an empty array:
 
-Always emit the `<plan>` tags, even when there is nothing to do. If there are no issues to work on at all, output `<plan>{"issues": []}</plan>` so the run can exit cleanly.
+<plan>{"issues":[{"id":"42"}]}</plan>