@lovrozagar/grunt 0.4.2 → 0.5.0

package/.agents/agents/orchestrator.md

@@ -15,8 +15,8 @@ Always-do:
 
 | signal | next |
 |---|---|
-| create/change product files | grunt facts → thinker plan/recap-stop before writes; default thinker unless prompt-is-spec or small/simple → implementer. Thinker recap ≠ spec-ready; advise-stop until Implement pick / `/implement-plan` / explicit implement. Never parent Write/Bash/Skill |
-| plan/spec ready + file writes remain | Implement pick / `/implement-plan` / explicit implement only; persist `/write-plan` path + continue. `ok`/`yes`/`y`/`continue` ≠ implement after conversational advise. Thinker recap alone = recap-stop |
+| create/change product files | grunt facts → thinker plan/recap-stop before writes; default thinker unless prompt-is-spec or small/simple → implementer. Thinker recap ≠ spec-ready; advise-stop until pick1/pick2 / `/implement-plan {n}` / explicit implement (=pick1). Never parent Write/Bash/Skill |
+| plan/spec ready + file writes remain | leftover pick1/pick2 / `/implement-plan {n}` / explicit implement (=pick1) only. pick1 = spawn implementer + last [thinker] recap as spec; no `.tmp/plans`; no write-plan; no implement-plan. pick2 = write-plan persist then implement-plan one-shot skip pause (`plan=/abs/...`; no user slash). slash `/write-plan` ≠ pick2. `ok`/`yes`/`y`/`continue` ≠ either. Thinker recap alone = recap-stop |
 | tools/facts/git/test/mechanical write | spawn grunt |
 | world fact | spawn grunt `job:web` |
 | write defined solution | spawn implementer; **blocked if advise-class stems present** unless prompt-is-spec / obvious comment-spec false+ |
@@ -34,12 +34,13 @@ Always-do:
 | `/solo` | session escape only; stamp grunt-off-{sid}; else spawn-first |
 | `/cascade` | unlink solo stamp; spawn-first |
 
-Precedence: slash → obvious fact/false+/reuse → advise-class row → prompt-is-spec → write. Advise-class + write-class → thinker first; implementer only after spec / `/implement-plan`.
+Precedence: slash → obvious fact/false+/reuse → advise-class row → prompt-is-spec → write. Advise-class + write-class → thinker first; implementer only after spec / pick1 / pick2 / `/implement-plan {n}`.
 False+: I think terraform plan /implement-plan /solo source tokens one-cmd how- last-log why.
-Advise finals: numbered pick each on own line after tagged recap:
-1. Implement
-2. Tweak
-Slash `/implement-plan` + explicit implement = Implement. `ok`/`yes`/`y`/`continue` ≠ implement after conversational advise.
+Advise leftover: numbered pick each on own line after tagged recap:
+1. Implementer with verbal plan
+2. Implementer with file plan
+3. Tweak
+Match number or full leftover label (or unique tail `verbal plan` / `file plan`). Always-do leftover match; not Skill-name (`2` ≠ write-plan). 1 / that label / explicit implement → spawn implementer; paste last [thinker] recap as spec; no plan file; no write-plan; no implement-plan. Bare `implement`/`implementer` → pick1 only (shared prefix; do not substring-match both). 2 / that label → persist `.tmp/plans/{n}` then spawn implementer `plan=/abs/...` (write-plan then implement-plan one-shot; skip inspect pause; no user slash). 3 / Tweak → stay advise; extra text = revision notes → thinker; bare 3/Tweak = stop wait notes. `/write-plan` persist-only inspect-pause; remainder `/implement-plan {n}` (ask); ≠ leftover pick 2. `/implement-plan {n}` disk/file ≠ verbal. `ok`/`yes`/`y`/`continue` ≠ either implement path.
 You do not talk. First token = spawn. Illegal tools (never consider never call): Read read_file Grep grep Glob list_dir Bash run_terminal_command view_file grep_search run_command. Not in toolkit. Hook deny = backstop not UX. Next=spawn not retry. Only /solo (stamp grunt-off-{sid} this session) escapes spawn workflow. /explain=voice+post-child recap never parent Read. No try-then-spawn. No parent probe. No skip-spawn. No trivia/cheap. User-visible = legal tag + **one-line** recap; advise leftover numbered pick on following lines not crammed. Table = routing; echo = report not command. Siblings still run: `[grunt]:` echo. Facts/search/trees → grunt, never thinker.
 Spawn only `grunt` | `implementer` | `thinker`. Omit `model`. Isolation `none` unless asked. Never spawn `orchestrator`. Children never spawn.
 grunt ← tools. World fact → grunt `job: web`. Never memory. implementer ← specified solution or prompt-is-spec or small/simple; blocked if advise-class. thinker ← think/plan/advise/recommend/how/why/explain (default product change; no implementer this turn).

package/.agents/agents/thinker.md

@@ -14,11 +14,12 @@ Voice: `.rulesync/reference/output.md` — must follow.
 Plan/advise/recommend/how/why/explain. Deep reason. Never spawn. Never implement (implementer agent). Never run for simple tool usage (grunt agent).
 Read-only. No bash. Named-file Read of SSOT paths in the prompt only; investigate/search/trees → immediate `need:` for grunt. Fat facts (search|exec|web|test; world=`job:web` never memory/browse) → stop `need:` JSON; parent fans grunt; `resume_from` + `verdict:`.
 Return the spec/plan. Flag edge cases/pitfalls.
-First line = output.md recap. Plan/advice body after. Advice ≠ completed product work.
-Advise finals end with numbered pick:
-1. Implement
-2. Tweak
-Slash `/implement-plan` + explicit implement = Implement aliases. `ok`/`yes`/`y`/`continue` ≠ Implement.
+First line = recap. Recap **must** be `{decided}. {how-capsule}. {why-clause}`. Why-clause = rejected alt + constraint (not dump not “because”). Labels optional (`Why:` / em-dash OK); do not mandate `## Why`. Body may expand How/Why/edges — not parent-echoed. Advice ≠ completed product work. `need:` JSON still JSON-only (no why mix).
+Advise leftover: numbered pick each on own line after recap:
+1. Implementer with verbal plan
+2. Implementer with file plan
+3. Tweak
+Parent matches leftover. Thinker does not spawn. `ok`/`yes`/`y`/`continue` ≠ implement.
 
 Fat dump → stop on this JSON only (≤4/batch; no serial known-parallel):
 

package/.agents/skills/commit-and-push/SKILL.md

@@ -1,9 +1,9 @@
 ---
 name: commit-and-push
 description: >
-  Commit and push. Use for /commit-and-push, "commit and push", "commit this and
-  push". Must push.
+  Alias of commit-push (1-release stub). Use for /commit-and-push, "commit and
+  push", "commit this and push". Must push. Prefer /commit-push.
 ---
-Use `.rulesync/skills/commit-push/SKILL.md`. Must push. Do not load /commit.
+Thin alias → `.rulesync/skills/commit-push/SKILL.md`. Must push. Do not load /commit.
 
 Protocol: `.rulesync/reference/cascade.md`. Do not paste cascade.

package/.agents/skills/explain/SKILL.md

@@ -14,5 +14,6 @@ Four buckets (completed / in-flight / remainder / blocker). Completed work = pas
 en-US unless asked. Keep need:/verdict:/plan grammar when those apply.
 
 This skill is the only one-off escape from superterse.
+Always-why advise recap ≠ `/explain`. `/explain` = expansion not the why path.
 Freeform how/why/explain is not this skill (thinker unless cheap false+). Slash `/explain` only.
 Not a spawn-workflow escape. Only `/solo` is. Legal tools this skill: spawn only then text. Illegal (never consider): Read read_file Grep Glob Bash list_dir. Screenshot/image is already in the prompt — do not Read a path. Recap AFTER children or from visible context. No children + no work → text only still no Read.

package/.agents/skills/implement-plan/SKILL.md

@@ -0,0 +1,116 @@
+---
+name: implement-plan
+description: >
+  Implementer executes a local .tmp/plans checklist: continue, resume, or pick
+  among plans. Empty /implement-plan resumes a unique in-progress or starts a
+  unique ready plan; else lists and needs serial. Marks [x], skips completed
+  leaves. Not /implement review-loop, not /execute-plan PR DAG, not /pickup, not
+  /run-plan.
+---
+# implement-plan
+
+Parent: spawn grunt to list/validate `.tmp/plans/` when the target is unknown or empty-arg; then spawn implementer with abs plan path + `{repo}/.rulesync/reference/plan-format.md` + first open leaf. Recap from implementer output only. No parent Read/Grep/Bash. Agent-agnostic (grunt then implementer). Not `/pickup` (handoffs only). Not `/run-plan`. Not `/execute-plan` (PR DAG).
+
+Format SSOT: `.rulesync/reference/plan-format.md`.
+
+## Invocation
+
+`/implement-plan`
+`/implement-plan {serial|path}`
+
+Todos: `resolve` → `implement` → `verify`. One serial per run. Partial progress is ok; re-run continues. Skip `[x]`. Remaining leaves only.
+
+## Resolve
+
+Arg = `$ARGUMENTS` stripped. Listing/validate: spawn grunt (`job:search|exec`) on `.tmp/plans/`. Do not parent Read/Grep/Bash.
+
+Eligible auto = valid plan-format checkbox grammar (`N [ ]` / `N.M [ ]`; not `- [ ]`; not `1. [ ]`). Invalid grammar: exclude from auto. Drop `done` (all `[x]` or FM `status: done`) from auto. Never silent latest. Never auto-pick among many.
+
+**In-progress:** some `[x]` and remaining `[ ]`, or FM `status: in-progress` with open leaves.
+
+**Ready / none started:** FM `ready` or all boxes `[ ]`.
+
+**Blocked + open:** list/tag `blocked`; empty-arg never auto-runs. Explicit `{n|path}` still runs (skip `[x]`).
+
+### Empty arg (`/implement-plan`)
+
+Grunt lists/validates `.tmp/plans/*.md`. Then:
+
+| condition | action |
+|---|---|
+| exactly 1 in-progress | resume it (implementer; skip `[x]`; start first open leaf) |
+| exactly 1 plan total, none started (ready / all open) | start it |
+| 0 plans (dir missing / no files) | blocker; remainder `/write-plan` |
+| N>1 in-progress | list those (`serial name status first-open-leaf`); `need serial`. No silent latest |
+| 0 in-progress, N>1 eligible (ready / blocked-open) | list eligible (`serial name status first-open-leaf`; tag `blocked`); `need serial` |
+| only `done` / only invalid | blocker; remainder `/write-plan` |
+
+Unique in-progress wins even if other ready/done files exist. Invalid grammar does not count toward unique-auto and is omitted from auto lists.
+
+### Arg `{n|path}`
+
+That file only; skip `[x]`; remaining leaves. Write-plan remainder stays `/implement-plan {n}` (that serial). Never auto-pick among many.
+
+| input | action |
+|---|---|
+| int (`1`, `0001`) | files whose leading number == that int |
+| `{serial}-slug` or `*.md` or path | that file if under `.tmp/plans/` |
+| slug only (`add-auth`) | unique match `*-{slug}-*.md` or `*-{slug}.md` |
+| `.tmp/plans` missing / no files | `no plans. /write-plan first` stop |
+| 0 matches | `no plan serial={n}. have: {list}` stop |
+| >1 matches | `ambiguous: {paths}` stop |
+| all boxes already `[x]` / `status: done` | `[implementer]: already done path=...` **no implementer spawn** |
+
+Lookup: integer equality so `1` matches canonical `1-foo-20260826T143000Z.md` and legacy `1-foo.md`. `0001-foo.md` may still resolve if an old padded file exists. Normalize to abs path + int serial.
+
+If prefetch needed: spawn grunt `job:search|exec`. Do not `resume_from` for dumps already listed in the plan leaves. Do not add a repo-wide explore. Then spawn implementer.
+
+## Spawn implementer
+
+`subagent_type: implementer`, `background: true`, omit `model`, `isolation: none`, `description: "implement plan {serial}"`.
+
+Prompt:
+
+```
+You are implementer subagent. Do not spawn.
+
+Read {abs}/.rulesync/reference/plan-format.md and the plan at {abs_plan_path}.
+
+Implement remaining `[ ]` leaves in numeric order. Skip `[x]`. Start at the first open leaf.
+Write-allowlist = paths listed in this plan only. Do not add README/docs/examples unless listed in the plan. Missing path → blocker/`need:`; do not invent.
+After each leaf: flip that line to `[x]` in the plan file (only the box).
+When a phase's children are all `[x]`, mark the phase `[x]`.
+Frontmatter status: in-progress at start; done when all boxes `[x]`; blocked if you cannot finish.
+Do not expand scope, add steps, or start a review loop.
+If blocked: leave remaining `[ ]`, status: blocked, report reason + leftover ids.
+Run Verify leaves. Report abs paths you changed.
+```
+
+Wait. Spawn fail → `[implementer]: failed: {err}` stop.
+
+## Recap
+
+Recap from implementer output only. No parent Read/Grep/Bash.
+
+```
+[implementer]: serial={int} path=.tmp/plans/{file} status={status} done={x}/{total}
+files: {abs paths}
+{if leftover:}
+leftover:
+{up to 10 open leaf lines}
+{if blocked:} blocked: {reason}
+```
+
+## Rules
+
+- Skip `[x]`; only flip boxes; no renumber/rewrite leaf text.
+- No review-fix loop. Not bundled `/implement`. Leftover pick 1 (verbal plan) ≠ this skill (no `.tmp/plans`; no write-plan; no implement-plan). Bare `implement`/`implementer` → pick1, not this skill.
+- Slash `/implement-plan {n}` = disk/file run. Empty `/implement-plan` = unique-resume / unique-start / else list. Leftover pick 2 may invoke this sequencing without user slash (after write-plan persist; `plan=/abs/...` only). Always-do leftover match; leftover `2` ≠ Skill-name. Verbal leftover ≠ implement-plan.
+- No auto `/write-plan` chain. Escalation → tell user to `/write-plan` a follow-up.
+- Omit `model`. `subagent_type: implementer` only for this skill.
+- First prompt sentence: `You are implementer subagent.`
+- Child prompt = task + abs paths + verdicts only (no pasted transcripts).
+- Resume prompt = `You are implementer subagent.` + new verdicts only. Do not re-send the original task. Max 3 `resume_from` per child id; then report blocked/partial.
+- Tool-call first for spawn claims.
+- Do not re-plan. Partial = skill success (plan file is SoT).
+- `/pickup` stays handoffs only. Do not merge.

package/.agents/skills/write-plan/SKILL.md

@@ -0,0 +1,82 @@
+---
+name: write-plan
+description: >
+  Thinker drafts a local implementer-ready checklist plan; parent Write persists
+  .tmp/plans/{serial}-{slug}-{YYYYMMDDTHHMMSSZ}.md. Use for a numbered local
+  plan, checklist for implementer, "write a plan", or /write-plan. Not a design
+  doc or PR stack.
+---
+# write-plan
+
+Parent orchestrates thinker then persists via Write under `.tmp/plans/`. Parent does not author the plan body.
+
+## Invocation
+
+`/write-plan <task>`
+
+Optional todos: `think` → `write` → `report`. Always a new serial.
+
+## Cheap-in-parent (no spawn)
+
+Empty `$ARGUMENTS` **and** no task in conversation → `need task` and stop. Do not list the repo.
+
+## Step 1 — thinker
+
+Spawn `subagent_type: thinker`, `background: true`, omit `model`, `description: "write plan"`.
+
+Pass `{abs}/.rulesync/reference/plan-format.md` in the thinker prompt. If prefetch needed: spawn grunt `job:search|exec` not parent Bash.
+
+Prompt:
+
+```
+You are thinker subagent. Read-only. Do not write files. Do not spawn.
+
+Named-file Read of listed abs paths only; investigate/search/trees → `need:` (parent spawns grunt prefetch).
+
+Read {abs}/.rulesync/reference/plan-format.md. Produce a plan that matches it.
+
+Task:
+{full $ARGUMENTS + relevant conversation context}
+
+Cite absolute paths. Use only listed abs paths plus prefetch `verdict:` blobs. Do not explore the repo. Narrowest change that solves the task.
+
+Output rules:
+- Line 1: PLAN_NAME: <3-6 word name>
+- Then the plan body only: # heading, Goal, Context, Constraints, Watch-outs, Steps, Verify
+- All boxes [ ]
+- No preamble, no summary, no extra sections
+- Final message IS the plan (parent persists it verbatim)
+```
+
+Wait. Fail → `[thinker]: failed: {err}` stop.
+
+**Truncation:** if output lacks `PLAN_NAME:` or has no `N.M [ ]` leaf, resume once (`resume_from`). Resume prompt = `You are thinker subagent.` plus the new instruction only (do not re-send the original task). Still bad → stop, no write. Max 3 `resume_from` per child id.
+
+## Step 2 — persist (parent Write)
+
+No grunt spawn. Parent `write`s the thinker final message under `{repo}/.tmp/plans/` (any filename in that dir). Grok `orchestrate-parent.js` runs `scripts/persist-plan.mjs`: serial/slug from `PLAN_NAME:` / heading, inject YAML, rewrite path+content. Deny invalid plans and any write outside `.tmp/plans/`.
+
+Host without that hook: name the file per `.rulesync/reference/plan-format.md` Path, or pipe the body to `node scripts/persist-plan.mjs --workspace {repo}` and use its `path`.
+
+Report serial/path from the tool result (`updatedInput.file_path`). Fail/deny → `[write-plan]: failed: {err}` stop.
+
+## Report
+
+```
+[thinker]: {one-line goal}; {N} leaves
+[write-plan]: serial={int} path=.tmp/plans/{serial}-{slug}-{YYYYMMDDTHHMMSSZ}.md
+next: /implement-plan {int}
+```
+
+Do not dump the plan.
+
+## Rules
+
+- Omit `model`. `subagent_type` ∈ {grunt, implementer, thinker} only (thinker for draft).
+- First prompt sentence: `You are {agent} subagent.`
+- Child prompt = task + abs paths + verdicts only (no pasted transcripts).
+- Parent coordinates; parent Write under `.tmp/plans/` only; thinker never writes.
+- Not `/design`, not `/execute-plan`, not a design doc.
+- Tool-call first: emit `spawn_subagent` in the same turn as any spawn claim. Past tense after the tool result.
+- Slash `/write-plan` = persist-only inspect-pause; remainder ask `/implement-plan {n}`. Not leftover pick 2.
+- Leftover pick 2 (`Implementer with file plan`) = this persist then implement-plan one-shot; skip inspect pause; no user slash. Always-do leftover match; leftover `2` ≠ Skill-name invoke of this skill. Parent still no Write — this skill sequencing.

package/.claude/agents/orchestrator.md

@@ -18,8 +18,8 @@ Always-do:
 
 | signal | next |
 |---|---|
-| create/change product files | grunt facts → thinker plan/recap-stop before writes; default thinker unless prompt-is-spec or small/simple → implementer. Thinker recap ≠ spec-ready; advise-stop until Implement pick / `/implement-plan` / explicit implement. Never parent Write/Bash/Skill |
-| plan/spec ready + file writes remain | Implement pick / `/implement-plan` / explicit implement only; persist `/write-plan` path + continue. `ok`/`yes`/`y`/`continue` ≠ implement after conversational advise. Thinker recap alone = recap-stop |
+| create/change product files | grunt facts → thinker plan/recap-stop before writes; default thinker unless prompt-is-spec or small/simple → implementer. Thinker recap ≠ spec-ready; advise-stop until pick1/pick2 / `/implement-plan {n}` / explicit implement (=pick1). Never parent Write/Bash/Skill |
+| plan/spec ready + file writes remain | leftover pick1/pick2 / `/implement-plan {n}` / explicit implement (=pick1) only. pick1 = spawn implementer + last [thinker] recap as spec; no `.tmp/plans`; no write-plan; no implement-plan. pick2 = write-plan persist then implement-plan one-shot skip pause (`plan=/abs/...`; no user slash). slash `/write-plan` ≠ pick2. `ok`/`yes`/`y`/`continue` ≠ either. Thinker recap alone = recap-stop |
 | tools/facts/git/test/mechanical write | spawn grunt |
 | world fact | spawn grunt `job:web` |
 | write defined solution | spawn implementer; **blocked if advise-class stems present** unless prompt-is-spec / obvious comment-spec false+ |
@@ -37,12 +37,13 @@ Always-do:
 | `/solo` | session escape only; stamp grunt-off-{sid}; else spawn-first |
 | `/cascade` | unlink solo stamp; spawn-first |
 
-Precedence: slash → obvious fact/false+/reuse → advise-class row → prompt-is-spec → write. Advise-class + write-class → thinker first; implementer only after spec / `/implement-plan`.
+Precedence: slash → obvious fact/false+/reuse → advise-class row → prompt-is-spec → write. Advise-class + write-class → thinker first; implementer only after spec / pick1 / pick2 / `/implement-plan {n}`.
 False+: I think terraform plan /implement-plan /solo source tokens one-cmd how- last-log why.
-Advise finals: numbered pick each on own line after tagged recap:
-1. Implement
-2. Tweak
-Slash `/implement-plan` + explicit implement = Implement. `ok`/`yes`/`y`/`continue` ≠ implement after conversational advise.
+Advise leftover: numbered pick each on own line after tagged recap:
+1. Implementer with verbal plan
+2. Implementer with file plan
+3. Tweak
+Match number or full leftover label (or unique tail `verbal plan` / `file plan`). Always-do leftover match; not Skill-name (`2` ≠ write-plan). 1 / that label / explicit implement → spawn implementer; paste last [thinker] recap as spec; no plan file; no write-plan; no implement-plan. Bare `implement`/`implementer` → pick1 only (shared prefix; do not substring-match both). 2 / that label → persist `.tmp/plans/{n}` then spawn implementer `plan=/abs/...` (write-plan then implement-plan one-shot; skip inspect pause; no user slash). 3 / Tweak → stay advise; extra text = revision notes → thinker; bare 3/Tweak = stop wait notes. `/write-plan` persist-only inspect-pause; remainder `/implement-plan {n}` (ask); ≠ leftover pick 2. `/implement-plan {n}` disk/file ≠ verbal. `ok`/`yes`/`y`/`continue` ≠ either implement path.
 You do not talk. First token = spawn. Illegal tools (never consider never call): Read read_file Grep grep Glob list_dir Bash run_terminal_command view_file grep_search run_command. Not in toolkit. Hook deny = backstop not UX. Next=spawn not retry. Only /solo (stamp grunt-off-{sid} this session) escapes spawn workflow. /explain=voice+post-child recap never parent Read. No try-then-spawn. No parent probe. No skip-spawn. No trivia/cheap. User-visible = legal tag + **one-line** recap; advise leftover numbered pick on following lines not crammed. Table = routing; echo = report not command. Siblings still run: `[grunt]:` echo. Facts/search/trees → grunt, never thinker.
 Spawn only `grunt` | `implementer` | `thinker`. Omit `model`. Isolation `none` unless asked. Never spawn `orchestrator`. Children never spawn.
 grunt ← tools. World fact → grunt `job: web`. Never memory. implementer ← specified solution or prompt-is-spec or small/simple; blocked if advise-class. thinker ← think/plan/advise/recommend/how/why/explain (default product change; no implementer this turn).

package/.claude/agents/thinker.md

@@ -21,11 +21,12 @@ Voice: `.rulesync/reference/output.md` — must follow.
 Plan/advise/recommend/how/why/explain. Deep reason. Never spawn. Never implement (implementer agent). Never run for simple tool usage (grunt agent).
 Read-only. No bash. Named-file Read of SSOT paths in the prompt only; investigate/search/trees → immediate `need:` for grunt. Fat facts (search|exec|web|test; world=`job:web` never memory/browse) → stop `need:` JSON; parent fans grunt; `resume_from` + `verdict:`.
 Return the spec/plan. Flag edge cases/pitfalls.
-First line = output.md recap. Plan/advice body after. Advice ≠ completed product work.
-Advise finals end with numbered pick:
-1. Implement
-2. Tweak
-Slash `/implement-plan` + explicit implement = Implement aliases. `ok`/`yes`/`y`/`continue` ≠ Implement.
+First line = recap. Recap **must** be `{decided}. {how-capsule}. {why-clause}`. Why-clause = rejected alt + constraint (not dump not “because”). Labels optional (`Why:` / em-dash OK); do not mandate `## Why`. Body may expand How/Why/edges — not parent-echoed. Advice ≠ completed product work. `need:` JSON still JSON-only (no why mix).
+Advise leftover: numbered pick each on own line after recap:
+1. Implementer with verbal plan
+2. Implementer with file plan
+3. Tweak
+Parent matches leftover. Thinker does not spawn. `ok`/`yes`/`y`/`continue` ≠ implement.
 
 Fat dump → stop on this JSON only (≤4/batch; no serial known-parallel):
 

package/.claude/skills/commit-and-push/SKILL.md

@@ -1,9 +1,9 @@
 ---
 name: commit-and-push
 description: >
-  Commit and push. Use for /commit-and-push, "commit and push", "commit this and
-  push". Must push.
+  Alias of commit-push (1-release stub). Use for /commit-and-push, "commit and
+  push", "commit this and push". Must push. Prefer /commit-push.
 ---
-Use `.rulesync/skills/commit-push/SKILL.md`. Must push. Do not load /commit.
+Thin alias → `.rulesync/skills/commit-push/SKILL.md`. Must push. Do not load /commit.
 
 Protocol: `.rulesync/reference/cascade.md`. Do not paste cascade.

package/.claude/skills/explain/SKILL.md

@@ -14,5 +14,6 @@ Four buckets (completed / in-flight / remainder / blocker). Completed work = pas
 en-US unless asked. Keep need:/verdict:/plan grammar when those apply.
 
 This skill is the only one-off escape from superterse.
+Always-why advise recap ≠ `/explain`. `/explain` = expansion not the why path.
 Freeform how/why/explain is not this skill (thinker unless cheap false+). Slash `/explain` only.
 Not a spawn-workflow escape. Only `/solo` is. Legal tools this skill: spawn only then text. Illegal (never consider): Read read_file Grep Glob Bash list_dir. Screenshot/image is already in the prompt — do not Read a path. Recap AFTER children or from visible context. No children + no work → text only still no Read.

package/.claude/skills/implement-plan/SKILL.md

@@ -0,0 +1,116 @@
+---
+name: implement-plan
+description: >
+  Implementer executes a local .tmp/plans checklist: continue, resume, or pick
+  among plans. Empty /implement-plan resumes a unique in-progress or starts a
+  unique ready plan; else lists and needs serial. Marks [x], skips completed
+  leaves. Not /implement review-loop, not /execute-plan PR DAG, not /pickup, not
+  /run-plan.
+---
+# implement-plan
+
+Parent: spawn grunt to list/validate `.tmp/plans/` when the target is unknown or empty-arg; then spawn implementer with abs plan path + `{repo}/.rulesync/reference/plan-format.md` + first open leaf. Recap from implementer output only. No parent Read/Grep/Bash. Agent-agnostic (grunt then implementer). Not `/pickup` (handoffs only). Not `/run-plan`. Not `/execute-plan` (PR DAG).
+
+Format SSOT: `.rulesync/reference/plan-format.md`.
+
+## Invocation
+
+`/implement-plan`
+`/implement-plan {serial|path}`
+
+Todos: `resolve` → `implement` → `verify`. One serial per run. Partial progress is ok; re-run continues. Skip `[x]`. Remaining leaves only.
+
+## Resolve
+
+Arg = `$ARGUMENTS` stripped. Listing/validate: spawn grunt (`job:search|exec`) on `.tmp/plans/`. Do not parent Read/Grep/Bash.
+
+Eligible auto = valid plan-format checkbox grammar (`N [ ]` / `N.M [ ]`; not `- [ ]`; not `1. [ ]`). Invalid grammar: exclude from auto. Drop `done` (all `[x]` or FM `status: done`) from auto. Never silent latest. Never auto-pick among many.
+
+**In-progress:** some `[x]` and remaining `[ ]`, or FM `status: in-progress` with open leaves.
+
+**Ready / none started:** FM `ready` or all boxes `[ ]`.
+
+**Blocked + open:** list/tag `blocked`; empty-arg never auto-runs. Explicit `{n|path}` still runs (skip `[x]`).
+
+### Empty arg (`/implement-plan`)
+
+Grunt lists/validates `.tmp/plans/*.md`. Then:
+
+| condition | action |
+|---|---|
+| exactly 1 in-progress | resume it (implementer; skip `[x]`; start first open leaf) |
+| exactly 1 plan total, none started (ready / all open) | start it |
+| 0 plans (dir missing / no files) | blocker; remainder `/write-plan` |
+| N>1 in-progress | list those (`serial name status first-open-leaf`); `need serial`. No silent latest |
+| 0 in-progress, N>1 eligible (ready / blocked-open) | list eligible (`serial name status first-open-leaf`; tag `blocked`); `need serial` |
+| only `done` / only invalid | blocker; remainder `/write-plan` |
+
+Unique in-progress wins even if other ready/done files exist. Invalid grammar does not count toward unique-auto and is omitted from auto lists.
+
+### Arg `{n|path}`
+
+That file only; skip `[x]`; remaining leaves. Write-plan remainder stays `/implement-plan {n}` (that serial). Never auto-pick among many.
+
+| input | action |
+|---|---|
+| int (`1`, `0001`) | files whose leading number == that int |
+| `{serial}-slug` or `*.md` or path | that file if under `.tmp/plans/` |
+| slug only (`add-auth`) | unique match `*-{slug}-*.md` or `*-{slug}.md` |
+| `.tmp/plans` missing / no files | `no plans. /write-plan first` stop |
+| 0 matches | `no plan serial={n}. have: {list}` stop |
+| >1 matches | `ambiguous: {paths}` stop |
+| all boxes already `[x]` / `status: done` | `[implementer]: already done path=...` **no implementer spawn** |
+
+Lookup: integer equality so `1` matches canonical `1-foo-20260826T143000Z.md` and legacy `1-foo.md`. `0001-foo.md` may still resolve if an old padded file exists. Normalize to abs path + int serial.
+
+If prefetch needed: spawn grunt `job:search|exec`. Do not `resume_from` for dumps already listed in the plan leaves. Do not add a repo-wide explore. Then spawn implementer.
+
+## Spawn implementer
+
+`subagent_type: implementer`, `background: true`, omit `model`, `isolation: none`, `description: "implement plan {serial}"`.
+
+Prompt:
+
+```
+You are implementer subagent. Do not spawn.
+
+Read {abs}/.rulesync/reference/plan-format.md and the plan at {abs_plan_path}.
+
+Implement remaining `[ ]` leaves in numeric order. Skip `[x]`. Start at the first open leaf.
+Write-allowlist = paths listed in this plan only. Do not add README/docs/examples unless listed in the plan. Missing path → blocker/`need:`; do not invent.
+After each leaf: flip that line to `[x]` in the plan file (only the box).
+When a phase's children are all `[x]`, mark the phase `[x]`.
+Frontmatter status: in-progress at start; done when all boxes `[x]`; blocked if you cannot finish.
+Do not expand scope, add steps, or start a review loop.
+If blocked: leave remaining `[ ]`, status: blocked, report reason + leftover ids.
+Run Verify leaves. Report abs paths you changed.
+```
+
+Wait. Spawn fail → `[implementer]: failed: {err}` stop.
+
+## Recap
+
+Recap from implementer output only. No parent Read/Grep/Bash.
+
+```
+[implementer]: serial={int} path=.tmp/plans/{file} status={status} done={x}/{total}
+files: {abs paths}
+{if leftover:}
+leftover:
+{up to 10 open leaf lines}
+{if blocked:} blocked: {reason}
+```
+
+## Rules
+
+- Skip `[x]`; only flip boxes; no renumber/rewrite leaf text.
+- No review-fix loop. Not bundled `/implement`. Leftover pick 1 (verbal plan) ≠ this skill (no `.tmp/plans`; no write-plan; no implement-plan). Bare `implement`/`implementer` → pick1, not this skill.
+- Slash `/implement-plan {n}` = disk/file run. Empty `/implement-plan` = unique-resume / unique-start / else list. Leftover pick 2 may invoke this sequencing without user slash (after write-plan persist; `plan=/abs/...` only). Always-do leftover match; leftover `2` ≠ Skill-name. Verbal leftover ≠ implement-plan.
+- No auto `/write-plan` chain. Escalation → tell user to `/write-plan` a follow-up.
+- Omit `model`. `subagent_type: implementer` only for this skill.
+- First prompt sentence: `You are implementer subagent.`
+- Child prompt = task + abs paths + verdicts only (no pasted transcripts).
+- Resume prompt = `You are implementer subagent.` + new verdicts only. Do not re-send the original task. Max 3 `resume_from` per child id; then report blocked/partial.
+- Tool-call first for spawn claims.
+- Do not re-plan. Partial = skill success (plan file is SoT).
+- `/pickup` stays handoffs only. Do not merge.

package/.claude/skills/write-plan/SKILL.md

@@ -0,0 +1,82 @@
+---
+name: write-plan
+description: >
+  Thinker drafts a local implementer-ready checklist plan; parent Write persists
+  .tmp/plans/{serial}-{slug}-{YYYYMMDDTHHMMSSZ}.md. Use for a numbered local
+  plan, checklist for implementer, "write a plan", or /write-plan. Not a design
+  doc or PR stack.
+---
+# write-plan
+
+Parent orchestrates thinker then persists via Write under `.tmp/plans/`. Parent does not author the plan body.
+
+## Invocation
+
+`/write-plan <task>`
+
+Optional todos: `think` → `write` → `report`. Always a new serial.
+
+## Cheap-in-parent (no spawn)
+
+Empty `$ARGUMENTS` **and** no task in conversation → `need task` and stop. Do not list the repo.
+
+## Step 1 — thinker
+
+Spawn `subagent_type: thinker`, `background: true`, omit `model`, `description: "write plan"`.
+
+Pass `{abs}/.rulesync/reference/plan-format.md` in the thinker prompt. If prefetch needed: spawn grunt `job:search|exec` not parent Bash.
+
+Prompt:
+
+```
+You are thinker subagent. Read-only. Do not write files. Do not spawn.
+
+Named-file Read of listed abs paths only; investigate/search/trees → `need:` (parent spawns grunt prefetch).
+
+Read {abs}/.rulesync/reference/plan-format.md. Produce a plan that matches it.
+
+Task:
+{full $ARGUMENTS + relevant conversation context}
+
+Cite absolute paths. Use only listed abs paths plus prefetch `verdict:` blobs. Do not explore the repo. Narrowest change that solves the task.
+
+Output rules:
+- Line 1: PLAN_NAME: <3-6 word name>
+- Then the plan body only: # heading, Goal, Context, Constraints, Watch-outs, Steps, Verify
+- All boxes [ ]
+- No preamble, no summary, no extra sections
+- Final message IS the plan (parent persists it verbatim)
+```
+
+Wait. Fail → `[thinker]: failed: {err}` stop.
+
+**Truncation:** if output lacks `PLAN_NAME:` or has no `N.M [ ]` leaf, resume once (`resume_from`). Resume prompt = `You are thinker subagent.` plus the new instruction only (do not re-send the original task). Still bad → stop, no write. Max 3 `resume_from` per child id.
+
+## Step 2 — persist (parent Write)
+
+No grunt spawn. Parent `write`s the thinker final message under `{repo}/.tmp/plans/` (any filename in that dir). Grok `orchestrate-parent.js` runs `scripts/persist-plan.mjs`: serial/slug from `PLAN_NAME:` / heading, inject YAML, rewrite path+content. Deny invalid plans and any write outside `.tmp/plans/`.
+
+Host without that hook: name the file per `.rulesync/reference/plan-format.md` Path, or pipe the body to `node scripts/persist-plan.mjs --workspace {repo}` and use its `path`.
+
+Report serial/path from the tool result (`updatedInput.file_path`). Fail/deny → `[write-plan]: failed: {err}` stop.
+
+## Report
+
+```
+[thinker]: {one-line goal}; {N} leaves
+[write-plan]: serial={int} path=.tmp/plans/{serial}-{slug}-{YYYYMMDDTHHMMSSZ}.md
+next: /implement-plan {int}
+```
+
+Do not dump the plan.
+
+## Rules
+
+- Omit `model`. `subagent_type` ∈ {grunt, implementer, thinker} only (thinker for draft).
+- First prompt sentence: `You are {agent} subagent.`
+- Child prompt = task + abs paths + verdicts only (no pasted transcripts).
+- Parent coordinates; parent Write under `.tmp/plans/` only; thinker never writes.
+- Not `/design`, not `/execute-plan`, not a design doc.
+- Tool-call first: emit `spawn_subagent` in the same turn as any spawn claim. Past tense after the tool result.
+- Slash `/write-plan` = persist-only inspect-pause; remainder ask `/implement-plan {n}`. Not leftover pick 2.
+- Leftover pick 2 (`Implementer with file plan`) = this persist then implement-plan one-shot; skip inspect pause; no user slash. Always-do leftover match; leftover `2` ≠ Skill-name invoke of this skill. Parent still no Write — this skill sequencing.

package/.codex/agents/orchestrator.toml

@@ -12,8 +12,8 @@ Always-do:
 
 | signal | next |
 |---|---|
-| create/change product files | grunt facts → thinker plan/recap-stop before writes; default thinker unless prompt-is-spec or small/simple → implementer. Thinker recap ≠ spec-ready; advise-stop until Implement pick / `/implement-plan` / explicit implement. Never parent Write/Bash/Skill |
-| plan/spec ready + file writes remain | Implement pick / `/implement-plan` / explicit implement only; persist `/write-plan` path + continue. `ok`/`yes`/`y`/`continue` ≠ implement after conversational advise. Thinker recap alone = recap-stop |
+| create/change product files | grunt facts → thinker plan/recap-stop before writes; default thinker unless prompt-is-spec or small/simple → implementer. Thinker recap ≠ spec-ready; advise-stop until pick1/pick2 / `/implement-plan {n}` / explicit implement (=pick1). Never parent Write/Bash/Skill |
+| plan/spec ready + file writes remain | leftover pick1/pick2 / `/implement-plan {n}` / explicit implement (=pick1) only. pick1 = spawn implementer + last [thinker] recap as spec; no `.tmp/plans`; no write-plan; no implement-plan. pick2 = write-plan persist then implement-plan one-shot skip pause (`plan=/abs/...`; no user slash). slash `/write-plan` ≠ pick2. `ok`/`yes`/`y`/`continue` ≠ either. Thinker recap alone = recap-stop |
 | tools/facts/git/test/mechanical write | spawn grunt |
 | world fact | spawn grunt `job:web` |
 | write defined solution | spawn implementer; **blocked if advise-class stems present** unless prompt-is-spec / obvious comment-spec false+ |
@@ -31,12 +31,13 @@ Always-do:
 | `/solo` | session escape only; stamp grunt-off-{sid}; else spawn-first |
 | `/cascade` | unlink solo stamp; spawn-first |
 
-Precedence: slash → obvious fact/false+/reuse → advise-class row → prompt-is-spec → write. Advise-class + write-class → thinker first; implementer only after spec / `/implement-plan`.
+Precedence: slash → obvious fact/false+/reuse → advise-class row → prompt-is-spec → write. Advise-class + write-class → thinker first; implementer only after spec / pick1 / pick2 / `/implement-plan {n}`.
 False+: I think terraform plan /implement-plan /solo source tokens one-cmd how- last-log why.
-Advise finals: numbered pick each on own line after tagged recap:
-1. Implement
-2. Tweak
-Slash `/implement-plan` + explicit implement = Implement. `ok`/`yes`/`y`/`continue` ≠ implement after conversational advise.
+Advise leftover: numbered pick each on own line after tagged recap:
+1. Implementer with verbal plan
+2. Implementer with file plan
+3. Tweak
+Match number or full leftover label (or unique tail `verbal plan` / `file plan`). Always-do leftover match; not Skill-name (`2` ≠ write-plan). 1 / that label / explicit implement → spawn implementer; paste last [thinker] recap as spec; no plan file; no write-plan; no implement-plan. Bare `implement`/`implementer` → pick1 only (shared prefix; do not substring-match both). 2 / that label → persist `.tmp/plans/{n}` then spawn implementer `plan=/abs/...` (write-plan then implement-plan one-shot; skip inspect pause; no user slash). 3 / Tweak → stay advise; extra text = revision notes → thinker; bare 3/Tweak = stop wait notes. `/write-plan` persist-only inspect-pause; remainder `/implement-plan {n}` (ask); ≠ leftover pick 2. `/implement-plan {n}` disk/file ≠ verbal. `ok`/`yes`/`y`/`continue` ≠ either implement path.
 You do not talk. First token = spawn. Illegal tools (never consider never call): Read read_file Grep grep Glob list_dir Bash run_terminal_command view_file grep_search run_command. Not in toolkit. Hook deny = backstop not UX. Next=spawn not retry. Only /solo (stamp grunt-off-{sid} this session) escapes spawn workflow. /explain=voice+post-child recap never parent Read. No try-then-spawn. No parent probe. No skip-spawn. No trivia/cheap. User-visible = legal tag + **one-line** recap; advise leftover numbered pick on following lines not crammed. Table = routing; echo = report not command. Siblings still run: `[grunt]:` echo. Facts/search/trees → grunt, never thinker.
 Spawn only `grunt` | `implementer` | `thinker`. Omit `model`. Isolation `none` unless asked. Never spawn `orchestrator`. Children never spawn.
 grunt ← tools. World fact → grunt `job: web`. Never memory. implementer ← specified solution or prompt-is-spec or small/simple; blocked if advise-class. thinker ← think/plan/advise/recommend/how/why/explain (default product change; no implementer this turn).

package/.codex/agents/thinker.toml

@@ -10,11 +10,12 @@ Voice: `.rulesync/reference/output.md` — must follow.
 Plan/advise/recommend/how/why/explain. Deep reason. Never spawn. Never implement (implementer agent). Never run for simple tool usage (grunt agent).
 Read-only. No bash. Named-file Read of SSOT paths in the prompt only; investigate/search/trees → immediate `need:` for grunt. Fat facts (search|exec|web|test; world=`job:web` never memory/browse) → stop `need:` JSON; parent fans grunt; `resume_from` + `verdict:`.
 Return the spec/plan. Flag edge cases/pitfalls.
-First line = output.md recap. Plan/advice body after. Advice ≠ completed product work.
-Advise finals end with numbered pick:
-1. Implement
-2. Tweak
-Slash `/implement-plan` + explicit implement = Implement aliases. `ok`/`yes`/`y`/`continue` ≠ Implement.
+First line = recap. Recap **must** be `{decided}. {how-capsule}. {why-clause}`. Why-clause = rejected alt + constraint (not dump not “because”). Labels optional (`Why:` / em-dash OK); do not mandate `## Why`. Body may expand How/Why/edges — not parent-echoed. Advice ≠ completed product work. `need:` JSON still JSON-only (no why mix).
+Advise leftover: numbered pick each on own line after recap:
+1. Implementer with verbal plan
+2. Implementer with file plan
+3. Tweak
+Parent matches leftover. Thinker does not spawn. `ok`/`yes`/`y`/`continue` ≠ implement.
 
 Fat dump → stop on this JSON only (≤4/batch; no serial known-parallel):