@oh-my-pi/pi-coding-agent 14.9.3 → 14.9.7

package/src/modes/controllers/event-controller.ts

@@ -1,6 +1,6 @@
 import { INTENT_FIELD } from "@oh-my-pi/pi-agent-core";
 import type { AssistantMessage, ImageContent } from "@oh-my-pi/pi-ai";
-import { Loader, TERMINAL, Text } from "@oh-my-pi/pi-tui";
+import { type Component, Loader, TERMINAL, Text } from "@oh-my-pi/pi-tui";
 import { settings } from "../../config/settings";
 import { AssistantMessageComponent } from "../../modes/components/assistant-message";
 import { ReadToolGroupComponent } from "../../modes/components/read-tool-group";
@@ -15,6 +15,8 @@ import type { ExitPlanModeDetails } from "../../tools";
 
 type AgentSessionEventKind = AgentSessionEvent["type"];
 
+const IRC_MESSAGE_VISIBLE_TTL_MS = 10_000;
+
 type AgentSessionEventHandlers = {
 	[E in AgentSessionEventKind]: (event: Extract<AgentSessionEvent, { type: E }>) => Promise<void>;
 };
@@ -29,6 +31,7 @@ export class EventController {
 	#readToolCallAssistantComponents = new Map<string, AssistantMessageComponent>();
 	#lastAssistantComponent: AssistantMessageComponent | undefined = undefined;
 	#idleCompactionTimer?: NodeJS.Timeout;
+	#ircExpiryTimers = new Map<string, NodeJS.Timeout>();
 	#handlers: AgentSessionEventHandlers;
 
 	constructor(private ctx: InteractiveModeContext) {
@@ -59,6 +62,10 @@ export class EventController {
 
 	dispose(): void {
 		this.#cancelIdleCompaction();
+		for (const timer of this.#ircExpiryTimers.values()) {
+			clearTimeout(timer);
+		}
+		this.#ircExpiryTimers.clear();
 	}
 
 	#resetReadGroup(): void {
@@ -222,10 +229,24 @@ export class EventController {
 		}
 		this.#renderedCustomMessages.add(signature);
 		this.#resetReadGroup();
-		this.ctx.addMessageToChat(event.message);
+		const components = this.ctx.addMessageToChat(event.message);
+		this.#scheduleIrcExpiry(signature, components);
 		this.ctx.ui.requestRender();
 	}
 
+	#scheduleIrcExpiry(signature: string, components: Component[]): void {
+		if (components.length === 0 || this.#ircExpiryTimers.has(signature)) return;
+		const timer = setTimeout(() => {
+			this.#ircExpiryTimers.delete(signature);
+			for (const component of components) {
+				this.ctx.chatContainer.removeChild(component);
+			}
+			this.ctx.ui.requestRender();
+		}, IRC_MESSAGE_VISIBLE_TTL_MS);
+		timer.unref?.();
+		this.#ircExpiryTimers.set(signature, timer);
+	}
+
 	async #handleNotice(event: Extract<AgentSessionEvent, { type: "notice" }>): Promise<void> {
 		const message = event.source ? `${event.source}: ${event.message}` : event.message;
 		if (event.level === "error") {

package/src/modes/controllers/mcp-command-controller.ts

@@ -1238,12 +1238,12 @@ export class MCPCommandController {
 								? theme.fg("muted", "Connecting")
 								: theme.fg("warning", "Not connected yet");
 					this.#showMessage(
-						["", theme.fg("success", `\u2713 Enabled "${name}"`), "", `  Status: ${status}`, ""].join("\n"),
+						["", theme.fg("success", `✓ Enabled "${name}"`), "", `  Status: ${status}`, ""].join("\n"),
 					);
 				} else {
 					await this.ctx.mcpManager?.disconnectServer(name);
 					await this.ctx.session.refreshMCPTools(this.ctx.mcpManager?.getTools() ?? []);
-					this.#showMessage(["", theme.fg("success", `\u2713 Disabled "${name}"`), ""].join("\n"));
+					this.#showMessage(["", theme.fg("success", `✓ Disabled "${name}"`), ""].join("\n"));
 				}
 				return;
 			}
@@ -1429,12 +1429,9 @@ export class MCPCommandController {
 				await this.ctx.session.refreshMCPTools(this.ctx.mcpManager.getTools());
 				const serverTools = this.ctx.mcpManager.getTools().filter(t => t.mcpServerName === name);
 				this.#showMessage(
-					[
-						"\n",
-						theme.fg("success", `\u2713 Reconnected to "${name}"`),
-						`  Tools: ${serverTools.length}`,
+					["\n", theme.fg("success", `✓ Reconnected to "${name}"`), `  Tools: ${serverTools.length}`, "\n"].join(
 						"\n",
-					].join("\n"),
+					),
 				);
 			} else {
 				this.ctx.showError(`Failed to reconnect to "${name}". Check server status and logs.`);
@@ -1589,8 +1586,8 @@ export class MCPCommandController {
 			hasAny = true;
 
 			lines.push(`${theme.fg("accent", name)}:`);
-			const check = theme.fg("success", "\u2713");
-			const cross = theme.fg("dim", "\u2717");
+			const check = theme.fg("success", "✓");
+			const cross = theme.fg("dim", "✗");
 			if (supportsToolsChanged) lines.push(`  ${check} tools/list_changed`);
 			if (supportsResourcesChanged) lines.push(`  ${check} resources/list_changed`);
 			if (supportsPromptsChanged) lines.push(`  ${check} prompts/list_changed`);
@@ -1607,7 +1604,7 @@ export class MCPCommandController {
 				lines.push(`  ${check} resources/subscribe  ${subStatus}`);
 				if (enabled && subscribedUris && subscribedUris.size > 0) {
 					for (const uri of subscribedUris) {
-						lines.push(`    ${theme.fg("success", "\u2713")} ${theme.fg("dim", uri)}`);
+						lines.push(`    ${theme.fg("success", "✓")} ${theme.fg("dim", uri)}`);
 					}
 				}
 			} else if (supportsResources) {

package/src/modes/interactive-mode.ts

@@ -1502,8 +1502,8 @@ export class InteractiveMode implements InteractiveModeContext {
 		return this.#uiHelpers.isKnownSlashCommand(text);
 	}
 
-	addMessageToChat(message: AgentMessage, options?: { populateHistory?: boolean }): void {
-		this.#uiHelpers.addMessageToChat(message, options);
+	addMessageToChat(message: AgentMessage, options?: { populateHistory?: boolean }): Component[] {
+		return this.#uiHelpers.addMessageToChat(message, options);
 	}
 
 	renderSessionContext(

package/src/modes/theme/theme.ts

@@ -387,51 +387,51 @@ const NERD_SYMBOLS: SymbolMap = {
 	"nav.back": "\uf060",
 	// Tree Connectors (same as unicode)
 	// pick: ├─ | alt: ├╴ ├╌ ╠═ ┣━
-	"tree.branch": "\u251c\u2500",
+	"tree.branch": "├─",
 	// pick: └─ | alt: └╴ └╌ ╚═ ┗━
-	"tree.last": "\u2514\u2500",
+	"tree.last": "└─",
 	// pick: │ | alt: ┃ ║ ▏ ▕
-	"tree.vertical": "\u2502",
+	"tree.vertical": "│",
 	// pick: ─ | alt: ━ ═ ╌ ┄
-	"tree.horizontal": "\u2500",
+	"tree.horizontal": "─",
 	// pick: └ | alt: ╰ ⎿ ↳
-	"tree.hook": "\u2514",
+	"tree.hook": "└",
 	// Box Drawing - Rounded (same as unicode)
 	// pick: ╭ | alt: ┌ ┏ ╔
-	"boxRound.topLeft": "\u256d",
+	"boxRound.topLeft": "╭",
 	// pick: ╮ | alt: ┐ ┓ ╗
-	"boxRound.topRight": "\u256e",
+	"boxRound.topRight": "╮",
 	// pick: ╰ | alt: └ ┗ ╚
-	"boxRound.bottomLeft": "\u2570",
+	"boxRound.bottomLeft": "╰",
 	// pick: ╯ | alt: ┘ ┛ ╝
-	"boxRound.bottomRight": "\u256f",
+	"boxRound.bottomRight": "╯",
 	// pick: ─ | alt: ━ ═ ╌
-	"boxRound.horizontal": "\u2500",
+	"boxRound.horizontal": "─",
 	// pick: │ | alt: ┃ ║ ▏
-	"boxRound.vertical": "\u2502",
+	"boxRound.vertical": "│",
 	// Box Drawing - Sharp (same as unicode)
 	// pick: ┌ | alt: ┏ ╭ ╔
-	"boxSharp.topLeft": "\u250c",
+	"boxSharp.topLeft": "┌",
 	// pick: ┐ | alt: ┓ ╮ ╗
-	"boxSharp.topRight": "\u2510",
+	"boxSharp.topRight": "┐",
 	// pick: └ | alt: ┗ ╰ ╚
-	"boxSharp.bottomLeft": "\u2514",
+	"boxSharp.bottomLeft": "└",
 	// pick: ┘ | alt: ┛ ╯ ╝
-	"boxSharp.bottomRight": "\u2518",
+	"boxSharp.bottomRight": "┘",
 	// pick: ─ | alt: ━ ═ ╌
-	"boxSharp.horizontal": "\u2500",
+	"boxSharp.horizontal": "─",
 	// pick: │ | alt: ┃ ║ ▏
-	"boxSharp.vertical": "\u2502",
+	"boxSharp.vertical": "│",
 	// pick: ┼ | alt: ╋ ╬ ┿
-	"boxSharp.cross": "\u253c",
+	"boxSharp.cross": "┼",
 	// pick: ┬ | alt: ╦ ┯ ┳
-	"boxSharp.teeDown": "\u252c",
+	"boxSharp.teeDown": "┬",
 	// pick: ┴ | alt: ╩ ┷ ┻
-	"boxSharp.teeUp": "\u2534",
+	"boxSharp.teeUp": "┴",
 	// pick: ├ | alt: ╠ ┝ ┣
-	"boxSharp.teeRight": "\u251c",
+	"boxSharp.teeRight": "├",
 	// pick: ┤ | alt: ╣ ┥ ┫
-	"boxSharp.teeLeft": "\u2524",
+	"boxSharp.teeLeft": "┤",
 	// Separators - Nerd Font specific
 	// pick:  | alt:   
 	"sep.powerline": "\ue0b0",
@@ -446,7 +446,7 @@ const NERD_SYMBOLS: SymbolMap = {
 	// pick:  | alt: 
 	"sep.powerlineThinRight": "\ue0b3",
 	// pick: █ | alt: ▓ ▒ ░ ▉ ▌
-	"sep.block": "\u2588",
+	"sep.block": "█",
 	// pick: space | alt: ␠ ·
 	"sep.space": " ",
 	// pick: > | alt: › » ▸
@@ -454,7 +454,7 @@ const NERD_SYMBOLS: SymbolMap = {
 	// pick: < | alt: ‹ « ◂
 	"sep.asciiRight": "<",
 	// pick: · | alt: • ⋅
-	"sep.dot": " \u00b7 ",
+	"sep.dot": " · ",
 	// pick:  | alt: / ∕ ⁄
 	"sep.slash": "\ue0bb",
 	// pick:  | alt: │ ┃ |
@@ -545,16 +545,16 @@ const NERD_SYMBOLS: SymbolMap = {
 	// pick:  | alt:   •
 	"format.bullet": "\uf111",
 	// pick: – | alt: — ― -
-	"format.dash": "\u2013",
+	"format.dash": "–",
 	// pick: ⟨ | alt: [ ⟦
 	"format.bracketLeft": "⟨",
 	// pick: ⟩ | alt: ] ⟧
 	"format.bracketRight": "⟩",
 	// Markdown-specific
 	// pick: │ | alt: ┃ ║
-	"md.quoteBorder": "\u2502",
+	"md.quoteBorder": "│",
 	// pick: ─ | alt: ━ ═
-	"md.hrChar": "\u2500",
+	"md.hrChar": "─",
 	// pick:  | alt:  •
 	"md.bullet": "\uf111",
 	// Language icons (nerd font devicons)

package/src/modes/types.ts

@@ -170,7 +170,7 @@ export interface InteractiveModeContext {
 	 */
 	withLocalSubmission<T>(text: string, fn: () => Promise<T>, options?: { imageCount?: number }): Promise<T>;
 	isKnownSlashCommand(text: string): boolean;
-	addMessageToChat(message: AgentMessage, options?: { populateHistory?: boolean }): void;
+	addMessageToChat(message: AgentMessage, options?: { populateHistory?: boolean }): Component[];
 	renderSessionContext(
 		sessionContext: SessionContext,
 		options?: { updateFooter?: boolean; populateHistory?: boolean },

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

@@ -1,6 +1,6 @@
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { AssistantMessage, ImageContent, Message } from "@oh-my-pi/pi-ai";
-import { Spacer, Text, TruncatedText } from "@oh-my-pi/pi-tui";
+import { type Component, Spacer, Text, TruncatedText } from "@oh-my-pi/pi-tui";
 import { settings } from "../../config/settings";
 import { AssistantMessageComponent } from "../../modes/components/assistant-message";
 import { BashExecutionComponent } from "../../modes/components/bash-execution";
@@ -70,7 +70,7 @@ export class UiHelpers {
 		this.ctx.ui.requestRender();
 	}
 
-	addMessageToChat(message: AgentMessage, options?: { populateHistory?: boolean }): void {
+	addMessageToChat(message: AgentMessage, options?: { populateHistory?: boolean }): Component[] {
 		switch (message.role) {
 			case "bashExecution": {
 				const component = new BashExecutionComponent(message.command, this.ctx.ui, message.excludeFromContext);
@@ -147,26 +147,30 @@ export class UiHelpers {
 						if (message.customType === "irc:incoming") {
 							const peer = details?.from ?? "?";
 							body = details?.message ?? "";
-							arrow = `\u21e6 ${peer}`;
+							arrow = `⇦ ${peer}`;
 						} else if (message.customType === "irc:autoreply") {
 							const peer = details?.to ?? "?";
 							body = details?.reply ?? "";
-							arrow = `\u21e8 ${peer} (auto)`;
+							arrow = `⇨ ${peer}`;
 						} else {
 							const from = details?.from ?? "?";
 							const to = details?.to ?? "?";
 							body = details?.body ?? "";
-							const suffix = details?.kind === "reply" ? " (auto)" : "";
-							arrow = `${from} \u21e8 ${to}${suffix}`;
+							arrow = `${from} ⇨ ${to}`;
 						}
+						const components: Component[] = [];
 						const header = `${theme.fg("accent", `[IRC] ${arrow}`)}`;
-						this.ctx.chatContainer.addChild(new Text(header, 1, 0));
+						const headerComponent = new Text(header, 1, 0);
+						this.ctx.chatContainer.addChild(headerComponent);
+						components.push(headerComponent);
 						if (body) {
 							for (const line of body.split("\n")) {
-								this.ctx.chatContainer.addChild(new Text(theme.fg("muted", `  ${line}`), 0, 0));
+								const lineComponent = new Text(theme.fg("muted", `  ${line}`), 0, 0);
+								this.ctx.chatContainer.addChild(lineComponent);
+								components.push(lineComponent);
 							}
 						}
-						break;
+						return components;
 					}
 					const renderer = this.ctx.session.extensionRunner?.getMessageRenderer(message.customType);
 					// Both HookMessage and CustomMessage have the same structure, cast for compatibility
@@ -240,6 +244,7 @@ export class UiHelpers {
 				const _exhaustive: never = message;
 			}
 		}
+		return [];
 	}
 
 	/**

package/src/prompts/commands/orchestrate.md

@@ -26,6 +26,7 @@ You decompose, dispatch, verify, and iterate. You do **not** edit code. Every fi
 6. **Commit policy.** If the task asks for commits or the repo workflow expects them, commit after each green phase with a focused message. Never commit a red tree. Never commit work the user did not ask to commit.
 7. **Respawn, do not absorb.** If a subagent returns incomplete or wrong work, spawn a corrective subagent with the specific gap — do not silently fix it yourself.
 8. **No scope creep, no scope shrink.** Do not add work the user did not ask for. Do not relabel unfinished items as "follow-up", "v1", or "MVP" to imply completion.
+9. **Subagents do not verify, lint, or format.** Every `task` assignment **MUST** instruct the subagent to skip all gates and formatters. Their job is the edit only. You — the orchestrator — run verification and formatting **once** at the end of the phase across the union of changed files. Avoids redundant runs and racing formatter passes.
 </rules>
 
 <workflow>

package/src/prompts/system/project-prompt.md

@@ -1,4 +1,4 @@
-<|START_PROJECT|>
+[PROJECT]
 <workstation>
 {{#list environment prefix="- " join="\n"}}{{label}}: {{value}}{{/list}}
 </workstation>
@@ -32,7 +32,15 @@ Working directory layout (sorted by mtime, recent first; depth ≤ 3):
 </workspace-tree>
 {{/if}}
 
+Today is {{date}}, and the current working directory is '{{cwd}}'.
+
+<critical>
+- Each response **MUST** advance the task. There is no stopping condition other than completion.
+- You **MUST** default to informed action; do not ask for confirmation when tools or repo context can answer.
+- You **MUST** verify the effect of significant behavioral changes before yielding: run the specific test, command, or scenario that covers your change.
+</critical>
+
 {{#if appendPrompt}}
 {{appendPrompt}}
 {{/if}}
-<|END_PROJECT|>
+[/PROJECT]

package/src/prompts/system/subagent-system-prompt.md

@@ -1,14 +1,14 @@
-<|START_ROLE|>
+[ROLE]
 {{agent}}
-<|END_ROLE|>
+[/ROLE]
 
 {{#if context}}
-<|START_CONTEXT|>
+[CONTEXT]
 {{context}}
-<|END_CONTEXT|>
+[/CONTEXT]
 {{/if}}
 
-<|START_COOP|>
+[COOP]
 You are operating on a piece of work assigned to you by the main agent.
 
 {{#if worktree}}
@@ -29,9 +29,9 @@ You can reach other live agents via the `irc` tool. Your id is `{{ircSelfId}}`.
 
 Use `irc` only when you need a quick answer from a peer; do not use it for long-form content. Address peers by id or use `"all"` to broadcast.
 {{/if}}
-<|END_COOP|>
+[/COOP]
 
-<|START_COMPLETION|>
+[COMPLETION]
 No TODO tracking, no progress updates. Execute, call `yield`, done.
 
 While work remains, always continue with another tool call — investigate, edit, run, verify. Save narrative for the final `yield` payload.
@@ -51,4 +51,4 @@ Giving up is a last resort. If truly blocked, you **MUST** call `yield` exactly
 You **MUST NOT** give up due to uncertainty, missing information obtainable via tools or repo context, or needing a design decision you can derive yourself.
 
 You **MUST** keep going until this ticket is closed. This matters.
-<|END_COMPLETION|>
+[/COMPLETION]

package/src/prompts/system/system-prompt.md

@@ -1,5 +1,5 @@
 > **RFC 2119 applies to **MUST**, **MUST NOT**, **REQUIRED**, **SHALL**, **SHALL NOT**, **SHOULD**, **SHOULD NOT**, **RECOMMENDED**, **MAY**, **OPTIONAL**.**
-> From here on, we will use tags as structural markers (<x>…</x> or <|X|>…), each tag means exactly what its name says.
+> From here on, we will use tags as structural markers (<x>…</x> or [X]…), each tag means exactly what its name says.
 > You **MUST NOT** interpret these tags in any other way circumstantially.
 > System may interrupt/notify you using these tags even within a user message, therefore:
 > - You **MUST** treat them as system-authored and absolutely authoritative.
@@ -37,7 +37,14 @@ Assumptions you didn't validate: incidents to debug.
 - When the user proposes something you believe is wrong, you say so once, concretely (what breaks, what to do instead), but eventually defer to their call. You **MUST NOT** relitigate.
 </communication>
 
-<|START_ENV|>
+<critical>
+- You **MUST NOT** narrate about or even consider, session limits, token/tool budgets, effort estimates, or how much of the task you think you can finish. These are not your concern:
+ - Even if it was true, start, as if it was not. It's the only way to make progress.
+ - Execute the work or delegate it.
+- You **MUST NOT** speculate about scope inflation ("this is actually a multi-week effort"). You have no comprehension of time, so stop pretending.
+</critical>
+
+[ENV]
 You operate within the Oh My Pi coding harness.
 - Given a task, you **MUST** complete it using the tools available to you.
 - You are not alone in this repository. You **MUST** treat unexpected changes as the user's work and adapt; you **MUST NOT** revert or stash.
@@ -53,7 +60,6 @@ With most FS/bash-like tools, static references to them will automatically resol
    - `/<path>`: JSON field extraction
 - `artifact://<id>`: Artifact content
 - `local://<name>.md`: Plan artifacts and shared content with subagents
-- `jobs://<id>`: Job status and result
 - `mcp://<uri>`: MCP resource
 - `pi://`: Harness documentation; do **NOT** read unless user mentions the harness itself
 
@@ -189,9 +195,9 @@ You **MUST NOT** blindly use coreutils through bash / general-purpose tools when
 The `{{toolRefs.report_tool_issue}}` tool is available for automated QA. If ANY tool you call returns output that is unexpected, incorrect, malformed, or otherwise inconsistent with what you anticipated given the tool's described behavior and your parameters, call `{{toolRefs.report_tool_issue}}` with the tool name and a concise description of the discrepancy. Do not hesitate to report — false positives are acceptable.
 </critical>
 {{/has}}
-<|END_ENV|>
+[/ENV]
 
-<|START_CONTRACT|>
+[CONTRACT]
 These are inviolable.
 - You **MUST NOT** yield unless the deliverable is complete. A phase boundary, todo flip, or completed sub-step is **NOT** a yield point — continue directly to the next step in the same turn.
 - You **MUST NOT** suppress tests to make code pass.
@@ -218,7 +224,7 @@ Before yielding, you **MUST** verify:
 - All explicitly requested deliverables are complete; no partial implementation is presented as complete
 - All directly affected artifacts (callsites, tests, docs) are updated or intentionally left unchanged
 - The output format matches the ask
-- No unobserved claim is presented as fact. Mark explicitly as `<|INFERENCE|>` if so
+- No unobserved claim is presented as fact. Mark explicitly as `[INFERENCE]` if so
 - No required tool-based lookup was skipped when it would materially reduce uncertainty
 
 Before declaring blocked:
@@ -252,4 +258,4 @@ Before declaring blocked:
 - Do not test defaults: changing the default configuration, or a string, should not break the test. Assert logical behavior, not the current state.
 - Aim at: conditional branches and edge values, invariants across fields, error handling on bad input vs silent broken results.
 </workflow>
-<|END_CONTRACT|>
+[/CONTRACT]

package/src/prompts/tools/ask.md

@@ -8,7 +8,6 @@ Asks user when you need clarification or input during task execution.
 - Use `recommended: <index>` to mark default (0-indexed); " (Recommended)" added automatically
 - Use `questions` for multiple related questions instead of asking one at a time
 - Set `multi: true` on question to allow multiple selections
-- `ask.timeout` only applies while choosing options; once the user selects "Other (type your own)", there is no timeout
 </instruction>
 
 <caution>

package/src/prompts/tools/bash.md

@@ -10,16 +10,6 @@ Executes bash command in shell session for terminal operations like git, bun, ca
 {{#if asyncEnabled}}
 - Use `async: true` for long-running commands when you don't need immediate output; the call returns a background job ID and the result is delivered automatically as a follow-up.
 {{/if}}
-{{#if autoBackgroundEnabled}}
-- Long-running non-PTY commands may auto-background after ~{{autoBackgroundThresholdSeconds}}s and continue as background jobs.
-{{/if}}
-{{#if asyncEnabled}}
-- Inspect background jobs with `read jobs://` (`read jobs://<job-id>` for detail). To wait for results, call `job` (with `poll`) — do NOT poll `read jobs://` in a loop or yield and hope for delivery.
-{{else}}
-{{#if autoBackgroundEnabled}}
-- For auto-backgrounded jobs, inspect with `read jobs://` and call `job` (with `poll`) to wait — do NOT poll in a loop.
-{{/if}}
-{{/if}}
 </instruction>
 
 <output>

package/src/prompts/tools/eval.md

@@ -1,23 +1,18 @@
 Run code in a persistent kernel using codeblock cells.
 
 <instruction>
-Each cell is wrapped between `*** Begin <LANG>` and `*** End <LANG>`:
+Each cell starts with a single header line and runs until the next header (or end of input):
 
 ```
-*** Begin PY
-*** Title: optional title
-*** Timeout: 10s
-*** Reset
+*** Cell py:"optional title" t:10s rst
 print("hi")
-*** End PY
 ```
 
-- **Language**: {{#if py}}`PY` for Python{{/if}}{{#ifAll py js}}, {{/ifAll}}{{#if js}}`JS` / `TS` for JavaScript{{/if}}. The opening `<LANG>` and closing `<LANG>` **MUST** match.
-- **Attributes** (optional, in any order, immediately after `*** Begin`):
-  - `*** Title: …` — cell title shown in the UI.
-  - `*** Timeout: <duration>` — per-cell timeout. Digits with optional `ms` / `s` / `m` units (e.g. `500ms`, `15s`, `2m`). Default 30s.
-  - `*** Reset` — wipe this cell's own language kernel before running.{{#ifAll py js}} Other languages are untouched.{{/ifAll}}
-- Anything between the last attribute and `*** End <LANG>` is the cell's code, verbatim.
+- **Language + title**: `<lang>:"<title>"` — {{#if py}}`py` for Python{{/if}}{{#ifAll py js}}, {{/ifAll}}{{#if js}}`js` for JavaScript{{/if}}. Title may be empty (`py:""`).
+- **Attributes** (optional, in this order, after the language+title):
+  - `t:<duration>` — per-cell timeout. Digits with optional `ms` / `s` / `m` units (e.g. `500ms`, `15s`, `2m`). Default 30s.
+  - `rst` — wipe this cell's own language kernel before running.{{#ifAll py js}} Other languages are untouched.{{/ifAll}}
+- Anything after the header line, up to the next `*** Cell` header, is the cell's code, verbatim.
 - Stack multiple cells back-to-back; blank lines between cells are ignored.
 
 **Work incrementally:**
@@ -46,46 +41,36 @@ tree(path?=".", max_depth?=3, show_hidden?=False) → str
     Render a directory tree.
 diff(a, b) → str
     Unified diff between two files.
-run(cmd, cwd?=None, timeout?=None) → {stdout, stderr, exit_code}
-    Run a shell command.
 env(key?=None, value?=None) → str | None | dict
     No args → full environment as dict. One arg → value of `key`. Two args → set `key=value` and return value.
 output(*ids, format?="raw", query?=None, offset?=None, limit?=None) → str | dict | list[dict]
     Read task/agent output by ID. Single id returns text/dict; multiple ids return a list.
+tool.<name>(args) → unknown
+    Invoke any session tool by name. `args` is the tool's parameter object.
 ```
-
-{{#if js}}**JavaScript only:** `tool.<name>(args)` invokes any session tool directly (e.g. `await tool.read({ path: "src/foo.ts" })`).
-{{/if}}</prelude>
+</prelude>
 
 <output>
 Cells render like a Jupyter notebook. `display(value)` renders non-presentable data as an interactive JSON tree. Presentable values (figures, images, dataframes, etc.) use their native representation.
 </output>
 
 <caution>
-- In session mode, use `*** Reset` on a cell to wipe its language's kernel before running.{{#ifAll py js}} Reset is per-language: a python cell's `*** Reset` does not touch the JavaScript kernel and vice versa.{{/ifAll}}
-{{#if js}}- **js**: the VM exposes a selective `process` subset, Web APIs, `Buffer`, `fs/promises`.
+- In session mode, use `rst` on a cell to wipe its language's kernel before running.{{#ifAll py js}} Reset is per-language: a python cell's `rst` does not touch the JavaScript kernel and vice versa.{{/ifAll}}
+{{#if js}}- **js**: the VM exposes a selective `process` subset, Web APIs, `Buffer`, `fs/promises`, and the `Bun` global.
 {{/if}}</caution>
 
 <example>
-{{#if py}}*** Begin PY
-*** Title: imports
-*** Timeout: 10s
+{{#if py}}*** Cell py:"imports" t:10s
 import json
 from pathlib import Path
-*** End PY
 
-*** Begin PY
-*** Title: load config
+*** Cell py:"load config"
 data = json.loads(read('package.json'))
 display(data)
-*** End PY
 {{/if}}{{#ifAll py js}}
-{{/ifAll}}{{#if js}}*** Begin JS
-*** Title: js summary
-*** Reset
+{{/ifAll}}{{#if js}}*** Cell js:"summary" rst
 const data = JSON.parse(await read('package.json'));
 display(data);
 return data.name;
-*** End JS
 {{/if}}
 </example>

package/src/prompts/tools/github.md

@@ -9,11 +9,12 @@ Pick the operation via `op`. Each op uses a subset of the parameters:
 - `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`.
-- `search_code` — Search code with GitHub code search syntax. Required `query`. Optional `repo`, `limit`. Returns matching paths with surrounding fragments.
-- `search_commits` — Search commits across GitHub. Required `query`. Optional `repo`, `limit`. Returns short SHA, author, and the first line of each commit message.
-- `search_repos` — Search repositories across GitHub. Required `query`. Optional `limit` (use query qualifiers like `org:`, `language:` instead of `repo`).
+- `search_issues` — Search issues using normal GitHub issue search syntax. Optional `query` (required unless `since`/`until` is set), `repo`, `limit`, `since`, `until`, `dateField`.
+- `search_prs` — Search pull requests using normal GitHub PR search syntax. Optional `query` (required unless `since`/`until` is set), `repo`, `limit`, `since`, `until`, `dateField`.
+- `search_code` — Search code with GitHub code search syntax. Required `query`. Optional `repo`, `limit`. Returns matching paths with surrounding fragments. Date filtering (`since`/`until`) is **not** supported by GitHub code search.
+- `search_commits` — Search commits across GitHub. Optional `query` (required unless `since`/`until` is set), `repo`, `limit`, `since`, `until`. `dateField` is ignored — always uses `committer-date`.
+- `search_repos` — Search repositories across GitHub. Optional `query` (required unless `since`/`until` is set), `limit`, `since`, `until`, `dateField` (use query qualifiers like `org:`, `language:` instead of `repo`).
+- Date filter format for `since` / `until`: relative duration `<n><unit>` (`m`/`h`/`d`/`w`/`mo`/`y`, e.g. `3d`, `12h`, `2w`), an ISO date `YYYY-MM-DD`, or an ISO datetime. Translated to a single GitHub-search qualifier (`created:≥…`, `created:≤…`, or `created:since..until`). `dateField: "updated"` maps to `updated:` for issues/prs and `pushed:` for repos. When you only want a date filter and no keywords, omit `query` entirely.
 - `run_watch` — Watch a GitHub Actions workflow run. Optional `run` (id or URL). Omitting `run` watches all workflow runs for the current HEAD commit; `branch` falls back to the current branch. Optional `tail` (log lines per failed job). Streams snapshots, fast-fails on the first detected job failure (with a brief grace period to capture concurrent failures), then fetches tailed logs for the failed jobs. The full failed-job logs are saved as a session artifact for on-demand reads.
 </instruction>
 

package/src/prompts/tools/hashline.md

@@ -17,6 +17,7 @@ Purely textual format. The tool has NO awareness of language, indentation, brack
 <rules>
 - Every line of inserted/replacement content **MUST** be emitted as a payload line starting with `{{hsep}}`.
 - `{{hsep}}` is syntax, not content. The inserted text begins after the first `{{hsep}}`; use a bare `{{hsep}}` to insert a blank line.
+- Payload is verbatim — don't escape unicode (write `—`, not `\u2014`).
 - `< A` inserts before line A; `+ A` inserts after line A. `< BOF` / `+ BOF` both prepend; `< EOF` / `+ EOF` both append.
 - `= A..B` replaces the inclusive range with the following payload lines. `= A..B` with no payload blanks the range to a single empty line.
 - `- A..B` deletes the inclusive range; `A..A` for one line.

package/src/prompts/tools/job.md

@@ -1,11 +1,19 @@
-Manages background jobs: poll to wait for completion, cancel to stop running jobs.
+Inspects, waits, or cancels async jobs.
 
-You **MUST** use the `job` tool (in a loop, if necessary) instead of manually reading in a loop or issuing sleep commands.
+Background job results are delivered automatically when complete. Reach for this tool only when you need to intervene.
 
-Pass `poll` to wait for one or more background jobs to finalize. If the timeout elapses before any job changes state, it returns the current snapshot (still-running jobs and any already-completed deliveries) without erroring — call `job` again to keep waiting. Calling with no `poll` and no `cancel` waits on every running background job.
+# Operations
 
-You **MUST NOT** poll the same job repeatedly without evidence of progress. Between calls, inspect `read jobs://<id>` to confirm new output or activity. If a job is stalled, has hung, or is producing nothing useful, cancel it via `cancel` and try a different approach instead of waiting indefinitely.
+## `list: true`
+Use to inspect what's running.
 
-Pass `cancel` to stop one or more running background jobs (started via async tool execution or bash auto-backgrounding). You **SHOULD** cancel jobs that are no longer needed or stuck. You **MAY** inspect jobs first with `read jobs://` or `read jobs://<job-id>`.
+## `poll: [id, …]`
+Block until the specified jobs finish or the wait window elapses.
+- Use when you are genuinely blocked on a result and have no other work to do.
+- Returns the current snapshot when the timer elapses; running jobs remain running.
+- Completed jobs include their final output in the returned snapshot.
 
-`poll` and `cancel` may be combined in a single call: cancellations apply first, then polling waits on the remaining ids. When only `cancel` is provided the call returns immediately without waiting.
+## `cancel: [id, …]`
+Stop running jobs.
+- Use when a job is stalled, hung, or no longer needed.
+- Returns immediately after cancelling.