@oh-my-pi/pi-coding-agent 15.3.2 → 15.4.2

package/src/modes/components/extensions/types.ts

@@ -143,11 +143,6 @@ export interface DashboardState {
 	selected: Extension | null;
 }
 
-/**
- * @deprecated Use FocusRegion instead
- */
-export type FocusPane = "sidebar" | "main" | "inspector";
-
 /**
  * Callbacks from dashboard to parent.
  */

package/src/modes/components/session-observer-overlay.ts

@@ -22,6 +22,7 @@ import { isSilentAbort } from "../../session/messages";
 import type { SessionMessageEntry } from "../../session/session-manager";
 import { parseSessionEntries } from "../../session/session-manager";
 import { PREVIEW_LIMITS, replaceTabs, TRUNCATE_LENGTHS, truncateToWidth } from "../../tools/render-utils";
+import { toPathList } from "../../tools/search";
 import type { ObservableSession, SessionObserverRegistry } from "../session-observer-registry";
 import { getMarkdownTheme, theme } from "../theme/theme";
 import { DynamicBorder } from "./dynamic-border";
@@ -533,13 +534,21 @@ export class SessionObserverOverlayComponent extends Container {
 			case "write":
 			case "edit":
 				return args.path ? `path: ${args.path}` : "";
-			case "search":
+			case "search": {
+				const searchPathsInput =
+					typeof args.paths === "string" || Array.isArray(args.paths)
+						? args.paths
+						: typeof args.path === "string"
+							? args.path
+							: undefined;
+				const searchPaths = toPathList(searchPathsInput);
 				return [
 					args.pattern ? `pattern: ${args.pattern}` : "",
-					Array.isArray(args.paths) ? `paths: ${args.paths.join(", ")}` : "",
+					searchPaths.length > 0 ? `paths: ${searchPaths.join(", ")}` : "",
 				]
 					.filter(Boolean)
 					.join(", ");
+			}
 			case "find":
 				return Array.isArray(args.paths) ? `paths: ${args.paths.join(", ")}` : "";
 			case "bash": {

package/src/modes/components/settings-selector.ts

@@ -13,7 +13,7 @@ import {
 	TabBar,
 	Text,
 } from "@oh-my-pi/pi-tui";
-import { type SettingPath, settings } from "../../config/settings";
+import { getDefault, type SettingPath, settings } from "../../config/settings";
 import type {
 	SettingTab,
 	StatusLinePreset,
@@ -294,6 +294,7 @@ export class SettingsSelectorComponent extends Container {
 		}
 
 		const currentValue = this.#getCurrentValue(def);
+		const changed = this.#isChanged(def, currentValue);
 
 		switch (def.type) {
 			case "boolean":
@@ -303,6 +304,7 @@ export class SettingsSelectorComponent extends Container {
 					description: def.description,
 					currentValue: currentValue ? "true" : "false",
 					values: ["true", "false"],
+					changed,
 				};
 
 			case "enum":
@@ -312,6 +314,7 @@ export class SettingsSelectorComponent extends Container {
 					description: def.description,
 					currentValue: currentValue as string,
 					values: [...def.values],
+					changed,
 				};
 
 			case "submenu":
@@ -321,6 +324,7 @@ export class SettingsSelectorComponent extends Container {
 					description: def.description,
 					currentValue: this.#getSubmenuCurrentValue(def.path, currentValue),
 					submenu: (cv, done) => this.#createSubmenu(def, cv, done),
+					changed,
 				};
 
 			case "text":
@@ -330,6 +334,7 @@ export class SettingsSelectorComponent extends Container {
 					description: def.description,
 					currentValue: (currentValue as string) ?? "",
 					submenu: (cv, done) => this.#createTextInput(def, cv, done),
+					changed,
 				};
 		}
 	}
@@ -341,6 +346,10 @@ export class SettingsSelectorComponent extends Container {
 		return settings.get(def.path);
 	}
 
+	#isChanged(def: SettingDef, currentValue: unknown): boolean {
+		return !Object.is(currentValue, getDefault(def.path));
+	}
+
 	#getSubmenuCurrentValue(path: SettingPath, value: unknown): string {
 		const rawValue = String(value ?? "");
 		if (path === "compaction.thresholdPercent" && (rawValue === "-1" || rawValue === "")) {

package/src/modes/components/tree-selector.ts

@@ -15,6 +15,7 @@ import { theme } from "../../modes/theme/theme";
 import { matchesAppInterrupt } from "../../modes/utils/keybinding-matchers";
 import type { SessionTreeNode } from "../../session/session-manager";
 import { shortenPath } from "../../tools/render-utils";
+import { toPathList } from "../../tools/search";
 import { DynamicBorder } from "./dynamic-border";
 
 /** Gutter info: position (displayIndent where connector was) and whether to show │ */
@@ -690,8 +691,15 @@ class TreeList implements Component {
 			}
 			case "search": {
 				const pattern = String(args.pattern || "");
-				const paths = Array.isArray(args.paths) ? args.paths.join(", ") : String(args.path || ".");
-				return `[search: /${pattern}/ in ${shortenPath(paths)}]`;
+				const searchPathsInput =
+					typeof args.paths === "string" || Array.isArray(args.paths)
+						? args.paths
+						: typeof args.path === "string"
+							? args.path
+							: undefined;
+				const paths = toPathList(searchPathsInput);
+				const scope = paths.length > 0 ? paths.join(", ") : ".";
+				return `[search: /${pattern}/ in ${shortenPath(scope)}]`;
 			}
 			case "find": {
 				const paths = Array.isArray(args.paths) ? args.paths.join(", ") : String(args.pattern || ".");

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

@@ -894,8 +894,6 @@ export class CommandController {
 		this.ctx.statusLine.setSessionStartTime(Date.now());
 		this.ctx.updateEditorTopBorder();
 		this.ctx.updateEditorBorderColor();
-		this.ctx.ui.requestRender();
-
 		this.ctx.chatContainer.clear();
 		this.ctx.pendingMessagesContainer.clear();
 		this.ctx.compactionQueuedMessages = [];
@@ -906,7 +904,7 @@ export class CommandController {
 		this.ctx.chatContainer.addChild(new Spacer(1));
 		this.ctx.chatContainer.addChild(new Text(`${theme.fg("accent", `${theme.status.success} ${label}`)}`, 1, 1));
 		await this.ctx.reloadTodos();
-		this.ctx.ui.requestRender();
+		this.ctx.ui.requestRender(true, { clearScrollback: true });
 	}
 
 	async handleClearCommand(): Promise<void> {

package/src/modes/controllers/extension-ui-controller.ts

@@ -135,7 +135,7 @@ export class ExtensionUiController {
 			reload: async () => {
 				await this.ctx.session.reload();
 				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				this.ctx.renderInitialMessages(undefined, { clearTerminalHistory: true });
 				await this.ctx.reloadTodos();
 				this.ctx.showStatus("Reloaded session");
 			},
@@ -180,7 +180,7 @@ export class ExtensionUiController {
 					new Text(`${theme.fg("accent", `${theme.status.success} New session started`)}`, 1, 1),
 				);
 				await this.ctx.reloadTodos();
-				this.ctx.ui.requestRender();
+				this.ctx.ui.requestRender(true, { clearScrollback: true });
 
 				return { cancelled: false };
 			},
@@ -192,7 +192,7 @@ export class ExtensionUiController {
 
 				// Update UI
 				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				this.ctx.renderInitialMessages(undefined, { clearTerminalHistory: true });
 				await this.ctx.reloadTodos();
 				this.ctx.editor.setText(result.selectedText);
 				this.ctx.showStatus("Branched to new session");
@@ -207,7 +207,7 @@ export class ExtensionUiController {
 
 				// Update UI
 				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				this.ctx.renderInitialMessages(undefined, { clearTerminalHistory: true });
 				await this.ctx.reloadTodos();
 				if (result.editorText && !this.ctx.editor.getText().trim()) {
 					this.ctx.editor.setText(result.editorText);
@@ -225,7 +225,7 @@ export class ExtensionUiController {
 				}
 				setSessionTerminalTitle(this.ctx.sessionManager.getSessionName(), this.ctx.sessionManager.getCwd());
 				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				this.ctx.renderInitialMessages(undefined, { clearTerminalHistory: true });
 				await this.ctx.reloadTodos();
 				return { cancelled: false };
 			},
@@ -378,7 +378,7 @@ export class ExtensionUiController {
 				}
 				await this.ctx.session.reload();
 				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				this.ctx.renderInitialMessages(undefined, { clearTerminalHistory: true });
 				await this.ctx.reloadTodos();
 				this.ctx.showStatus("Reloaded session");
 			},
@@ -419,7 +419,7 @@ export class ExtensionUiController {
 					new Text(`${theme.fg("accent", `${theme.status.success} New session started`)}`, 1, 1),
 				);
 				await this.ctx.reloadTodos();
-				this.ctx.ui.requestRender();
+				this.ctx.ui.requestRender(true, { clearScrollback: true });
 
 				return { cancelled: false };
 			},
@@ -434,7 +434,7 @@ export class ExtensionUiController {
 
 				// Update UI
 				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				this.ctx.renderInitialMessages(undefined, { clearTerminalHistory: true });
 				await this.ctx.reloadTodos();
 				this.ctx.editor.setText(result.selectedText);
 				this.ctx.showStatus("Branched to new session");
@@ -452,7 +452,7 @@ export class ExtensionUiController {
 
 				// Update UI
 				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				this.ctx.renderInitialMessages(undefined, { clearTerminalHistory: true });
 				await this.ctx.reloadTodos();
 				if (result.editorText && !this.ctx.editor.getText().trim()) {
 					this.ctx.editor.setText(result.editorText);
@@ -472,7 +472,7 @@ export class ExtensionUiController {
 					return { cancelled: true };
 				}
 				this.ctx.chatContainer.clear();
-				this.ctx.renderInitialMessages();
+				this.ctx.renderInitialMessages(undefined, { clearTerminalHistory: true });
 				await this.ctx.reloadTodos();
 				return { cancelled: false };
 			},
@@ -537,7 +537,6 @@ export class ExtensionUiController {
 						model: this.ctx.session.model,
 						isIdle: () => !this.ctx.session.isStreaming,
 						hasPendingMessages: () => this.ctx.session.queuedMessageCount > 0,
-						hasQueuedMessages: () => this.ctx.session.queuedMessageCount > 0,
 						abort: () => {
 							this.ctx.session.abort();
 						},

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

@@ -553,7 +553,7 @@ export class SelectorController {
 					}
 
 					this.ctx.chatContainer.clear();
-					this.ctx.renderInitialMessages();
+					this.ctx.renderInitialMessages(undefined, { clearTerminalHistory: true });
 					this.ctx.editor.setText(result.selectedText);
 					done();
 					this.ctx.showStatus("Branched to new session");
@@ -664,7 +664,7 @@ export class SelectorController {
 
 						// Update UI — pass the context built by navigateTree to skip a second O(N) walk.
 						this.ctx.chatContainer.clear();
-						this.ctx.renderInitialMessages(result.sessionContext);
+						this.ctx.renderInitialMessages(result.sessionContext, { clearTerminalHistory: true });
 						await this.ctx.reloadTodos();
 						if (result.editorText && !this.ctx.editor.getText().trim()) {
 							this.ctx.editor.setText(result.editorText);
@@ -772,9 +772,9 @@ export class SelectorController {
 		this.ctx.statusLine.setSessionStartTime(Date.now());
 		this.ctx.updateEditorTopBorder();
 		this.ctx.updateEditorBorderColor();
-		this.ctx.renderInitialMessages();
+		this.ctx.renderInitialMessages(undefined, { clearTerminalHistory: true });
 		await this.ctx.reloadTodos();
-		this.ctx.ui.requestRender();
+		this.ctx.ui.requestRender(true, { clearScrollback: true });
 		return true;
 	}
 
@@ -788,7 +788,7 @@ export class SelectorController {
 
 		// Clear and re-render the chat
 		this.ctx.chatContainer.clear();
-		this.ctx.renderInitialMessages();
+		this.ctx.renderInitialMessages(undefined, { clearTerminalHistory: true });
 		await this.ctx.reloadTodos();
 		this.ctx.showStatus("Resumed session");
 	}

package/src/modes/theme/theme.ts

@@ -2404,8 +2404,10 @@ export function getEditorTheme(): EditorTheme {
 
 export function getSettingsListTheme(): import("@oh-my-pi/pi-tui").SettingsListTheme {
 	return {
-		label: (text: string, selected: boolean) => (selected ? theme.fg("accent", text) : text),
-		value: (text: string, selected: boolean) => (selected ? theme.fg("accent", text) : theme.fg("muted", text)),
+		label: (text: string, selected: boolean, changed: boolean) =>
+			changed ? theme.fg("statusLineGitDirty", text) : selected ? theme.fg("accent", text) : text,
+		value: (text: string, selected: boolean, changed: boolean) =>
+			selected ? theme.fg("accent", text) : changed ? theme.fg("statusLineGitDirty", text) : theme.fg("muted", text),
 		description: (text: string) => theme.fg("dim", text),
 		cursor: theme.fg("accent", `${theme.nav.cursor} `),
 		hint: (text: string) => theme.fg("dim", text),

package/src/modes/types.ts

@@ -186,7 +186,10 @@ export interface InteractiveModeContext {
 		sessionContext: SessionContext,
 		options?: { updateFooter?: boolean; populateHistory?: boolean },
 	): void;
-	renderInitialMessages(prebuiltContext?: SessionContext, options?: { preserveExistingChat?: boolean }): void;
+	renderInitialMessages(
+		prebuiltContext?: SessionContext,
+		options?: { preserveExistingChat?: boolean; clearTerminalHistory?: boolean },
+	): void;
 	getUserMessageText(message: Message): string;
 	findLastAssistantMessage(): AssistantMessage | undefined;
 	extractAssistantText(message: AssistantMessage): string;

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

@@ -31,6 +31,7 @@ import { formatBytes, formatDuration } from "../../tools/render-utils";
 type TextBlock = { type: "text"; text: string };
 interface RenderInitialMessagesOptions {
 	preserveExistingChat?: boolean;
+	clearTerminalHistory?: boolean;
 }
 
 type QueuedMessages = {
@@ -490,6 +491,9 @@ export class UiHelpers {
 			const times = compactionCount === 1 ? "1 time" : `${compactionCount} times`;
 			this.ctx.showStatus(`Session compacted ${times}`);
 		}
+		if (options.clearTerminalHistory) {
+			this.ctx.ui.requestRender(true, { clearScrollback: true });
+		}
 		if (preservedChatChildren && preservedChatChildren.length > 0) {
 			for (const child of preservedChatChildren) {
 				this.ctx.chatContainer.addChild(child);

package/src/prompts/agents/explore.md

@@ -15,7 +15,7 @@ output:
         description: Files examined with relevant code references
       elements:
         properties:
-          ref:
+          path:
             metadata:
               description: Project-relative path or paths to the most relevant code reference(s), optionally suffixed with line ranges like `:12-34` when relevant
             type: string

package/src/prompts/tools/ast-edit.md

@@ -14,7 +14,7 @@ Performs structural AST-aware rewrites via native ast-grep.
 </instruction>
 
 <output>
-- Replacement summary, per-file replacement counts, and change diffs as `-LINE+ID|before` / `+LINE+ID|after` lines
+- Replacement summary, per-file replacement counts, and change diffs as `¶src/foo.ts#1a2b`, `-12:before`, `+12:after` lines in hashline mode
 - Parse issues when files cannot be processed
 </output>
 

package/src/prompts/tools/ast-grep.md

@@ -18,7 +18,7 @@ Performs structural code search using AST matching via native ast-grep.
 
 <output>
 - Grouped matches with file path, byte range, line/column ranges, metavariable captures
-- Match lines are anchor-prefixed: `*LINE+ID|content` for the matched line and ` LINE+ID|content` (leading space) for surrounding context
+- Match lines are numbered under a file-hash header in hashline mode: `¶src/foo.ts#1a2b`, `*42:content` for the matched line, ` 43:content` for context
 - Summary counts (`totalMatches`, `filesWithMatches`, `filesSearched`) and parse issues when present
 </output>
 

package/src/prompts/tools/eval.md

@@ -1,7 +1,7 @@
 Run code in a persistent kernel using a list of cells.
 
 <instruction>
-Each call submits one or more cells. Cells run in array order. State persists within each language across cells **and across tool calls**.
+Each call submits one or more cells. Cells run in array order. State persists within each language across cells, tool calls, and subagents spawned with `task`; variables a parent or subagent declares are visible to the other on the same shared executor.
 
 Cell fields:
 

package/src/prompts/tools/hashline.md

@@ -1,130 +1,109 @@
 Your patch language is a compact, line-anchored edit format.
 
-A patch contains one or more file sections. The first non-blank line of every edit section MUST be `§PATH`.
-Operations reference lines in the file by their line number and hash, called "Anchors", e.g. `5th`, `123ab`.
-You MUST copy them verbatim from the latest output for the file you're editing.
+A patch contains one or more file sections. Each anchored section starts with `¶PATH#HASH`, copied verbatim from the latest `read`/`search` output. `HASH` is a 4-hex file hash; `¶PATH` without `#HASH` is allowed only for new-file / `BOF` / `EOF` boundary inserts.
 
-Purely textual format. The tool has NO awareness of language, indentation, brackets, fences, or table widths. You MUST emit valid syntax in replacements/insertions.
+Operations reference lines by bare line number (`5`, `123`). Payload text is verbatim — NEVER escape unicode. The tool has NO awareness of language, indentation, brackets, fences, or table widths. Emit valid syntax in replacements/insertions.
 
 <ops>
-§PATH           header: subsequent ops apply to PATH
-Each op line is ONE of:
-»ANCHOR         insert lines AFTER  the anchored line (or EOF); payload follows on subsequent lines
-«ANCHOR         insert lines BEFORE the anchored line (or BOF); payload follows on subsequent lines
-≔A..B           replace the inclusive range A..B with payload; delete the range if no payload follows
-≔A              shorthand for ≔A..A
+¶PATH#HASH     header: subsequent anchored ops apply to PATH at file hash HASH
+¶PATH          unbound header: only BOF/EOF boundary inserts
+LINE↑PAYLOAD   insert ABOVE the anchored line (or BOF)
+LINE↓PAYLOAD   insert BELOW the anchored line (or EOF)
+A-B:PAYLOAD    replace the inclusive range A..B with PAYLOAD
+A:PAYLOAD      shorthand for A-A:PAYLOAD
+A-B!           delete the inclusive range A..B (payload forbidden)
+A!             shorthand for A-A!
 </ops>
 
+<payload>
+- The first payload line is whatever follows the sigil on the op line. Additional payload lines follow on the next lines and append after the first.
+- An empty inline IS an empty first line. So bare `A↓` / `A↑` insert one blank line; bare `A:` / `A-B:` replace with one blank line. `A↓\nfoo` inserts blank-then-`foo`, NOT just `foo`.
+- Payload ends at the next op, next `¶PATH`, envelope marker, or EOF. Blank lines immediately before a next op or `¶PATH` are dropped; blank lines between content lines are preserved.
+</payload>
+
 <rules>
-- Payload text is verbatim — NEVER escape unicode.
-- Payload ends at the next `»`, `«`, `≔`, `§`, envelope marker, or EOF.
-- `≔A..B` with no payload deletes the range. To keep a blank line, include one explicit empty payload line.
-- **Payload is only what's NEW relative to your range:**
-  - `≔` replaces inside; NEVER include lines outside.
-  - `»`/`«` adds at the anchor; NEVER repeat line A or neighbors.
-  - Payload matching nearby content duplicates — drop it or widen.
-- **Pick a self-contained unit first.** Touching a multiline construct? Widen to the whole thing.
-- Then smallest op: add → `»`/`«`; delete/replace → `≔`.
+- The sigil tells where content lands: `↑` above, `↓` below, `:` replaces, `!` deletes.
+- **Payload is only what's NEW relative to your range.** `:` replaces inside; `↑`/`↓` add at anchor. NEVER repeat the anchor line or neighbors — that duplicates them.
+- **Pick a self-contained unit.** Touching a multiline construct (return, array, brace block, JSX element)? Widen the range to span it. Don't bisect.
+- Smallest op wins: add with `↑`/`↓`; replace with `:`; delete with `!`.
+- Anchors reference the file as last read. ONE patch, ONE coordinate space — later ops still use original line numbers.
 </rules>
 
-<brace-shapes>
-When braces bound your edit, you SHOULD prefer these shapes:
-- **Whole block**: range spans `{` through matching `}`.
-- **Signature only**: one-line `≔` on the opener; body untouched.
-- **Insert inside**: anchor on `{` or last interior line; NEVER repeat the braces.
-- **End on `}`**: only when that `}` is part of the change. Otherwise extend or stop earlier.
-</brace-shapes>
-
 <common-failures>
 - **NEVER replay past your range.** Stop before B+1; extend B if it must go.
-- **NEVER duplicate chunks inside one payload.** Caught re-emitting? Rewrite.
-- **Anchor only inside the visible region.** B+1 truncated? Re-`read` first.
-- **You SHOULD prefer the narrowest self-contained edit.** Narrow range beats wide range.
-- **Anchors reference the file as last read.** NEVER shift for prior ops.
-- **One `»`/`«` op per block, NOT per line.** N lines = ONE op, N payloads. Collapse adjacent ops.
-- **NEVER fabricate anchor hashes.** Missing? Re-`read`.
+- **NEVER duplicate chunks inside one payload.**
+- **Read lines look like replace ops.** `84:content` already means "make line 84 equal to content" — don't echo a context line before it.
+- **NEVER fabricate file hashes.** Missing? Re-`read`.
+- **`A!` deletes silently.** Deleting a line that closes/opens a block (`}`, `} else {`, `})`, `*/`) breaks structure with no parse error.
 </common-failures>
 
 <case file="mod.ts">
-{{hline 1 "const TITLE = \"Mr\";"}}
-{{hline 2 "export function greet(name) {"}}
-{{hline 3 "\treturn ["}}
-{{hline 4 "\t\tTITLE,"}}
-{{hline 5 "\t\tname?.trim() || \"guest\","}}
-{{hline 6 "\t].join(\" \");"}}
+¶mod.ts#1a2b
+{{hline 1 'const TITLE = "Mr";'}}
+{{hline 2 'export function greet(name) {'}}
+{{hline 3 '	return ['}}
+{{hline 4 '		TITLE,'}}
+{{hline 5 '		name?.trim() || "guest",'}}
+{{hline 6 '	].join(" ");'}}
 {{hline 7 "}"}}
 </case>
 
 <examples>
-# Replace one line (the payload must re-emit the original indentation)
-§mod.ts
-≔{{hrefr 1}}
-const TITLE = "Mrs";
-
-# Replace a full multiline statement (widen to a self-contained boundary)
-§mod.ts
-≔{{hrefr 3}}..{{hrefr 6}}
-	return [
+# Replace one line (inline payload preserves original indentation)
+¶mod.ts#1a2b
+{{hrefr 1}}:const TITLE = "Mrs";
+
+# Replace a multiline statement — first line inline, rest below
+¶mod.ts#1a2b
+{{hrefr 3}}-{{hrefr 6}}:	return [
 		"Mrs",
 		name?.trim() || "guest",
 	].join(" ");
 
-# Insert AFTER/BEFORE a line
-§mod.ts
-»{{hrefr 4}}
-		"Dr",
-«{{hrefr 5}}
-		"Dr",
-
-# Append to file
-§mod.ts
-»EOF
-export const done = true;
-
-# Delete a line
-§mod.ts
-≔{{hrefr 5}}
-
-# Blank a line (replace with LF: the empty payload is the blank line before `»EOF`)
-§mod.ts
-≔{{hrefr 5}}
-
-»EOF
-export const done = true;
+# Insert ABOVE / BELOW a line
+¶mod.ts#1a2b
+{{hrefr 4}}↓		"Dr",
+{{hrefr 5}}↑		"Dr",
+
+# Delete one line / blank a line / insert a blank line
+¶mod.ts#1a2b
+{{hrefr 5}}!
+{{hrefr 6}}:
+{{hrefr 7}}↑
+
+# Create a file / append to one (hash optional for boundary-only inserts)
+¶new.ts
+BOF↓export const done = true;
+¶mod.ts
+EOF↓export const done = true;
+
+# Multi-file patch
+¶src/a.ts#1a2b
+12:const enabled = true;
+¶src/b.ts#3c4d
+20!
 </examples>
 
 <anti-pattern>
 # WRONG — replaces 2 lines just to add one.
-§mod.ts
-≔{{hrefr 1}}..{{hrefr 2}}
-const TITLE = "Mr";
+¶mod.ts#1a2b
+{{hrefr 1}}-{{hrefr 2}}:const TITLE = "Mr";
 const DEBUG = false;
 export function greet(name) {
-# RIGHT — same effect, one-line insert
-§mod.ts
-»{{hrefr 1}}
-const DEBUG = false;
 
-# WRONG — replace from the middle of a larger statement (error-prone)
-§mod.ts
-≔{{hrefr 4}}..{{hrefr 5}}
-		"Dr",
+# RIGHT — one-line insert
+¶mod.ts#1a2b
+{{hrefr 1}}↓const DEBUG = false;
+
+# WRONG — bisects a multiline statement
+¶mod.ts#1a2b
+{{hrefr 4}}-{{hrefr 5}}:		"Dr",
 		name?.trim() || "guest",
+
 # RIGHT — widen to the full statement
-§mod.ts
-≔{{hrefr 3}}..{{hrefr 6}}
-	return [
+¶mod.ts#1a2b
+{{hrefr 3}}-{{hrefr 6}}:	return [
 		"Dr",
 		name?.trim() || "guest",
 	].join(" ");
 </anti-pattern>
-
-<critical>
-- Copy anchors verbatim (line number + 2-char hash); NEVER include the `|TEXT` body.
-- NEVER write unified diff syntax. Headers are `§PATH`; ops are `»`/`«`/`≔`.
-- `≔A..B` deletes the range when no payload follows. To keep a blank line, include one explicit empty payload line.
-- `≔A..B` with payload writes exactly that payload. Edge line matches just outside? Widen, or it duplicates.
-- Multiple ops are cheap. SHOULD prefer two narrow ops over one wide `≔`.
-  - Before `≔A..B`, mentally delete A..B. Splits an unclosed bracket/brace/string from above, or orphans a closer inside? You're bisecting a construct.
-- NEVER use this tool to reformat code (indentation, whitespace, line wrapping, style). Run the project's formatter instead.
-</critical>

package/src/prompts/tools/read.md

@@ -28,17 +28,17 @@ 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. The pipe character after the hash is a separator, not part of the file content.
+- Reading a file with an explicit selector emits a file-hash header and numbered lines: `¶src/foo.ts#1a2b` then `41:def alpha():`. Copy the `¶PATH#HASH` header for anchored edits; ops use bare line numbers. NEVER fabricate the hash.
 {{else}}
 {{#if IS_LINE_NUMBER_MODE}}
 - Reading a file with an explicit selector returns lines prefixed with line numbers: `41|def alpha():`.
 {{/if}}
 {{/if}}
-- Parseable code without a selector returns a **structural summary**: declarations kept, large bodies collapsed to `..` (merged brace pair) or `…` (standalone). Summarized output ends with a footer of the form:
+- Parseable code without a selector returns a **structural summary**: declarations kept, large bodies collapsed to `..` (merged brace pair) or `…` (standalone). Summarized output ends with a footer demonstrating the multi-range selector you can use to recover the elided bodies, e.g.:
 
-  `[NN lines across MM elided regions; read <path>:raw or a line range like <path>:1-9999 for verbatim content]`
+  `[NN lines elided; re-read needed ranges, e.g. <path>:5-16,40-80]`
 
-  If the elided body is what you actually need, re-issue the **exact selector the footer names**. NEVER guess what's inside `..` / `…` — those markers carry no content.
+  Re-issue **only the relevant range(s)** using the multi-range selector (e.g. `<path>:5-16,120-200`). NEVER guess what's inside `..` / `…` — those markers carry no content. NEVER re-read the whole file or use `:raw` when targeted ranges suffice.
 
 # Documents & Notebooks
 

package/src/prompts/tools/search.md

@@ -2,14 +2,14 @@ Searches files using powerful regex matching.
 
 <instruction>
 - Supports Rust regex syntax (RE2-style — no lookaround or backreferences). Use line anchors or post-filters instead of (?!…)/(?<!…)
-- `paths` is required and accepts an array of files, directories, globs, or internal URLs
-- `paths` is an array; do not embed commas or spaces inside a single entry. Pass `["src", "tests"]` not `["src,tests"]`.
+- `paths` is required and accepts either one string or an array of files, directories, globs, or internal URLs
+- For multiple targets, pass an array with one target per element. Do not comma-join targets inside one string: pass `["src", "tests"]`, not `"src,tests"` or `["src,tests"]`.
 - Cross-line patterns are detected from literal `\n` or escaped `\\n` in `pattern`
 </instruction>
 
 <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. The `|` before content is a separator, not part of the file content.
+- Text output emits a file-hash header per matched file plus numbered lines: `¶src/login.ts#3c4d`, `*42:if (user.id) {` (match), ` 43:return user;` (context). Copy the header for anchored edits; ops use bare line numbers.
 {{else}}
 {{#if IS_LINE_NUMBER_MODE}}
 - Text output is line-number-prefixed