@oh-my-pi/pi-coding-agent 13.3.12 → 13.3.14

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 ## [Unreleased]
 
+## [13.3.14] - 2026-02-28
+
+### Added
+
+- Expanded AST tool language support from 7 to all 25 ast-grep tree-sitter languages (Bash, C, C++, C#, CSS, Elixir, Go, Haskell, HCL, HTML, Java, JavaScript, JSON, Kotlin, Lua, Nix, PHP, Python, Ruby, Rust, Scala, Solidity, Swift, TSX, TypeScript, YAML)
+- AST find now emits all lines of multiline matches with hashline tags (LINE#HASH:content) consistent with read/grep output
+- Added AST pattern syntax reference (metavariables, wildcards, variadics) to system prompt
+- Added examples and scoping guidance to ast-find and ast-replace tool prompts
+- Added `provider-schema-compatibility.test.ts`: integration test that instantiates every builtin and hidden tool, runs their parameter schemas through `adaptSchemaForStrict`, `sanitizeSchemaForGoogle`, and `prepareSchemaForCCA`, and asserts zero violations against each provider's compatibility rules
+
+### Fixed
+
+- Non-code files (.md, .zip, .bin, .gitignore, etc.) are now silently skipped by AST tools instead of producing misleading parse errors
+- Fixed `grep` path wildcard handling so file patterns passed via `path` (for example `schema-review-*.test.ts`) are resolved as glob filters instead of failing path existence checks
+
 ## [13.3.11] - 2026-02-28
 
 ### Fixed
@@ -92,6 +107,7 @@
 - Fixed `todo_write` task normalization to auto-activate the first remaining task and include explicit remaining-items output in tool results, removing the need for an immediate follow-up start update
 
 ## [13.3.7] - 2026-02-27
+
 ### Breaking Changes
 
 - Removed `preloadedSkills` option from `CreateAgentSessionOptions`; skills are no longer inlined into system prompts
@@ -125,11 +141,13 @@
 - Fixed handling of union type schemas (e.g., object|null) to normalize them into strict-mode compatible variants
 
 ## [13.3.6] - 2026-02-26
+
 ### Breaking Changes
 
 - Changed `submit_result` tool parameter structure from top-level `data` or `error` fields to nested `result` object containing either `result.data` or `result.error`
 
 ## [13.3.5] - 2026-02-26
+
 ### Added
 
 - Added support for setting array and record configuration values using JSON syntax
@@ -144,6 +162,7 @@
 - Enhanced type display in config list output to show correct type indicators for number, array, and record settings
 
 ## [13.3.3] - 2026-02-26
+
 ### Added
 
 - Support for `move` parameter in `computeHashlineDiff` to enable file move operations alongside content edits
@@ -195,13 +214,16 @@
 ## [13.2.1] - 2026-02-24
 
 ### Fixed
+
 - Fixed changelog tools to enforce category-specific arrays and reuse the shared category list for generation
 - Non-interactive environment variables (pager, editor, prompt suppression) were not applied to non-PTY bash execution, causing commands to potentially block on pagers or prompts
 
 ### Changed
 
 - Extracted non-interactive environment config from `bash-interactive.ts` into shared `non-interactive-env.ts` module, applied consistently to all bash execution paths
+
 ## [13.2.0] - 2026-02-23
+
 ### Breaking Changes
 
 - Made `description` field required in CustomTool interface
@@ -225,19 +247,24 @@
 ## [13.1.2] - 2026-02-23
 
 ### Breaking Changes
+
 - Removed `timeout` parameter from await tool—tool now waits indefinitely until jobs complete or the call is aborted
 - Renamed `job_ids` parameter to `jobs` in await tool schema
 - Removed `timedOut` field from await tool result details
 
 ### Changed
+
 - Resolved docs index generation paths using path.resolve relative to the script directory
+
 ## [13.1.1] - 2026-02-23
 
 ### Fixed
 
 - Fixed bash internal URL expansion to resolve `local://` targets to concrete filesystem paths, including newly created destination files for commands like `mv src.json local://dest.json`
 - Fixed bash local URL resolution to create missing parent directories under the session local root before command execution, preventing `mv` destination failures for new paths
+
 ## [13.1.0] - 2026-02-23
+
 ### Breaking Changes
 
 - Renamed `file` parameter to `path` in replace, patch, and hashline edit operations
@@ -254,6 +281,7 @@
 - Moved intent field documentation from per-tool JSON schema descriptions into a single system prompt block, reducing token overhead proportional to tool count
 
 ## [13.0.1] - 2026-02-22
+
 ### Changed
 
 - Simplified hashline edit schema to use unified `first`/`last` anchor fields instead of operation-specific field names (`tag`, `before`, `after`)
@@ -261,6 +289,7 @@
 - Updated hashline tool documentation to reflect new unified anchor syntax across all operations (replace, append, prepend, insert)
 
 ## [13.0.0] - 2026-02-22
+
 ### Added
 
 - Added `getTodoPhases()` and `setTodoPhases()` methods to ToolSession API for managing todo state programmatically
@@ -301,6 +330,7 @@
 - Fixed todo reminder XML tags from underscore to kebab-case format (`system-reminder`)
 
 ## [12.19.3] - 2026-02-22
+
 ### Added
 
 - Added `pty` parameter to bash tool to enable PTY mode for commands requiring a real terminal (e.g., sudo, ssh, top, less)
@@ -314,12 +344,14 @@
 - Removed `bash.virtualTerminal` setting; use the `pty` parameter on individual bash commands instead
 
 ## [12.19.1] - 2026-02-22
+
 ### Removed
 
 - Removed `replaceText` edit operation from hashline mode (substring-based text replacement)
 - Removed autocorrect heuristics that attempted to detect and fix line merges and formatting rewrites in hashline edits
 
 ## [12.19.0] - 2026-02-22
+
 ### Added
 
 - Added `poll_jobs` tool to block until background jobs complete, providing an alternative to polling `read jobs://` in loops
@@ -367,6 +399,7 @@
 - Fixed `submit_result` schema generation to use valid JSON Schema when no explicit output schema is provided
 
 ## [12.18.1] - 2026-02-21
+
 ### Added
 
 - Added Buffer.toBase64() polyfill for Bun compatibility to enable base64 encoding of buffers
@@ -395,6 +428,7 @@
 - Fixed potential race condition in bash interactive component where output could be appended after the component was closed
 
 ## [12.17.2] - 2026-02-21
+
 ### Changed
 
 - Modified bash command normalization to only apply explicit head/tail parameters from tool input, removing automatic extraction from command pipes
@@ -406,6 +440,7 @@
 - Fixed hard timeout handling to properly interrupt long-running commands that exceed the grace period beyond the configured timeout
 
 ## [12.17.1] - 2026-02-21
+
 ### Added
 
 - Added `filterBrowser` option to filter out browser automation MCP servers when builtin browser tool is enabled
@@ -414,6 +449,7 @@
 - Added `BrowserFilterResult` type for browser MCP server filtering results
 
 ## [12.17.0] - 2026-02-21
+
 ### Added
 
 - Added timeout protection (5 seconds) for system prompt preparation with graceful fallback to minimal context on timeout
@@ -5326,4 +5362,4 @@ Initial public release.
 - Git branch display in footer
 - Message queueing during streaming responses
 - OAuth integration for Gmail and Google Calendar access
-- HTML export with syntax highlighting and collapsible sections
+- HTML export with syntax highlighting and collapsible sections

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "13.3.12",
+	"version": "13.3.14",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -41,12 +41,12 @@
 	},
 	"dependencies": {
 		"@mozilla/readability": "^0.6",
-		"@oh-my-pi/omp-stats": "13.3.12",
-		"@oh-my-pi/pi-agent-core": "13.3.12",
-		"@oh-my-pi/pi-ai": "13.3.12",
-		"@oh-my-pi/pi-natives": "13.3.12",
-		"@oh-my-pi/pi-tui": "13.3.12",
-		"@oh-my-pi/pi-utils": "13.3.12",
+		"@oh-my-pi/omp-stats": "13.3.14",
+		"@oh-my-pi/pi-agent-core": "13.3.14",
+		"@oh-my-pi/pi-ai": "13.3.14",
+		"@oh-my-pi/pi-natives": "13.3.14",
+		"@oh-my-pi/pi-tui": "13.3.14",
+		"@oh-my-pi/pi-utils": "13.3.14",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.18",

package/src/ipy/gateway-coordinator.ts

@@ -110,7 +110,7 @@ async function withGatewayLock<T>(handler: () => Promise<T>): Promise<T> {
 	while (true) {
 		let fd: fs.promises.FileHandle | undefined;
 		try {
-			fd = await fs.promises.open(lockPath, fs.constants.O_WRONLY | fs.constants.O_CREAT | fs.constants.O_EXCL);
+			fd = await fs.promises.open(lockPath, "wx");
 			let heartbeatRunning = true;
 			const heartbeat = (async () => {
 				while (heartbeatRunning) {

package/src/mcp/tool-bridge.ts

@@ -4,6 +4,7 @@
  * Converts MCP tool definitions to CustomTool format for the agent.
  */
 import type { AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
+import { sanitizeSchemaForMCP } from "@oh-my-pi/pi-ai/utils/schema";
 import type { TSchema } from "@sinclair/typebox";
 import type { SourceMeta } from "../capability/types";
 import type {
@@ -49,46 +50,6 @@ export interface MCPToolDetails {
 	/** Provider display name (e.g., "Claude Code", "MCP Config") */
 	providerName?: string;
 }
-
-/**
- * Recursively strip JSON Schema fields that cause AJV validation errors.
- *
- * - `$schema`: AJV throws on unknown meta-schema URIs (e.g. draft 2020-12 from schemars 1.x / rmcp 0.15+)
- * - `nullable`: OpenAPI 3.0 extension, not standard JSON Schema — AJV rejects it as an unknown keyword.
- */
-function sanitizeSchema(schema: unknown): unknown {
-	if (Array.isArray(schema)) {
-		return schema.map(sanitizeSchema);
-	}
-	if (schema !== null && typeof schema === "object") {
-		const { $schema: _, nullable: __, ...rest } = schema as Record<string, unknown>;
-		const out: Record<string, unknown> = {};
-		for (const [k, v] of Object.entries(rest)) {
-			out[k] = sanitizeSchema(v);
-		}
-		return out;
-	}
-	return schema;
-}
-
-/**
- * Convert JSON Schema from MCP to TypeBox-compatible schema.
- * MCP uses standard JSON Schema, TypeBox uses a compatible subset.
- *
- * Also normalizes schemas to work around common issues:
- * - Adds `properties: {}` to object schemas missing it (some LLM providers require this)
- * - Strips `$schema` and `nullable` fields (see sanitizeSchema)
- */
-function convertSchema(mcpSchema: MCPToolDefinition["inputSchema"]): TSchema {
-	const schema = sanitizeSchema(mcpSchema) as Record<string, unknown>;
-
-	// Normalize: object schemas must have properties field for some providers
-	if (schema.type === "object" && !("properties" in schema)) {
-		return { ...schema, properties: {} } as unknown as TSchema;
-	}
-	return schema as unknown as TSchema;
-}
-
 /**
  * Format MCP content for LLM consumption.
  */
@@ -193,7 +154,7 @@ export class MCPTool implements CustomTool<TSchema, MCPToolDetails> {
 		this.name = createMCPToolName(connection.name, tool.name);
 		this.label = `${connection.name}/${tool.name}`;
 		this.description = tool.description ?? `MCP tool from ${connection.name}`;
-		this.parameters = convertSchema(tool.inputSchema);
+		this.parameters = sanitizeSchemaForMCP(tool.inputSchema) as TSchema;
 		this.mcpToolName = tool.name;
 		this.mcpServerName = connection.name;
 	}
@@ -297,7 +258,7 @@ export class DeferredMCPTool implements CustomTool<TSchema, MCPToolDetails> {
 		this.name = createMCPToolName(serverName, tool.name);
 		this.label = `${serverName}/${tool.name}`;
 		this.description = tool.description ?? `MCP tool from ${serverName}`;
-		this.parameters = convertSchema(tool.inputSchema);
+		this.parameters = sanitizeSchemaForMCP(tool.inputSchema) as TSchema;
 		this.mcpToolName = tool.name;
 		this.mcpServerName = serverName;
 		this.#fallbackProvider = source?.provider;

package/src/modes/interactive-mode.ts

@@ -702,7 +702,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		await this.session.prompt(prompt, { synthetic: true });
 	}
 
-	async handlePlanModeCommand(): Promise<void> {
+	async handlePlanModeCommand(initialPrompt?: string): Promise<void> {
 		if (this.planModeEnabled) {
 			const confirmed = await this.showHookConfirm(
 				"Exit plan mode?",
@@ -713,6 +713,9 @@ export class InteractiveMode implements InteractiveModeContext {
 			return;
 		}
 		await this.#enterPlanMode();
+		if (initialPrompt) {
+			this.onInputCallback?.({ text: initialPrompt });
+		}
 	}
 
 	async handleExitPlanModeTool(details: ExitPlanModeDetails): Promise<void> {

package/src/modes/theme/theme.ts

@@ -1629,25 +1629,26 @@ function detectTerminalBackground(): "dark" | "light" {
 	if (terminalReportedAppearance) {
 		return terminalReportedAppearance;
 	}
-	// macOS: query system appearance via CoreFoundation (native, no shell).
-	// Uses cached observer value, or falls back to CFPreferencesCopyAppValue.
-	// Works on all terminals including Warp which lacks Mode 2031 / OSC 11.
-	const macAppearance = macOSReportedAppearance ?? detectMacOSAppearance();
-	if (macAppearance) {
-		return macAppearance;
-	}
-	// Fallback: COLORFGBG environment variable (static, set once at terminal launch)
+	// COLORFGBG is set by the terminal emulator to reflect the actual profile colors.
+	// Check it before macOS system appearance because the terminal profile may differ
+	// from the OS-level dark/light setting (e.g. dark terminal on macOS light mode).
 	const colorfgbg = Bun.env.COLORFGBG || "";
 	if (colorfgbg) {
 		const parts = colorfgbg.split(";");
 		if (parts.length >= 2) {
 			const bg = parseInt(parts[1], 10);
 			if (!Number.isNaN(bg)) {
-				const result = bg < 8 ? "dark" : "light";
-				return result;
+				return bg < 8 ? "dark" : "light";
 			}
 		}
 	}
+	// macOS: query system appearance via CoreFoundation (native, no shell).
+	// Uses cached observer value, or falls back to CFPreferencesCopyAppValue.
+	// Works on all terminals including Warp which lacks Mode 2031 / OSC 11.
+	const macAppearance = macOSReportedAppearance ?? detectMacOSAppearance();
+	if (macAppearance) {
+		return macAppearance;
+	}
 	return "dark";
 }
 

package/src/modes/types.ts

@@ -197,7 +197,7 @@ export interface InteractiveModeContext {
 	toggleThinkingBlockVisibility(): void;
 	openExternalEditor(): void;
 	registerExtensionShortcuts(): void;
-	handlePlanModeCommand(): Promise<void>;
+	handlePlanModeCommand(initialPrompt?: string): Promise<void>;
 	handleExitPlanModeTool(details: ExitPlanModeDetails): Promise<void>;
 
 	// Hook UI methods

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

@@ -161,6 +161,21 @@ When AST tools are available, syntax-aware operations take priority over text ha
 {{#has tools "ast_find"}}- Use `ast_find` for structural discovery (call shapes, declarations, syntax patterns) before text grep when code structure matters{{/has}}
 {{#has tools "ast_replace"}}- Use `ast_replace` for structural codemods/replacements; do not use bash `sed`/`perl`/`awk` for syntax-level rewrites{{/has}}
 - Use `grep` for plain text/regex lookup only when AST shape is irrelevant
+
+#### Pattern syntax
+
+Patterns match **AST structure, not text** — whitespace and formatting are irrelevant. `foo( x, y )` and `foo(x,y)` are the same pattern.
+
+|Syntax|Name|Matches|
+|---|---|---|
+|`$VAR`|Capture|One AST node, bound as `$VAR`|
+|`$_`|Wildcard|One AST node, not captured|
+|`$$$VAR`|Variadic capture|Zero or more nodes, bound as `$VAR`|
+|`$$$`|Variadic wildcard|Zero or more nodes, not captured|
+
+Metavariable names **MUST** be UPPERCASE (`$A`, `$FUNC`, `$MY_VAR`). Lowercase `$var` is invalid.
+
+When a metavariable appears multiple times in one pattern, all occurrences must match **identical** code: `$A == $A` matches `x == x` but not `x == y`.
 {{/ifAny}}
 {{#if eagerTasks}}
 <eager-tasks>
@@ -244,7 +259,6 @@ Justify sequential work; default parallel. Cannot articulate why B depends on A
 - You **MUST NOT** yield without proof when non-trivial work, self-assessment is deceptive: tests, linters, type checks, repro steps… exhaust all external verification.
 ## 8. Handoff
 Before finishing, you **MUST**:
-- List all commands run and confirm they passed.
 - Summarize changes with file and line references.
 - Call out TODOs, follow-up work, or uncertainties — no surprises are **PERMITTED**.
 

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

@@ -3,9 +3,13 @@ Performs structural code search using AST matching via native ast-grep.
 <instruction>
 - Use this when syntax shape matters more than raw text (calls, declarations, specific language constructs)
 - Prefer a precise `path` scope to keep results targeted and deterministic (`path` accepts files, directories, or glob patterns)
+- Default to language-scoped search in mixed repositories: pair `path` glob + explicit `lang` to avoid parse-noise from non-source files
 - `pattern` is required; `lang` is optional (`lang` is inferred per file extension when omitted)
 - Use `selector` only for contextual pattern mode; otherwise provide a direct pattern
 - Enable `include_meta` when metavariable captures are needed in output
+- For variadic arguments/fields, use `$$$NAME` (not `$$NAME`)
+- Patterns match AST structure, not text — whitespace/formatting differences are ignored
+- When the same metavariable appears multiple times, all occurrences must match identical code
 </instruction>
 
 <output>
@@ -13,8 +17,20 @@ Performs structural code search using AST matching via native ast-grep.
 - Includes summary counts (`totalMatches`, `filesWithMatches`, `filesSearched`) and parse issues when present
 </output>
 
+<examples>
+- Find prompt-template call sites in tool code (scoped + typed):
+  `{"pattern":"renderPromptTemplate($A)","lang":"typescript","path":"packages/coding-agent/src/tools/**/*.ts","include_meta":true}`
+- Match variadic call arguments correctly:
+  `{"pattern":"renderStatusLine($$$ARGS)","lang":"typescript","path":"packages/coding-agent/src/tools/**/*.ts","include_meta":true}`
+- Exact call-shape match in one file:
+  `{"pattern":"renderStatusLine({ icon: \"pending\", title: \"AST Find\", description, meta }, uiTheme)","lang":"typescript","path":"packages/coding-agent/src/tools/ast-find.ts"}`
+- Contextual pattern with selector — match only the identifier `foo`, not the whole call:
+  `{"pattern":"foo()","selector":"identifier","lang":"typescript","path":"src/utils.ts"}`
+</examples>
+
 <critical>
 - `pattern` is required
 - Set `lang` explicitly to constrain matching when path pattern spans mixed-language trees
+- Avoid repo-root AST scans when the target is language-specific; narrow `path` first
 - If exploration is broad/open-ended across subsystems, use Task tool with explore subagent first
 </critical>

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

@@ -3,9 +3,13 @@ Performs structural AST-aware rewrites via native ast-grep.
 <instruction>
 - Use for codemods and structural rewrites where plain text replace is unsafe
 - Narrow scope with `path` before replacing (`path` accepts files, directories, or glob patterns)
+- Default to language-scoped rewrites in mixed repositories: set `lang` and keep `path` narrow
 - `pattern` + `rewrite` are required; `lang` is optional only when all matched files resolve to a single language
 - Keep `dry_run` enabled unless explicit apply intent is clear
 - Use `max_files` and `max_replacements` as safety caps on broad rewrites
+- Treat parse issues as a scoping signal: tighten `path`/`lang` before retrying
+- Metavariables captured in `pattern` (`$A`, `$$$ARGS`) are substituted into `rewrite` — this is the core mechanism
+- Each rewrite is a 1:1 structural substitution; you cannot split one capture into multiple nodes or merge multiple captures into one node
 </instruction>
 
 <output>
@@ -14,8 +18,20 @@ Performs structural AST-aware rewrites via native ast-grep.
 - Includes parse issues when files cannot be processed
 </output>
 
+<examples>
+- Preview a single exact-shape rewrite in one file:
+  `{"pattern":"renderStatusLine({ icon: \"pending\", title: \"AST Find\", description, meta }, uiTheme)","rewrite":"renderStatusLine({ icon: \"success\", title: \"AST Find\", description, meta }, uiTheme)","lang":"typescript","path":"packages/coding-agent/src/tools/ast-find.ts","dry_run":true}`
+- Preview with safety caps across multiple files (demonstrates cap behavior):
+  `{"pattern":"renderPromptTemplate($A)","rewrite":"String(renderPromptTemplate($A))","lang":"typescript","path":"packages/coding-agent/src/tools/**/*.ts","dry_run":true,"max_files":2,"max_replacements":3}`
+- Swap two arguments using captures:
+  `{"pattern":"assertEqual($A, $B)","rewrite":"assertEqual($B, $A)","lang":"typescript","path":"tests/**/*.ts","dry_run":true}`
+- Preserve variadic arguments through a rewrite:
+  `{"pattern":"oldApi($$$ARGS)","rewrite":"newApi($$$ARGS)","lang":"typescript","path":"src/**/*.ts","dry_run":true}`
+</examples>
+
 <critical>
 - `pattern` + `rewrite` are required
 - If the path pattern spans multiple languages, set `lang` explicitly for deterministic rewrites
+- Run `dry_run: true` first, review preview, then rerun with `dry_run: false` only when intent is explicit
 - For one-off local text edits, prefer the Edit tool instead of AST replace
 </critical>

package/src/session/agent-session.ts

@@ -3200,7 +3200,7 @@ Be thorough - include exact file paths, function names, error messages, and tech
 			this.model && assistantMessage.provider === this.model.provider && assistantMessage.model === this.model.id;
 		// This handles the case where an error was kept after compaction (in the "kept" region).
 		// The error shouldn't trigger another compaction since we already compacted.
-		// Example: opus fails \u2192 switch to codex \u2192 compact \u2192 switch back to opus \u2192 opus error
+		// Example: opus fails -> switch to codex -> compact -> switch back to opus -> opus error
 		// is still in context but shouldn't trigger compaction again.
 		const compactionEntry = getLatestCompactionEntry(this.sessionManager.getBranch());
 		const errorIsFromBeforeCompaction =
@@ -3213,7 +3213,7 @@ Be thorough - include exact file paths, function names, error messages, and tech
 				this.agent.replaceMessages(messages.slice(0, -1));
 			}
 
-			// Try context promotion first \u2014 switch to a larger model and retry without compacting
+			// Try context promotion first - switch to a larger model and retry without compacting
 			const promoted = await this.#tryContextPromotion(assistantMessage);
 			if (promoted) {
 				// Retry on the promoted (larger) model without compacting
@@ -3221,7 +3221,7 @@ Be thorough - include exact file paths, function names, error messages, and tech
 				return;
 			}
 
-			// No promotion target available \u2014 fall through to compaction
+			// No promotion target available fall through to compaction
 			const compactionSettings = this.settings.getGroup("compaction");
 			if (compactionSettings.enabled) {
 				await this.#runAutoCompaction("overflow", true);

package/src/slash-commands/builtin-registry.ts

@@ -75,8 +75,10 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<BuiltinSlashCommandSpec> = [
 	{
 		name: "plan",
 		description: "Toggle plan mode (agent plans before executing)",
-		handle: async (_command, runtime) => {
-			await runtime.ctx.handlePlanModeCommand();
+		inlineHint: "[prompt]",
+		allowArgs: true,
+		handle: async (command, runtime) => {
+			await runtime.ctx.handlePlanModeCommand(command.args || undefined);
 			runtime.ctx.editor.setText("");
 		},
 	},

package/src/tools/ast-find.ts

@@ -7,8 +7,10 @@ import { type Static, Type } from "@sinclair/typebox";
 import { renderPromptTemplate } from "../config/prompt-templates";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import type { Theme } from "../modes/theme/theme";
+import { computeLineHash } from "../patch/hashline";
 import astFindDescription from "../prompts/tools/ast-find.md" with { type: "text" };
 import { Ellipsis, Hasher, type RenderCache, renderStatusLine, renderTreeList, truncateToWidth } from "../tui";
+import { resolveFileDisplayMode } from "../utils/file-display-mode";
 import type { ToolSession } from ".";
 import type { OutputMeta } from "./output-meta";
 import { hasGlobPathChars, parseSearchPath, resolveToCwd } from "./path-utils";
@@ -133,12 +135,20 @@ export class AstFindTool implements AgentTool<typeof astFindSchema, AstFindToolD
 					grouped.set(match.path, [match]);
 				}
 			}
+			const useHashLines = resolveFileDisplayMode(this.session).hashLines;
 			for (const [filePath, matches] of grouped) {
 				lines.push("", `# ${filePath}`);
 				for (const match of matches) {
-					const firstLine = match.text.split("\n", 1)[0] ?? "";
-					const preview = firstLine.length > 140 ? `${firstLine.slice(0, 137)}...` : firstLine;
-					lines.push(`${match.startLine}:${match.startColumn}-${match.endLine}:${match.endColumn}: ${preview}`);
+					const matchLines = match.text.split("\n");
+					for (let i = 0; i < matchLines.length; i++) {
+						const lineNum = match.startLine + i;
+						const line = matchLines[i];
+						if (useHashLines) {
+							lines.push(`${lineNum}#${computeLineHash(lineNum, line)}:${line}`);
+						} else {
+							lines.push(`${lineNum}:${line}`);
+						}
+					}
 					if (match.metaVariables && Object.keys(match.metaVariables).length > 0) {
 						const serializedMeta = Object.entries(match.metaVariables)
 							.sort(([left], [right]) => left.localeCompare(right))

package/src/tools/ast-replace.ts

@@ -7,8 +7,10 @@ import { type Static, Type } from "@sinclair/typebox";
 import { renderPromptTemplate } from "../config/prompt-templates";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import type { Theme } from "../modes/theme/theme";
+import { computeLineHash } from "../patch/hashline";
 import astReplaceDescription from "../prompts/tools/ast-replace.md" with { type: "text" };
 import { Ellipsis, Hasher, type RenderCache, renderStatusLine, renderTreeList, truncateToWidth } from "../tui";
+import { resolveFileDisplayMode } from "../utils/file-display-mode";
 import type { ToolSession } from ".";
 import type { OutputMeta } from "./output-meta";
 import { hasGlobPathChars, parseSearchPath, resolveToCwd } from "./path-utils";
@@ -129,11 +131,15 @@ export class AstReplaceTool implements AgentTool<typeof astReplaceSchema, AstRep
 				}
 			}
 			if (result.changes.length > 0) {
+				const useHashLines = resolveFileDisplayMode(this.session).hashLines;
 				lines.push("", "Preview:");
 				for (const change of result.changes.slice(0, 30)) {
+					const tag = useHashLines
+						? `${change.startLine}#${computeLineHash(change.startLine, change.before.split("\n", 1)[0] ?? "")}`
+						: `${change.startLine}:${change.startColumn}`;
 					const before = (change.before.split("\n", 1)[0] ?? "").slice(0, 80);
 					const after = (change.after.split("\n", 1)[0] ?? "").slice(0, 80);
-					lines.push(`${change.path}:${change.startLine}:${change.startColumn} ${before} -> ${after}`);
+					lines.push(`${change.path}:${tag} ${before} -> ${after}`);
 				}
 				if (result.changes.length > 30) {
 					lines.push(`... ${result.changes.length - 30} more changes`);

package/src/tools/grep.ts

@@ -16,7 +16,7 @@ import { Ellipsis, Hasher, type RenderCache, renderStatusLine, renderTreeList, t
 import { resolveFileDisplayMode } from "../utils/file-display-mode";
 import type { ToolSession } from ".";
 import { formatFullOutputReference, type OutputMeta } from "./output-meta";
-import { resolveToCwd } from "./path-utils";
+import { hasGlobPathChars, parseSearchPath, resolveToCwd } from "./path-utils";
 import { formatCount, formatEmptyMessage, formatErrorMessage, PREVIEW_LIMITS } from "./render-utils";
 import { ToolError } from "./tool-errors";
 import { toolResult } from "./tool-result";
@@ -106,15 +106,33 @@ export class GrepTool implements AgentTool<typeof grepSchema, GrepToolDetails> {
 
 			const useHashLines = resolveFileDisplayMode(this.session).hashLines;
 			let searchPath: string;
+			let globFilter = glob?.trim() || undefined;
 			const internalRouter = this.session.internalRouter;
-			if (searchDir && internalRouter?.canHandle(searchDir)) {
-				const resource = await internalRouter.resolve(searchDir);
-				if (!resource.sourcePath) {
-					throw new ToolError(`Cannot grep internal URL without a backing file: ${searchDir}`);
+			if (searchDir?.trim()) {
+				const rawPath = searchDir.trim();
+				if (internalRouter?.canHandle(rawPath)) {
+					if (hasGlobPathChars(rawPath)) {
+						throw new ToolError(`Glob patterns are not supported for internal URLs: ${rawPath}`);
+					}
+					const resource = await internalRouter.resolve(rawPath);
+					if (!resource.sourcePath) {
+						throw new ToolError(`Cannot grep internal URL without a backing file: ${rawPath}`);
+					}
+					searchPath = resource.sourcePath;
+				} else {
+					const parsedPath = parseSearchPath(rawPath);
+					searchPath = resolveToCwd(parsedPath.basePath, this.session.cwd);
+					if (parsedPath.glob) {
+						if (globFilter) {
+							throw new ToolError(
+								"When path already includes glob characters, omit the separate glob parameter",
+							);
+						}
+						globFilter = parsedPath.glob;
+					}
 				}
-				searchPath = resource.sourcePath;
 			} else {
-				searchPath = resolveToCwd(searchDir || ".", this.session.cwd);
+				searchPath = resolveToCwd(".", this.session.cwd);
 			}
 			const scopePath = (() => {
 				const relative = path.relative(this.session.cwd, searchPath).replace(/\\/g, "/");
@@ -139,7 +157,7 @@ export class GrepTool implements AgentTool<typeof grepSchema, GrepToolDetails> {
 				result = await grep({
 					pattern: normalizedPattern,
 					path: searchPath,
-					glob: glob?.trim() || undefined,
+					glob: globFilter,
 					type: type?.trim() || undefined,
 					ignoreCase,
 					multiline: effectiveMultiline,

package/src/tools/submit-result.ts

@@ -4,7 +4,7 @@
  * Subagents must call this tool to finish and return structured JSON output.
  */
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import { sanitizeSchemaForStrictMode } from "@oh-my-pi/pi-ai/utils/typebox-helpers";
+import { sanitizeSchemaForStrictMode } from "@oh-my-pi/pi-ai/utils/schema";
 import type { Static, TSchema } from "@sinclair/typebox";
 import { Type } from "@sinclair/typebox";
 import Ajv, { type ErrorObject, type ValidateFunction } from "ajv";