@oh-my-pi/pi-coding-agent 14.3.0 → 14.4.0

package/CHANGELOG.md

@@ -1,6 +1,88 @@
 # Changelog
 
 ## [Unreleased]
+### Breaking Changes
+
+- Replaced the legacy `gh_repo_view`, `gh_issue_view`, `gh_pr_view`, `gh_pr_diff`, `gh_pr_checkout`, `gh_pr_push`, `gh_run_watch`, `gh_search_issues`, and `gh_search_prs` tool names with only `github`, which requires updating existing callers that invoked the old `gh_*` tools
+
+### Added
+
+- Added the unified `github` tool with op-based dispatch for repository, issue, pull request, search, checkout, push, and Actions watch workflows
+- Added `op` routing so callers can select `repo_view`, `issue_view`, `pr_view`, `pr_diff`, `pr_checkout`, `pr_push`, `search_issues`, `search_prs`, or `run_watch` through a single tool entry point
+
+### Changed
+
+- Updated GitHub CLI render output to show `GitHub <op>` for tool calls dispatched through `github` operations
+
+## [14.4.0] - 2026-04-26
+
+### Breaking Changes
+
+- Removed multi-pattern array input from `ast_grep` by changing `pat` to a single pattern string, so call sites using `pat: [...]` must be updated to send one query per invocation
+- Removed `lang`, `glob`, and `sel` options from `ast_edit` and `ast_grep`, and moved those behaviors into the required `path` argument
+- Required `path` for `ast_edit` and `ast_grep`, so invocations that relied on implicit repo-root searching are no longer valid
+- Changed `todo_write` from multi-field verb payloads to an ordered array of flat operations, while retaining `replace` for harness bootstrap compatibility
+- Renamed atom edit operations from `before` and `after` to `pre` and `post`, so existing `atom` payloads using the old operation keys must be updated
+- Changed the hashline anchor format from `LINE#ID:content` to `LINEID:content` (no `#` separator, colon between anchor and content, no padding on line numbers); expanded the bigram alphabet from 40 hand-picked English bigrams to the full 647 single-token 2-letter bigrams — invalidates every previously captured `LINE#ID` reference
+- Renamed the subagent completion contract from `submit_result` to `yield`, so subagent sessions must now finish with the `yield` tool and the `requireYieldTool` option; `submit_result`/`requireSubmitResultTool` and old completion calls are no longer recognized
+- Changed the hashline and chunk anchor ID format from the prior hex-like tokens to two-letter BPE bigrams (for example `#th`), which invalidates previously captured `LINE#ID`/chunk selectors and requires re-reading to refresh anchors
+
+### Added
+
+- Added inline file overrides in atom locators (`loc: "a.ts:160sr"`) so cross-file edits can be written without a separate per-entry `path` field
+- Added `openai` to the `providers.image` options, allowing image generation to be explicitly routed through the active GPT Responses/Codex model
+- Added `between` atom edit operation to replace only the lines between two surviving anchors while preserving the boundary anchors
+- Added conflict detection for `between` atom edits to require non-overlapping regions and forbid edits targeting lines strictly inside those regions
+- Added `atom` edit mode to `edit` with single-anchor operations (`set`, `before`, `after`, `del`, `sub`, `ins`) for hashline-anchored line edits
+- Added support for request-level `path` defaults in patch, replace, and chunk edits so shared file paths no longer need to be repeated in every entry
+
+### Changed
+
+- Updated `atom` and `hashline` edit anchor validation to auto-rebase a stale anchor within ±2 lines when the same hash matches a unique nearby line, continuing the edit with a warning instead of immediate failure
+- Changed bash command output labels from `[full result: artifact://…]` to `[raw output: artifact://…]` for artifact references produced from large command output
+- Changed `todo_write` `done`, `rm`, and `drop` operations to target all tasks when neither `task` nor `phase` is provided, and made `append` create the target phase automatically when missing
+- Updated `ast_edit` and `ast_grep` to pass file-selection intent through `path` (including inline globs and comma/space-separated path lists) instead of separate `glob` filters
+- Changed `ast_grep` pagination API from `offset` to `skip`
+- Flattened `todo_write` operation arguments to `{ op, task?, phase?, items? }[]` and removed task details from the persisted todo shape
+- Changed `grep` truncation output to report `Result limit reached; narrow path.` and label match/result caps as `first N`
+- Changed JSON tree output to truncate inline argument pairs by available width and add an ellipsis when values no longer fit in the display
+- Changed JSON tree rendering to hide harness-internal `intent` and `__partialJson` fields from top-level tool output
+- Simplified the `grep` tool schema by requiring `path`, folding glob and type filtering into path globs, auto-detecting multiline patterns, removing model-controlled context and limit options, and renaming result skipping to `skip`.
+- Changed atom edit request format to use a shared `loc` selector, including range (`"160sr-9ab"`) and boundary (`"^"`, `"$"`) forms instead of per-operation anchor fields
+- Changed atom edit payload fields so `set`, `pre`, and `post` now require line-array values and `sub` now takes a `[find, replace]` tuple, with boundary deletion now expressed as `set: []`
+- Changed edit diff wrapping to preserve the active line-prefix separator (`|` or `│`) while keeping continuation lines aligned by line-number width
+- Changed Vim focus and viewport rendering to align cursor/selection markers and line numbers in a single gutter format
+- Changed auto image provider selection for `providers.image=auto` to try active GPT image generation before Antigravity, OpenRouter, and Gemini
+- Updated atom and hashline anchor validation to require the full `line+suffix` anchor format and report missing-line-number errors more clearly, including guidance when only a 2-letter suffix is provided
+- Changed read, grep, and ast-edit line-prefixed output to drop fixed-width line number padding, so anchors render in natural width without leading spaces
+- Updated terminal diff rendering to use a continuous `│` gutter and hide repeated line numbers on adjacent diff lines
+- Updated subagent reminders, prompts, and rendered subagent output to reference `yield` completion and report missing/final results from `yield` tool data
+- Updated the `edit` workflow to treat `atom` mode like hashline mode for read output, so hashline anchors are shown when `atom` is selected
+- Adjusted patch/replace/chunk tooling to accept optional entry paths and to apply a top-level path default
+- Updated hashline/chunk selector parsing to the new stable bigram token set used for checksums
+- Renamed the image generation implementation module to `image-gen` and routed active GPT Responses/Codex models through OpenAI's hosted `image_generation` tool with WebP output
+
+### Removed
+
+- Removed line-range support from `atom` mode selectors, including `loc` values like `160sr-170ab`, so edits must target a single anchor (`160sr`, `^`, or `$`) per entry
+- Removed the atom `del` verb and now require anchored-line deletion to be requested with `set: []`
+- Removed `todo_write` task details and the `add_notes` operation
+
+### Fixed
+
+- Improved no-op edit diagnostics for `atom` and `hashline` operations so edits that leave content unchanged now fail with contextual details (edit index, locator, and reason), including guidance for `replace_range` no-op cases
+- Wrapped `todo_write` operations in an `ops` object so Codex/OpenAI function schemas always use a JSON Schema object.
+- Fixed JSON tree rendering for tool arguments by excluding injected internal keys from displayed root records
+- Printed assistant `errorMessage` text in print mode output to stderr so message-level errors are visible during non-interactive runs
+- Displayed assistant `errorMessage` text in the assistant message component for completed tool responses with non-terminal stop reasons
+- Fixed atom input handling to ignore null optional verb fields so entries with `pre`, `set`, `post`, or `sub` set to `null` remain valid
+- Fixed status-line Git branch rendering to degrade gracefully when the process hits `ENFILE`/`EMFILE` while reading optional Git refs
+- Changed hashline mismatch failure output to show a clean numbered context block with numbered gutter and full-anchor alignment guidance when edits are rejected after the file changed
+- Fixed `atom` mode to apply multiple edits on the same anchor line without index-shift artifacts, so mixed operations like `before`, `after`, `set`, `sub`, `ins`, and `del` now resolve consistently
+- Fixed `atom` mode `append_file` insertion to preserve a file’s trailing newline sentinel when appending content
+- Fixed `read` output for raw archive entries so hashline anchors, line numbers, and chunked formatting are not injected into raw content
+- Fixed hashline parsing so lines like `# Note:` or `# TODO:` are no longer misinterpreted and stripped as hashline prefixes
+- Adjusted patch and replace validation to report a clear missing-path error when neither an entry path nor a top-level path is provided
 
 ## [14.3.0] - 2026-04-25
 
@@ -60,6 +142,7 @@
 - Fixed Mermaid fenced markdown rendering in assistant messages on terminals without image protocol support ([#650](https://github.com/can1357/oh-my-pi/issues/650))
 - Fixed chunk edit path parsing so plan-mode edits to section-addressed `local://PLAN.md:<selector>` paths are classified as writes to the plan file
 - Fixed SQLite `read` helper queries to reject `where=` clauses with SQL control syntax that could override the structured selector's pagination; raw SQL remains available through `q=SELECT ...`
+- Fixed `models` provider transport overrides so `headers`-only entries apply without requiring `baseUrl`, including runtime `registerProvider()` overrides that now persist across `refresh()` / `refreshProvider()`, preserve existing `baseUrl` on subsequent headers-only updates, clear stale transport overrides when a provider is re-registered under a different extension source, and keep runtime transport headers authoritative when `modelOverrides` set overlapping header keys
 
 ## [14.2.0] - 2026-04-23
 
@@ -7186,4 +7269,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": "14.3.0",
+	"version": "14.4.0",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -46,12 +46,12 @@
 	"dependencies": {
 		"@agentclientprotocol/sdk": "0.20.0",
 		"@mozilla/readability": "^0.6.0",
-		"@oh-my-pi/omp-stats": "14.3.0",
-		"@oh-my-pi/pi-agent-core": "14.3.0",
-		"@oh-my-pi/pi-ai": "14.3.0",
-		"@oh-my-pi/pi-natives": "14.3.0",
-		"@oh-my-pi/pi-tui": "14.3.0",
-		"@oh-my-pi/pi-utils": "14.3.0",
+		"@oh-my-pi/omp-stats": "14.4.0",
+		"@oh-my-pi/pi-agent-core": "14.4.0",
+		"@oh-my-pi/pi-ai": "14.4.0",
+		"@oh-my-pi/pi-natives": "14.4.0",
+		"@oh-my-pi/pi-tui": "14.4.0",
+		"@oh-my-pi/pi-utils": "14.4.0",
 		"@sinclair/typebox": "^0.34.49",
 		"@xterm/headless": "^6.0.0",
 		"ajv": "^8.20.0",

package/src/autoresearch/prompt.md

@@ -1,4 +1,4 @@
-{{{base_system_prompt}}}
+{{base_system_prompt}}
 
 ## Autoresearch Mode
 

package/src/commit/agentic/prompts/analyze-file.md

@@ -19,4 +19,4 @@ Return concise JSON object with:
 Consider how file's changes relate to above files.
 {{/if}}
 
-Call submit_result tool with JSON payload.
+Call yield tool with JSON payload.

package/src/config/model-registry.ts

@@ -300,6 +300,7 @@ interface ProviderValidationModel {
 
 interface ProviderValidationConfig {
 	baseUrl?: string;
+	headers?: Record<string, string>;
 	apiKey?: string;
 	api?: Api;
 	auth?: ProviderAuthMode;
@@ -321,9 +322,9 @@ function validateProviderConfiguration(
 	if (models.length === 0) {
 		if (mode === "models-config") {
 			const hasModelOverrides = config.modelOverrides && Object.keys(config.modelOverrides).length > 0;
-			if (!config.baseUrl && !config.compat && !hasModelOverrides && !config.discovery) {
+			if (!config.baseUrl && !config.headers && !config.compat && !hasModelOverrides && !config.discovery) {
 				throw new Error(
-					`Provider ${providerName}: must specify "baseUrl", "compat", "modelOverrides", "discovery", or "models"`,
+					`Provider ${providerName}: must specify "baseUrl", "headers", "compat", "modelOverrides", "discovery", or "models"`,
 				);
 			}
 		}
@@ -378,6 +379,7 @@ export const ModelsConfigFile = new ConfigFile<ModelsConfig>("models", ModelsCon
 				providerName,
 				{
 					baseUrl: providerConfig.baseUrl,
+					headers: providerConfig.headers,
 					apiKey: providerConfig.apiKey,
 					api: providerConfig.api as Api | undefined,
 					auth: (providerConfig.auth ?? "apiKey") as ProviderAuthMode,
@@ -770,6 +772,7 @@ export class ModelRegistry {
 	// models registered by extensions survive the model selector's offline reload.
 	#runtimeModelOverlays: CustomModelOverlay[] = [];
 	#runtimeProviderApiKeys: Map<string, string> = new Map();
+	#runtimeProviderOverrides: Map<string, ProviderOverride> = new Map();
 	#runtimeProvidersBySource: Map<string, Set<string>> = new Map();
 	#runtimeProviderSourceByName: Map<string, string> = new Map();
 
@@ -883,8 +886,8 @@ export class ModelRegistry {
 		const withConfigModels = this.#mergeCustomModels(resolvedDefaults, this.#customModelOverlays);
 		// Merge runtime extension models so they survive refresh() cycles
 		const combined = this.#mergeCustomModels(withConfigModels, this.#runtimeModelOverlays);
-
-		this.#models = this.#applyModelOverrides(combined, this.#modelOverrides);
+		const withModelOverrides = this.#applyModelOverrides(combined, this.#modelOverrides);
+		this.#models = this.#applyRuntimeProviderOverrides(withModelOverrides);
 		this.#rebuildCanonicalIndex();
 	}
 
@@ -1175,7 +1178,8 @@ export class ModelRegistry {
 		const withConfigModels = this.#mergeCustomModels(resolved, this.#customModelOverlays);
 		// Merge runtime extension models so they survive online discovery completion
 		const combined = this.#mergeCustomModels(withConfigModels, this.#runtimeModelOverlays);
-		this.#models = this.#applyModelOverrides(combined, this.#modelOverrides);
+		const withModelOverrides = this.#applyModelOverrides(combined, this.#modelOverrides);
+		this.#models = this.#applyRuntimeProviderOverrides(withModelOverrides);
 		this.#rebuildCanonicalIndex();
 	}
 
@@ -1657,6 +1661,32 @@ export class ModelRegistry {
 		});
 	}
 
+	#mergeProviderOverride(baseOverride: ProviderOverride | undefined, override: ProviderOverride): ProviderOverride {
+		return {
+			baseUrl: override.baseUrl ?? baseOverride?.baseUrl,
+			apiKey: override.apiKey ?? baseOverride?.apiKey,
+			headers: override.headers ? { ...(baseOverride?.headers ?? {}), ...override.headers } : baseOverride?.headers,
+			compat: override.compat ? mergeCompat(baseOverride?.compat, override.compat) : baseOverride?.compat,
+		};
+	}
+	#applyProviderTransportOverride<T extends { baseUrl?: string; headers?: Record<string, string> }>(
+		entry: T,
+		override: Pick<ProviderOverride, "baseUrl" | "headers">,
+	): T {
+		return {
+			...entry,
+			baseUrl: override.baseUrl ?? entry.baseUrl,
+			headers: override.headers ? { ...entry.headers, ...override.headers } : entry.headers,
+		};
+	}
+	#applyRuntimeProviderOverrides(models: Model<Api>[]): Model<Api>[] {
+		if (this.#runtimeProviderOverrides.size === 0) return models;
+		return models.map(model => {
+			const override = this.#runtimeProviderOverrides.get(model.provider);
+			if (!override) return model;
+			return this.#applyProviderTransportOverride(model, override);
+		});
+	}
 	#applyModelOverrides(models: Model<Api>[], overrides: Map<string, Map<string, ModelOverride>>): Model<Api>[] {
 		if (overrides.size === 0) return models;
 		return models.map(model => {
@@ -1916,6 +1946,12 @@ export class ModelRegistry {
 		return this.authStorage.hasOAuth(model.provider);
 	}
 
+	#clearRuntimeProviderState(providerName: string): void {
+		this.#runtimeProviderApiKeys.delete(providerName);
+		this.#runtimeProviderOverrides.delete(providerName);
+		this.#runtimeModelOverlays = this.#runtimeModelOverlays.filter(overlay => overlay.provider !== providerName);
+	}
+
 	/**
 	 * Remove custom API/OAuth registrations for a specific extension source.
 	 */
@@ -1932,8 +1968,7 @@ export class ModelRegistry {
 				continue;
 			}
 			this.#runtimeProviderSourceByName.delete(providerName);
-			this.#runtimeProviderApiKeys.delete(providerName);
-			this.#runtimeModelOverlays = this.#runtimeModelOverlays.filter(overlay => overlay.provider !== providerName);
+			this.#clearRuntimeProviderState(providerName);
 		}
 		this.#reloadStaticModels();
 		this.#rebuildCanonicalIndex();
@@ -1970,6 +2005,7 @@ export class ModelRegistry {
 			providerName,
 			{
 				baseUrl: config.baseUrl,
+				headers: config.headers,
 				apiKey: config.apiKey,
 				api: config.api,
 				oauthConfigured: Boolean(config.oauth),
@@ -1993,6 +2029,7 @@ export class ModelRegistry {
 			});
 		}
 
+		let sourceHandoff = false;
 		if (sourceId) {
 			this.#registeredProviderSources.add(sourceId);
 			const previousSourceId = this.#runtimeProviderSourceByName.get(providerName);
@@ -2002,12 +2039,18 @@ export class ModelRegistry {
 				if (previousProviders && previousProviders.size === 0) {
 					this.#runtimeProvidersBySource.delete(previousSourceId);
 				}
+				this.#clearRuntimeProviderState(providerName);
+				sourceHandoff = true;
 			}
 			const sourceProviders = this.#runtimeProvidersBySource.get(sourceId) ?? new Set<string>();
 			sourceProviders.add(providerName);
 			this.#runtimeProvidersBySource.set(sourceId, sourceProviders);
 			this.#runtimeProviderSourceByName.set(providerName, sourceId);
 		}
+		if (sourceHandoff) {
+			this.#reloadStaticModels();
+		}
+
 		if (config.apiKey) {
 			this.#customProviderApiKeys.set(providerName, config.apiKey);
 			// Persist runtime API keys so they survive #reloadStaticModels() cycles
@@ -2042,29 +2085,38 @@ export class ModelRegistry {
 			for (const overlay of newOverlays) {
 				nextModels.push(finalizeCustomModel(overlay, { useDefaults: true }));
 			}
+			const runtimeTransportOverride = this.#runtimeProviderOverrides.get(providerName);
+			const withRuntimeTransportOverride = runtimeTransportOverride
+				? nextModels.map(model => {
+						if (model.provider !== providerName) return model;
+						return this.#applyProviderTransportOverride(model, runtimeTransportOverride);
+					})
+				: nextModels;
 
 			if (config.oauth?.modifyModels) {
 				const credential = this.authStorage.getOAuthCredential(providerName);
 				if (credential) {
-					this.#models = config.oauth.modifyModels(nextModels, credential);
+					this.#models = config.oauth.modifyModels(withRuntimeTransportOverride, credential);
 					this.#rebuildCanonicalIndex();
 					return;
 				}
 			}
 
-			this.#models = nextModels;
+			this.#models = withRuntimeTransportOverride;
 			this.#rebuildCanonicalIndex();
 			return;
 		}
 
-		if (config.baseUrl) {
+		if (config.baseUrl || config.headers) {
+			const transportOverride = { baseUrl: config.baseUrl, headers: config.headers };
+			const nextRuntimeOverride = this.#mergeProviderOverride(
+				this.#runtimeProviderOverrides.get(providerName),
+				transportOverride,
+			);
+			this.#runtimeProviderOverrides.set(providerName, nextRuntimeOverride);
 			this.#models = this.#models.map(m => {
 				if (m.provider !== providerName) return m;
-				return {
-					...m,
-					baseUrl: config.baseUrl ?? m.baseUrl,
-					headers: config.headers ? { ...m.headers, ...config.headers } : m.headers,
-				};
+				return this.#applyProviderTransportOverride(m, transportOverride);
 			});
 			this.#rebuildCanonicalIndex();
 		}

package/src/config/prompt-templates.ts

@@ -9,7 +9,7 @@ import {
 	parseFrontmatter,
 	prompt,
 } from "@oh-my-pi/pi-utils";
-import { computeLineHash } from "../edit/line-hash";
+import { computeLineHash, HASHLINE_CONTENT_SEPARATOR } from "../edit/line-hash";
 import { jtdToTypeScript } from "../tools/jtd-to-typescript";
 import { parseCommandArgs, substituteArgs } from "../utils/command-args";
 
@@ -40,13 +40,13 @@ function formatHashlineRef(lineNum: unknown, content: unknown): { num: number; t
 	const num = typeof lineNum === "number" ? lineNum : Number.parseInt(String(lineNum), 10);
 	const raw = typeof content === "string" ? content : String(content ?? "");
 	const text = raw.replace(/\\t/g, "\t").replace(/\\n/g, "\n").replace(/\\r/g, "\r");
-	const ref = `${num}#${computeLineHash(num, text)}`;
+	const ref = `${num}${computeLineHash(num, text)}`;
 	return { num, text, ref };
 }
 
 /**
  * {{href lineNum "content"}} — compute a real hashline ref for prompt examples.
- * Returns `"lineNum#hash"` using the actual hash algorithm.
+ * Returns `"lineNumBIGRAM"` (e.g., `"42nd"`) using the actual hash algorithm.
  */
 prompt.registerHelper("href", (lineNum: unknown, content: unknown): string => {
 	const { ref } = formatHashlineRef(lineNum, content);
@@ -55,11 +55,11 @@ prompt.registerHelper("href", (lineNum: unknown, content: unknown): string => {
 
 /**
  * {{hline lineNum "content"}} — format a full read-style line with prefix.
- * Returns `"lineNum#hash:content"`.
+ * Returns `"lineNumBIGRAM:content"` (colon between anchor and content).
  */
 prompt.registerHelper("hline", (lineNum: unknown, content: unknown): string => {
 	const { ref, text } = formatHashlineRef(lineNum, content);
-	return `${ref}:${text}`;
+	return `${ref}${HASHLINE_CONTENT_SEPARATOR}${text}`;
 });
 
 /**

package/src/config/settings-schema.ts

@@ -955,7 +955,7 @@ export const SETTINGS_SCHEMA = {
 	// Edit tool
 	"edit.mode": {
 		type: "enum",
-		values: ["replace", "patch", "hashline", "chunk", "vim", "apply_patch"] as const,
+		values: ["replace", "patch", "hashline", "chunk", "vim", "apply_patch", "atom"] as const,
 		default: "hashline",
 		ui: {
 			tab: "editing",
@@ -1021,7 +1021,7 @@ export const SETTINGS_SCHEMA = {
 		ui: {
 			tab: "editing",
 			label: "Hash Lines",
-			description: "Include line hashes in read output for hashline edit mode (LINE#ID:content)",
+			description: "Include line hashes in read output for hashline edit mode (LINE+ID\\tcontent)",
 		},
 	},
 
@@ -1349,7 +1349,7 @@ export const SETTINGS_SCHEMA = {
 			tab: "tools",
 			label: "GitHub CLI",
 			description:
-				"Enable gh_* tools for GitHub repository, issue, pull request, diff, search, checkout, and PR push workflows",
+				"Enable the github tool (op-based dispatch for repository, issue, pull request, diff, search, checkout, push, and Actions watch workflows)",
 		},
 	},
 
@@ -1702,7 +1702,7 @@ export const SETTINGS_SCHEMA = {
 	},
 	"providers.image": {
 		type: "enum",
-		values: ["auto", "gemini", "openrouter"] as const,
+		values: ["auto", "openai", "gemini", "openrouter"] as const,
 		default: "auto",
 		ui: {
 			tab: "providers",

package/src/cursor.ts

@@ -177,16 +177,11 @@ export class CursorExecHandlers implements ICursorExecHandlers {
 
 	async grep(args: Parameters<NonNullable<ICursorExecHandlers["grep"]>>[0]) {
 		const toolCallId = decodeToolCallId(args.toolCallId);
+		const grepPath = args.glob ? `${args.path || "."}/${args.glob}` : args.path || ".";
 		const toolResultMessage = await executeTool(this.options, "grep", toolCallId, {
 			pattern: args.pattern,
-			path: args.path || undefined,
-			glob: args.glob || undefined,
-			mode: args.outputMode || undefined,
-			context: args.context ?? args.contextBefore ?? args.contextAfter ?? undefined,
-			ignore_case: args.caseInsensitive || undefined,
-			type: args.type || undefined,
-			limit: args.headLimit ?? undefined,
-			multiline: args.multiline || undefined,
+			path: grepPath,
+			i: args.caseInsensitive || undefined,
 		});
 		return toolResultMessage;
 	}

package/src/discovery/helpers.ts

@@ -221,9 +221,9 @@ export function parseAgentFields(frontmatter: Record<string, unknown>): ParsedAg
 
 	let tools = parseArrayOrCSV(frontmatter.tools)?.map(tool => tool.toLowerCase());
 
-	// Subagents with explicit tool lists always need submit_result
-	if (tools && !tools.includes("submit_result")) {
-		tools = [...tools, "submit_result"];
+	// Subagents with explicit tool lists always need yield
+	if (tools && !tools.includes("yield")) {
+		tools = [...tools, "yield"];
 	}
 
 	// Parse spawns field (array, "*", or CSV)

package/src/edit/diff.ts

@@ -50,17 +50,8 @@ export class ApplyPatchError extends Error {
 // Diff String Generation
 // ═══════════════════════════════════════════════════════════════════════════
 
-function countContentLines(content: string): number {
-	const lines = content.split("\n");
-	if (lines.length > 1 && lines[lines.length - 1] === "") {
-		lines.pop();
-	}
-	return Math.max(1, lines.length);
-}
-
-function formatNumberedDiffLine(prefix: "+" | "-" | " ", lineNum: number, width: number, content: string): string {
-	const padded = String(lineNum).padStart(width, " ");
-	return `${prefix}${padded}|${content}`;
+function formatNumberedDiffLine(prefix: "+" | "-" | " ", lineNum: number, content: string): string {
+	return `${prefix}${lineNum}|${content}`;
 }
 
 /**
@@ -71,9 +62,6 @@ export function generateDiffString(oldContent: string, newContent: string, conte
 	const parts = Diff.diffLines(oldContent, newContent);
 	const output: string[] = [];
 
-	const maxLineNum = Math.max(countContentLines(oldContent), countContentLines(newContent));
-	const lineNumWidth = String(maxLineNum).length;
-
 	let oldLineNum = 1;
 	let newLineNum = 1;
 	let lastWasChange = false;
@@ -95,10 +83,10 @@ export function generateDiffString(oldContent: string, newContent: string, conte
 			// Show the change
 			for (const line of raw) {
 				if (part.added) {
-					output.push(formatNumberedDiffLine("+", newLineNum, lineNumWidth, line));
+					output.push(formatNumberedDiffLine("+", newLineNum, line));
 					newLineNum++;
 				} else {
-					output.push(formatNumberedDiffLine("-", oldLineNum, lineNumWidth, line));
+					output.push(formatNumberedDiffLine("-", oldLineNum, line));
 					oldLineNum++;
 				}
 			}
@@ -108,40 +96,57 @@ export function generateDiffString(oldContent: string, newContent: string, conte
 			const nextPartIsChange = i < parts.length - 1 && (parts[i + 1].added || parts[i + 1].removed);
 
 			if (lastWasChange || nextPartIsChange) {
-				let linesToShow = raw;
-				let skipStart = 0;
-				let skipEnd = 0;
-
-				if (!lastWasChange) {
-					// Show only last N lines as leading context
-					skipStart = Math.max(0, raw.length - contextLines);
-					linesToShow = raw.slice(skipStart);
-				}
-
-				if (!nextPartIsChange && linesToShow.length > contextLines) {
-					// Show only first N lines as trailing context
-					skipEnd = linesToShow.length - contextLines;
-					linesToShow = linesToShow.slice(0, contextLines);
+				const contextLimit = Math.max(0, contextLines);
+				let leadingSkip = 0;
+				let middleSkip = 0;
+				let trailingSkip = 0;
+				let linesToShow: string[];
+
+				if (lastWasChange && nextPartIsChange) {
+					if (raw.length > contextLimit * 2) {
+						const leadingContext = raw.slice(0, contextLimit);
+						const trailingContext = raw.slice(raw.length - contextLimit);
+						middleSkip = raw.length - leadingContext.length - trailingContext.length;
+						linesToShow = [...leadingContext, ...trailingContext];
+					} else {
+						linesToShow = raw;
+					}
+				} else if (nextPartIsChange) {
+					leadingSkip = Math.max(0, raw.length - contextLimit);
+					linesToShow = raw.slice(leadingSkip);
+				} else {
+					trailingSkip = Math.max(0, raw.length - contextLimit);
+					linesToShow = raw.slice(0, contextLimit);
 				}
 
-				// Add ellipsis if we skipped lines at start
-				if (skipStart > 0) {
-					output.push(formatNumberedDiffLine(" ", oldLineNum, lineNumWidth, "..."));
-					oldLineNum += skipStart;
-					newLineNum += skipStart;
+				if (leadingSkip > 0) {
+					output.push(formatNumberedDiffLine(" ", oldLineNum, "..."));
+					oldLineNum += leadingSkip;
+					newLineNum += leadingSkip;
 				}
 
-				for (const line of linesToShow) {
-					output.push(formatNumberedDiffLine(" ", oldLineNum, lineNumWidth, line));
+				const firstChunkLength = middleSkip > 0 ? contextLimit : linesToShow.length;
+				for (const line of linesToShow.slice(0, firstChunkLength)) {
+					output.push(formatNumberedDiffLine(" ", oldLineNum, line));
 					oldLineNum++;
 					newLineNum++;
 				}
 
-				// Add ellipsis if we skipped lines at end
-				if (skipEnd > 0) {
-					output.push(formatNumberedDiffLine(" ", oldLineNum, lineNumWidth, "..."));
-					oldLineNum += skipEnd;
-					newLineNum += skipEnd;
+				if (middleSkip > 0) {
+					output.push(formatNumberedDiffLine(" ", oldLineNum, "..."));
+					oldLineNum += middleSkip;
+					newLineNum += middleSkip;
+					for (const line of linesToShow.slice(firstChunkLength)) {
+						output.push(formatNumberedDiffLine(" ", oldLineNum, line));
+						oldLineNum++;
+						newLineNum++;
+					}
+				}
+
+				if (trailingSkip > 0) {
+					output.push(formatNumberedDiffLine(" ", oldLineNum, "..."));
+					oldLineNum += trailingSkip;
+					newLineNum += trailingSkip;
 				}
 			} else {
 				// Skip these context lines entirely
@@ -184,8 +189,6 @@ export function generateUnifiedDiffString(oldContent: string, newContent: string
 	const patch = Diff.structuredPatch("", "", oldContent, newContent, "", "", { context: contextLines });
 	const output: string[] = [];
 	let firstChangedLine: number | undefined;
-	const maxLineNum = Math.max(countContentLines(oldContent), countContentLines(newContent));
-	const lineNumWidth = String(maxLineNum).length;
 	for (const hunk of patch.hunks) {
 		output.push(`@@ -${hunk.oldStart},${hunk.oldLines} +${hunk.newStart},${hunk.newLines} @@`);
 		let oldLine = hunk.oldStart;
@@ -193,18 +196,18 @@ export function generateUnifiedDiffString(oldContent: string, newContent: string
 		for (const line of hunk.lines) {
 			if (line.startsWith("-")) {
 				if (firstChangedLine === undefined) firstChangedLine = newLine;
-				output.push(formatNumberedDiffLine("-", oldLine, lineNumWidth, line.slice(1)));
+				output.push(formatNumberedDiffLine("-", oldLine, line.slice(1)));
 				oldLine++;
 				continue;
 			}
 			if (line.startsWith("+")) {
 				if (firstChangedLine === undefined) firstChangedLine = newLine;
-				output.push(formatNumberedDiffLine("+", newLine, lineNumWidth, line.slice(1)));
+				output.push(formatNumberedDiffLine("+", newLine, line.slice(1)));
 				newLine++;
 				continue;
 			}
 			if (line.startsWith(" ")) {
-				output.push(formatNumberedDiffLine(" ", oldLine, lineNumWidth, line.slice(1)));
+				output.push(formatNumberedDiffLine(" ", oldLine, line.slice(1)));
 				oldLine++;
 				newLine++;
 				continue;