@oh-my-pi/pi-coding-agent 11.3.0 → 11.4.1

package/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 ## [Unreleased]
 
+## [11.4.1] - 2026-02-06
+### Fixed
+
+- Fixed tab character display in error messages and bash tool output by properly replacing tabs with spaces
+
+## [11.4.0] - 2026-02-06
+
+### Added
+
+- Visualize leading whitespace (indentation) in diff output with dim glyphs—tabs display as `→` and spaces as `·` for improved readability
+
+### Fixed
+
+- Fixed patch applicator to correctly handle context-only hunks (pure context lines between @@ markers) without altering indentation in tab-indented files
+- Fixed indentation conversion logic to infer tab width from space-to-tab patterns using linear regression (ax+b model) when pattern uses spaces and actual file uses tabs
+- Fixed tab character rendering in tool output previews and code cell displays, ensuring tabs are properly converted to spaces for consistent terminal display
+- Fixed `newSession()` to properly await session manager operations, ensuring new session is fully initialized before returning
+- Fixed session formatting to use XML structure for tools and tool invocations instead of YAML, improving compatibility with structured output parsing
+
 ## [11.3.0] - 2026-02-06
 
 ### Added
@@ -109,6 +128,7 @@
 - Fixed CLI invocation with flags only (e.g. `pi --model=codex`) to route to the default command instead of erroring
 
 ## [11.2.0] - 2026-02-05
+
 ### Added
 
 - Added `omp commit` command to generate commit messages and update changelogs with `--push`, `--dry-run`, `--no-changelog`, and model override flags
@@ -1080,7 +1100,7 @@
 - Updated all tools to use structured metadata instead of inline notices for truncation, limits, and diagnostics
 - Replaced manual error formatting with ToolError.render() and standardized error handling
 - Enhanced bash and python executors to save full output as artifacts when truncated
-- Improved abort signal handling across all tools with consistent ToolAbortError
+- Improved abort signal handling across <caution>ith consistent ToolAbortError
 - Renamed task parameter from `vars` to `args` throughout task tool interface and updated template rendering to support built-in `{{id}}` and `{{description}}` placeholders
 - Simplified todo-write tool by removing active_form parameter, using single content field for task descriptions
 - Updated system prompt structure with `<important>` and `<avoid>` tags, clearer critical sections, and standardized whitespace handling
@@ -1808,8 +1828,8 @@
 
 - Fixed editor border rendering glitch after canceling slash command autocomplete
 - Fixed login/logout credential path message to reference agent.db
- - Removed legacy auth.json file—credentials are stored exclusively in agent.db
- - Removed legacy auth.json file—credentials are stored exclusively in agent.db
+- Removed legacy auth.json file—credentials are stored exclusively in agent.db
+- Removed legacy auth.json file—credentials are stored exclusively in agent.db
 
 ## [4.2.0] - 2026-01-10
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "11.3.0",
+	"version": "11.4.1",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"type": "module",
 	"ompConfig": {
@@ -90,12 +90,12 @@
 		"@mozilla/readability": "0.6.0",
 		"@oclif/core": "^4.8.0",
 		"@oclif/plugin-autocomplete": "^3.2.40",
-		"@oh-my-pi/omp-stats": "11.3.0",
-		"@oh-my-pi/pi-agent-core": "11.3.0",
-		"@oh-my-pi/pi-ai": "11.3.0",
-		"@oh-my-pi/pi-natives": "11.3.0",
-		"@oh-my-pi/pi-tui": "11.3.0",
-		"@oh-my-pi/pi-utils": "11.3.0",
+		"@oh-my-pi/omp-stats": "11.4.1",
+		"@oh-my-pi/pi-agent-core": "11.4.1",
+		"@oh-my-pi/pi-ai": "11.4.1",
+		"@oh-my-pi/pi-natives": "11.4.1",
+		"@oh-my-pi/pi-tui": "11.4.1",
+		"@oh-my-pi/pi-utils": "11.4.1",
 		"@sinclair/typebox": "^0.34.48",
 		"ajv": "^8.17.1",
 		"chalk": "^5.6.2",

package/src/modes/components/diff.ts

@@ -2,6 +2,38 @@ import * as Diff from "diff";
 import { theme } from "../../modes/theme/theme";
 import { replaceTabs } from "../../tools/render-utils";
 
+/** SGR dim on / normal intensity — additive, preserves fg/bg colors. */
+const DIM = "\x1b[2m";
+const DIM_OFF = "\x1b[22m";
+
+/**
+ * Visualize leading whitespace (indentation) with dim glyphs.
+ * Tabs become ` → ` and spaces become `·`. Only affects whitespace
+ * before the first non-whitespace character; remaining tabs in code
+ * content are replaced with spaces (like replaceTabs).
+ */
+function visualizeIndent(text: string): string {
+	const match = text.match(/^([ \t]+)/);
+	if (!match) return replaceTabs(text);
+	const indent = match[1];
+	const rest = text.slice(indent.length);
+	// Normalize: collapse 3-space groups (tab-width) into tab arrows,
+	// then handle remaining tabs and lone spaces.
+	const normalized = indent.replaceAll("\t", "   ");
+	let visible = "";
+	let pos = 0;
+	while (pos < normalized.length) {
+		if (pos + 3 <= normalized.length && normalized.slice(pos, pos + 3) === "   ") {
+			visible += `${DIM} → ${DIM_OFF}`;
+			pos += 3;
+		} else {
+			visible += `${DIM}·${DIM_OFF}`;
+			pos++;
+		}
+	}
+	return `${visible}${replaceTabs(rest)}`;
+}
+
 /**
  * Parse diff line to extract prefix, line number, and content.
  * Format: "+123 content" or "-123 content" or " 123 content" or "     ..."
@@ -122,24 +154,26 @@ export function renderDiff(diffText: string, _options: RenderDiffOptions = {}):
 					replaceTabs(added.content),
 				);
 
-				result.push(theme.fg("toolDiffRemoved", formatLine("-", removed.lineNum, removedLine)));
-				result.push(theme.fg("toolDiffAdded", formatLine("+", added.lineNum, addedLine)));
+				result.push(theme.fg("toolDiffRemoved", formatLine("-", removed.lineNum, visualizeIndent(removedLine))));
+				result.push(theme.fg("toolDiffAdded", formatLine("+", added.lineNum, visualizeIndent(addedLine))));
 			} else {
 				// Show all removed lines first, then all added lines
 				for (const removed of removedLines) {
-					result.push(theme.fg("toolDiffRemoved", formatLine("-", removed.lineNum, replaceTabs(removed.content))));
+					result.push(
+						theme.fg("toolDiffRemoved", formatLine("-", removed.lineNum, visualizeIndent(removed.content))),
+					);
 				}
 				for (const added of addedLines) {
-					result.push(theme.fg("toolDiffAdded", formatLine("+", added.lineNum, replaceTabs(added.content))));
+					result.push(theme.fg("toolDiffAdded", formatLine("+", added.lineNum, visualizeIndent(added.content))));
 				}
 			}
 		} else if (parsed.prefix === "+") {
 			// Standalone added line
-			result.push(theme.fg("toolDiffAdded", formatLine("+", parsed.lineNum, replaceTabs(parsed.content))));
+			result.push(theme.fg("toolDiffAdded", formatLine("+", parsed.lineNum, visualizeIndent(parsed.content))));
 			i++;
 		} else {
 			// Context line
-			result.push(theme.fg("toolDiffContext", formatLine(" ", parsed.lineNum, replaceTabs(parsed.content))));
+			result.push(theme.fg("toolDiffContext", formatLine(" ", parsed.lineNum, visualizeIndent(parsed.content))));
 			i++;
 		}
 	}

package/src/patch/applicator.ts

@@ -126,6 +126,8 @@ function adjustLinesIndentation(patternLines: string[], actualLines: string[], n
 
 	let patternTabOnly = true;
 	let actualSpaceOnly = true;
+	let patternSpaceOnly = true;
+	let actualTabOnly = true;
 	let patternMixed = false;
 	let actualMixed = false;
 
@@ -133,6 +135,7 @@ function adjustLinesIndentation(patternLines: string[], actualLines: string[], n
 		if (line.trim().length === 0) continue;
 		const ws = getLeadingWhitespace(line);
 		if (ws.includes(" ")) patternTabOnly = false;
+		if (ws.includes("\t")) patternSpaceOnly = false;
 		if (ws.includes(" ") && ws.includes("\t")) patternMixed = true;
 	}
 
@@ -140,6 +143,7 @@ function adjustLinesIndentation(patternLines: string[], actualLines: string[], n
 		if (line.trim().length === 0) continue;
 		const ws = getLeadingWhitespace(line);
 		if (ws.includes("\t")) actualSpaceOnly = false;
+		if (ws.includes(" ")) actualTabOnly = false;
 		if (ws.includes(" ") && ws.includes("\t")) actualMixed = true;
 	}
 
@@ -173,6 +177,88 @@ function adjustLinesIndentation(patternLines: string[], actualLines: string[], n
 		}
 	}
 
+	// Reverse: pattern uses spaces, actual uses tabs — infer spaces = tabs * width + offset
+	// Collect (tabs, spaces) pairs from matched lines to solve for the model's tab rendering.
+	// With one data point: spaces = tabs * width (offset=0).
+	// With two+: solve ax + b via pairs with distinct tab counts.
+	if (!patternMixed && !actualMixed && patternSpaceOnly && actualTabOnly) {
+		const samples = new Map<number, number>(); // tabs -> spaces
+		const lineCount = Math.min(patternLines.length, actualLines.length);
+		let consistent = true;
+		for (let i = 0; i < lineCount; i++) {
+			const patternLine = patternLines[i];
+			const actualLine = actualLines[i];
+			if (patternLine.trim().length === 0 || actualLine.trim().length === 0) continue;
+			const spaces = countLeadingWhitespace(patternLine);
+			const tabs = countLeadingWhitespace(actualLine);
+			if (tabs === 0) continue;
+			const existing = samples.get(tabs);
+			if (existing !== undefined && existing !== spaces) {
+				consistent = false;
+				break;
+			}
+			samples.set(tabs, spaces);
+		}
+
+		if (consistent && samples.size > 0) {
+			let tabWidth: number | undefined;
+			let offset = 0;
+
+			if (samples.size === 1) {
+				// One level: assume offset=0, width = spaces / tabs
+				const [[tabs, spaces]] = samples;
+				if (spaces % tabs === 0) {
+					tabWidth = spaces / tabs;
+				}
+			} else {
+				// Two+ levels: solve via any two distinct pairs
+				// spaces = tabs * width + offset  =>  width = (s2 - s1) / (t2 - t1)
+				const entries = [...samples.entries()];
+				const [t1, s1] = entries[0];
+				const [t2, s2] = entries[1];
+				if (t1 !== t2) {
+					const w = (s2 - s1) / (t2 - t1);
+					if (w > 0 && Number.isInteger(w)) {
+						const b = s1 - t1 * w;
+						// Validate all samples against this model
+						let valid = true;
+						for (const [t, s] of samples) {
+							if (t * w + b !== s) {
+								valid = false;
+								break;
+							}
+						}
+						if (valid) {
+							tabWidth = w;
+							offset = b;
+						}
+					}
+				}
+			}
+
+			if (tabWidth !== undefined && tabWidth > 0) {
+				const converted = newLines.map(line => {
+					if (line.trim().length === 0) return line;
+					const ws = countLeadingWhitespace(line);
+					if (ws === 0) return line;
+					// Reverse: tabs = (spaces - offset) / width
+					const adjusted = ws - offset;
+					if (adjusted >= 0 && adjusted % tabWidth! === 0) {
+						return "\t".repeat(adjusted / tabWidth!) + line.slice(ws);
+					}
+					// Partial tab — keep remainder as spaces
+					const tabCount = Math.floor(adjusted / tabWidth!);
+					const remainder = adjusted - tabCount * tabWidth!;
+					if (tabCount >= 0) {
+						return "\t".repeat(tabCount) + " ".repeat(remainder) + line.slice(ws);
+					}
+					return line;
+				});
+				return converted;
+			}
+		}
+	}
+
 	// Build a map from trimmed content to actual lines (by content, not position)
 	// This handles fuzzy matches where pattern and actual may not be positionally aligned
 	const contentToActualLines = new Map<string, string[]>();
@@ -1118,8 +1204,25 @@ function computeReplacements(
 
 		// Adjust indentation if needed (handles fuzzy matches where indentation differs)
 		const actualMatchedLines = originalLines.slice(found, found + pattern.length);
-		const adjustedNewLines = adjustLinesIndentation(pattern, actualMatchedLines, newSlice);
 
+		// Skip pure-context hunks (no +/- lines — oldLines === newLines).
+		// They serve only to advance lineIndex for subsequent hunks.
+		let isNoOp = pattern.length === newSlice.length;
+		if (isNoOp) {
+			for (let i = 0; i < pattern.length; i++) {
+				if (pattern[i] !== newSlice[i]) {
+					isNoOp = false;
+					break;
+				}
+			}
+		}
+
+		if (isNoOp) {
+			lineIndex = found + pattern.length;
+			continue;
+		}
+
+		const adjustedNewLines = adjustLinesIndentation(pattern, actualMatchedLines, newSlice);
 		replacements.push({ startIndex: found, oldLen: pattern.length, newLines: adjustedNewLines });
 		lineIndex = found + pattern.length;
 	}

package/src/patch/shared.ts

@@ -14,6 +14,7 @@ import {
 	formatStatusIcon,
 	getDiffStats,
 	PREVIEW_LIMITS,
+	replaceTabs,
 	shortenPath,
 	ToolUIKit,
 	truncateDiffByHunk,
@@ -181,7 +182,7 @@ export const editToolRenderer = {
 			const maxLines = 6;
 			text += "\n\n";
 			for (const line of previewLines.slice(0, maxLines)) {
-				text += `${uiTheme.fg("toolOutput", ui.truncate(line, 80))}\n`;
+				text += `${uiTheme.fg("toolOutput", ui.truncate(replaceTabs(line), 80))}\n`;
 			}
 			if (previewLines.length > maxLines) {
 				text += uiTheme.fg("dim", `… ${previewLines.length - maxLines} more lines`);
@@ -191,7 +192,7 @@ export const editToolRenderer = {
 			const maxLines = 6;
 			text += "\n\n";
 			for (const line of previewLines.slice(0, maxLines)) {
-				text += `${uiTheme.fg("toolOutput", ui.truncate(line, 80))}\n`;
+				text += `${uiTheme.fg("toolOutput", ui.truncate(replaceTabs(line), 80))}\n`;
 			}
 			if (previewLines.length > maxLines) {
 				text += uiTheme.fg("dim", `… ${previewLines.length - maxLines} more lines`);
@@ -264,13 +265,13 @@ export const editToolRenderer = {
 
 				if (result.isError) {
 					if (errorText) {
-						text += `\n\n${uiTheme.fg("error", errorText)}`;
+						text += `\n\n${uiTheme.fg("error", replaceTabs(errorText))}`;
 					}
 				} else if (result.details?.diff) {
 					text += renderDiffSection(result.details.diff, rawPath, expanded, uiTheme, ui, renderDiffFn);
 				} else if (editDiffPreview) {
 					if ("error" in editDiffPreview) {
-						text += `\n\n${uiTheme.fg("error", editDiffPreview.error)}`;
+						text += `\n\n${uiTheme.fg("error", replaceTabs(editDiffPreview.error))}`;
 					} else if (editDiffPreview.diff) {
 						text += renderDiffSection(editDiffPreview.diff, rawPath, expanded, uiTheme, ui, renderDiffFn);
 					}

package/src/prompts/system/plan-mode-active.md

@@ -19,9 +19,9 @@ Create plan at `{{planFilePath}}`.
 
 Use `{{editToolName}}` incremental updates; `{{writeToolName}}` only create/full replace.
 
-<important>
+<caution>
 Plan execution runs in fresh context (session cleared). Make plan file self-contained: include requirements, decisions, key findings, remaining todos needed to continue without prior session history.
-</important>
+</caution>
 
 {{#if reentry}}
 ## Re-entry
@@ -56,7 +56,7 @@ Use `{{editToolName}}` update plan file as you learn; don't wait until end.
 - Smaller task → fewer or no questions
 </procedure>
 
-<important>
+<caution>
 ### Plan Structure
 
 Use clear markdown headers; include:
@@ -65,7 +65,7 @@ Use clear markdown headers; include:
 - Verification: how to test end-to-end
 
 Concise enough to scan. Detailed enough to execute.
-</important>
+</caution>
 
 {{else}}
 ## Planning Workflow
@@ -87,9 +87,9 @@ Update `{{planFilePath}}` (`{{editToolName}}` changes, `{{writeToolName}}` only
 - Verification section
 </procedure>
 
-<important>
+<caution>
 Ask questions throughout. Don't make large assumptions about user intent.
-</important>
+</caution>
 {{/if}}
 
 <directives>

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

@@ -4,7 +4,7 @@ XML tags prompt: system-level instructions, not suggestions.
 Tag hierarchy (enforcement):
 - `<critical>` — Inviolable; noncompliance = system failure.
 - `<prohibited>` — Forbidden; actions cause harm.
-- `<important>` — High priority; deviate only with justification.
+- `<caution>` — High priority; important to follow.
 - `<instruction>` — Operating rules; follow precisely.
 - `<conditions>` — When rules apply; check before acting.
 - `<avoid>` — Anti-patterns; prefer alternatives.

package/src/prompts/tools/ask.md

@@ -16,9 +16,9 @@ Ask user when you need clarification or input during task execution.
 Returns selected option(s) as text. For multi-part questions, returns map of question IDs to selected values.
 </output>
 
-<important>
+<caution>
 - Provide 2-5 concise, distinct options
-</important>
+</caution>
 
 <critical>
 **Default to action. Do NOT ask unless you are genuinely blocked and user preference is required to avoid a wrong outcome.**

package/src/prompts/tools/gemini-image.md

@@ -14,10 +14,10 @@ When using multiple `input_images`, describe each image's role in `subject` or `
 Returns generated image saved to disk. Response includes file path where image was written.
 </output>
 
-<important>
+<caution>
 - For photoreal: add "ultra-detailed, realistic, natural skin texture" to style
 - For posters/cards: use 9:16 aspect ratio with negative space for text placement
 - For iteration: use `changes` for targeted adjustments rather than regenerating from scratch
 - For text: add "sharp, legible, correctly spelled" for important text; keep text short
 - For diagrams: include "scientifically accurate" in style and provide facts explicitly
-</important>
+</caution>

package/src/prompts/tools/lsp.md

@@ -22,7 +22,7 @@ Interact with Language Server Protocol servers for code intelligence.
 - `reload`: Confirmation of server restart
 </output>
 
-<important>
+<caution>
 - Requires running LSP server for target language
 - Some operations require file to be saved to disk
-</important>
+</caution>

package/src/prompts/tools/patch.md

@@ -48,7 +48,7 @@ Returns success/failure; on failure, error message indicates:
 - Never use anchors as comments (no line numbers, location labels, placeholders like `@@ @@`)
 - Do not place new lines outside intended block
 - If edit fails or breaks structure, re-read file and produce new patch from current content—do not retry same diff
-- If indentation/alignment wrong after editing, run formatter (`go fmt`, `cargo fmt`, `ruff format`, `biome`, etc.)—never make repeated edit attempts to fix whitespace
+- **NEVER** use edit to fix indentation or reformat code—run the project's formatter instead
 </critical>
 
 <example name="create">

package/src/prompts/tools/python.md

@@ -41,13 +41,13 @@ User sees output like Jupyter notebook; rich displays render fully:
 - `display(HTML(...))` → rendered HTML
 - `display(Markdown(...))` → formatted markdown
 - `plt.show()` → inline figures
-**You will see object repr** (e.g., `<IPython.core.display.JSON object>`). Trust `display()`; do not assume user sees only repr.
+  **You will see object repr** (e.g., `<IPython.core.display.JSON object>`). Trust `display()`; do not assume user sees only repr.
 </output>
 
-<important>
+<caution>
 - Per-call mode uses fresh kernel each call
 - Use `reset: true` to clear state when session mode active
-</important>
+</caution>
 
 <critical>
 - Use `run()` for shell commands; never raw `subprocess`

package/src/prompts/tools/task.md

@@ -123,7 +123,7 @@ If tempted to write above, expand using templates.
 Structured agents (`explore`, `reviewer`) have built-in output schemas. Describing a different output format in `context`/`assignment` without overriding via `schema` creates a mismatch — the agent can't reconcile your prose instructions with its schema and submits null data. Always use `schema` for output structure, or pick an agent whose built-in schema matches your needs.
 **Test/lint commands in parallel tasks** — edit wars:
 Parallel agents share working tree. If two agents run `bun check` or `bun test` concurrently, they see each other's half-finished edits, "fix" phantom errors, loop. **Never tell parallel tasks run project-wide build/test/lint commands.** Each task edits, stops. Caller verifies after all tasks complete.
-**If you can’t specify scope yet**, create **Discovery task** first: enumerate files, find callsites, list candidates. Then fan out with explicit paths.
+**If you can't specify scope yet**, create **Discovery task** first: enumerate files, find callsites, list candidates. Then fan out with explicit paths.
 
 ### Delegate intent, not keystrokes
 

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

@@ -36,9 +36,9 @@ Use proactively:
 Returns confirmation todo list updated.
 </output>
 
-<important>
+<caution>
 When in doubt, use this.
-</important>
+</caution>
 
 <example name="use-dark-mode">
 User: Add dark mode toggle to settings. Run tests when done.

package/src/prompts/tools/web-search.md

@@ -14,6 +14,6 @@ Returns search results formatted as blocks with:
 - Provider-dependent structure based on selected backend
 </output>
 
-<important>
+<caution>
 Searches are performed automatically within a single API call—no pagination or follow-up requests needed.
-</important>
+</caution>

package/src/prompts/tools/write.md

@@ -14,8 +14,5 @@ Confirmation of file creation/write with path. When LSP available, content may b
 <critical>
 - Prefer Edit tool for modifying existing files (more precise, preserves formatting)
 - Create documentation files (*.md, README) only when explicitly requested
-</critical>
-
-<important>
-- Include emojis only when explicitly requested
-</important>
+- No emojis unless requested
+</critical>

package/src/session/agent-session.ts

@@ -29,7 +29,6 @@ import type {
 } from "@oh-my-pi/pi-ai";
 import { isContextOverflow, modelsAreEqual, supportsXhigh } from "@oh-my-pi/pi-ai";
 import { abortableSleep, isEnoent, logger } from "@oh-my-pi/pi-utils";
-import { YAML } from "bun";
 import type { Rule } from "../capability/rule";
 import { getAgentDbPath } from "../config";
 import { MODEL_ROLE_IDS, type ModelRegistry, type ModelRole } from "../config/model-registry";
@@ -1740,7 +1739,7 @@ export class AgentSession {
 		await this.abort();
 		this.agent.reset();
 		await this.sessionManager.flush();
-		this.sessionManager.newSession(options);
+		await this.sessionManager.newSession(options);
 		this.agent.sessionId = this.sessionManager.getSessionId();
 		this._steeringMessages = [];
 		this._followUpMessages = [];
@@ -2443,7 +2442,7 @@ Be thorough - include exact file paths, function names, error messages, and tech
 
 			// Start a new session
 			await this.sessionManager.flush();
-			this.sessionManager.newSession();
+			await this.sessionManager.newSession();
 			this.agent.reset();
 			this.agent.sessionId = this.sessionManager.getSessionId();
 			this._steeringMessages = [];
@@ -3453,7 +3452,7 @@ Be thorough - include exact file paths, function names, error messages, and tech
 		await this.sessionManager.flush();
 
 		if (!selectedEntry.parentId) {
-			this.sessionManager.newSession({ parentSession: previousSessionFile });
+			await this.sessionManager.newSession({ parentSession: previousSessionFile });
 		} else {
 			this.sessionManager.createBranchedSession(selectedEntry.parentId);
 		}
@@ -3875,6 +3874,16 @@ Be thorough - include exact file paths, function names, error messages, and tech
 	formatSessionAsText(): string {
 		const lines: string[] = [];
 
+		/** Serialize an object as XML parameter elements, one per key. */
+		function formatArgsAsXml(args: Record<string, unknown>, indent = "\t"): string {
+			const parts: string[] = [];
+			for (const [key, value] of Object.entries(args)) {
+				const text = typeof value === "string" ? value : JSON.stringify(value);
+				parts.push(`${indent}<parameter name="${key}">${text}</parameter>`);
+			}
+			return parts.join("\n");
+		}
+
 		// Include system prompt at the beginning
 		const systemPrompt = this.agent.state.systemPrompt;
 		if (systemPrompt) {
@@ -3914,12 +3923,11 @@ Be thorough - include exact file paths, function names, error messages, and tech
 		if (tools.length > 0) {
 			lines.push("## Available Tools\n");
 			for (const tool of tools) {
-				lines.push(`### ${tool.name}\n`);
+				lines.push(`<tool name="${tool.name}">`);
 				lines.push(tool.description);
-				lines.push("\n```yaml");
 				const parametersClean = stripTypeBoxFields(tool.parameters);
-				lines.push(YAML.stringify(parametersClean, null, 2));
-				lines.push("```\n");
+				lines.push(`\nParameters:\n${formatArgsAsXml(parametersClean as Record<string, unknown>)}`);
+				lines.push("<" + "/tool>\n");
 			}
 			lines.push("\n");
 		}
@@ -3951,10 +3959,11 @@ Be thorough - include exact file paths, function names, error messages, and tech
 						lines.push(c.thinking);
 						lines.push("</thinking>\n");
 					} else if (c.type === "toolCall") {
-						lines.push(`### Tool: ${c.name}`);
-						lines.push("```yaml");
-						lines.push(YAML.stringify(c.arguments, null, 2));
-						lines.push("```\n");
+						lines.push(`<invoke name="${c.name}">`);
+						if (c.arguments && typeof c.arguments === "object") {
+							lines.push(formatArgsAsXml(c.arguments as Record<string, unknown>));
+						}
+						lines.push("<" + "/invoke>\n");
 					}
 				}
 				lines.push("");

package/src/tools/bash.ts

@@ -17,7 +17,7 @@ import { applyHeadTail, normalizeBashCommand } from "./bash-normalize";
 import type { OutputMeta } from "./output-meta";
 import { allocateOutputArtifact, createTailBuffer } from "./output-utils";
 import { resolveToCwd } from "./path-utils";
-import { formatBytes, wrapBrackets } from "./render-utils";
+import { formatBytes, replaceTabs, wrapBrackets } from "./render-utils";
 import { ToolError } from "./tool-errors";
 import { toolResult } from "./tool-result";
 import { DEFAULT_MAX_BYTES } from "./truncate";
@@ -271,11 +271,13 @@ export const bashToolRenderer = {
 				const hasOutput = displayOutput.trim().length > 0;
 				if (hasOutput) {
 					if (expanded) {
-						outputLines.push(...displayOutput.split("\n").map(line => uiTheme.fg("toolOutput", line)));
+						outputLines.push(
+							...displayOutput.split("\n").map(line => uiTheme.fg("toolOutput", replaceTabs(line))),
+						);
 					} else {
 						const styledOutput = displayOutput
 							.split("\n")
-							.map(line => uiTheme.fg("toolOutput", line))
+							.map(line => uiTheme.fg("toolOutput", replaceTabs(line)))
 							.join("\n");
 						const textContent = styledOutput;
 						const result = truncateToVisualLines(textContent, previewLines, width);

package/src/tools/write.ts

@@ -23,6 +23,7 @@ import {
 	formatExpandHint,
 	formatMoreItems,
 	formatStatusIcon,
+	replaceTabs,
 	shortenPath,
 	ToolUIKit,
 } from "./render-utils";
@@ -160,7 +161,7 @@ function formatStreamingContent(content: string, uiTheme: Theme, ui: ToolUIKit):
 		text += uiTheme.fg("dim", `… (${hidden} earlier lines)\n`);
 	}
 	for (const line of displayLines) {
-		text += `${uiTheme.fg("toolOutput", ui.truncate(line, 80))}\n`;
+		text += `${uiTheme.fg("toolOutput", ui.truncate(replaceTabs(line), 80))}\n`;
 	}
 	text += uiTheme.fg("dim", `… (streaming)`);
 	return text;
@@ -175,7 +176,7 @@ function renderContentPreview(content: string, expanded: boolean, uiTheme: Theme
 
 	let text = "\n\n";
 	for (const line of displayLines) {
-		text += `${uiTheme.fg("toolOutput", ui.truncate(line, 80))}\n`;
+		text += `${uiTheme.fg("toolOutput", ui.truncate(replaceTabs(line), 80))}\n`;
 	}
 	if (!expanded && hidden > 0) {
 		const hint = formatExpandHint(uiTheme, expanded, hidden > 0);

package/src/tui/code-cell.ts

@@ -90,7 +90,7 @@ export function renderCodeCell(options: CodeCellOptions, theme: Theme): string[]
 		const maxLines = expanded ? rawLines.length : Math.min(rawLines.length, outputMaxLines);
 		const displayLines = rawLines
 			.slice(0, maxLines)
-			.map(line => (line.includes("\x1b[") ? line : theme.fg("toolOutput", line)));
+			.map(line => (line.includes("\x1b[") ? replaceTabs(line) : theme.fg("toolOutput", replaceTabs(line))));
 		outputLines.push(...displayLines);
 		const remaining = rawLines.length - maxLines;
 		if (remaining > 0) {