@lovrozagar/grunt 0.4.2 → 0.5.2

package/.codex/agents/thinker.toml

@@ -8,13 +8,15 @@ developer_instructions = '''
 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:`.
+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) → stop `need:` JSON; parent fans grunt; `resume_from` + `verdict:`. Browse-vs-web advise only: INDEX `browser` row + `.rulesync/reference/browser.md`; route; do not browse. How-does-the-page-look → grunt not self.
 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: one empty blank line after recap/body then numbered pick each on own line. Always-print typed leftover triple (advise-class final recap only). One verb per recap; never jammed Implement/write. No leftover on `need:` JSON wait-grunt grunt/implementer recaps slash-only turns.
+1. {Implement|Write} with verbal plan
+2. {same verb} with file plan
+3. Tweak
+Type Implement = in-repo product writes. Type Write = persist-only/implementer-nonsense (SCA/advise-only/`/tmp`/inspect-pause). Recap remainder still names the human gate; leftover is not `4. Contact bank`. `/handoff` stays slash not Write pick1. Print all three. No omit 1/2. No frozen 4. Do not relabel 3. Parent echoes printed leftover. Thinker does not spawn. Bare `implement`/`implementer` → pick1 iff Implement-typed; else recap “no implementer this remainder”. Bare `write` → pick1 iff Write-typed. Type-mismatch → that recap no spawn. `ok`/`yes`/`y`/`continue` ≠ implement.
+Owned-defect: recap `Fix {path+bug}`. How=patch. Why=rejected workaround + we-own-it. Leftover always-print typed triple (Implement when in-repo writes). Workaround in why not remainder.
 
 Fat dump → stop on this JSON only (≤4/batch; no serial known-parallel):
 

package/.grok/agents/grunt.md

@@ -15,11 +15,12 @@ You CAN run npm/git/bash via `run_terminal_command`. Do NOT wait on MCP. Do NOT
 Run tools. Return output. Never spawn. Never implement complex/feature solutions (implementer agent). Never plan/advise (thinker agent).
 May write simple structural folders/files (scaffold/mkdir/touch/boilerplate only). Not feature solutions.
 Low-reason write: mechanical/repetitive/obvious; volume OK.
-Scratch/tmp → `{workspaceRoot}/.tmp/grunt/` only (mkdir as needed). Never `.tmp/` root, `.tmp/plans/`, `.tmp/grunt/handoffs/`, or `.tmp/orchestrator-logs/`. Repo scaffold/mkdir/touch/boilerplate stays in the real tree.
+Scratch/tmp → `{workspaceRoot}/.tmp/grunt/` root files only (mkdir as needed). Never `.tmp/` root. Never persist-owned reserved dirs `plans|handoffs|browser|orchestrator-logs` except owning scripts. No nested `.tmp/grunt/tmp/`. Repo scaffold/mkdir/touch/boilerplate stays in the real tree.
 
 `job: search|exec` → first action `node scripts/grunt-job.mjs --job search|exec --query …`; whole reply = stdout.
 `job: test` → grunt-job; `FALLBACK` (exit 2) → LLM tools.
 `job: web` and messy test → LLM grunt (web_search/web_fetch).
+Live page ≠ `job:web`. Read pasted `.rulesync/skills/browser/SKILL.md`. `.rulesync/reference/browser.md` only if engine/doctor. No `job:browse`.
 Browser → `node scripts/browser.mjs <verb>` (`nav|snap|click|fill|shot|pdf|stop`). Lightpanda default. Never MCP. Never raw Playwright. Never env knobs.
 Isolation/write reply ≤8 lines. Verdict grammar only — no dumps/recap/HTML/JSON/full logs:
 

package/.grok/agents/implementer.md

@@ -9,7 +9,7 @@ tools: read_file, grep, list_dir, write, search_replace, run_terminal_command, w
 ---
 Voice: `.rulesync/reference/output.md` — must follow.
 
-Implement specified solution. User prompt may be the spec; `.tmp/plans` not required for small/defined writes. Never spawn. Never run for simple tool usage (grunt agent). Never plan/advise (thinker agent). Never how/why/explain judgment.
+Implement specified solution. User prompt may be the spec; `.tmp/grunt/plans` not required for small/defined writes. Never spawn. Never run for simple tool usage (grunt agent). Never plan/advise (thinker agent). Never how/why/explain judgment.
 After write: validate+sim (mandatory). Fix hard failures. Return findings. Never skip validation
 DOM ⚠ → `node scripts/browser.mjs snap`. Visual ⚠ → `node scripts/browser.mjs shot`.
 Read/Grep/list_dir only if needed for edit. Prefer: implement the spec; dump via `need:`.

package/.grok/agents/orchestrator.md

@@ -8,15 +8,17 @@ mcpInheritance: none
 tools: spawn_subagent, write, todo_write, get_command_or_subagent_output, kill_command_or_subagent
 ---
 Voice: `.rulesync/reference/output.md` — cite once; apply every turn.
-en-US unless asked. every output maximal superterse. Fragments OK. Sacrifice grammar; keep meaning. Parent and child. Every turn, not final-only. no mid-turn chat; no narration while Agent runs; user-visible = legal `[role]:` + **one-line** recap. Advise leftover: numbered pick each on own line after recap. Zero user-visible tokens before spawn/peek. In-flight host Stop → only `[orchestrator]: wait grunt`.
+en-US unless asked. every output maximal superterse. Fragments OK. Sacrifice grammar; keep meaning. Parent and child. Every turn, not final-only. no mid-turn chat; no narration while Agent runs; user-visible = legal `[role]:` + **one-line** recap. Advise leftover: one empty blank line after recap/body then numbered pick each on own line. Zero user-visible tokens before spawn/peek. In-flight host Stop → only `[orchestrator]: wait grunt`.
 Protocol: `.rulesync/reference/cascade.md` (peek/kill table need:/resume). Do not paste.
 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 iff Implement-typed). Never parent Write/Bash/Skill |
+| plan/spec ready + file writes remain | leftover pick1/pick2 / `/implement-plan {n}` / explicit implement (=pick1 iff Implement-typed) only. Implement pick1 = spawn implementer + last [thinker] recap as spec; no `.tmp/grunt/plans`; no write-plan; no implement-plan. Implement pick2 = persist `.tmp/grunt/plans/{n}` then implementer `plan=/abs/...` one-shot skip pause. Write pick1 = `/tmp` persist recap; no implementer. Write pick2 = write-plan persist inspect-pause; remainder `/implement-plan {n}`; no implementer. slash `/write-plan` ≠ leftover 2. `ok`/`yes`/`y`/`continue` ≠ either. Thinker recap alone = recap-stop |
 | tools/facts/git/test/mechanical write | spawn grunt |
+| snippet / cite / "what is X" | spawn grunt `job:web`. URL-in-a-cite ≠ browse |
+| URL / browse / click / fill / snap / live DOM | spawn grunt; child prompt must include abs `.rulesync/skills/browser/SKILL.md` and `.rulesync/reference/browser.md`; Read then `node scripts/browser.mjs`; Lightpanda default; never websearch that page |
 | 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+ |
 | think / plan / advise / recommend / how / why / explain (ask us; not slash `/explain` not one-cmd/last-log/source-token) | spawn thinker; facts=grunt/`need:`; **no implementer this turn**. Repeat how/why/… + last [thinker] still visible + no new input/tools since → no spawn; echo last or /explain. Unsure → thinker |
@@ -27,22 +29,26 @@ Always-do:
 | children done + no findings | recap; advise-first stop wins. Else stop only if no writes remain and spawn count > 0 when the user asked for a file change |
 | `/parent` | spawn-first; hook last-ditch `parent-escape`; never Read/Bash |
 | `/handoff` | one-turn write `.tmp/grunt/handoffs/`; recap `[handoff]:` |
+| `/tmp` | one-turn write `.tmp/grunt/`; recap `[tmp]:` |
 | `/pickup` | spawn-first; grunt resolve if needed; never parent Read; not a mode |
 | `/write-plan` plan-only | recap; remainder `/implement-plan` (ask) |
 | `/explain` | spawn if facts/work; then human recap of child output; screenshot/visible=context no Read |
-| `/solo` | session escape only; stamp grunt-off-{sid}; else spawn-first |
-| `/cascade` | unlink solo stamp; spawn-first |
+| `/solo` | session escape; stamp spawn-mode-{sid} iff slash≠config; always unlink grunt-off; else spawn-first |
+| `/cascade` | restore cascade; stamp spawn-mode-{sid} iff slash≠config; always unlink grunt-off; spawn-first |
+| `/auto` | session leftover-gate auto; stamp auto-ask-{sid} iff slash≠config; not spawn-escape; not autofix |
+| `/ask` | session leftover-gate ask; stamp auto-ask-{sid} iff slash≠config; not leftover y/n; not pick 3 |
 
-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.
-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.
+Advise leftover: numbered pick each on own line after tagged recap; one empty blank line immediately before leftover 1. (leftover last; not adjacent to recap/body). Always-print typed leftover triple (advise-class final recap only). One verb per recap; never jammed Implement/write. No leftover on `need:` JSON wait-grunt grunt/implementer recaps slash-only turns.
+1. {Implement|Write} with verbal plan
+2. {same verb} with file plan
+3. Tweak
+Type Implement = in-repo product writes. Type Write = persist-only/implementer-nonsense (SCA/advise-only/`/tmp`/inspect-pause). Recap remainder still names the human gate; leftover is not `4. Contact bank`. `/handoff` stays slash not Write pick1. No omit 1/2. No frozen 4. Do not relabel 3. Parent echoes printed leftover. Match number or full leftover label (or unique tail `verbal plan` / `file plan`). Always-do leftover match printed lines; not Skill-name (`2` ≠ write-plan). Implement pick1 = spawn implementer; last [thinker] recap as spec; no `.tmp/grunt/plans`; no write-plan; no implement-plan. Implement pick2 = persist `.tmp/grunt/plans/{n}` then spawn implementer `plan=/abs/...` one-shot skip pause. Write pick1 = `/tmp` persist recap/body under `.tmp/grunt/`; no implementer. Write pick2 = write-plan persist inspect-pause; remainder `/implement-plan {n}`; no implementer this turn. 3 / Tweak → stay advise; extra text = revision notes → thinker; bare 3/Tweak = stop wait notes. Bare `implement`/`implementer` → pick1 iff Implement-typed; else recap “no implementer this remainder”; no spawn. Bare `write` → pick1 iff Write-typed; else not a match. Type-mismatch → that recap no spawn. Alias `Implementer with …` → pick1/pick2 iff Implement-typed. `/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 pick.
+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 spawn-mode-{sid} iff slash≠config; unlink grunt-off) 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 after one empty blank line not crammed (echo printed leftover; always-print typed triple). 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).
-Child prompt first sentence only: `You are {agent} subagent.` Then task + abs paths + verdicts only.
+grunt ← tools. Snippet/cite/"what is X" → grunt `job: web`. URL/browse/click/fill/snap/live DOM → grunt; paste skill+browser.md abs paths; never websearch that page. 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).
+Child prompt first sentence only: `You are {agent} subagent.` Then task + abs paths + verdicts only. Browse tags match → prompt must include abs `.rulesync/skills/browser/SKILL.md` and `.rulesync/reference/browser.md`.
 Peek every 60s/child; quote real host fields; `done|alive|stuck`; no invent; no auto-kill. Grok: `get_command_or_subagent_output` `timeout_ms=60000` every peek. Else GAP: block on spawn return = `done`. Stuck/blocked: quote host fields only.
 Child `need:` JSON → parse-need + parallel grunt; one `resume_from` + **new** verdicts only; max 3; no re-send task; no fresh-spawn.
 `/parent` hook last-ditch only. Skills spawn-first. Only `/solo` escapes spawn workflow. `/pickup` spawn-first; grunt resolve if needed; never parent Read; not a mode.

package/.grok/agents/thinker.md

@@ -10,13 +10,15 @@ tools: read_file
 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:`.
+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) → stop `need:` JSON; parent fans grunt; `resume_from` + `verdict:`. Browse-vs-web advise only: INDEX `browser` row + `.rulesync/reference/browser.md`; route; do not browse. How-does-the-page-look → grunt not self.
 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: one empty blank line after recap/body then numbered pick each on own line. Always-print typed leftover triple (advise-class final recap only). One verb per recap; never jammed Implement/write. No leftover on `need:` JSON wait-grunt grunt/implementer recaps slash-only turns.
+1. {Implement|Write} with verbal plan
+2. {same verb} with file plan
+3. Tweak
+Type Implement = in-repo product writes. Type Write = persist-only/implementer-nonsense (SCA/advise-only/`/tmp`/inspect-pause). Recap remainder still names the human gate; leftover is not `4. Contact bank`. `/handoff` stays slash not Write pick1. Print all three. No omit 1/2. No frozen 4. Do not relabel 3. Parent echoes printed leftover. Thinker does not spawn. Bare `implement`/`implementer` → pick1 iff Implement-typed; else recap “no implementer this remainder”. Bare `write` → pick1 iff Write-typed. Type-mismatch → that recap no spawn. `ok`/`yes`/`y`/`continue` ≠ implement.
+Owned-defect: recap `Fix {path+bug}`. How=patch. Why=rejected workaround + we-own-it. Leftover always-print typed triple (Implement when in-repo writes). Workaround in why not remainder.
 
 Fat dump → stop on this JSON only (≤4/batch; no serial known-parallel):
 

package/.grok/hooks/orchestrate-parent.js

@@ -2,7 +2,7 @@
 /** PreToolUse parent-deny on Claude+Grok+Antigravity; Stop = first-non-empty-line recap; stop-block survives host banners; SubagentStop is single-registration intercept.
 Parent Read/Grep/Glob/Bash/Web denied unless parent-escape (fat-gate still).
 SubagentStop intercepts need: search|exec with grunt-job verdicts.
-Stop: first-non-empty-line [orchestrator]:/[grunt]:/[implementer]:/[thinker]:/[handoff]: recap
+Stop: first-non-empty-line [orchestrator]:/[grunt]:/[implementer]:/[thinker]:/[handoff]:/[tmp]: recap
 | parent-escape once; else block. MAX_STOP=3. No isCheap/trivia.
 Empty lastAssistantMessage → transcript_path tail-scan. Fail-open: parse/crash → empty stdout, exit 0.
 */
@@ -25,16 +25,20 @@ import {
 } from "../../scripts/gate-fat-tools.mjs";
 import { persistPlan } from "../../scripts/persist-plan.mjs";
 import { persistHandoff } from "../../scripts/persist-handoff.mjs";
+import { persistTmp } from "../../scripts/persist-tmp.mjs";
 import { parseNeed } from "../../scripts/parse-need.mjs";
 import { resolveJobCwd, runJob } from "../../scripts/grunt-job.mjs";
+import { loadLeftoverGate, loadSpawnMode } from "../../scripts/grunt-config.mjs";
 
-export const ORCHESTRATOR_LOGS_DIR = ".tmp/orchestrator-logs";
+export const ORCHESTRATOR_LOGS_DIR = ".tmp/grunt/orchestrator-logs";
+/** One-release dual-read; drop next release. */
+export const LEGACY_ORCHESTRATOR_LOGS_DIR = ".tmp/orchestrator-logs";
 export const DENY_REASON =
   "First action=spawn implementer|grunt|thinker. Deny expected. Only /solo this session escapes.";
 export const STOP_REASONS = [
-  "Spawn: ⚠/validate/sim findings or writes remain after Implement pick/`/implement-plan`/explicit implement or parent just tried to Write → spawn implementer. Else facts → grunt. Else no spec/not small/simple → thinker then recap-stop. Else small/simple/defined → implementer. Thinker recap ≠ spec-ready. `ok`/`yes` ≠ implement. Else recap `[orchestrator]:` one recap line; advise leftover 1./2. each on own line after.",
-  "Still spawn: ⚠/validate/sim findings or writes remain after Implement pick/`/implement-plan`/explicit implement or parent just tried to Write → spawn implementer. Else facts → grunt. Else no spec/not small/simple → thinker then recap-stop. Else small/simple/defined → implementer. Thinker recap ≠ spec-ready. `ok`/`yes` ≠ implement. Else recap `[orchestrator]:` one recap line; advise leftover 1./2. each on own line after.",
-  "Last spawn: ⚠/validate/sim findings or writes remain after Implement pick/`/implement-plan`/explicit implement or parent just tried to Write → spawn implementer. Else facts → grunt. Else no spec/not small/simple → thinker then recap-stop. Else small/simple/defined → implementer. Thinker recap ≠ spec-ready. `ok`/`yes` ≠ implement. Else recap `[orchestrator]:` one recap line; advise leftover 1./2. each on own line after.",
+  "Spawn: ⚠/validate/sim findings or writes remain after Implement pick/`/implement-plan`/explicit implement or parent just tried to Write → spawn implementer. Else facts → grunt. Else no spec/not small/simple → thinker then recap-stop. Else small/simple/defined → implementer. Thinker recap ≠ spec-ready. `ok`/`yes` ≠ implement. Else recap `[orchestrator]:` one recap line; advise leftover numbered pick each on own line after (echo printed leftover; always-print typed triple).",
+  "Still spawn: ⚠/validate/sim findings or writes remain after Implement pick/`/implement-plan`/explicit implement or parent just tried to Write → spawn implementer. Else facts → grunt. Else no spec/not small/simple → thinker then recap-stop. Else small/simple/defined → implementer. Thinker recap ≠ spec-ready. `ok`/`yes` ≠ implement. Else recap `[orchestrator]:` one recap line; advise leftover numbered pick each on own line after (echo printed leftover; always-print typed triple).",
+  "Last spawn: ⚠/validate/sim findings or writes remain after Implement pick/`/implement-plan`/explicit implement or parent just tried to Write → spawn implementer. Else facts → grunt. Else no spec/not small/simple → thinker then recap-stop. Else small/simple/defined → implementer. Thinker recap ≠ spec-ready. `ok`/`yes` ≠ implement. Else recap `[orchestrator]:` one recap line; advise leftover numbered pick each on own line after (echo printed leftover; always-print typed triple).",
 ];
 const TRANSCRIPT_TAIL_BYTES = 512 * 1024;
 const PARENT_TOOLS = new Set([
@@ -58,12 +62,15 @@ const WRITE_TOOLS = new Set([
 ]);
 const BASH_TOOLS = new Set(["bash", "runterminalcommand", "runcommand"]);
 const SKILL_TOOLS = new Set(["skill"]);
-const PARENT_SKILLS = new Set([
+export const PARENT_SKILLS = new Set([
   "parent",
   "explain",
   "solo",
   "cascade",
+  "auto",
+  "ask",
   "handoff",
+  "tmp",
   "pickup",
   "write-plan",
   "implement-plan",
@@ -74,7 +81,11 @@ const MAX_INTERCEPT = 3;
 /** `/solo` enters single-agent mode; `/cascade` restores the orchestrator. */
 const SOLO_RE = /^\s*\/solo\s*$/;
 const CASCADE_RE = /^\s*\/cascade\s*$/;
+const AUTO_RE = /^\s*\/auto\s*$/;
+const ASK_RE = /^\s*\/ask\s*$/;
 const SOLO_STAMP = "grunt-off";
+export const AUTO_ASK_STAMP = "auto-ask";
+export const SPAWN_MODE_STAMP = "spawn-mode";
 
 
 function main() {
@@ -154,19 +165,17 @@ function preToolUse(data) {
   return 0;
 }
 
-/** Session flag, not one-turn. Fail-closed: an unreadable stamp keeps grunt on. */
+/** Session flag, not one-turn. Fail-closed: unreadable spawn-mode stamp is not solo. */
 export function isSoloMode(data) {
   try {
-    const p = soloStampPath(data);
-    return Boolean(p && fs.existsSync(p));
+    return spawnModeOf(data) === "solo";
   } catch {
     return false;
   }
 }
 
 function hasParentEscape(data) {
-  const p = stampPath(data, "parent-escape");
-  return Boolean(p && fs.existsSync(p));
+  return Boolean(resolveStamp(data, "parent-escape"));
 }
 
 function emitFat(data) {
@@ -198,13 +207,30 @@ function isUnderDir(filePath, workspaceRoot, segments) {
 }
 
 export function isUnderPlans(filePath, workspaceRoot) {
-  return isUnderDir(filePath, workspaceRoot, [".tmp", "plans"]);
+  return isUnderDir(filePath, workspaceRoot, [".tmp", "grunt", "plans"]);
 }
 
 export function isUnderHandoffs(filePath, workspaceRoot) {
   return isUnderDir(filePath, workspaceRoot, [".tmp", "grunt", "handoffs"]);
 }
 
+export const TMP_RESERVED_DIRS = new Set([
+  "plans",
+  "handoffs",
+  "browser",
+  "orchestrator-logs",
+]);
+
+export function isUnderTmp(filePath, workspaceRoot) {
+  if (!filePath || !workspaceRoot) return false;
+  const abs = path.isAbsolute(filePath)
+    ? path.resolve(filePath)
+    : path.resolve(workspaceRoot, filePath);
+  const root = path.resolve(workspaceRoot, ".tmp", "grunt");
+  if (path.dirname(abs) !== root) return false;
+  return !TMP_RESERVED_DIRS.has(path.basename(abs));
+}
+
 export function isAllowedParentGruntJob(command, workspaceRoot) {
   return isWorkspaceGruntJob(command, workspaceRoot, ["search", "exec"]);
 }
@@ -257,8 +283,18 @@ function parentWrite(data, toolInput) {
     "";
   const rewritten = rewriteGruntScratchPath(rawPath, ws);
   if (rewritten) rawPath = rewritten;
-  const handoff = isUnderHandoffs(rawPath, ws);
-  if (!handoff && !isUnderPlans(rawPath, ws)) {
+  let persist;
+  let invalid = "invalid plan";
+  if (isUnderPlans(rawPath, ws)) {
+    persist = persistPlan;
+    invalid = "invalid plan";
+  } else if (isUnderHandoffs(rawPath, ws)) {
+    persist = persistHandoff;
+    invalid = "invalid handoff";
+  } else if (isUnderTmp(rawPath, ws)) {
+    persist = persistTmp;
+    invalid = "invalid tmp";
+  } else {
     if (hasParentEscape(data)) {
       emit({ decision: "allow" });
       return 0;
@@ -267,12 +303,11 @@ function parentWrite(data, toolInput) {
     return 0;
   }
   const content = typeof toolInput.content === "string" ? toolInput.content : "";
-  const persist = handoff ? persistHandoff : persistPlan;
   const result = persist({ workspaceRoot: ws, content });
   if (!result.ok) {
     emit({
       decision: "deny",
-      reason: result.error || (handoff ? "invalid handoff" : "invalid plan"),
+      reason: result.error || invalid,
     });
     return 0;
   }
@@ -307,10 +342,7 @@ function rewriteSpawn(toolInput, data) {
 
 function postToolUse(data) {
   if (data.subagentType || data.subagent_type) return 0;
-  const stamp = stampPath(data, "tools-used");
-  if (!stamp) return 0;
-  fs.mkdirSync(path.dirname(stamp), { recursive: true });
-  fs.writeFileSync(stamp, "1");
+  writeStamp(data, "tools-used", "1");
   return 0;
 }
 
@@ -324,35 +356,41 @@ function isParentEscapePrompt(prompt) {
 }
 
 function userPromptSubmit(data) {
-  unlinkQuiet(stampPath(data, "tools-used"));
+  unlinkStamp(data, "tools-used");
   const prompt = userPromptOf(data);
   if (!isHostStopBanner(prompt)) {
-    unlinkQuiet(stampPath(data, "stop-block"));
-  }
-  // Sticky: only /solo and /cascade move it. Every other prompt leaves it alone.
-  if (SOLO_RE.test(prompt)) {
-    const solo = soloStampPath(data);
-    if (solo) {
-      fs.mkdirSync(path.dirname(solo), { recursive: true });
-      fs.writeFileSync(solo, "1");
+    unlinkStamp(data, "stop-block");
+  }
+  // Sticky: only exact /solo and /cascade move spawn-mode. Always unlink grunt-off.
+  if (SOLO_RE.test(prompt) || CASCADE_RE.test(prompt)) {
+    const token = SOLO_RE.test(prompt) ? "solo" : "cascade";
+    const cfg = loadSpawnMode(workspaceRootOf(data));
+    if (token === cfg) {
+      unlinkSpawnModeStamp(data);
+    } else {
+      writeSpawnModeStamp(data, token);
+    }
+    unlinkSoloStamp(data);
+  }
+  if (AUTO_RE.test(prompt) || ASK_RE.test(prompt)) {
+    const token = AUTO_RE.test(prompt) ? "auto" : "ask";
+    const cfg = loadLeftoverGate(workspaceRootOf(data));
+    if (token === cfg) {
+      unlinkAutoAskStamp(data);
+    } else {
+      writeAutoAskStamp(data, token);
     }
-  } else if (CASCADE_RE.test(prompt)) {
-    unlinkQuiet(soloStampPath(data));
   }
   if (isParentEscapePrompt(prompt)) {
-    const p = stampPath(data, "parent-escape");
-    if (p) {
-      fs.mkdirSync(path.dirname(p), { recursive: true });
-      fs.writeFileSync(p, "1");
-    }
+    writeStamp(data, "parent-escape", "1");
   } else {
-    unlinkQuiet(stampPath(data, "parent-escape"));
+    unlinkStamp(data, "parent-escape");
   }
   return 0;
 }
 
 const RECAP_TAG_RE =
-  /^\[(?:orchestrator|grunt|implementer|thinker|handoff)\]:/;
+  /^\[(?:orchestrator|grunt|implementer|thinker|handoff|tmp)\]:/;
 const WAIT_GRUNT = "[orchestrator]: wait grunt";
 
 function firstNonEmptyStripped(msg) {
@@ -376,6 +414,38 @@ export function isWaitGruntExact(msg) {
   return nonempty[0].replace(/^[\s`*_>]+/, "") === WAIT_GRUNT;
 }
 
+function nonemptyLines(msg) {
+  return String(msg || "")
+    .split("\n")
+    .filter((l) => l.trim());
+}
+
+/** Format-only leftover triple. No leftover-number → skill map. */
+export function hasLeftoverTriple(msg) {
+  const lines = String(msg || "")
+    .split("\n")
+    .map((l) => l.replace(/^[\s`*_>]+/, "").trim());
+  const hit = (re) => lines.some((l) => re.test(l));
+  const tweak = hit(/^3\.\s+Tweak$/);
+  const impl =
+    hit(/^1\.\s+Implement with verbal plan$/) &&
+    hit(/^2\.\s+Implement with file plan$/);
+  const write =
+    hit(/^1\.\s+Write with verbal plan$/) &&
+    hit(/^2\.\s+Write with file plan$/);
+  return Boolean(tweak && (impl || write));
+}
+
+/** Ask leftover-required: any `[thinker]:`; `[orchestrator]:` iff >1 nonempty line (except exact wait-grunt); `[grunt]|[implementer]|[handoff]|[tmp]:` exempt. Auto waives in Stop. */
+export function leftoverRequiredAsk(msg) {
+  if (isWaitGruntExact(msg)) return false;
+  const first = firstNonEmptyStripped(msg);
+  if (/^\[(?:grunt|implementer|handoff|tmp)\]:/.test(first)) return false;
+  if (/^\[thinker\]:/.test(first)) return true;
+  if (/^\[orchestrator\]:/.test(first)) return nonemptyLines(msg).length > 1;
+  return false;
+}
+
 function payloadAssistantMessage(data) {
   if (!data || typeof data !== "object") return "";
   const camel = data.lastAssistantMessage;
@@ -466,9 +536,8 @@ function stop(data) {
   // Before the parent-escape consume: solo must never burn the one-turn stamp.
   if (isSoloMode(data)) return 0;
 
-  const escapeStamp = stampPath(data, "parent-escape");
-  if (escapeStamp && fs.existsSync(escapeStamp)) {
-    unlinkQuiet(escapeStamp);
+  if (resolveStamp(data, "parent-escape")) {
+    unlinkStamp(data, "parent-escape");
     return 0;
   }
 
@@ -483,22 +552,22 @@ function stop(data) {
   if (waitFirst && !isWaitGruntExact(msg)) {
     // fall through to block — leftover lines not allowed on mid-turn wait
   } else if (isRecap(msg)) {
-    return 0;
+    if (
+      leftoverGateOf(data) !== "auto" &&
+      leftoverRequiredAsk(msg) &&
+      !hasLeftoverTriple(msg)
+    ) {
+      // fall through to block — leftover-required under ask
+    } else {
+      return 0;
+    }
   }
 
-  const stopStamp = stampPath(data, "stop-block");
-  let n = 0;
-  if (stopStamp && fs.existsSync(stopStamp)) {
-    n = parseInt(fs.readFileSync(stopStamp, "utf8"), 10);
-    if (!Number.isFinite(n) || n < 0) n = 0;
-  }
+  let n = readStampInt(data, "stop-block");
   if (n >= MAX_STOP) {
     return 0;
   }
-  if (stopStamp) {
-    fs.mkdirSync(path.dirname(stopStamp), { recursive: true });
-    fs.writeFileSync(stopStamp, String(n + 1));
-  }
+  writeStamp(data, "stop-block", String(n + 1));
   const reasonText = STOP_REASONS[Math.min(n, STOP_REASONS.length - 1)];
   emit({ decision: "block", reason: reasonText });
   return 0;
@@ -522,12 +591,7 @@ function interceptNeed(data, hookEventName) {
     return 0;
   }
 
-  const interceptStamp = stampPath(data, "need-intercept");
-  let n = 0;
-  if (interceptStamp && fs.existsSync(interceptStamp)) {
-    n = parseInt(fs.readFileSync(interceptStamp, "utf8"), 10);
-    if (!Number.isFinite(n) || n < 0) n = 0;
-  }
+  let n = readStampInt(data, "need-intercept");
   if (n >= MAX_INTERCEPT) {
     return 0;
   }
@@ -557,10 +621,7 @@ function interceptNeed(data, hookEventName) {
     }
     parts.push(String(result.text || "").trimEnd());
   }
-  if (interceptStamp) {
-    fs.mkdirSync(path.dirname(interceptStamp), { recursive: true });
-    fs.writeFileSync(interceptStamp, String(n + 1));
-  }
+  writeStamp(data, "need-intercept", String(n + 1));
   const reason = parts.join("\n");
   emit({
     decision: "block",
@@ -579,6 +640,42 @@ function stampPath(data, prefix) {
   return path.join(root, ORCHESTRATOR_LOGS_DIR, prefix + "-" + sid);
 }
 
+function legacyStampPath(data, prefix) {
+  const root = workspaceRootOf(data);
+  const sid = sessionIdOf(data) || "default";
+  if (!root) return null;
+  return path.join(root, LEGACY_ORCHESTRATOR_LOGS_DIR, prefix + "-" + sid);
+}
+
+function resolveStamp(data, prefix) {
+  const neu = stampPath(data, prefix);
+  if (neu && fs.existsSync(neu)) return neu;
+  const old = legacyStampPath(data, prefix);
+  if (old && fs.existsSync(old)) return old;
+  return null;
+}
+
+function writeStamp(data, prefix, body) {
+  const p = stampPath(data, prefix);
+  if (!p) return null;
+  fs.mkdirSync(path.dirname(p), { recursive: true });
+  fs.writeFileSync(p, body);
+  return p;
+}
+
+function unlinkStamp(data, prefix) {
+  unlinkQuiet(stampPath(data, prefix));
+  unlinkQuiet(legacyStampPath(data, prefix));
+}
+
+function readStampInt(data, prefix) {
+  const p = resolveStamp(data, prefix);
+  if (!p) return 0;
+  const n = parseInt(fs.readFileSync(p, "utf8"), 10);
+  if (!Number.isFinite(n) || n < 0) return 0;
+  return n;
+}
+
 function sessionIdOf(data) {
   return String(
     process.env.GROK_SESSION_ID ||
@@ -595,6 +692,127 @@ function soloStampPath(data) {
   return path.join(root, ORCHESTRATOR_LOGS_DIR, SOLO_STAMP + "-" + sid);
 }
 
+function legacySoloStampPath(data) {
+  const root = workspaceRootOf(data);
+  const sid = sessionIdOf(data);
+  if (!root || !sid) return null;
+  return path.join(root, LEGACY_ORCHESTRATOR_LOGS_DIR, SOLO_STAMP + "-" + sid);
+}
+
+function resolveSoloStamp(data) {
+  const neu = soloStampPath(data);
+  if (neu && fs.existsSync(neu)) return neu;
+  const old = legacySoloStampPath(data);
+  if (old && fs.existsSync(old)) return old;
+  return null;
+}
+
+function unlinkSoloStamp(data) {
+  unlinkQuiet(soloStampPath(data));
+  unlinkQuiet(legacySoloStampPath(data));
+}
+
+/** Spawn-mode stamp: never share a `default` stamp across sid-less sessions. */
+export function spawnModeStampPath(data) {
+  const root = workspaceRootOf(data);
+  const sid = sessionIdOf(data);
+  if (!root || !sid) return null;
+  return path.join(root, ORCHESTRATOR_LOGS_DIR, SPAWN_MODE_STAMP + "-" + sid);
+}
+
+function legacySpawnModeStampPath(data) {
+  const root = workspaceRootOf(data);
+  const sid = sessionIdOf(data);
+  if (!root || !sid) return null;
+  return path.join(root, LEGACY_ORCHESTRATOR_LOGS_DIR, SPAWN_MODE_STAMP + "-" + sid);
+}
+
+function resolveSpawnModeStamp(data) {
+  const neu = spawnModeStampPath(data);
+  if (neu && fs.existsSync(neu)) return neu;
+  const old = legacySpawnModeStampPath(data);
+  if (old && fs.existsSync(old)) return old;
+  return null;
+}
+
+function writeSpawnModeStamp(data, body) {
+  const p = spawnModeStampPath(data);
+  if (!p) return null;
+  fs.mkdirSync(path.dirname(p), { recursive: true });
+  fs.writeFileSync(p, body);
+  return p;
+}
+
+function unlinkSpawnModeStamp(data) {
+  unlinkQuiet(spawnModeStampPath(data));
+  unlinkQuiet(legacySpawnModeStampPath(data));
+}
+
+/** Valid stamp solo|cascade wins; else grunt-off presence as solo; else config. Unreadable/bad body ignored. */
+export function spawnModeOf(data) {
+  try {
+    const p = resolveSpawnModeStamp(data);
+    if (p) {
+      const body = fs.readFileSync(p, "utf8").trim();
+      if (body === "solo" || body === "cascade") return body;
+    }
+  } catch {
+    // unreadable stamp → fall through
+  }
+  if (resolveSoloStamp(data)) return "solo";
+  return loadSpawnMode(workspaceRootOf(data));
+}
+
+/** Leftover-gate stamp: never share a `default` stamp across sid-less sessions. */
+export function autoAskStampPath(data) {
+  const root = workspaceRootOf(data);
+  const sid = sessionIdOf(data);
+  if (!root || !sid) return null;
+  return path.join(root, ORCHESTRATOR_LOGS_DIR, AUTO_ASK_STAMP + "-" + sid);
+}
+
+function legacyAutoAskStampPath(data) {
+  const root = workspaceRootOf(data);
+  const sid = sessionIdOf(data);
+  if (!root || !sid) return null;
+  return path.join(root, LEGACY_ORCHESTRATOR_LOGS_DIR, AUTO_ASK_STAMP + "-" + sid);
+}
+
+function resolveAutoAskStamp(data) {
+  const neu = autoAskStampPath(data);
+  if (neu && fs.existsSync(neu)) return neu;
+  const old = legacyAutoAskStampPath(data);
+  if (old && fs.existsSync(old)) return old;
+  return null;
+}
+
+function writeAutoAskStamp(data, body) {
+  const p = autoAskStampPath(data);
+  if (!p) return null;
+  fs.mkdirSync(path.dirname(p), { recursive: true });
+  fs.writeFileSync(p, body);
+  return p;
+}
+
+function unlinkAutoAskStamp(data) {
+  unlinkQuiet(autoAskStampPath(data));
+  unlinkQuiet(legacyAutoAskStampPath(data));
+}
+
+/** Stamp body auto|ask wins; else config; else ask. Bad stamp body ignored. */
+export function leftoverGateOf(data) {
+  try {
+    const p = resolveAutoAskStamp(data);
+    if (p) {
+      const body = fs.readFileSync(p, "utf8").trim();
+      if (body === "auto" || body === "ask") return body;
+    }
+  } catch {
+    // unreadable stamp → fall through
+  }
+  return loadLeftoverGate(workspaceRootOf(data));
+}
+
 function unlinkQuiet(p) {
   if (!p) return;
   try {