@oh-my-pi/pi-coding-agent 15.3.1 → 15.4.1

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

package/src/sdk.ts

@@ -51,6 +51,7 @@ import "./discovery";
 import { resolveConfigValue } from "./config/resolve-config-value";
 import { initializeWithSettings } from "./discovery";
 import { disposeAllKernelSessions, disposeKernelSessionsByOwner } from "./eval/py/executor";
+import { defaultEvalSessionId } from "./eval/session-id";
 import { TtsrManager } from "./export/ttsr";
 import {
 	type CustomCommandsLoadResult,
@@ -84,11 +85,7 @@ import type { HindsightSessionState } from "./hindsight/state";
 import { LocalProtocolHandler, type LocalProtocolOptions } from "./internal-urls";
 import { LSP_STARTUP_EVENT_CHANNEL, type LspStartupEvent } from "./lsp/startup-events";
 import { discoverAndLoadMCPTools, MCPManager, type MCPToolsLoadResult } from "./mcp";
-import {
-	collectDiscoverableMCPTools,
-	formatDiscoverableMCPToolServerSummary,
-	selectDiscoverableMCPToolNamesByServer,
-} from "./mcp/discoverable-tool-metadata";
+
 import { resolveMemoryBackend } from "./memory-backend";
 import asyncResultTemplate from "./prompts/tools/async-result.md" with { type: "text" };
 import { AgentRegistry, MAIN_AGENT_ID } from "./registry/agent-registry";
@@ -117,6 +114,9 @@ import { parseThinkingLevel, resolveThinkingLevelForModel, toReasoningEffort } f
 import {
 	collectDiscoverableTools,
 	type DiscoverableTool,
+	filterBySource,
+	formatDiscoverableToolServerSummary,
+	selectDiscoverableToolNamesByServer,
 	summarizeDiscoverableTools,
 } from "./tool-discovery/tool-index";
 import {
@@ -318,6 +318,8 @@ export interface CreateAgentSessionOptions {
 	agentRegistry?: AgentRegistry;
 	/** Parent task ID prefix for nested artifact naming (e.g., "6-Extensions") */
 	parentTaskPrefix?: string;
+	/** Inherited eval executor session id for subagents sharing parent eval state. */
+	parentEvalSessionId?: string;
 
 	/** Session manager. Default: session stored under the configured agentDir sessions root */
 	sessionManager?: SessionManager;
@@ -1177,6 +1179,8 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			taskDepth: options.taskDepth ?? 0,
 			getSessionFile: () => sessionManager.getSessionFile() ?? null,
 			getEvalKernelOwnerId: () => evalKernelOwnerId,
+			getEvalSessionId: () =>
+				session?.getEvalSessionId() ?? options.parentEvalSessionId ?? defaultEvalSessionId(toolSession),
 			assertEvalExecutionAllowed: () => session?.assertEvalExecutionAllowed(),
 			trackEvalExecution: (execution, abortController) =>
 				session ? session.trackEvalExecution(execution, abortController) : execution,
@@ -1196,8 +1200,6 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			getTodoPhases: () => session.getTodoPhases(),
 			setTodoPhases: phases => session.setTodoPhases(phases),
 			isMCPDiscoveryEnabled: () => session.isMCPDiscoveryEnabled(),
-			getDiscoverableMCPTools: () => session.getDiscoverableMCPTools(),
-			getDiscoverableMCPSearchIndex: () => session.getDiscoverableMCPSearchIndex(),
 			getSelectedMCPToolNames: () => session.getSelectedMCPToolNames(),
 			activateDiscoveredMCPTools: toolNames => session.activateDiscoveredMCPTools(toolNames),
 			// Generic tool discovery (unified — covers built-in + MCP + extension)
@@ -1581,7 +1583,9 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			tools: Map<string, AgentTool>,
 		): Promise<BuildSystemPromptResult> => {
 			toolContextStore.setToolNames(toolNames);
-			const discoverableMCPTools = mcpDiscoveryEnabled ? collectDiscoverableMCPTools(tools.values()) : [];
+			const discoverableMCPTools: DiscoverableTool[] = mcpDiscoveryEnabled
+				? filterBySource(collectDiscoverableTools(tools.values()), "mcp")
+				: [];
 			const activeToolNames = new Set(toolNames);
 			const discoverableBuiltinTools: DiscoverableTool[] =
 				effectiveDiscoveryMode === "all"
@@ -1592,18 +1596,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 							{ source: "builtin" },
 						)
 					: [];
-			const discoverableToolsForDesc: DiscoverableTool[] = [
-				...discoverableBuiltinTools,
-				...discoverableMCPTools.map(t => ({
-					name: t.name,
-					label: t.label,
-					summary: t.description,
-					source: "mcp" as const,
-					serverName: t.serverName,
-					mcpToolName: t.mcpToolName,
-					schemaKeys: t.schemaKeys,
-				})),
-			];
+			const discoverableToolsForDesc: DiscoverableTool[] = [...discoverableBuiltinTools, ...discoverableMCPTools];
 			const discoverableToolSummary = summarizeDiscoverableTools(discoverableToolsForDesc);
 			const hasDiscoverableTools =
 				mcpDiscoveryEnabled && toolNames.includes("search_tool_bm25") && discoverableToolsForDesc.length > 0;
@@ -1647,7 +1640,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 				repeatToolDescriptions,
 				intentField,
 				mcpDiscoveryMode: hasDiscoverableTools,
-				mcpDiscoveryServerSummaries: discoverableToolSummary.servers.map(formatDiscoverableMCPToolServerSummary),
+				mcpDiscoveryServerSummaries: discoverableToolSummary.servers.map(formatDiscoverableToolServerSummary),
 				eagerTasks,
 				secretsEnabled,
 				workspaceTree: workspaceTreePromise,
@@ -1693,8 +1686,8 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			(settings.get("mcp.discoveryDefaultServers") ?? []).map(serverName => serverName.trim()).filter(Boolean),
 		);
 		const discoveryDefaultServerToolNames = mcpDiscoveryEnabled
-			? selectDiscoverableMCPToolNamesByServer(
-					collectDiscoverableMCPTools(toolRegistry.values()),
+			? selectDiscoverableToolNamesByServer(
+					filterBySource(collectDiscoverableTools(toolRegistry.values()), "mcp"),
 					discoveryDefaultServers,
 				)
 			: [];
@@ -1893,7 +1886,10 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 				streamSimple(streamModel, context, {
 					...streamOptions,
 					onAuthError: async (provider, oldKey, error) => {
-						await modelRegistry.authStorage.invalidateCredentialMatching(provider, oldKey, streamOptions?.signal);
+						await modelRegistry.authStorage.invalidateCredentialMatching(provider, oldKey, {
+							signal: streamOptions?.signal,
+							sessionId: agent.sessionId,
+						});
 						logger.debug("Retrying provider request after credential invalidation", {
 							provider,
 							error: error instanceof Error ? error.message : String(error),
@@ -1991,6 +1987,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			agentId: resolvedAgentId,
 			agentRegistry,
 			providerSessionId: options.providerSessionId,
+			parentEvalSessionId: options.parentEvalSessionId,
 		});
 		hasSession = true;
 		if (asyncJobManager) {