القائمة
Merge trunk into worktree and resolve conflicts
التثبيت باستخدام Codex أو Claude انسخ هذا Prompt والصقه في Codex أو Claude أو مساعد آخر ليراجع صفحة Skill ويثبّتها لك.
استنادا إلى تصنيف SOC المهني
Collaboratively refine a high-level ambition into a set of chunk prompts.
Migrate the project's ACTIVE chunks to the present-tense, intent-owning standard. Audits each chunk's goal against the code it claims to govern; rewrites retrospective framing inline; logs over-claims that need operator triage; historicalizes chunks with no enduring intent. Designed for full-corpus migrations — fans out across many parallel sub-agents at 5 chunks per agent.
Create a new chunk of work and refine its goal. Use when the operator wants to start new intent-bearing work, chunk something, define a piece of work, or break work into a chunk.
Update code references in the current chunk and move both the PLAN.md and the GOAL.md to the ACTIVE state.
Wake an entity by loading its identity, memories, and operational context
Set up a project steward via interactive interview
| name | chunk-rebase |
| description | Merge trunk into worktree and resolve conflicts |
This phase integrates the current trunk (main branch) into the worktree branch before review. This ensures the REVIEW phase sees code that has already been merged with any concurrent changes from other parallel chunks.
First, check for and commit any uncommitted changes from the IMPLEMENT phase:
git status
If there are uncommitted changes:
git add -AMerge the current main branch into this worktree branch:
git merge main
Note: Worktrees share the same git object store as the main repo, so main
always reflects the latest local state. Do NOT use origin/main — in
orchestrator mode, other chunks merge to local main without pushing, so
origin/main will be stale.
If conflicts arise:
git add -A
git commit -m "Merge main into chunk branch, resolve conflicts"
Verify the integrated result passes tests:
uv run pytest tests/
If tests fail:
On Success (clean merge or resolved conflicts, tests pass):
On Failure (unresolvable conflicts or test failures):