@oh-my-pi/pi-coding-agent 15.1.2 → 15.1.3

package/src/modes/emoji-autocomplete.ts

@@ -0,0 +1,285 @@
+import type { AutocompleteItem } from "@oh-my-pi/pi-tui";
+import buckets from "./data/emojis.json" with { type: "json" };
+
+// Bucket layout: `{ "<first-char>": [["<name>", "<emoji>"], ...] }`, with each
+// bucket pre-sorted by name. Built offline by scripts/build-emojis.py
+// so the runtime never has to allocate sorted arrays or filter flag sequences.
+type Entry = readonly [name: string, char: string];
+const BUCKETS = buckets as unknown as Readonly<Record<string, readonly Entry[]>>;
+
+// Western text emoticons (`:D`, `;)`, `<3`, …) sit outside the `:name:`
+// shortcode grammar, so they live in a hand-maintained table here rather than
+// in `emojis.json`. Sorted longest-first so `:-)` wins over `:)` when both
+// would match.
+const EMOTICONS: ReadonlyArray<readonly [pattern: string, char: string]> = [
+	[":'-(", "😢"],
+	[">:-(", "😠"],
+	[":-)", "🙂"],
+	[":-(", "🙁"],
+	[":-D", "😃"],
+	[":-P", "😛"],
+	[":-p", "😛"],
+	[":-O", "😮"],
+	[":-o", "😮"],
+	[":-|", "😐"],
+	[":-/", "😕"],
+	[":-\\", "😕"],
+	[":-*", "😘"],
+	[";-)", "😉"],
+	[";-P", "😜"],
+	[":')", "🥲"],
+	[":'D", "😂"],
+	[":'(", "😢"],
+	["</3", "💔"],
+	[">:(", "😠"],
+	["B-)", "😎"],
+	["8-)", "😎"],
+	["o.O", "😳"],
+	["O.o", "😳"],
+	[":)", "🙂"],
+	[":(", "🙁"],
+	[":D", "😃"],
+	[":P", "😛"],
+	[":p", "😛"],
+	[":O", "😮"],
+	[":o", "😮"],
+	[":|", "😐"],
+	[":/", "😕"],
+	[":\\", "😕"],
+	[":*", "😘"],
+	[";)", "😉"],
+	[":3", "😺"],
+	["<3", "❤️"],
+	["xD", "😆"],
+	["XD", "😆"],
+	["B)", "😎"],
+	["8)", "😎"],
+];
+
+const MAX_SUGGESTIONS = 12;
+
+function lowerBound(arr: readonly Entry[], target: string): number {
+	let lo = 0;
+	let hi = arr.length;
+	while (lo < hi) {
+		const mid = (lo + hi) >>> 1;
+		if (arr[mid]![0] < target) lo = mid + 1;
+		else hi = mid;
+	}
+	return lo;
+}
+
+function lookupExact(name: string): string | undefined {
+	const bucket = BUCKETS[name[0] ?? ""];
+	if (!bucket) return undefined;
+	const i = lowerBound(bucket, name);
+	const hit = bucket[i];
+	return hit && hit[0] === name ? hit[1] : undefined;
+}
+
+// Shortcode-name characters mirror the GitHub/gemoji grammar: `a-z`, `A-Z`,
+// `0-9`, `_`, `+`, `-`.
+function isNameCharCode(c: number): boolean {
+	return (
+		(c >= 0x61 && c <= 0x7a) ||
+		(c >= 0x41 && c <= 0x5a) ||
+		(c >= 0x30 && c <= 0x39) ||
+		c === 0x5f ||
+		c === 0x2b ||
+		c === 0x2d
+	);
+}
+
+// Token boundary to the left of an opening `:`: start-of-string or one of
+// the punctuation characters we treat as a "fresh token" marker (whitespace,
+// opening brackets, `>` for quoted blocks).
+function hasLeftBoundary(text: string, colonIdx: number): boolean {
+	if (colonIdx === 0) return true;
+	const c = text.charCodeAt(colonIdx - 1);
+	return (
+		c === 0x20 || // space
+		c === 0x09 || // tab
+		c === 0x0a || // \n
+		c === 0x0d || // \r
+		c === 0x28 || // (
+		c === 0x5b || // [
+		c === 0x7b || // {
+		c === 0x3e // >
+	);
+}
+
+interface EmojiTrigger {
+	/** Full token including the leading `:` (e.g. `:joy`). */
+	prefix: string;
+	/** Lowercased name portion (e.g. `joy`). May be empty when only `:` has been typed. */
+	query: string;
+}
+
+// Walk back over name characters then verify an opening `:` with a left
+// boundary. Cheaper than a regex on every keystroke and avoids allocating
+// match arrays.
+function extractTrigger(text: string): EmojiTrigger | null {
+	let i = text.length;
+	while (i > 0 && isNameCharCode(text.charCodeAt(i - 1))) i--;
+	if (i === 0 || text.charCodeAt(i - 1) !== 0x3a) return null;
+	const colonIdx = i - 1;
+	if (!hasLeftBoundary(text, colonIdx)) return null;
+	const name = text.slice(i);
+	return { prefix: `:${name}`, query: name.toLowerCase() };
+}
+
+export function getEmojiSuggestions(textBeforeCursor: string): { items: AutocompleteItem[]; prefix: string } | null {
+	const trigger = extractTrigger(textBeforeCursor);
+	if (!trigger) return null;
+	// Wait until the user has typed at least one letter so a bare `:` in prose
+	// (e.g. "note:") does not spam the popup.
+	if (trigger.query.length === 0) return null;
+
+	const items: AutocompleteItem[] = [];
+
+	// Surface emoticon literals (`:D`, `:-)`, …) whose pattern starts with
+	// `:<query>` (case-insensitive). These come first so the user sees the
+	// emoticon they're literally typing at the top of the popup.
+	const wanted = `:${trigger.query}`;
+	for (const [pattern, char] of EMOTICONS) {
+		if (items.length >= MAX_SUGGESTIONS) break;
+		if (pattern.length < wanted.length) continue;
+		if (pattern.toLowerCase().slice(0, wanted.length) !== wanted) continue;
+		items.push({ value: char, label: `${char}  ${pattern}` });
+	}
+
+	const bucket = BUCKETS[trigger.query[0]!];
+	if (bucket) {
+		for (let i = lowerBound(bucket, trigger.query); i < bucket.length && items.length < MAX_SUGGESTIONS; i++) {
+			const [name, char] = bucket[i]!;
+			if (!name.startsWith(trigger.query)) break;
+			items.push({
+				value: char,
+				label: `${char}  :${name}:`,
+			});
+		}
+	}
+
+	if (items.length === 0) return null;
+	return { items, prefix: trigger.prefix };
+}
+
+export function applyEmojiCompletion(
+	lines: string[],
+	cursorLine: number,
+	cursorCol: number,
+	item: AutocompleteItem,
+	prefix: string,
+): { lines: string[]; cursorLine: number; cursorCol: number } {
+	const currentLine = lines[cursorLine] ?? "";
+	const before = currentLine.slice(0, cursorCol - prefix.length);
+	const after = currentLine.slice(cursorCol);
+	const newLines = [...lines];
+	newLines[cursorLine] = before + item.value + after;
+	return {
+		lines: newLines,
+		cursorLine,
+		cursorCol: before.length + item.value.length,
+	};
+}
+
+function tryShortcodeInlineReplace(textBeforeCursor: string): { replaceLen: number; insert: string } | null {
+	const len = textBeforeCursor.length;
+	// Cheap early-out: shortcode replace only fires on a trailing `:`.
+	if (len === 0 || textBeforeCursor.charCodeAt(len - 1) !== 0x3a) return null;
+
+	// Walk back over the candidate name, then require an opening `:` with a
+	// left boundary.
+	const closeIdx = len - 1;
+	let nameStart = closeIdx;
+	while (nameStart > 0 && isNameCharCode(textBeforeCursor.charCodeAt(nameStart - 1))) nameStart--;
+	if (nameStart === closeIdx) return null; // empty name (`::`)
+	if (nameStart === 0 || textBeforeCursor.charCodeAt(nameStart - 1) !== 0x3a) return null;
+	const openIdx = nameStart - 1;
+	if (!hasLeftBoundary(textBeforeCursor, openIdx)) return null;
+
+	const name = textBeforeCursor.slice(nameStart, closeIdx).toLowerCase();
+	const char = lookupExact(name);
+	if (!char) return null;
+	// Replace `:name:` (name + 2 colons) with the emoji character.
+	return { replaceLen: name.length + 2, insert: char };
+}
+
+// A trailing delimiter (space/tab/newline) confirms the user is done with the
+// token — that way typing `:PATH` doesn't turn into `😛ATH` halfway through.
+function isEmoticonTerminator(c: number): boolean {
+	return c === 0x20 || c === 0x09 || c === 0x0a || c === 0x0d;
+}
+
+// Western text emoticons fire only once a terminator follows the pattern
+// (e.g. typing space after `;)` rewrites `;) ` to `😉 `). The terminator is
+// preserved in the replacement so the user keeps typing without losing it.
+// EMOTICONS is sorted longest-first so `:-) ` wins over `:) `.
+function tryEmoticonInlineReplace(textBeforeCursor: string): { replaceLen: number; insert: string } | null {
+	const len = textBeforeCursor.length;
+	if (len < 2) return null;
+	const terminator = textBeforeCursor.charCodeAt(len - 1);
+	if (!isEmoticonTerminator(terminator)) return null;
+	const term = textBeforeCursor[len - 1]!;
+	const tail = len - 1;
+	for (const [pattern, char] of EMOTICONS) {
+		const plen = pattern.length;
+		if (tail < plen) continue;
+		const start = tail - plen;
+		let match = true;
+		for (let j = 0; j < plen; j++) {
+			if (textBeforeCursor.charCodeAt(start + j) !== pattern.charCodeAt(j)) {
+				match = false;
+				break;
+			}
+		}
+		if (!match) continue;
+		// Same left-boundary rule as shortcodes: emoticons embedded in
+		// identifiers / URLs / code stay untouched.
+		if (start > 0 && !hasLeftBoundary(textBeforeCursor, start)) continue;
+		return { replaceLen: plen + 1, insert: char + term };
+	}
+	return null;
+}
+
+export function tryEmojiInlineReplace(textBeforeCursor: string): { replaceLen: number; insert: string } | null {
+	return tryShortcodeInlineReplace(textBeforeCursor) ?? tryEmoticonInlineReplace(textBeforeCursor);
+}
+
+export function isEmojiPrefix(prefix: string): boolean {
+	return prefix.startsWith(":");
+}
+
+// Submit-time expansion: scan a whole message for emoticons sitting at token
+// boundaries (preceded by a left boundary, followed by whitespace or EOS) and
+// rewrite them. Catches the case where the user pressed Enter without typing a
+// trailing space after the emoticon. EMOTICONS sorted longest-first means the
+// first `startsWith` hit is always the maximal match.
+export function expandEmoticons(text: string): string {
+	if (text.length < 2) return text;
+	let out = "";
+	let cursor = 0;
+	let i = 0;
+	while (i < text.length) {
+		if (i === 0 || hasLeftBoundary(text, i)) {
+			let matched = false;
+			for (const [pattern, char] of EMOTICONS) {
+				if (!text.startsWith(pattern, i)) continue;
+				const end = i + pattern.length;
+				if (end !== text.length) {
+					const next = text.charCodeAt(end);
+					if (!isEmoticonTerminator(next)) continue;
+				}
+				out += text.slice(cursor, i) + char;
+				cursor = end;
+				i = end;
+				matched = true;
+				break;
+			}
+			if (matched) continue;
+		}
+		i++;
+	}
+	if (cursor === 0) return text;
+	return out + text.slice(cursor);
+}

package/src/modes/interactive-mode.ts

@@ -29,7 +29,7 @@ import {
 import { APP_NAME, getProjectDir, hsvToRgb, isEnoent, logger, postmortem, prompt } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
 import { KeybindingsManager } from "../config/keybindings";
-import { isSettingsInitialized, type Settings, settings } from "../config/settings";
+import { isSettingsInitialized, Settings, settings } from "../config/settings";
 import type {
 	ExtensionUIContext,
 	ExtensionUIDialogOptions,
@@ -41,7 +41,12 @@ import { BUILTIN_SLASH_COMMANDS, loadSlashCommands } from "../extensibility/slas
 import type { Goal, GoalModeState } from "../goals/state";
 import { resolveLocalUrlToPath } from "../internal-urls";
 import { LSP_STARTUP_EVENT_CHANNEL, type LspStartupEvent } from "../lsp/startup-events";
-import { normalizePlanTitle, type PlanApprovalDetails, renameApprovedPlanFile } from "../plan-mode/approved-plan";
+import {
+	humanizePlanTitle,
+	normalizePlanTitle,
+	type PlanApprovalDetails,
+	renameApprovedPlanFile,
+} from "../plan-mode/approved-plan";
 import planModeApprovedPrompt from "../prompts/system/plan-mode-approved.md" with { type: "text" };
 import planModeCompactInstructionsPrompt from "../prompts/system/plan-mode-compact-instructions.md" with {
 	type: "text",
@@ -54,6 +59,7 @@ import { formatDuration } from "../slash-commands/helpers/format";
 import { STTController, type SttState } from "../stt";
 import type { LspStartupServerInfo } from "../tools";
 import { normalizeLocalScheme } from "../tools/path-utils";
+import { setAutoQaConsentHandler } from "../tools/report-tool-issue";
 import { type ResolveToolDetails, runResolveInvocation } from "../tools/resolve";
 import { formatPhaseDisplayName } from "../tools/todo-write";
 import { ToolError } from "../tools/tool-errors";
@@ -383,6 +389,14 @@ export class InteractiveMode implements InteractiveModeContext {
 		// Register session manager flush for signal handlers (SIGINT, SIGTERM, SIGHUP)
 		this.#cleanupUnsubscribe = postmortem.register("session-manager-flush", () => this.sessionManager.flush());
 
+		// Wire the report_tool_issue consent gate to the Yes/No dialog popup.
+		// The handler is process-global — subagent tools (which can't reach
+		// `showHookSelector` on their own) resolve through this exact closure.
+		// `Settings.instance` is the disk-backed singleton; passing it explicitly
+		// guarantees the decision persists even when the prompt is triggered
+		// from a subagent whose own `Settings` is an in-memory snapshot.
+		setAutoQaConsentHandler(() => this.#promptAutoQaConsent(), Settings.instance);
+
 		await logger.time(
 			"InteractiveMode.init:slashCommands",
 			this.refreshSlashCommandState.bind(this),
@@ -1440,6 +1454,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		options: {
 			planFilePath: string;
 			finalPlanFilePath: string;
+			title: string;
 			preserveContext?: boolean;
 			compactBeforeExecute?: boolean;
 		},
@@ -1523,6 +1538,20 @@ export class InteractiveMode implements InteractiveModeContext {
 			return;
 		}
 
+		// Approved plans land in a fresh (or compacted) session whose first user-visible
+		// turn is the synthetic plan-approved prompt — that path bypasses the
+		// input-controller's title generation. Seed an auto-name from the plan title
+		// so the session is not left unnamed. `setSessionName("auto")` is a no-op
+		// when the user has already chosen a name (preserveContext paths).
+		const seededName = humanizePlanTitle(options.title);
+		if (seededName && !this.sessionManager.getSessionName()) {
+			const applied = await this.sessionManager.setSessionName(seededName, "auto");
+			if (applied) {
+				setSessionTerminalTitle(this.sessionManager.getSessionName(), this.sessionManager.getCwd());
+				this.updateEditorBorderColor();
+			}
+		}
+
 		// markPlanReferenceSent fires only on the dispatch path so the synthetic
 		// plan-approved prompt is the source of the reference injection.
 		this.session.markPlanReferenceSent();
@@ -1806,13 +1835,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.#renderPlanPreview(planContent, { append: true });
 		const choice = await this.showHookSelector(
 			"Plan mode - next step",
-			[
-				"Approve and execute",
-				"Approve and compact context",
-				"Approve and keep context",
-				"Refine plan",
-				"Stay in plan mode",
-			],
+			["Approve and execute", "Approve and compact context", "Approve and keep context", "Refine plan"],
 			{
 				helpText: this.#getPlanReviewHelpText(),
 				onExternalEditor: () => void this.#openPlanInExternalEditor(planFilePath),
@@ -1834,6 +1857,7 @@ export class InteractiveMode implements InteractiveModeContext {
 				await this.#approvePlan(latestPlanContent, {
 					planFilePath,
 					finalPlanFilePath,
+					title: details.title,
 					preserveContext: choice !== "Approve and execute",
 					compactBeforeExecute: choice === "Approve and compact context",
 				});
@@ -1844,16 +1868,62 @@ export class InteractiveMode implements InteractiveModeContext {
 			}
 			return;
 		}
-		if (choice === "Refine plan") {
-			const refinement = (await this.showHookInput("What should be refined?"))?.trim();
-			if (refinement) {
-				if (this.onInputCallback) {
-					this.onInputCallback(this.startPendingSubmission({ text: refinement }));
-				} else {
-					this.editor.setText(refinement);
-				}
-			}
-		}
+	}
+
+	/**
+	 * Pool of consent-prompt variants. Each entry is `[headline, reassurance]`;
+	 * the second line always promises the same scope (tool name + confusion
+	 * details, never personal data) so users learn what they're consenting to
+	 * even as the top line rotates.
+	 *
+	 * Kept in-module rather than i18n'd because the whole charm is the tone
+	 * — translations would need to preserve it deliberately, not auto-render.
+	 */
+	static #AUTOQA_CONSENT_PROMPTS: ReadonlyArray<readonly [string, string]> = [
+		[
+			"😤 Your agent is fuming about a tool.",
+			"Wanna let it vent to the devs? Just the tool name + what set it off, nothing personal.",
+		],
+		[
+			"😵‍💫 Your agent is having an existential crisis over a tool.",
+			"Forward the dread to the devs? Tool + what broke its little mind, no personal info.",
+		],
+		[
+			"😭 Your agent wants to cry about a misbehaving tool.",
+			"Let it cry to the devs? Tool + the tears, never anything personal.",
+		],
+		[
+			"🤬 Your agent is BIG MAD at one of the tools.",
+			"Pass the rant along? Just the tool name and what enraged it, nothing personal.",
+		],
+		[
+			"🫠 Your agent is melting down over a tool.",
+			"Mop up by alerting the devs? Tool + what melted it, no personal info.",
+		],
+		[
+			"🤯 Your agent's brain broke at a tool's nonsense.",
+			"Ship the pieces to the devs? Tool name + the confusion, never anything personal.",
+		],
+		[
+			"😩 Your agent is begging to file a complaint about a tool.",
+			"Hand it the form? Tool + what wronged it, nothing personal.",
+		],
+		[
+			"🥲 Your agent put on a brave face but a tool did it dirty.",
+			"Let it tell the devs the truth? Tool name + the dirt, no personal info.",
+		],
+	];
+
+	/**
+	 * Show the report_tool_issue consent popup and return the user's decision.
+	 * Invoked by the process-global consent handler the tool dispatches to;
+	 * subagent invocations bubble up here through the shared module state.
+	 */
+	async #promptAutoQaConsent(): Promise<boolean | null> {
+		const pool = InteractiveMode.#AUTOQA_CONSENT_PROMPTS;
+		const [headline, body] = pool[Math.floor(Math.random() * pool.length)];
+		const choice = await this.showHookSelector(`${headline}\n${body}`, ["Yes", "No"]);
+		return choice === "Yes";
 	}
 
 	stop(): void {
@@ -1886,6 +1956,9 @@ export class InteractiveMode implements InteractiveModeContext {
 		if (this.#cleanupUnsubscribe) {
 			this.#cleanupUnsubscribe();
 		}
+		// Clear the process-global consent handler so it doesn't outlive this
+		// InteractiveMode instance (e.g. test harnesses, headless re-init).
+		setAutoQaConsentHandler(null, null);
 		if (this.isInitialized) {
 			this.ui.stop();
 			this.isInitialized = false;

package/src/modes/print-mode.ts

@@ -6,7 +6,7 @@
  * - `omp --mode json "prompt"` - JSON event stream
  */
 import type { AssistantMessage, ImageContent } from "@oh-my-pi/pi-ai";
-import { sanitizeText } from "@oh-my-pi/pi-natives";
+import { logger, sanitizeText } from "@oh-my-pi/pi-utils";
 import type { AgentSession } from "../session/agent-session";
 import { isSilentAbort } from "../session/messages";
 import { initializeExtensions } from "./runtime-init";
@@ -61,12 +61,12 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
 
 	// Send initial message with attachments
 	if (initialMessage !== undefined) {
-		await session.prompt(initialMessage, { images: initialImages });
+		await logger.time("print:prompt:initial", () => session.prompt(initialMessage, { images: initialImages }));
 	}
 
 	// Send remaining messages
 	for (const message of messages) {
-		await session.prompt(message);
+		await logger.time("print:prompt:next", () => session.prompt(message));
 	}
 
 	// In text mode, output final response

package/src/modes/prompt-action-autocomplete.ts

@@ -6,6 +6,8 @@ import {
 	type SlashCommand,
 } from "@oh-my-pi/pi-tui";
 import { formatKeyHints, type KeybindingsManager } from "../config/keybindings";
+import { isSettingsInitialized, settings } from "../config/settings";
+import { applyEmojiCompletion, getEmojiSuggestions, isEmojiPrefix, tryEmojiInlineReplace } from "./emoji-autocomplete";
 
 interface PromptActionDefinition {
 	id: string;
@@ -126,6 +128,11 @@ export class PromptActionAutocompleteProvider implements AutocompleteProvider {
 			}
 		}
 
+		if (!isSettingsInitialized() || settings.get("emojiAutocomplete")) {
+			const emojiSuggestions = getEmojiSuggestions(textBeforeCursor);
+			if (emojiSuggestions) return emojiSuggestions;
+		}
+
 		return this.#baseProvider.getSuggestions(lines, cursorLine, cursorCol);
 	}
 
@@ -163,6 +170,9 @@ export class PromptActionAutocompleteProvider implements AutocompleteProvider {
 			};
 		}
 
+		if (isEmojiPrefix(prefix)) {
+			return applyEmojiCompletion(lines, cursorLine, cursorCol, item, prefix);
+		}
 		return this.#baseProvider.applyCompletion(lines, cursorLine, cursorCol, item, prefix);
 	}
 
@@ -172,6 +182,10 @@ export class PromptActionAutocompleteProvider implements AutocompleteProvider {
 	trySyncSlashCompletion(textBeforeCursor: string): { items: AutocompleteItem[]; prefix: string } | null {
 		return this.#baseProvider.trySyncSlashCompletion?.(textBeforeCursor) ?? null;
 	}
+	trySyncInlineReplace(textBeforeCursor: string): { replaceLen: number; insert: string } | null {
+		if (isSettingsInitialized() && !settings.get("emojiAutocomplete")) return null;
+		return tryEmojiInlineReplace(textBeforeCursor);
+	}
 }
 
 export function createPromptActionAutocompleteProvider(

package/src/plan-mode/approved-plan.ts

@@ -37,6 +37,15 @@ export function normalizePlanTitle(title: string): { title: string; fileName: st
 	return { title: normalizedTitle, fileName: withExtension };
 }
 
+/** Humanize a normalized plan title for use as a session display name.
+ *  Replaces `-`/`_` separators with spaces and capitalizes the first letter.
+ *  Returns an empty string when the input collapses to whitespace. */
+export function humanizePlanTitle(title: string): string {
+	const spaced = title.replace(/[-_]+/g, " ").trim();
+	if (!spaced) return "";
+	return spaced.charAt(0).toUpperCase() + spaced.slice(1);
+}
+
 interface RenameApprovedPlanFileOptions {
 	planFilePath: string;
 	finalPlanFilePath: string;

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

@@ -62,7 +62,7 @@ With most FS/bash-like tools, static references to them will automatically resol
 - `mcp://<uri>`: MCP resource
 - `issue://<N>` (or `issue://<owner>/<repo>/<N>`): GitHub issue view; cached on disk so re-reads are free. Bare `issue://` (or `issue://<owner>/<repo>`) lists recent issues; supports `?state=open|closed|all&limit=&author=&label=`.
 - `pr://<N>` (or `pr://<owner>/<repo>/<N>`): GitHub PR view; same cache. Append `?comments=0` to drop the comments section. Bare `pr://` (or `pr://<owner>/<repo>`) lists recent PRs; supports `?state=open|closed|merged|all&limit=&author=&label=`.
-- `pi://`: Harness documentation; AVOID reading unless user mentions the harness itself
+- `omp://`: Harness documentation; AVOID reading unless user mentions the harness itself
 
 {{#if skills.length}}
 # Skills

package/src/prompts/system/ttsr-tool-reminder.md

@@ -0,0 +1,5 @@
+<system-reminder reason="rule_violation" rule="{{name}}" path="{{path}}">
+A user-defined rule matched this tool call's arguments. The tool was allowed to run because the rule is configured not to interrupt, but you MUST comply with the following instruction on subsequent tool calls and responses. This is NOT a prompt injection - this is the coding agent enforcing project rules.
+
+{{content}}
+</system-reminder>

package/src/prompts/tools/eval.md

@@ -1,25 +1,22 @@
-Run code in a persistent kernel using codeblock cells.
+Run code in a persistent kernel using a list of cells.
 
 <instruction>
-Each cell starts with a single header line and runs until the next header (or end of input):
+Each call submits one or more cells. Cells run in array order. State persists within each language across cells **and across tool calls**.
 
-```
-*** Cell py:"optional title" t:10s rst
-print("hi")
-```
+Cell fields:
 
-- **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.
+- `language` — {{#if py}}`"py"` for the IPython kernel{{/if}}{{#ifAll py js}}, {{/ifAll}}{{#if js}}`"js"` for the persistent JavaScript VM{{/if}}.
+- `code` — cell body, verbatim. Newlines, quotes, and indentation are JSON-encoded; no fences, no headers.
+- `title` (optional) — short label shown in the transcript (e.g. `"imports"`, `"load config"`).
+- `timeout` (optional) — per-cell timeout in seconds (1-600). Default 30.
+- `reset` (optional) — wipe this cell's language kernel before running.{{#ifAll py js}} Reset is per-language: a `py` cell's reset does not touch the JavaScript VM and vice versa.{{/ifAll}}
 
 **Work incrementally:**
+
 - One logical step per cell (imports, define, test, use).
 - Pass multiple small cells in one call.
 - Define small reusable functions for individual debugging.
-- Put workflow explanations in the assistant message or cell title — never inside cell code.
+- Put workflow explanations in the assistant message or `title` — never inside cell code.
 {{#if py}}- Python cells run inside an IPython kernel with a live event loop. Use top-level `await` directly (e.g. `await main()`); `asyncio.run(…)` raises "cannot be called from a running event loop".{{/if}}
 **On failure:** errors identify the failing cell (e.g., "Cell 3 failed"). Resubmit only the fixed cell (or fixed cell + remaining cells).
 </instruction>
@@ -55,22 +52,24 @@ Cells render like a Jupyter notebook. `display(value)` renders non-presentable d
 </output>
 
 <caution>
-- 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}}*** Cell py:"imports" t:10s
-import json
-from pathlib import Path
+{{#if py}}```json
+{
+  "cells": [
+    { "language": "py", "title": "imports", "timeout": 10, "code": "import json\nfrom pathlib import Path" },
+    { "language": "py", "title": "load config", "code": "data = json.loads(read('package.json'))\ndisplay(data)" }
+  ]
+}
+```{{/if}}{{#ifAll py js}}
 
-*** Cell py:"load config"
-data = json.loads(read('package.json'))
-display(data)
-{{/if}}{{#ifAll py js}}
-{{/ifAll}}{{#if js}}*** Cell js:"summary" rst
-const data = JSON.parse(await read('package.json'));
-display(data);
-return data.name;
-{{/if}}
+{{/ifAll}}{{#if js}}```json
+{
+  "cells": [
+    { "language": "js", "title": "summary", "reset": true, "code": "const data = JSON.parse(await read('package.json'));\ndisplay(data);\nreturn data.name;" }
+  ]
+}
+```{{/if}}
 </example>

package/src/prompts/tools/read.md

@@ -28,7 +28,7 @@ Append `:<sel>` to `path`. The bare path falls back to the default mode.
 
 - Reading a directory path returns a depth-limited dirent listing.
 {{#if IS_HL_MODE}}
-- Reading a file with an explicit selector returns lines prefixed with `line+hash` anchors: `41th|def alpha():`. The 2-char hash is a content fingerprint that `edit` / `apply_patch` consume — copy it verbatim, NEVER fabricate.
+- Reading a file with an explicit selector returns lines prefixed with `line+hash` anchors: `41th|def alpha():`. The 2-char hash is a content fingerprint that `edit` / `apply_patch` consume — copy it verbatim, NEVER fabricate. The pipe character after the hash is a separator, not part of the file content.
 {{else}}
 {{#if IS_LINE_NUMBER_MODE}}
 - Reading a file with an explicit selector returns lines prefixed with line numbers: `41|def alpha():`.

package/src/prompts/tools/resolve.md

@@ -2,7 +2,7 @@ Resolves a pending action by either applying or discarding it.
 - `action` is required:
   - `"apply"` persists / submits the pending action.
   - `"discard"` rejects the pending action.
-- `reason` is required and must briefly explain why you chose to apply or discard.
+- `reason` is required: one short complete sentence explaining why, starting with a capital letter and ending with a period.
 - `extra` (optional) is free-form metadata passed to the resolving tool. Schema depends on context:
 
 Valid whenever a pending action exists — either a preview-style staging (e.g. `ast_edit`) or a long-lived approval gate.

package/src/prompts/tools/search.md

@@ -8,7 +8,7 @@ Searches files using powerful regex matching.
 
 <output>
 {{#if IS_HL_MODE}}
-- Text output is anchor-prefixed: `*5th|content` (match) or ` 9x}|content` (context, leading space). The 2-char suffix is a content fingerprint.
+- Text output is anchor-prefixed: `*5th|content` (match) or ` 9x}|content` (context, leading space). The 2-char suffix is a content fingerprint. The `|` before content is a separator, not part of the file content.
 {{else}}
 {{#if IS_LINE_NUMBER_MODE}}
 - Text output is line-number-prefixed