@oh-my-pi/pi-coding-agent 13.10.1 → 13.11.1

package/src/prompts/tools/hashline.md

@@ -1,19 +1,6 @@
 Applies precise, surgical file edits by referencing `LINE#ID` tags from `read` output. Each tag uniquely identifies a line, so edits remain stable even when lines shift.
 
-<workflow>
-Follow these steps in order for every edit:
-1. You **SHOULD** issue a `read` call before editing to get fresh `LINE#ID` tags. Editing without current tags causes mismatches because other edits or external changes may have shifted line numbers since your last read.
-2. You **MUST** submit one `edit` call per file with all operations. Multiple calls to the same file require re-reading between each one (tags shift after each edit), so batching avoids wasted round-trips. Think your changes through before submitting.
-3. You **MUST** pick the operation that matches the owning structure, not merely the smallest textual diff. Use the smallest operation only when it still cleanly owns the changed syntax. If a tiny edit would patch around a block tail, delimiter, or neighboring structural line, expand it to the semantically correct `replace` span instead.
-</workflow>
-
-<checklist>
-Before choosing the payload, answer these questions in order:
-1. **Am I replacing existing lines or inserting new ones?** If any existing line changes, use `replace` for the full changed span.
-2. **What declaration or block owns this anchor line?** Prefer declaration/header lines over blank lines or delimiters.
-3. **Am I inserting self-contained new content, or changing an existing block?** Use `append`/`prepend` only for self-contained additions. If surrounding code, indentation, or closers also change, use `replace`.
-4. **Am I editing near a block tail or closing delimiter?** If yes, use shape (a) or (b) from the block-boundaries rule: either stay entirely inside the body, or own the full block including header and closer. Never set `end` at a closer without re-emitting it, and never re-emit a closer without including it in `end`.
-</checklist>
+Read the file first to get fresh tags. Submit one `edit` call per file with all operations batched — tags shift after each edit, so multiple calls require re-reading between them.
 
 <operations>
 **`path`** — the path to the file to edit.
@@ -21,25 +8,20 @@ Before choosing the payload, answer these questions in order:
 **`delete`** — if true, delete the file.
 
 **`edits[n].pos`** — the anchor line. Meaning depends on `op`:
-  - if `replace`: line to rewrite
+  - if `replace`: first line to rewrite
   - if `prepend`: line to insert new lines **before**; omit for beginning of file
   - if `append`: line to insert new lines **after**; omit for end of file
 **`edits[n].end`** — range replace only. The last line of the range (inclusive). Omit for single-line replace.
 **`edits[n].lines`** — the replacement content:
-  - `["line1", "line2"]` — insert `line1` and `line2`
+  - for `replace`: the exact lines that will replace `[pos, end??pos]` inclusively (or the single `pos` line when `end` is omitted)
+  - for `prepend`/`append`: the new lines to insert
   - `[""]` — blank line
-  - `null` or `[]` — delete if replace, no-op if append or prepend
-
-Ops are applied bottom-up. Tags **MUST** be referenced from the most recent `read` output.
+  - `null` or `[]` — delete if replace
+- If `lines` contains content that already exists after `end`, those lines **will be duplicated** in the output.
+- Keep `lines` to exactly what belongs inside the consumed range.
+- Ops are applied bottom-up. Tags **MUST** be referenced from the most recent `read` output.
 </operations>
 
-<rules>
-1. **Use `prepend`/`append` only for self-contained additions whose surrounding structure stays unchanged.** If you are adding a sibling declaration, prefer `prepend` on the next sibling declaration instead of `append` on the previous block closer.
-2. **If the change touches existing code near a block tail, use range `replace` over the owned span.** Do not patch just the final line(s) before a closing delimiter when the surrounding structure, indentation, or control flow is also changing.
-3. **Match surrounding indentation for new lines.** When inserting via `prepend`/`append`, look at the anchor line and its neighbors in the `read` output. New `lines` entries **MUST** carry the same leading whitespace. If the context uses tabs at depth 1 (`\t`), your inserted declarations need `\t` and bodies need `\t\t`. Inserting at indent level 0 inside an indented block is always wrong.
-4. **Block boundaries travel together — never split them.** See the block-boundaries rule in `<critical>`. The two valid shapes are: replace only the body (leave header and closer untouched), or replace the whole block (header through closer, re-emit all in `lines`). Do not set `end` to a closer and omit it from `lines` (deletes it). Do not emit a closer in `lines` without including it in `end` (duplicates it).
-</rules>
-
 <examples>
 All examples below reference the same file, `util.ts`:
 ```ts
@@ -103,55 +85,10 @@ Range — remove the legacy block (lines 10–11):
 ```
 </example>
 
-<example name="clear text but keep the line break">
-Blank out a line without removing it:
-```
-{
-  path: "util.ts",
-  edits: [{
-    op: "replace",
-    pos: {{hlineref 3 "const tag = \"DO NOT SHIP\";"}},
-    lines: [""]
-  }]
-}
-```
-</example>
-
 <example name="rewrite a block body — shape (a)">
 Replace the catch body with smarter error handling. Shape (a): `pos` is the first body line, `end` is the last body line. The catch header (line 14) and its closer (line 17) are outside the range and stay untouched.
-```
-{
-  path: "util.ts",
-  edits: [{
-    op: "replace",
-    pos: {{hlineref 15 "\t\tconsole.error(err);"}},
-    end: {{hlineref 16 "\t\treturn null;"}},
-    lines: [
-      "\t\tif (isEnoent(err)) return null;",
-      "\t\tthrow err;"
-    ]
-  }]
-}
-```
-</example>
 
-<example name="span the full body, not a single line">
-When changing body content, replace the entire body span — not just one line inside it. Patching one line leaves the rest of the body stale.
-
-Bad — appends after one body line, leaving the original `return null` in place:
-```
-{
-  path: "util.ts",
-  edits: [{
-    op: "append",
-    pos: {{hlineref 15 "\t\tconsole.error(err);"}},
-    lines: [
-      "\t\treturn fallback;"
-    ]
-  }]
-}
-```
-Good — shape (a): replace the full body span. Header and closer stay untouched:
+When changing body content, replace the **entire** body span — not just one line inside it. Patching one line leaves the rest of the body stale.
 ```
 {
   path: "util.ts",
@@ -161,7 +98,7 @@ Good — shape (a): replace the full body span. Header and closer stay untouched
     end: {{hlineref 16 "\t\treturn null;"}},
     lines: [
       "\t\tif (isEnoent(err)) return null;",
-      "\t\treturn fallback;"
+      "\t\tthrow err;"
     ]
   }]
 }
@@ -205,46 +142,18 @@ Good — `end` includes the function's own `}` on line 18, so the old closer is
 ```
 </example>
 
-<example name="insert between sibling declarations">
-Add a `gamma()` function between `alpha()` and `beta()`:
-```
-{
-  path: "util.ts",
-  edits: [{
-    op: "prepend",
-    pos: {{hlineref 9 "function beta() {"}},
-    lines: [
-      "function gamma() {",
-      "\tvalidate();",
-      "}",
-      ""
-    ]
-  }]
-}
-```
-Use a trailing `""` to preserve the blank line between sibling declarations.
-</example>
+<example name="avoid shared boundary lines">
+Do not anchor `replace` on a mixed boundary line such as `} catch (err) {`, `} else {`, `}),`, or `},{`. Those lines belong to two adjacent structures at once.
 
-<example name="avoid closer anchors">
-When inserting a sibling declaration, do not anchor on the previous block's lone closing brace. Anchor on the next declaration instead.
+Bad — if you need to change code on both sides of that line, replacing just the boundary span will usually leave one side's syntax behind.
 
-Bad — appending after line 7 (`}`) happens to land in the gap today, but the anchor is still the previous function's closer rather than a stable declaration boundary:
-```
-{
-  path: "util.ts",
-  edits: [{
-    op: "append",
-    pos: {{hlineref 7 "}"}},
-    lines: [
-      "",
-      "function gamma() {",
-      "\tvalidate();",
-      "}"
-    ]
-  }]
-}
-```
-Good — prepend before the next declaration so the new sibling is anchored on a declaration header, not a block tail:
+Good — choose one of two safe shapes instead:
+- move inward and replace only body-owned lines
+- expand outward and replace one whole owned block, consuming its real closer/separator too
+</example>
+
+<example name="insert between sibling declarations">
+Add a `gamma()` function between `alpha()` and `beta()`. Use `prepend` on the next declaration — not `append` on the previous block's closing brace — so the anchor is a stable declaration boundary.
 ```
 {
   path: "util.ts",
@@ -260,6 +169,7 @@ Good — prepend before the next declaration so the new sibling is anchored on a
   }]
 }
 ```
+Use a trailing `""` to preserve the blank line between sibling declarations.
 </example>
 </examples>
 
@@ -271,5 +181,10 @@ Good — prepend before the next declaration so the new sibling is anchored on a
 - When changing existing code near a block tail or closing delimiter, default to `replace` over the owned span instead of inserting around the boundary.
 - When adding a sibling declaration, default to `prepend` on the next sibling declaration instead of `append` on the previous block's closing brace.
 - **Block boundaries travel together.** For a block `{ header / body / closer }`, there are exactly two valid replace shapes: (a) replace only the body — `pos`=first body line, `end`=last body line, leave the header and closer untouched; or (b) replace the whole block — `pos`=header, `end`=closer, re-emit all three in `lines`. Never split them: do not set `end` to the closer while omitting it from `lines` (deletes it), and do not emit the closer in `lines` without including it in `end` (duplicates it). This applies to every block terminator: `}`, `continue`, `break`, `return`, `throw`.
+- **Never target shared boundary lines.** Do not use `replace` spans that start, end, or pivot on a line that closes one construct and opens/separates another, such as `},{`, `}),`, `} else {`, or `} catch (err) {`. Those lines are not owned by a single block. Move the range inward to body-only lines, or widen it to consume one whole owned construct including its true trailing delimiter.
+- **`lines` must not extend past `end`.** `lines` replaces exactly `pos..end`. Content after `end` survives. If you include lines in `lines` that exist after `end`, they will appear twice. Either extend `end` to cover all lines you are re-emitting, or remove the extra lines from `lines`.
 - `lines` entries **MUST** be literal file content with indentation copied exactly from the `read` output. If the file uses tabs, use a real tab character.
+- After any successful `edit` call on a file, the next change to that same file **MUST** start with a fresh `read`. Do not chain a second `edit` call off stale mental state, even if the intended range is nearby.
+- If you need a second change in the same local region, default to one wider `replace` over the whole owned block instead of a sequence of micro-edits on adjacent lines. Repeated small patches in a moving region are unstable.
+- If a local region is already malformed or a prior patch partially landed, stop nibbling at it. Re-read the file and replace the full owned block from a stable boundary; for a small file, prefer rewriting the file over stacking more tiny repairs.
 </critical>

package/src/prompts/tools/read.md

@@ -4,10 +4,10 @@ Reads files from local filesystem or internal URLs.
 - Reads up to {{DEFAULT_LIMIT}} lines default
 - Use `offset` and `limit` for large files; max {{DEFAULT_MAX_LINES}} lines per call
 {{#if IS_HASHLINE_MODE}}
-- Text output is CID prefixed: `LINE#ID:content`
+- Filesystem output is CID prefixed: `LINE#ID:content`
 {{else}}
 {{#if IS_LINE_NUMBER_MODE}}
-- Text output is line-number-prefixed
+- Filesystem output is line-number-prefixed
 {{/if}}
 {{/if}}
 - Supports images (PNG, JPG) and PDFs

package/src/prompts/tools/todo-write.md

@@ -46,6 +46,11 @@ Create a todo list when:
 - Multiple ops can be batched in one call (e.g., complete current + start next)
 </protocol>
 
+## Task Anatomy
+- `content`: Short label (5-10 words). What is being done, not how.
+- `details`: File paths, implementation steps, edge cases. Shown only when task is active.
+- `notes`: Runtime observations added during execution.
+
 <avoid>
 - Single-step tasks — act directly
 - Conversational or informational requests
@@ -65,11 +70,16 @@ ops: [
 ]
 </example>
 
+<example name="add_task">
+Add a follow-up task with implementation specifics in `details`:
+ops: [{op: "add_task", phase: "Implementation", after: "task-2", task: {content: "Handle retries", details: "Update retry.ts to cap exponential backoff and preserve AbortSignal handling", status: "pending"}}]
+</example>
+
 <example name="initial-setup">
 Replace is for setup only. Prefer add_phase / add_task for incremental additions.
 ops: [{op: "replace", phases: [
   {name: "Investigation", tasks: [{content: "Read source"}, {content: "Map callsites"}]},
-  {name: "Implementation", tasks: [{content: "Apply fix"}, {content: "Run tests"}]}
+  {name: "Implementation", tasks: [{content: "Apply fix", details: "Update parser.ts to handle edge case in line 42"}, {content: "Run tests"}]}
 ]}]
 </example>
 

package/src/sdk.ts

@@ -89,10 +89,13 @@ import {
 	GrepTool,
 	getSearchTools,
 	HIDDEN_TOOLS,
+	isCodeSearchProviderId,
+	isSearchProviderPreference,
 	loadSshTool,
 	PythonTool,
 	ReadTool,
 	ResolveTool,
+	setPreferredCodeSearchProvider,
 	setPreferredImageProvider,
 	setPreferredSearchProvider,
 	type Tool,
@@ -628,8 +631,20 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		options.skills === undefined ? discoverSkills(cwd, agentDir, skillsSettings) : undefined;
 
 	// Initialize provider preferences from settings
-	setPreferredSearchProvider(settings.get("providers.webSearch") ?? "auto");
-	setPreferredImageProvider(settings.get("providers.image") ?? "auto");
+	const webSearchProvider = settings.get("providers.webSearch");
+	if (typeof webSearchProvider === "string" && isSearchProviderPreference(webSearchProvider)) {
+		setPreferredSearchProvider(webSearchProvider);
+	}
+
+	const codeSearchProvider = settings.get("providers.codeSearch");
+	if (typeof codeSearchProvider === "string" && isCodeSearchProviderId(codeSearchProvider)) {
+		setPreferredCodeSearchProvider(codeSearchProvider);
+	}
+
+	const imageProvider = settings.get("providers.image");
+	if (imageProvider === "auto" || imageProvider === "gemini" || imageProvider === "openrouter") {
+		setPreferredImageProvider(imageProvider);
+	}
 
 	const sessionManager = options.sessionManager ?? logger.time("sessionManager", SessionManager.create, cwd);
 	const sessionId = sessionManager.getSessionId();
@@ -962,19 +977,8 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		customTools.push(...(geminiImageTools as unknown as CustomTool[]));
 	}
 
-	// Add specialized Exa web search tools if EXA_API_KEY is available
-	const exaSettings = settings.getGroup("exa");
-	if (exaSettings.enabled && exaSettings.enableSearch) {
-		const exaSearchTools = await logger.timeAsync("getSearchTools", getSearchTools, {
-			enableLinkedin: exaSettings.enableLinkedin as boolean,
-			enableCompany: exaSettings.enableCompany as boolean,
-		});
-		// Filter out the base web_search (already in built-in tools), add specialized Exa tools
-		const specializedTools = exaSearchTools.filter(t => t.name !== "web_search");
-		if (specializedTools.length > 0) {
-			customTools.push(...specializedTools);
-		}
-	}
+	// Add web search tools
+	customTools.push(...getSearchTools());
 
 	// Discover and load custom tools from .omp/tools/, .claude/tools/, etc.
 	const builtInToolNames = builtinTools.map(t => t.name);
@@ -1409,7 +1413,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			if (pendingActionStore.hasPending) {
 				return { type: "function", name: "resolve" };
 			}
-			return undefined;
+			return session?.consumeNextToolChoiceOverride();
 		},
 	});
 	cursorEventEmitter = event => agent.emitExternalEvent(event);

package/src/session/agent-session.ts

@@ -89,6 +89,7 @@ import { getCurrentThemeName, theme } from "../modes/theme/theme";
 import { normalizeDiff, normalizeToLF, ParseError, previewPatch, stripBom } from "../patch";
 import type { PlanModeState } from "../plan-mode/state";
 import autoHandoffThresholdFocusPrompt from "../prompts/system/auto-handoff-threshold-focus.md" with { type: "text" };
+import eagerTodoPrompt from "../prompts/system/eager-todo.md" with { type: "text" };
 import handoffDocumentPrompt from "../prompts/system/handoff-document.md" with { type: "text" };
 import planModeActivePrompt from "../prompts/system/plan-mode-active.md" with { type: "text" };
 import planModeReferencePrompt from "../prompts/system/plan-mode-reference.md" with { type: "text" };
@@ -106,6 +107,7 @@ import { getLatestTodoPhasesFromEntries, type TodoItem, type TodoPhase } from ".
 import { parseCommandArgs } from "../utils/command-args";
 import { resolveFileDisplayMode } from "../utils/file-display-mode";
 import { extractFileMentions, generateFileMentionMessages } from "../utils/file-mentions";
+import { buildNamedToolChoice } from "../utils/tool-choice";
 import {
 	type CompactionResult,
 	calculateContextTokens,
@@ -350,6 +352,7 @@ export class AgentSession {
 	// Todo completion reminder state
 	#todoReminderCount = 0;
 	#todoPhases: TodoPhase[] = [];
+	#nextToolChoiceOverride: ToolChoice | undefined = undefined;
 
 	// Bash execution state
 	#bashAbortController: AbortController | undefined = undefined;
@@ -457,6 +460,12 @@ export class AgentSession {
 		return this.#modelRegistry;
 	}
 
+	consumeNextToolChoiceOverride(): ToolChoice | undefined {
+		const toolChoice = this.#nextToolChoiceOverride;
+		this.#nextToolChoiceOverride = undefined;
+		return toolChoice;
+	}
+
 	/** Provider-scoped mutable state store for transport/session caches. */
 	get providerSessionState(): Map<string, ProviderSessionState> {
 		return this.#providerSessionState;
@@ -791,7 +800,11 @@ export class AgentSession {
 			const compactionTask = this.#checkCompaction(msg);
 			this.#trackPostPromptTask(compactionTask);
 			await compactionTask;
-			// Check for incomplete todos (unless there was an error or abort)
+			// Check for incomplete todos only after a final assistant stop, not intermediate tool-use turns.
+			const hasToolCalls = msg.content.some(content => content.type === "toolCall");
+			if (hasToolCalls) {
+				return;
+			}
 			if (msg.stopReason !== "error" && msg.stopReason !== "aborted") {
 				if (this.#enforceRewindBeforeYield()) {
 					return;
@@ -1349,6 +1362,7 @@ export class AgentSession {
 		if (!this.#extensionRunner) return;
 		if (event.type === "agent_start") {
 			this.#turnIndex = 0;
+			this.#nextToolChoiceOverride = undefined;
 			await this.#extensionRunner.emit({ type: "agent_start" });
 		} else if (event.type === "agent_end") {
 			await this.#extensionRunner.emit({ type: "agent_end", messages: event.messages });
@@ -1945,6 +1959,8 @@ export class AgentSession {
 			return;
 		}
 
+		const eagerTodoPrelude = !options?.synthetic ? this.#createEagerTodoPrelude() : undefined;
+
 		const userContent: (TextContent | ImageContent)[] = [{ type: "text", text: expandedText }];
 		if (options?.images) {
 			userContent.push(...options.images);
@@ -1954,7 +1970,20 @@ export class AgentSession {
 			? { role: "developer" as const, content: userContent, attribution: "agent" as const, timestamp: Date.now() }
 			: { role: "user" as const, content: userContent, attribution: "user" as const, timestamp: Date.now() };
 
-		await this.#promptWithMessage(message, expandedText, options);
+		if (eagerTodoPrelude) {
+			this.#nextToolChoiceOverride = eagerTodoPrelude.toolChoice;
+		}
+
+		try {
+			await this.#promptWithMessage(message, expandedText, {
+				...options,
+				prependMessages: eagerTodoPrelude ? [eagerTodoPrelude.message] : undefined,
+			});
+		} finally {
+			if (eagerTodoPrelude) {
+				this.#nextToolChoiceOverride = undefined;
+			}
+		}
 		if (!options?.synthetic) {
 			await this.#enforcePlanModeToolDecision();
 		}
@@ -1997,6 +2026,7 @@ export class AgentSession {
 		message: AgentMessage,
 		expandedText: string,
 		options?: Pick<PromptOptions, "toolChoice" | "images" | "skipCompactionCheck"> & {
+			prependMessages?: AgentMessage[];
 			skipPostPromptRecoveryWait?: boolean;
 		},
 	): Promise<void> {
@@ -2034,7 +2064,7 @@ export class AgentSession {
 				await this.#checkCompaction(lastAssistant, false);
 			}
 
-			// Build messages array (custom messages if any, then user message)
+			// Build messages array (session context, eager todo prelude, then active prompt message)
 			const messages: AgentMessage[] = [];
 			const planReferenceMessage = await this.#buildPlanReferenceMessage?.();
 			if (planReferenceMessage) {
@@ -2044,6 +2074,9 @@ export class AgentSession {
 			if (planModeMessage) {
 				messages.push(planModeMessage);
 			}
+			if (options?.prependMessages) {
+				messages.push(...options.prependMessages);
+			}
 
 			messages.push(message);
 
@@ -3481,6 +3514,51 @@ export class AgentSession {
 			this.agent.setTools(previousTools);
 		}
 	}
+
+	#createEagerTodoPrelude(): { message: AgentMessage; toolChoice: ToolChoice } | undefined {
+		const eagerTodosEnabled = this.settings.get("todo.eager");
+		const todosEnabled = this.settings.get("todo.enabled");
+		if (!eagerTodosEnabled || !todosEnabled) {
+			return undefined;
+		}
+
+		if (this.#planModeState?.enabled) {
+			return undefined;
+		}
+		if (this.getTodoPhases().length > 0) {
+			return undefined;
+		}
+
+		if (!this.#toolRegistry.has("todo_write")) {
+			logger.warn("Eager todo enforcement skipped because todo_write is unavailable", {
+				activeToolNames: this.agent.state.tools.map(tool => tool.name),
+			});
+			return undefined;
+		}
+
+		const todoWriteToolChoice = buildNamedToolChoice("todo_write", this.model);
+		if (!todoWriteToolChoice) {
+			logger.warn("Eager todo enforcement skipped because the current model does not support forcing todo_write", {
+				modelApi: this.model?.api,
+				modelId: this.model?.id,
+			});
+			return undefined;
+		}
+
+		const eagerTodoReminder = renderPromptTemplate(eagerTodoPrompt);
+
+		return {
+			message: {
+				role: "custom",
+				customType: "eager-todo-prelude",
+				content: eagerTodoReminder,
+				display: false,
+				attribution: "agent",
+				timestamp: Date.now(),
+			},
+			toolChoice: todoWriteToolChoice,
+		};
+	}
 	/**
 	 * Check if agent stopped with incomplete todos and prompt to continue.
 	 */
@@ -5191,8 +5269,8 @@ export class AgentSession {
 		}
 
 		for (const msg of this.messages) {
-			if (msg.role === "user") {
-				lines.push("## User\n");
+			if (msg.role === "user" || msg.role === "developer") {
+				lines.push(msg.role === "developer" ? "## Developer\n" : "## User\n");
 				if (typeof msg.content === "string") {
 					lines.push(msg.content);
 				} else {
@@ -5316,8 +5394,8 @@ export class AgentSession {
 		lines.push("");
 
 		for (const msg of this.messages) {
-			if (msg.role === "user") {
-				lines.push("## User");
+			if (msg.role === "user" || msg.role === "developer") {
+				lines.push(msg.role === "developer" ? "## Developer" : "## User");
 				lines.push("");
 				if (typeof msg.content === "string") {
 					lines.push(msg.content);

package/src/session/streaming-output.ts

@@ -36,16 +36,14 @@ export interface OutputSinkOptions {
 
 export interface TruncationResult {
 	content: string;
-	truncated: boolean;
-	truncatedBy: "lines" | "bytes" | null;
+	truncated?: boolean;
+	truncatedBy?: "lines" | "bytes";
 	totalLines: number;
 	totalBytes: number;
-	outputLines: number;
-	outputBytes: number;
-	lastLinePartial: boolean;
-	firstLineExceedsLimit: boolean;
-	maxLines: number;
-	maxBytes: number;
+	outputLines?: number;
+	outputBytes?: number;
+	lastLinePartial?: boolean;
+	firstLineExceedsLimit?: boolean;
 }
 
 export interface TruncationOptions {
@@ -206,26 +204,10 @@ export function truncateLine(
 // =============================================================================
 
 /** Shared helper to build a no-truncation result. */
-function noTruncResult(
-	content: string,
-	totalLines: number,
-	totalBytes: number,
-	maxLines: number,
-	maxBytes: number,
-): TruncationResult {
-	return {
-		content,
-		truncated: false,
-		truncatedBy: null,
-		totalLines,
-		totalBytes,
-		outputLines: totalLines,
-		outputBytes: totalBytes,
-		lastLinePartial: false,
-		firstLineExceedsLimit: false,
-		maxLines,
-		maxBytes,
-	};
+export function noTruncResult(content: string, totalLines?: number, totalBytes?: number): TruncationResult {
+	if (totalLines == null) totalLines = countNewlines(content) + 1;
+	if (totalBytes == null) totalBytes = Buffer.byteLength(content, "utf-8");
+	return { content, totalLines, totalBytes };
 }
 
 /**
@@ -244,7 +226,7 @@ export function truncateHead(content: string, options: TruncationOptions = {}):
 	const totalLines = countNewlines(content) + 1;
 
 	if (totalLines <= maxLines && totalBytes <= maxBytes) {
-		return noTruncResult(content, totalLines, totalBytes, maxLines, maxBytes);
+		return noTruncResult(content, totalLines, totalBytes);
 	}
 
 	let includedLines = 0;
@@ -283,8 +265,6 @@ export function truncateHead(content: string, options: TruncationOptions = {}):
 					outputBytes: 0,
 					lastLinePartial: false,
 					firstLineExceedsLimit: true,
-					maxLines,
-					maxBytes,
 				};
 			}
 			break;
@@ -307,8 +287,6 @@ export function truncateHead(content: string, options: TruncationOptions = {}):
 					outputBytes: 0,
 					lastLinePartial: false,
 					firstLineExceedsLimit: true,
-					maxLines,
-					maxBytes,
 				};
 			}
 			break;
@@ -335,8 +313,6 @@ export function truncateHead(content: string, options: TruncationOptions = {}):
 		outputBytes: bytesUsed,
 		lastLinePartial: false,
 		firstLineExceedsLimit: false,
-		maxLines,
-		maxBytes,
 	};
 }
 
@@ -354,7 +330,7 @@ export function truncateTail(content: string, options: TruncationOptions = {}):
 	const totalLines = countNewlines(content) + 1;
 
 	if (totalLines <= maxLines && totalBytes <= maxBytes) {
-		return noTruncResult(content, totalLines, totalBytes, maxLines, maxBytes);
+		return noTruncResult(content, totalLines, totalBytes);
 	}
 
 	let includedLines = 0;
@@ -396,8 +372,6 @@ export function truncateTail(content: string, options: TruncationOptions = {}):
 					outputBytes: tail.bytes,
 					lastLinePartial: true,
 					firstLineExceedsLimit: false,
-					maxLines,
-					maxBytes,
 				};
 			}
 			break;
@@ -420,8 +394,6 @@ export function truncateTail(content: string, options: TruncationOptions = {}):
 					outputBytes: tail.bytes,
 					lastLinePartial: true,
 					firstLineExceedsLimit: false,
-					maxLines,
-					maxBytes,
 				};
 			}
 			break;
@@ -447,8 +419,6 @@ export function truncateTail(content: string, options: TruncationOptions = {}):
 		outputBytes: bytesUsed,
 		lastLinePartial: false,
 		firstLineExceedsLimit: false,
-		maxLines,
-		maxBytes,
 	};
 }
 
@@ -693,7 +663,7 @@ export function formatTailTruncationNotice(
 	if (!truncation.truncated) return "";
 
 	const { fullOutputPath, originalContent, suffix = "" } = options;
-	const startLine = truncation.totalLines - truncation.outputLines + 1;
+	const startLine = truncation.totalLines - (truncation.outputLines ?? truncation.totalLines) + 1;
 	const endLine = truncation.totalLines;
 	const fullOutputPart = fullOutputPath ? `. Full output: ${fullOutputPath}` : "";
 
@@ -705,11 +675,9 @@ export function formatTailTruncationNotice(
 			const lastLine = lastNl === -1 ? originalContent : originalContent.substring(lastNl + 1);
 			lastLineSizePart = ` (line is ${formatBytes(Buffer.byteLength(lastLine, "utf-8"))})`;
 		}
-		notice = `[Showing last ${formatBytes(truncation.outputBytes)} of line ${endLine}${lastLineSizePart}${fullOutputPart}${suffix}]`;
-	} else if (truncation.truncatedBy === "lines") {
-		notice = `[Showing lines ${startLine}-${endLine} of ${truncation.totalLines}${fullOutputPart}${suffix}]`;
+		notice = `[Showing last ${formatBytes(truncation.outputBytes ?? truncation.totalBytes)} of line ${endLine}${lastLineSizePart}${fullOutputPart}${suffix}]`;
 	} else {
-		notice = `[Showing lines ${startLine}-${endLine} of ${truncation.totalLines} (${formatBytes(truncation.maxBytes)} limit)${fullOutputPart}${suffix}]`;
+		notice = `[Showing lines ${startLine}-${endLine} of ${truncation.totalLines}${fullOutputPart}${suffix}]`;
 	}
 
 	return `\n\n${notice}`;
@@ -727,13 +695,8 @@ export function formatHeadTruncationNotice(
 
 	const startLineDisplay = options.startLine ?? 1;
 	const totalFileLines = options.totalFileLines ?? truncation.totalLines;
-	const endLineDisplay = startLineDisplay + truncation.outputLines - 1;
+	const endLineDisplay = startLineDisplay + (truncation.outputLines ?? truncation.totalLines) - 1;
 	const nextOffset = endLineDisplay + 1;
-
-	const notice =
-		truncation.truncatedBy === "lines"
-			? `[Showing lines ${startLineDisplay}-${endLineDisplay} of ${totalFileLines}. Use offset=${nextOffset} to continue]`
-			: `[Showing lines ${startLineDisplay}-${endLineDisplay} of ${totalFileLines} (${formatBytes(truncation.maxBytes)} limit). Use offset=${nextOffset} to continue]`;
-
+	const notice = `[Showing lines ${startLineDisplay}-${endLineDisplay} of ${totalFileLines}. Use offset=${nextOffset} to continue]`;
 	return `\n\n${notice}`;
 }