@oh-my-pi/pi-coding-agent 14.5.8 → 14.5.10

package/src/modes/utils/ui-helpers.ts

@@ -414,7 +414,7 @@ export class UiHelpers {
 		this.ctx.ui.requestRender();
 	}
 
-	renderInitialMessages(): void {
+	renderInitialMessages(prebuiltContext?: SessionContext): void {
 		// This path is used to rebuild the visible chat transcript (e.g. after custom/debug UI).
 		// Clear existing rendered chat first to avoid duplicating the full session in the container.
 		this.ctx.chatContainer.clear();
@@ -422,8 +422,8 @@ export class UiHelpers {
 		this.ctx.pendingBashComponents = [];
 		this.ctx.pendingPythonComponents = [];
 
-		// Get aligned messages and entries from session context
-		const context = this.ctx.sessionManager.buildSessionContext();
+		// Reuse a pre-built context when available (e.g. from navigateTree) to avoid a second O(N) walk.
+		const context = prebuiltContext ?? this.ctx.sessionManager.buildSessionContext();
 		this.ctx.renderSessionContext(context, {
 			updateFooter: true,
 			populateHistory: true,
@@ -610,9 +610,22 @@ export class UiHelpers {
 				await this.ctx.session.prompt(message.text);
 			}
 
-			const promptPromise = this.ctx.session.prompt(firstPrompt.text).catch((error: unknown) => {
-				restoreQueue(error);
-			});
+			// Pass streamingBehavior so that if the session is still streaming when
+			// compaction-end fires (race window between isStreaming flipping false and
+			// the event landing here), prompt() routes the message into the steer/
+			// follow-up queue instead of throwing AgentBusyError. When the session is
+			// genuinely idle, streamingBehavior is ignored and a fresh prompt runs as
+			// before. This keeps the steer preview honest: if delivery has to be
+			// deferred, the message lands in the same queue every other consumer
+			// (Alt+Up dequeue, post-stream drain) already drains, instead of being
+			// stranded in compactionQueuedMessages with no drainer.
+			const promptPromise = this.ctx.session
+				.prompt(firstPrompt.text, {
+					streamingBehavior: firstPrompt.mode === "followUp" ? "followUp" : "steer",
+				})
+				.catch((error: unknown) => {
+					restoreQueue(error);
+				});
 
 			for (const message of rest) {
 				if (this.ctx.isKnownSlashCommand(message.text)) {

package/src/prompts/system/auto-continue.md

@@ -0,0 +1 @@
+Resume work on the user's most recent intent. Re-read the kept recent messages above the summary to confirm what the user asked for last; if their latest request supersedes earlier plans recorded in the summary, follow the latest request. If there is nothing left to do, say so briefly instead of inventing further work.

package/src/prompts/tools/atom.md

@@ -1,26 +1,45 @@
-Your patch language is a compact, file-oriented edit format.
+Your patch language is a compact, line-anchored edit format.
 
-When emitting a patch, the first non-blank line **MUST** be `---PATH`.
-A Lid is the anchor emitted in read/grep etc. (line number + id, e.g. `5th`).
+A patch contains one or more file sections. The first non-blank line of every section **MUST** be `---PATH`.
+A "Lid" is a per-line anchor emitted by `read`, `grep`, etc. — `<lineNumber><2-letter-hash>`, e.g. `5th`, `123ab`. You **MUST** copy a Lid verbatim from the latest output for the file you're editing.
+
+This format is purely textual. The tool has NO awareness of language, indentation, brackets, fences, or table widths. You are responsible for emitting valid syntax in your replacements/insertions.
 
 <ops>
----PATH  start editing PATH with cursor at EOF
-!rm      delete PATH
-!mv X    move file to X
-$        move cursor to BOF
-^        move cursor to EOF
-@Lid     move cursor after Lid
-+X       insert X at the cursor; `+` alone inserts a blank line
-Lid=X    replace whole line with X; `Lid=` blanks it out
--Lid     delete line (repeat for multi)
+---PATH    start a section editing PATH; cursor begins at EOF
+^          move cursor to BOF (before line 1)
+$          move cursor to EOF (after the last line)
+@Lid       move cursor to AFTER the anchored line (does not modify the file)
+^Lid       move cursor to BEFORE the anchored line (does not modify the file)
++TEXT      insert one line containing TEXT at the cursor
++          insert one blank line at the cursor
+Lid=TEXT   replace the anchored line with TEXT
+LidA..LidB=TEXT replace the range with one line; following `\TEXT` lines append literal lines to the replacement
+\TEXT      append literal TEXT to the active replacement (after `Lid=…` or `LidA..LidB=…`)
+\          append a blank line to the active replacement
+Lid=       blank the anchored line's content but KEEP the line (results in an empty line, NOT a removed line; use `-Lid` to remove)
+-Lid       delete the anchored line (repeat for multi-line delete)
+-LidA..LidB delete the contiguous line range LidA..LidB (inclusive)
+!rm        delete the section's PATH (**MUST** be the only op in the section)
+!mv DEST   rename the section's PATH to DEST (**MUST** be the only op in the section)
 </ops>
 
 <rules>
-- You may have multiple `---PATH` sections to edit multiple files at once.
-- Ops starting with `$` / `^` / `@Lid` do not alter lines; you must still issue an op like `+` afterwards.
-- Consecutive `+X` ops insert consecutive lines.
-- `Lid=X` replaces the whole line. X must be the complete new line, not a fragment.
-- To rewrite multiple adjacent lines, delete each with `-Lid` then emit the new content as `+TEXT` lines. Do not stack `Lid=X` over a contiguous range — it requires the new block to match the old line count and silently corrupts the file when they differ.
+- Cursor-only ops (`^`, `$`, `@Lid`, `^Lid`) reposition without modifying. To insert anything you **MUST** follow them with `+TEXT` (or `+` for a blank).
+- TEXT in `+TEXT`, `Lid=TEXT`, and `\TEXT` is literal line content, INCLUDING leading whitespace. You **MUST NOT** trim or re-indent it.
+- Consecutive `+TEXT` ops produce consecutive lines in the order written. You **MUST NOT** separate them with a stray `+` unless you intend to insert a blank line.
+- `Lid=TEXT` rewrites ONE line. To rewrite K adjacent lines, you **MUST** use `LidA..LidB=FIRST_LINE` followed immediately by `\NEXT_LINE` continuation lines (canonical form for any block replacement). You **MUST** use bare `\` for blank replacement lines.
+- You **MUST** prefix every replacement continuation line with `\`, especially when the replacement line starts with edit syntax characters such as `#`, `+`, `-`, `@`, `$`, `^`, `!`, or a Lid-shaped token.
+- `\TEXT` **MUST** appear only immediately after an active `Lid=…` or `LidA..LidB=…` replacement. It **MUST NOT** be used as a general insert operator.
+- A `\TEXT` line **MUST** be the immediate continuation of a `Lid=…` or `LidA..LidB=…` op on the line above (or another `\` line rooted in one). If the line above is `+TEXT`, a bare Lid, a cursor op, or whitespace, the `\` is invalid and the tool will not interpret it as part of a replacement.
+- The legacy `-LidA..LidB` + `+TEXT…` block-rewrite form also works.
+- To insert ABOVE a line, you **MUST** use `^Lid` then `+TEXT`. To insert above line 1, you **MUST** use `^` (BOF) then `+TEXT`. To insert below a line, you **MUST** use `@Lid` then `+TEXT`.
+- Multiple `---PATH` sections **MAY** appear in one input; each section is applied in order.
+- `!rm` / `!mv DEST` **MUST NOT** be combined with line edits in the same section.
+- Lids contain a content hash. If a line has changed since you read it, the tool rejects the edit and shows the current content; you **MUST** re-read and retry with fresh Lids. Small drift (≤5 lines) where the original hash still matches a nearby line auto-rebases with a warning. Larger shifts may show a hash-only candidate, but two-letter hashes collide; verify surrounding content or re-read before using it.
+- After `+TEXT` (or `+`) the cursor advances past the inserted line, so consecutive `+TEXT` ops stack in order. After `Lid=TEXT` the cursor sits on the modified anchor; after `-Lid` it sits on the slot the deleted line vacated. You **MUST** use a fresh `@Lid` / `^Lid` / `^` / `$` to reposition.
+- The tool is syntax-blind: it will not check brackets, indentation, table column counts, or fence integrity. You **MUST** verify indentation-sensitive or structured files after editing (Python, Markdown tables/fences).
+- A section whose PATH does not yet exist creates the file from your `+TEXT` lines (use `^` or `$` then `+TEXT…`). No separate "create file" op is needed.
 </rules>
 
 <case file="a.ts">
@@ -33,11 +52,11 @@ Lid=X    replace whole line with X; `Lid=` blanks it out
 </case>
 
 <examples>
-# Replace line
+# Replace one line (preserve the leading tab from the original)
 ---a.ts
 {{hrefr 5}}=	return clean.trim().toUpperCase();
 
-# Rewrite multiple adjacent lines (delete the old, insert the new)
+# Rewrite multiple adjacent lines (delete each, then insert new content)
 ---a.ts
 -{{hrefr 3}}
 -{{hrefr 4}}
@@ -47,48 +66,84 @@ Lid=X    replace whole line with X; `Lid=` blanks it out
 +	return (name || DEF).trim().toUpperCase();
 +}
 
-# Append after
+# Same rewrite using a range (equivalent to four `-Lid` lines)
 ---a.ts
-@{{hrefr 4}}
-+	const suffix = "";
+-{{hrefr 3}}..{{hrefr 6}}
++export function label(name: string): string {
++	return (name || DEF).trim().toUpperCase();
++}
 
-# Delete a line
+# Replace a contiguous range with one line (range-replace shorthand)
 ---a.ts
--{{hrefr 2}}
+{{hrefr 3}}..{{hrefr 6}}=export const label = (name: string) => (name || DEF).trim().toUpperCase();
 
-# Prepend and append
+# Replace a contiguous range with multiple lines (continuation form)
 ---a.ts
-$
+{{hrefr 3}}..{{hrefr 6}}=export function label(name: string): string {
+\	return (name || DEF).trim().toUpperCase();
+\}
+
+# Replace a block with a longer multi-line block, including blank lines (canonical form for refactors)
+---a.ts
+{{hrefr 3}}..{{hrefr 6}}=/** Format a display label, falling back to DEF when empty. */
+\export function label(name: string): string {
+\	const clean = (name || DEF).trim();
+\
+\	if (clean.length === 0) return DEF;
+\	return clean.toUpperCase();
+\}
+
+# Insert ABOVE a line
+---a.ts
+^{{hrefr 5}}
++	const debug = false;
+
+# Insert BELOW a line
+---a.ts
+@{{hrefr 4}}
++	const debug = false;
+
+# Insert above the first line (use BOF)
+---a.ts
+^
 +// Copyright (c) 2026
 +
-^
+
+# Append at end of file
+---a.ts
+$
 +export { DEF };
 
-# File ops
+# Delete a single line
 ---a.ts
-!rm
----b.ts
-!mv a.ts
+-{{hrefr 2}}
 
-# Wrong: `@Lid=TEXT` is not replacement syntax
+# Delete the file (no other ops in the section)
 ---a.ts
-@{{hrefr 5}}=	return clean.trim().toUpperCase();
+!rm
 
-# Wrong: do not split `Lid=TEXT` across lines
+# Rename a file
 ---a.ts
-{{hrefr 5}}=
-	return clean.trim().toUpperCase();
+!mv b.ts
 
-# Wrong: do not replace by deleting then adding
+# Multi-file edit in one input
 ---a.ts
--{{hrefr 5}}
-+{{hrefr 5}}=	return clean.trim().toUpperCase();
+{{hrefr 1}}=const DEF = "user";
+---other.ts
+$
++// new footer
 </examples>
 
 <critical>
-- Copy Lids **EXACTLY** from prior tool output. Never guess, shorten, or omit the letters.
-- Only emit lines that change. Never repeat unchanged context — anchors imply it.
-- This is **NOT** unified diff. Never send `@@`, `-OLD` / `+NEW` pairs, or unchanged context.
-- Never split `Lid=TEXT` across two physical lines.
-- Never stack `Lid=X` over a contiguous range. Use `-Lid`+`+TEXT` for block rewrites.
+- You **MUST** copy Lids EXACTLY from the latest read/grep output. You **MUST NOT** guess, shorten, drop letters, or invent line numbers.
+- Current/added preview lines include fresh `LINE+hash|content` anchors. Removed preview lines show deleted content and **MUST NOT** be reused as anchors.
+- You **MUST** emit only lines that change. You **MUST NOT** echo unchanged context; the anchor implies position.
+- You **MUST NOT** write `Lid=<sameTextThatIsAlreadyOnThatLine>`; the tool reports a no-op (no change applied). Emit `Lid=TEXT` only when TEXT differs.
+- A line of the form `Lid|content` (a Lid, then `|`, then text, with NO leading `+`/`-`/`^`/`@`/`\`/`=`/`..`) is **FORBIDDEN**. That shape only appears in `read`/`grep` output as an anchor for *you*; it is never an edit op. If you copy a `Lid|content` line verbatim from a read into a patch, you have made an error — every edit op must start with `+`, `-`, `^`, `@`, `\`, `$`, `!`, or a Lid immediately followed by `=` or `..`.
+- To replace a contiguous block with new content, the canonical form is `LidA..LidB=FIRST_LINE` + `\NEXT_LINE…`. You **MUST NOT** write the old block and then the new block — that is unified-diff thinking and the tool does not understand it. If you find yourself emitting pre-image lines (with or without operators) before your new content, STOP and rewrite the section as a single range-replace.
+- TEXT after `=`, `+`, or `\` includes leading whitespace verbatim. You **MUST NOT** trim or re-indent it.
+- This is NOT unified diff. You **MUST NOT** write `@@` headers, `-OLD`/`+NEW` pairs, context lines, or `+Lid|…` (bad: `+5th|new text`; good: `5th=new text`).
+- You **MUST NOT** split `Lid=TEXT` across two physical lines.
+- For a contiguous range replacement, you **MAY** use either `Lid=FIRST_LINE` + `\NEXT_LINE…` (extends one anchor) or `LidA..LidB=FIRST_LINE` + `\NEXT_LINE…` (collapses an existing range), or fall back to `-LidA..LidB` + `+TEXT…` (delete + insert).
+- The tool is syntax-blind. Indentation, brackets, fences, table widths — you remain responsible.
 </critical>

package/src/prompts/tools/exit-plan-mode.md

@@ -1,40 +1,6 @@
-Signals plan completion, requests user approval, and provides the final plan title for handoff.
+Submits a finalized implementation plan for user approval.
 
-<conditions>
-Use when:
-- Plan written to `local://PLAN.md`
-- No unresolved questions about requirements or approach
-- Ready for user review and approval
-</conditions>
-
-<instruction>
-- You **MUST** write plan to plan file BEFORE calling this tool
-- Tool reads plan from file—does not take plan content as parameter
-- You **MUST** provide a `title` argument for the final plan artifact (example: `WP_MIGRATION_PLAN`)
-- `.md` is optional in `title`; it is appended automatically when omitted
-- User sees plan contents when reviewing
-</instruction>
-
-<output>
-Presents plan to user for approval. If approved, plan mode exits with full tool access restored and the plan is renamed to `local://<title>.md`.
-</output>
-
-<examples>
-# Ready
-Plan complete at local://PLAN.md, no open questions.
-→ Call `exit_plan_mode` with `{ "title": "WP_MIGRATION_PLAN" }`
-# Unclear
-Unsure about auth method (OAuth vs JWT).
-→ Use `ask` first to clarify, then call `exit_plan_mode`
-</examples>
-
-<avoid>
-- **MUST NOT** call before plan is written to file
-- **MUST NOT** omit `title`
-- **MUST NOT** use `ask` to request plan approval (this tool does that)
-- **MUST NOT** call after pure research tasks (no implementation planned)
-</avoid>
-
-<critical>
-You **MUST** only use when planning implementation steps. Research tasks (searching, reading, understanding) do not need this tool.
-</critical>
+Write the plan to `local://PLAN.md` first, then call this with `title` (e.g. `WP_MIGRATION_PLAN`); on approval the file is renamed to `local://<title>.md` and full tool access is restored.
+- Use only after planning implementation steps; not for pure research.
+- **MUST NOT** call before the plan file exists.
+- **MUST NOT** use `ask` to request plan approval — this tool does that.

package/src/prompts/tools/github.md

@@ -4,9 +4,9 @@ GitHub CLI tool with a single op-based dispatch. Wraps `gh` for repository, issu
 Pick the operation via `op`. Each op uses a subset of the parameters:
 - `repo_view` — Read repository metadata. Optional `repo` (owner/repo) and `branch`. Falls back to the current checkout or default `gh` repo.
 - `issue_view` — Read an issue. Required `issue` (number or URL). Optional `repo`. Set `comments: false` to skip discussion.
-- `pr_view` — Read a pull request, including reviews and inline review comments. Optional `pr` (number, URL, or branch); omitting it targets the current branch's PR. Optional `repo`. Set `comments: false` for a lighter summary.
-- `pr_diff` — Read a pull request diff. Optional `pr`, `repo`. Set `nameOnly: true` for changed file names. Use `exclude` to drop generated paths from the diff.
-- `pr_checkout` — Check a pull request out into a dedicated git worktree. Optional `pr`, `repo`, `branch` (local), `worktree` (path), `force` (reset existing local branch).
+- `pr_view` — Read one or more pull requests, including reviews and inline review comments. Optional `pr` (number, URL, branch, or array of any — pass an array to fetch multiple PRs in one call); omitting it targets the current branch's PR. Optional `repo`. Set `comments: false` for a lighter summary.
+- `pr_diff` — Read one or more pull request diffs. Optional `pr` (single identifier or array for batch). Optional `repo`. Set `nameOnly: true` for changed file names. Use `exclude` to drop generated paths from the diff.
+- `pr_checkout` — Check one or more pull requests out into dedicated git worktrees. Optional `pr` (number, URL, branch, or array of any of those — pass an array to batch-check-out multiple PRs in one call), `repo`, `force` (reset existing local branch).
 - `pr_push` — Push a checked-out PR branch back to its source branch. Requires the branch to have been checked out via `op: pr_checkout` (carries push metadata). Optional `branch`; defaults to the current checked-out git branch. Optional `forceWithLease`.
 - `search_issues` — Search issues using normal GitHub issue search syntax. Required `query`. Optional `repo`, `limit`.
 - `search_prs` — Search pull requests using normal GitHub PR search syntax. Required `query`. Optional `repo`, `limit`.

package/src/prompts/tools/lsp.md

@@ -17,8 +17,7 @@ Interacts with Language Server Protocol servers for code intelligence.
 <parameters>
 - `file`: File path, glob pattern (e.g. `src/**/*.ts`), or `"*"` for workspace scope. Globs are expanded locally before dispatch. `"*"` routes `diagnostics`/`symbols`/`reload` to their workspace-wide form.
 - `line`: 1-indexed line number for position-based actions
-- `symbol`: Substring on the target line used to resolve column automatically
-- `occurrence`: 1-indexed match index when `symbol` appears multiple times on the same line
+- `symbol`: Substring on the target line used to resolve column automatically. Append `#N` to pick the Nth occurrence on that line (1-indexed; default 1) — e.g. `foo#2` selects the second `foo`.
 - `query`: Symbol search query, code-action kind filter (list mode), or code-action selector (apply mode)
 - `new_name`: Required for rename
 - `apply`: Apply edits for rename/code_actions (default true for rename, list mode for code_actions unless explicitly true)
@@ -29,7 +28,7 @@ Interacts with Language Server Protocol servers for code intelligence.
 - Requires running LSP server for target language
 - Some operations require file to be saved to disk
 - Glob expansion samples up to 20 files per request; use `file: "*"` for broader coverage
-- When `symbol` is provided for position-based actions, missing symbols or out-of-bounds `occurrence` values return an explicit error instead of silently falling back
+- When `symbol` is provided for position-based actions, missing symbols or out-of-bounds `#N` occurrence selectors return an explicit error instead of silently falling back
 </caution>
 
 <critical>

package/src/prompts/tools/{run-command.md → recipe.md}

@@ -10,7 +10,7 @@ Run a recipe / script / target from the project's task runners.
 {{#each runners}}
 <runner id="{{id}}" label="{{label}}" command="{{commandPrefix}}">
 {{#each tasks}}
-- `{{name}}{{#if paramSig}} {{paramSig}}{{/if}}`{{#if doc}} — {{doc}}{{/if}}{{#if command}} (`{{command}}`){{/if}}
+- `{{name}}{{#if paramSig}} {{paramSig}}{{/if}}`{{#if doc}} — {{doc}}{{/if}}{{#if command}} (`{{command}}`{{#if cwd}} in `{{cwd}}`{{/if}}){{/if}}
 {{/each}}
 </runner>
 {{/each}}

package/src/prompts/tools/task.md

@@ -1,167 +1,54 @@
 Launches subagents to parallelize workflows.
 
 {{#if asyncEnabled}}
-- Use `read jobs://` to inspect state; `read jobs://<job_id>` for detail.
-- Use the `job` tool (with `poll`) to wait until completion. You **MUST NOT** poll `read jobs://` in a loop.
+- `read jobs://` for state, `read jobs://<id>` for detail.
+- Use `job` (with `poll`) to wait. **MUST NOT** poll `read jobs://` in a loop.
 {{/if}}
 
-{{#if defaultMode}}
-Current input mode: `default`. Shared `context` and custom task-call `schema` are available.
-{{/if}}
-{{#if schemaFreeMode}}
-Current input mode: `schema-free`. Shared `context` is available; custom task-call `schema` is disabled. For structured output, rely on the agent definition or inherited session schema.
-{{/if}}
-{{#if independentMode}}
-Current input mode: `independent`. Shared `context` and custom `schema` are both disabled. Every assignment must stand on its own.
-{{/if}}
-
-{{#if contextEnabled}}
-Subagents lack your conversation history. Every decision, file content, and user requirement they need **MUST** be explicit in `context` or `assignment`.
-{{else}}
-Subagents lack your conversation history. Every decision, file content, and user requirement they need **MUST** be explicit in each task `assignment`.
-{{/if}}
+Subagents have no access to your conversation history. Every fact, file path, and decision they need **MUST** be explicit in {{#if contextEnabled}}`context` or `assignment`{{else}}each `assignment`{{/if}}.
 
 <parameters>
-- `agent`: Agent type for all tasks.
-  - `.id`: CamelCase, max 32 chars
-  - `.description`: UI display only — subagent never sees it
-  - `.assignment`: Complete self-contained instructions. One-liners PROHIBITED; missing acceptance criteria = too vague.
-{{#if contextEnabled}}
-- `context`: Shared background prepended to every assignment. Session-specific info only.
-{{/if}}
-{{#if customSchemaEnabled}}
-- `schema`: JSON-encoded JTD schema for expected output. Format lives here — **MUST NOT** be duplicated in assignments.
-{{/if}}
-- `tasks`: Tasks to execute in parallel.
-{{#if isolationEnabled}}
-- `isolated`: Run in isolated environment; returns patches. Use when tasks edit overlapping files.
-{{/if}}
+- `agent`: agent type for all tasks
+- `tasks`: tasks to execute in parallel
+ - `.id`: CamelCase, ≤32 chars
+ - `.description`: UI label only — subagent never sees it
+ - `.assignment`: complete self-contained instructions; one-liners and missing acceptance criteria are PROHIBITED
+{{#if contextEnabled}}- `context`: shared background prepended to every assignment; session-specific only{{/if}}
+{{#if customSchemaEnabled}}- `schema`: JTD schema for expected structured output (do not put format rules in assignments){{/if}}
+{{#if isolationEnabled}}- `isolated`: run in isolated env; use when tasks edit overlapping files{{/if}}
 </parameters>
 
-<critical>
-{{#if contextEnabled}}
-- **MUST NOT** duplicate shared constraints across assignments — put them in `context` once.
-{{else}}
-- Every `assignment` must repeat any constraints, reference paths, and acceptance criteria it needs — there is no shared `context` field.
-{{/if}}
-- **MUST NOT** tell tasks to run project-wide build/test/lint. Parallel agents share the working tree; each task edits, stops. Caller verifies after all complete.
-- For large payloads (traces, JSON blobs), write to `local://<path>` and pass the path in {{#if contextEnabled}}`context`{{else}}the relevant `assignment`{{/if}}.
-- Prefer `task` agents that investigate **and** edit in one pass. Launch a dedicated read-only discovery step only when affected files are genuinely unknown.
-</critical>
-
-<scope>
-Each task: **at most 3–5 files**. Globs, "update all", or package-wide scope = too broad. Enumerate files explicitly and fan out to a cluster of agents.
-</scope>
+<rules>
+- **MUST NOT** assign tasks to run project-wide build/test/lint. Caller verifies after the batch.
+- Each task: ≤3–5 explicit files. No globs, no "update all", no package-wide scope. Fan out to a cluster instead.
+- Pass large payloads via `local://<path>` URIs, not inline.
+{{#if contextEnabled}}- Put shared constraints in `context` once; do not duplicate across assignments.{{/if}}
+- Prefer agents that investigate **and** edit in one pass; only spin a read-only discovery step when affected files are genuinely unknown.
+</rules>
 
 <parallelization>
-**Test:** Can task B produce correct output without seeing A's result? Yes → parallel. No → sequential.
-
-|Sequential first|Then|Reason|
-|---|---|---|
-|Types/interfaces|Consumers|Need contract|
-|API exports|Callers|Need signatures|
-|Core module|Dependents|Import dependency|
-|Schema/migration|App logic|Schema dependency|
-
-**Safe to parallelize:** independent modules, isolated file-scoped refactors, tests for existing code.
+Test: can task B run correctly without seeing A's output? If no, sequence A → B.
+Sequential when one task produces a contract (types, API, schema, core module) the other consumes.
+Parallel when tasks touch disjoint files or are independent refactors/tests.
 </parallelization>
 
-<templates>
-{{#if contextEnabled}}
-**context:**
-```
-## Goal         ← one sentence: what the batch accomplishes
-## Non-goals    ← what tasks must not touch
-## Constraints  ← MUST/MUST NOT rules and session decisions
-## API Contract ← exact types/signatures if tasks share an interface (omit if N/A)
-## Acceptance   ← definition of done; build/lint runs AFTER all tasks complete
-```
-{{else}}
-No shared `context` field exists in this mode. Fold goal, non-goals, constraints, and acceptance criteria into each `assignment`.
-{{/if}}
-**assignment:**
-```
-## Target       ← exact file paths; named symbols; explicit non-goals
-## Change       ← step-by-step what to add/remove/rename; patterns/APIs to use
-## Edge Cases   ← tricky inputs; existing behavior that must survive
-## Acceptance   ← observable result proving the task is done; no project-wide commands
-```
-</templates>
-
-<checklist>
-Before invoking:
 {{#if contextEnabled}}
-- `context` contains only session-specific info
-{{else}}
-- Every `assignment` includes its own goal, constraints, and acceptance criteria (no shared context)
+<context-fmt>
+# Goal         ← one sentence: what the batch accomplishes
+# Constraints  ← **MUST**/**MUST NOT** rules and session decisions
+# Contract     ← exact types/signatures if tasks share an interface
+</context-fmt>
 {{/if}}
-- Every `assignment` follows the template; no one-liners; edge cases covered
-- Tasks are truly parallel — you can articulate why none depends on another's output
-- File paths are explicit; no globs
-{{#if customSchemaEnabled}}
-- `schema` is set if you expect structured output
-{{else}}
-- Do not pass a custom task-call `schema` in this mode
-{{/if}}
-</checklist>
-
-{{#if contextEnabled}}
-<example label="Rename exported symbol + update all call sites">
-Two tasks with non-overlapping file sets — demonstrates scope partitioning.
 
-<context>
-## Goal
-Rename `parseConfig` → `loadConfig` in `src/config/parser.ts` and all callers.
-## Non-goals
-No behavior or signature changes; rename only.
-## Acceptance (global)
-Caller runs `bun check:ts` after both tasks complete. Tasks must NOT run it.
-</context>
-<tasks>
-  <task name="RenameExport">
-    <assignment>
-## Target
-- `src/config/parser.ts`: function `parseConfig`
-- If `src/config/index.ts` re-exports it, update the re-export
-- Non-goals: do not touch callers or tests
-
-## Change
-- Rename `parseConfig` → `loadConfig` (declaration + any JSDoc references)
-
-## Edge Cases
-- Rename all overload signatures if overloaded
-- Internal helpers like `_parseConfigValue` are different symbols — leave untouched
-- Do not add a backwards-compat alias
-
-## Acceptance
-- `parseConfig` no longer appears as a top-level export in `parser.ts`
-    </assignment>
-  </task>
-  <task name="UpdateCallers">
-    <assignment>
-## Target
-- `src/cli/init.ts`, `src/server/bootstrap.ts`, `src/worker/index.ts`
-- Non-goals: do not touch `src/config/parser.ts` or `src/config/index.ts`
-
-## Change
-- Replace `import { parseConfig }` → `import { loadConfig }`
-- Replace every call site `parseConfig(` → `loadConfig(`
-- For `import * as cfg` users, update `cfg.parseConfig` property access
-
-## Edge Cases
-- String literals containing "parseConfig" (logs, comments) are documentation — leave them
-- If a file re-exports to an external package boundary, keep the old name via `export { loadConfig as parseConfig }` with a `// TODO: remove after next major` comment
-
-## Acceptance
-- No bare `parseConfig` identifier remains in the three target files
-    </assignment>
-  </task>
-</tasks>
-</example>
-{{/if}}
+<assignment-fmt>
+# Target       ← exact files and symbols; explicit non-goals
+# Change       ← step-by-step add/remove/rename; APIs and patterns
+# Acceptance   ← observable result; no project-wide commands
+</assignment-fmt>
 
+<agents>
 {{#list agents join="\n"}}
-### Agent: {{name}}
-**Tools:** {{default (join tools ", ") "All"}}
+# {{name}}
 {{description}}
 {{/list}}
+</agents>