@nghyane/arcane 0.1.23 → 0.1.25

package/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 ## [Unreleased]
 
+## [0.1.25] - 2026-03-08
+
+### Added
+
+- Propagate OAuth flag from auth storage to Anthropic client, replacing token-format heuristic
+
+## [0.1.24] - 2026-03-08
+
+### Changed
+
+- Simplify hashline edit API to two operations: replace and insert
+- Remove redundant comments from patch module
+
 ## [0.1.23] - 2026-03-08
 
 ### Fixed

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@nghyane/arcane",
-	"version": "0.1.23",
+	"version": "0.1.25",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/nghyane/arcane",
 	"author": "Can Bölük",
@@ -44,9 +44,9 @@
 	},
 	"dependencies": {
 		"@mozilla/readability": "0.6.0",
-		"@nghyane/arcane-stats": "^0.1.12",
-		"@nghyane/arcane-agent": "^0.1.16",
-		"@nghyane/arcane-ai": "^0.1.12",
+		"@nghyane/arcane-stats": "^0.1.14",
+		"@nghyane/arcane-agent": "^0.1.18",
+		"@nghyane/arcane-ai": "^0.1.14",
 		"@nghyane/arcane-natives": "^0.1.11",
 		"@nghyane/arcane-tui": "^0.1.15",
 		"@nghyane/arcane-utils": "^0.1.8",

package/src/config/model-registry.ts

@@ -979,6 +979,10 @@ export class ModelRegistry {
 		return this.authStorage.getApiKey(provider, sessionId, { baseUrl });
 	}
 
+	isOAuthProvider(provider: string): boolean {
+		return this.authStorage.hasOAuth(provider);
+	}
+
 	async #peekApiKeyForProvider(provider: string): Promise<string | undefined> {
 		if (this.#keylessProviders.has(provider)) {
 			return kNoAuth;

package/src/patch/applicator.ts

@@ -114,7 +114,6 @@ function adjustLinesIndentation(patternLines: string[], actualLines: string[], n
 		}
 	}
 
-	// Detect indent character from actual content
 	let indentChar = " ";
 	for (const line of actualLines) {
 		const ws = getLeadingWhitespace(line);
@@ -220,7 +219,6 @@ function adjustLinesIndentation(patternLines: string[], actualLines: string[], n
 					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) {
@@ -308,7 +306,6 @@ function adjustLinesIndentation(patternLines: string[], actualLines: string[], n
 		const trimmed = newLine.trim();
 		const matchingActualLines = contentToActualLines.get(trimmed);
 
-		// Check if this is a context line (same trimmed content exists in actual)
 		if (matchingActualLines && matchingActualLines.length > 0) {
 			if (matchingActualLines.length === 1) {
 				return matchingActualLines[0];
@@ -319,12 +316,10 @@ function adjustLinesIndentation(patternLines: string[], actualLines: string[], n
 			const usedCount = usedActualLines.get(trimmed) ?? 0;
 			if (usedCount < matchingActualLines.length) {
 				usedActualLines.set(trimmed, usedCount + 1);
-				// Use actual file content directly for context lines
 				return matchingActualLines[usedCount];
 			}
 		}
 
-		// This is a new/added line - apply consistent delta if safe
 		if (delta && delta !== 0) {
 			const newIndent = countLeadingWhitespace(newLine);
 			if (newIndent === patternMin) {
@@ -573,7 +568,6 @@ function findHierarchicalContext(
 	lineHint: number | undefined,
 	allowFuzzy: boolean,
 ): ContextLineResult {
-	// Check for newline-separated hierarchical contexts (from nested @@ anchors)
 	if (context.includes("\n")) {
 		const parts = context
 			.split("\n")
@@ -627,7 +621,6 @@ function findHierarchicalContext(
 		return { index: undefined, confidence: 0 };
 	}
 
-	// Try literal context first
 	const spaceParts = context.split(/\s+/).filter(p => p.length > 0);
 	const hasSignatureChars = /[(){}[\]]/.test(context);
 	if (!hasSignatureChars && spaceParts.length > 2) {
@@ -662,7 +655,6 @@ function findHierarchicalContext(
 
 	const result = findContextLine(lines, context, startFrom, { allowFuzzy });
 
-	// If line hint exists and result is ambiguous or missing, try from hint
 	if ((result.index === undefined || (result.matchCount ?? 0) > 1) && lineHint !== undefined) {
 		const hintStart = Math.max(0, lineHint - 1);
 		const hintedResult = findContextLine(lines, context, hintStart, { allowFuzzy });
@@ -671,7 +663,6 @@ function findHierarchicalContext(
 		}
 	}
 
-	// If found uniquely, return it
 	if (result.index !== undefined && (result.matchCount ?? 0) <= 1) {
 		return result;
 	}
@@ -679,7 +670,6 @@ function findHierarchicalContext(
 		return result;
 	}
 
-	// Try from beginning if not found from current position
 	if (result.index === undefined && startFrom !== 0) {
 		const fromStartResult = findContextLine(lines, context, 0, { allowFuzzy });
 		if (fromStartResult.index !== undefined && (fromStartResult.matchCount ?? 0) <= 1) {
@@ -738,7 +728,6 @@ function findSequenceWithHint(
 	eof: boolean,
 	allowFuzzy: boolean,
 ): import("./types").SequenceSearchResult {
-	// Prefer content-based search starting from currentIndex
 	const primaryResult = seekSequence(lines, pattern, currentIndex, eof, { allowFuzzy });
 	if (
 		primaryResult.matchCount &&
@@ -758,7 +747,6 @@ function findSequenceWithHint(
 		return primaryResult;
 	}
 
-	// Use line hint as a secondary bias only if needed
 	if (hintIndex !== undefined && hintIndex !== currentIndex) {
 		const hintedResult = seekSequence(lines, pattern, hintIndex, eof, { allowFuzzy });
 		if (hintedResult.index !== undefined || (hintedResult.matchCount && hintedResult.matchCount > 1)) {
@@ -857,7 +845,6 @@ function applyCharacterMatch(
 		}
 	}
 
-	// Check for multiple exact occurrences
 	if (matchOutcome.occurrences && matchOutcome.occurrences > 1) {
 		const previews = matchOutcome.occurrencePreviews?.join("\n\n") ?? "";
 		const moreMsg = matchOutcome.occurrences > 5 ? ` (showing first 5 of ${matchOutcome.occurrences})` : "";
@@ -886,7 +873,6 @@ function applyCharacterMatch(
 		throw new ApplyPatchError(`Failed to find expected lines in ${path}:\n${oldText}`);
 	}
 
-	// Adjust indentation to match what was actually found
 	const adjustedNewText = adjustIndentation(normalizedOldText, matchOutcome.match.actualText, newText);
 
 	const warnings: string[] = [];
@@ -898,7 +884,6 @@ function applyCharacterMatch(
 		);
 	}
 
-	// Apply the replacement
 	const before = normalizedContent.substring(0, matchOutcome.match.startIndex);
 	const after = normalizedContent.substring(matchOutcome.match.startIndex + matchOutcome.match.actualText.length);
 	return { content: before + adjustedNewText + after, warnings };
@@ -942,9 +927,7 @@ function computeReplacements(
 			lineIndex = Math.max(0, Math.min(lineHint - 1, originalLines.length - 1));
 		}
 
-		// If hunk has a changeContext, find it and adjust lineIndex
 		if (hunk.changeContext !== undefined) {
-			// Use hierarchical context matching for nested @@ anchors and space-separated contexts
 			const result = findHierarchicalContext(originalLines, hunk.changeContext, lineIndex, lineHint, allowFuzzy);
 			const idx = result.index;
 			contextIndex = idx;
@@ -995,7 +978,6 @@ function computeReplacements(
 		}
 
 		if (hunk.oldLines.length === 0) {
-			// Pure addition - prefer changeContext position, then line hint, then end of file
 			let insertionIdx: number;
 			if (hunk.changeContext !== undefined) {
 				// changeContext was processed above; lineIndex is set to the context line or after it
@@ -1030,7 +1012,6 @@ function computeReplacements(
 			continue;
 		}
 
-		// Try to find the old lines in the file
 		let pattern = [...hunk.oldLines];
 		const matchHint = getHunkHintIndex(hunk, lineIndex);
 		let searchResult = findSequenceWithHint(
@@ -1043,7 +1024,6 @@ function computeReplacements(
 		);
 		let newSlice = [...hunk.newLines];
 
-		// Retry without trailing empty line if present
 		if (searchResult.index === undefined && pattern.length > 0 && pattern[pattern.length - 1] === "") {
 			pattern = pattern.slice(0, -1);
 			if (newSlice.length > 0 && newSlice[newSlice.length - 1] === "") {
@@ -1165,7 +1145,6 @@ function computeReplacements(
 			);
 		}
 
-		// Reject if match is ambiguous (prefix/substring matching found multiple matches)
 		if (searchResult.matchCount !== undefined && searchResult.matchCount > 1) {
 			const previews = formatSequenceMatchPreviews(
 				originalLines,
@@ -1186,7 +1165,6 @@ function computeReplacements(
 		if (hunk.changeContext === undefined && !hunk.hasContextLines && !hunk.isEndOfFile && lineHint === undefined) {
 			const secondMatch = seekSequence(originalLines, pattern, found + 1, false, { allowFuzzy });
 			if (secondMatch.index !== undefined) {
-				// Extract 3-line previews for each match
 				const formatPreview = (startIdx: number) => {
 					const contextLines = 2;
 					const maxLineLength = 80;
@@ -1210,7 +1188,6 @@ function computeReplacements(
 			}
 		}
 
-		// Adjust indentation if needed (handles fuzzy matches where indentation differs)
 		const actualMatchedLines = originalLines.slice(found, found + pattern.length);
 
 		// Skip pure-context hunks (no +/- lines — oldLines === newLines).
@@ -1235,7 +1212,6 @@ function computeReplacements(
 		lineIndex = found + pattern.length;
 	}
 
-	// Sort by start index
 	replacements.sort((a, b) => a.startIndex - b.startIndex);
 
 	for (let i = 1; i < replacements.length; i++) {
@@ -1319,14 +1295,12 @@ function applyHunksToContent(
 	const { replacements, warnings } = computeReplacements(originalLines, path, hunks, allowFuzzy);
 	const newLines = applyReplacements(originalLines, replacements);
 
-	// Restore the trailing empty element if we stripped it
 	if (strippedTrailingEmpty) {
 		newLines.push("");
 	}
 
 	const content = newLines.join("\n");
 
-	// Preserve original trailing newline behavior
 	if (hadFinalNewline && !content.endsWith("\n")) {
 		return { content: `${content}\n`, warnings };
 	}
@@ -1374,7 +1348,6 @@ async function applyNormalizedPatch(
 		}
 	}
 
-	// Handle CREATE operation
 	if (input.op === "create") {
 		if (!input.diff) {
 			throw new ApplyPatchError("Create operation requires diff (file content)");
@@ -1400,7 +1373,6 @@ async function applyNormalizedPatch(
 		};
 	}
 
-	// Handle DELETE operation
 	if (input.op === "delete") {
 		if (!(await fs.exists(absolutePath))) {
 			throw new ApplyPatchError(`File not found: ${input.path}`);
@@ -1420,7 +1392,6 @@ async function applyNormalizedPatch(
 		};
 	}
 
-	// Handle UPDATE operation
 	if (!input.diff) {
 		throw new ApplyPatchError("Update operation requires diff (hunks)");
 	}

package/src/patch/diff.ts

@@ -55,12 +55,10 @@ export function generateDiffString(oldContent: string, newContent: string, conte
 		}
 
 		if (part.added || part.removed) {
-			// Capture the first changed line (in the new file)
 			if (firstChangedLine === undefined) {
 				firstChangedLine = newLineNum;
 			}
 
-			// Show the change
 			for (const line of raw) {
 				if (part.added) {
 					output.push(formatNumberedDiffLine("+", newLineNum, lineNumWidth, line));
@@ -72,7 +70,6 @@ export function generateDiffString(oldContent: string, newContent: string, conte
 			}
 			lastWasChange = true;
 		} else {
-			// Context lines - only show a few before/after changes
 			const nextPartIsChange = i < parts.length - 1 && (parts[i + 1].added || parts[i + 1].removed);
 
 			if (lastWasChange || nextPartIsChange) {
@@ -81,18 +78,15 @@ export function generateDiffString(oldContent: string, newContent: string, conte
 				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);
 				}
 
-				// Add ellipsis if we skipped lines at start
 				if (skipStart > 0) {
 					output.push(formatNumberedDiffLine(" ", oldLineNum, lineNumWidth, "..."));
 					oldLineNum += skipStart;
@@ -105,14 +99,12 @@ export function generateDiffString(oldContent: string, newContent: string, conte
 					newLineNum++;
 				}
 
-				// Add ellipsis if we skipped lines at end
 				if (skipEnd > 0) {
 					output.push(formatNumberedDiffLine(" ", oldLineNum, lineNumWidth, "..."));
 					oldLineNum += skipEnd;
 					newLineNum += skipEnd;
 				}
 			} else {
-				// Skip these context lines entirely
 				oldLineNum += raw.length;
 				newLineNum += raw.length;
 			}
@@ -198,7 +190,6 @@ export function replaceText(content: string, oldText: string, newText: string, o
 	let count = 0;
 
 	if (options.all) {
-		// Check for exact matches first
 		const exactCount = normalizedContent.split(normalizedOldText).length - 1;
 		if (exactCount > 0) {
 			return {
@@ -207,7 +198,6 @@ export function replaceText(content: string, oldText: string, newText: string, o
 			};
 		}
 
-		// No exact matches - try fuzzy matching iteratively
 		while (true) {
 			const matchOutcome = findMatch(normalizedContent, normalizedOldText, {
 				allowFuzzy: options.fuzzy,
@@ -238,7 +228,6 @@ export function replaceText(content: string, oldText: string, newText: string, o
 		return { content: normalizedContent, count };
 	}
 
-	// Single replacement mode
 	const matchOutcome = findMatch(normalizedContent, normalizedOldText, {
 		allowFuzzy: options.fuzzy,
 		threshold,
@@ -319,7 +308,6 @@ export async function computeEditDiff(
 		});
 
 		if (result.count === 0) {
-			// Get closest match for error message
 			const matchOutcome = findMatch(normalizedContent, normalizedOldText, {
 				allowFuzzy: fuzzy,
 				threshold: threshold ?? DEFAULT_FUZZY_THRESHOLD,

package/src/patch/edit-tool.ts

@@ -35,7 +35,6 @@ import {
 	type HashlineEdit,
 	type LineTag,
 	parseTag,
-	type ReplaceTextEdit,
 } from "./hashline";
 import { detectLineEnding, normalizeToLF, restoreLineEndings, stripBom } from "./normalize";
 import {
@@ -44,7 +43,6 @@ import {
 	type HashlineParams,
 	hashlineEditSchema,
 	hashlineParseContent,
-	hashlineParseContentString,
 	normalizeEditMode,
 	type PatchParams,
 	patchEditSchema,
@@ -268,100 +266,32 @@ export class EditTool implements AgentTool<TInput, any, Theme> {
 			}
 
 			if (!(await file.exists())) {
-				const content: string[] = [];
-				for (const edit of edits) {
-					switch (edit.op) {
-						case "append": {
-							if (edit.after) {
-								throw new Error(`File not found: ${path}`);
-							}
-							content.push(...hashlineParseContent(edit.content));
-							break;
-						}
-						case "prepend": {
-							if (edit.before) {
-								throw new Error(`File not found: ${path}`);
-							}
-							content.unshift(...hashlineParseContent(edit.content));
-							break;
-						}
-						default: {
-							throw new Error(`File not found: ${path}`);
-						}
-					}
-				}
-				await file.write(content.join("\n"));
-				return {
-					content: [{ type: "text", text: `Created ${path}` }],
-					details: {
-						diff: "",
-						op: "create",
-						meta: outputMeta().get(),
-					},
-				};
+				throw new Error(`File not found: ${path}`);
 			}
 
 			const anchorEdits: HashlineEdit[] = [];
-			const replaceEdits: ReplaceTextEdit[] = [];
 			for (const edit of edits) {
 				switch (edit.op) {
-					case "set": {
-						const { tag, content } = edit;
-						anchorEdits.push({
-							op: "set",
-							tag: parseTag(tag),
-							content: hashlineParseContent(content),
-						});
-						break;
-					}
-					case "replace_range": {
-						const { first, last, content } = edit;
+					case "replace": {
+						const { target, end, content } = edit;
 						anchorEdits.push({
-							op: "replace_range",
-							first: parseTag(first),
-							last: parseTag(last),
-							content: hashlineParseContent(content),
-						});
-						break;
-					}
-					case "append": {
-						const { after, content } = edit;
-						anchorEdits.push({
-							op: "append",
-							...(after ? { after: parseTag(after) } : {}),
-							content: hashlineParseContent(content),
-						});
-						break;
-					}
-					case "prepend": {
-						const { before, content } = edit;
-						anchorEdits.push({
-							op: "prepend",
-							...(before ? { before: parseTag(before) } : {}),
+							op: "replace",
+							target: parseTag(target),
+							...(end ? { end: parseTag(end) } : {}),
 							content: hashlineParseContent(content),
 						});
 						break;
 					}
 					case "insert": {
-						const { before, after, content } = edit;
+						const { target, position, content } = edit;
 						anchorEdits.push({
 							op: "insert",
-							before: parseTag(before),
-							after: parseTag(after),
+							target: parseTag(target),
+							position,
 							content: hashlineParseContent(content),
 						});
 						break;
 					}
-					case "replaceText": {
-						const { old_text, new_text, all } = edit;
-						replaceEdits.push({
-							op: "replaceText",
-							old_text: old_text,
-							new_text: hashlineParseContentString(new_text),
-							all: all ?? false,
-						});
-						break;
-					}
 					default:
 						throw new Error(`Invalid edit operation: ${JSON.stringify(edit)}`);
 				}
@@ -371,31 +301,8 @@ export class EditTool implements AgentTool<TInput, any, Theme> {
 			const { bom, text: content } = stripBom(rawContent);
 			const originalEnding = detectLineEnding(content);
 			const originalNormalized = normalizeToLF(content);
-			let normalizedContent = originalNormalized;
 
-			// Apply anchor-based edits first (set, set_range, insert)
-			const anchorResult = applyHashlineEdits(normalizedContent, anchorEdits);
-			normalizedContent = anchorResult.content;
-
-			// Apply content-replace edits (substr-style fuzzy replace)
-			for (const r of replaceEdits) {
-				if (r.old_text.length === 0) {
-					throw new Error("old_text must not be empty.");
-				}
-				const rep = replaceText(normalizedContent, r.old_text, r.new_text, {
-					fuzzy: this.#allowFuzzy,
-					all: r.all ?? false,
-					threshold: this.#fuzzyThreshold,
-				});
-				normalizedContent = rep.content;
-			}
-
-			const result = {
-				content: normalizedContent,
-				firstChangedLine: anchorResult.firstChangedLine,
-				warnings: anchorResult.warnings,
-				noopEdits: anchorResult.noopEdits,
-			};
+			const result = applyHashlineEdits(originalNormalized, anchorEdits);
 			if (originalNormalized === result.content && !rename) {
 				let diagnostic = `No changes made to ${path}. The edits produced identical content.`;
 				if (result.noopEdits && result.noopEdits.length > 0) {
@@ -416,22 +323,12 @@ export class EditTool implements AgentTool<TInput, any, Theme> {
 					for (const edit of anchorEdits) {
 						refs.length = 0;
 						switch (edit.op) {
-							case "set":
-								refs.push(edit.tag);
-								break;
-							case "replace_range":
-								refs.push(edit.first, edit.last);
-								break;
-							case "append":
-								if (edit.after) refs.push(edit.after);
-								break;
-							case "prepend":
-								if (edit.before) refs.push(edit.before);
+							case "replace":
+								refs.push(edit.target);
+								if (edit.end) refs.push(edit.end);
 								break;
 							case "insert":
-								refs.push(edit.after, edit.before);
-								break;
-							default:
+								refs.push(edit.target);
 								break;
 						}
 
@@ -544,7 +441,6 @@ export class EditTool implements AgentTool<TInput, any, Theme> {
 			}
 			const effRename = result.change.newPath ? rename : undefined;
 
-			// Generate diff for display
 			let diffResult = {
 				diff: "",
 				firstChangedLine: undefined as number | undefined,
@@ -627,7 +523,6 @@ export class EditTool implements AgentTool<TInput, any, Theme> {
 		});
 
 		if (result.count === 0) {
-			// Get error details
 			const matchOutcome = findMatch(normalizedContent, normalizedOldText, {
 				allowFuzzy: this.#allowFuzzy,
 				threshold: this.#fuzzyThreshold,

package/src/patch/fuzzy.ts

@@ -220,7 +220,6 @@ export function findMatch(
 		return {};
 	}
 
-	// Try exact match first
 	const exactIndex = content.indexOf(target);
 	if (exactIndex !== -1) {
 		const occurrences = content.split(target).length - 1;
@@ -260,7 +259,6 @@ export function findMatch(
 		};
 	}
 
-	// Try fuzzy match
 	const threshold = options.threshold ?? DEFAULT_FUZZY_THRESHOLD;
 	const { best, aboveThresholdCount, secondBestScore } = findBestFuzzyMatch(content, target, threshold);
 
@@ -384,7 +382,6 @@ export function seekSequence(
 		return { index: undefined, confidence: 0 };
 	}
 
-	// Determine search start position
 	const searchStart = eof && lines.length >= pattern.length ? lines.length - pattern.length : start;
 	const maxStart = lines.length - pattern.length;
 
@@ -547,7 +544,6 @@ export function seekSequence(
 	});
 
 	if (matchOutcome.match) {
-		// Convert character index back to line index
 		const matchedContent = contentText.substring(0, matchOutcome.match.startIndex);
 		const lineIndex = start + matchedContent.split("\n").length - 1;
 		const fallbackMatchCount = matchOutcome.occurrences ?? matchOutcome.fuzzyMatches ?? 1;

package/src/patch/hashline.ts

@@ -16,13 +16,8 @@ import type { HashMismatch } from "./types";
 
 export type LineTag = { line: number; hash: string };
 export type HashlineEdit =
-	| { op: "set"; tag: LineTag; content: string[] }
-	| { op: "replace_range"; first: LineTag; last: LineTag; content: string[] }
-	| { op: "append"; after?: LineTag; content: string[] }
-	| { op: "prepend"; before?: LineTag; content: string[] }
-	| { op: "insert"; after: LineTag; before: LineTag; content: string[] };
-export type ReplaceTextEdit = { op: "replaceText"; old_text: string; new_text: string; all?: boolean };
-export type EditSpec = HashlineEdit | ReplaceTextEdit;
+	| { op: "replace"; target: LineTag; end?: LineTag; content: string[] }
+	| { op: "insert"; target: LineTag; position: "before" | "after"; content: string[] };
 
 /**
  * Compare two strings ignoring all whitespace differences.
@@ -31,9 +26,7 @@ export type EditSpec = HashlineEdit | ReplaceTextEdit;
  * the only differences are in spaces, tabs, or other whitespace.
  */
 function equalsIgnoringWhitespace(a: string, b: string): boolean {
-	// Fast path: identical strings
 	if (a === b) return true;
-	// Compare with all whitespace removed
 	return a.replace(/\s+/g, "") === b.replace(/\s+/g, "");
 }
 
@@ -140,17 +133,6 @@ function stripInsertAnchorEchoBefore(anchorLine: string, dstLines: string[]): st
 	return dstLines;
 }
 
-function stripInsertBoundaryEcho(afterLine: string, beforeLine: string, dstLines: string[]): string[] {
-	let out = dstLines;
-	if (out.length > 1 && equalsIgnoringWhitespace(out[0], afterLine)) {
-		out = out.slice(1);
-	}
-	if (out.length > 1 && equalsIgnoringWhitespace(out[out.length - 1], beforeLine)) {
-		out = out.slice(0, -1);
-	}
-	return out;
-}
-
 function stripRangeBoundaryEcho(fileLines: string[], startLine: number, endLine: number, dstLines: string[]): string[] {
 	// Only strip when the model replaced with multiple lines and grew the edit.
 	// This avoids turning a single-line replacement into a deletion.
@@ -504,7 +486,6 @@ export class HashlineMismatchError extends Error {
 			mismatchSet.set(m.line, m);
 		}
 
-		// Collect line ranges to display (mismatch lines + context)
 		const displayLines = new Set<number>();
 		for (const m of mismatches) {
 			const lo = Math.max(1, m.line - MISMATCH_CONTEXT);
@@ -630,7 +611,6 @@ export function applyHashlineEdits(
 
 	const autocorrect = Bun.env.ARCANE_HL_AUTOCORRECT === "1";
 
-	// Collect warnings and auto-correct edit content
 	const warnings: string[] = [];
 	for (const edit of edits) {
 		const unicodeWarning = detectUnicodeEscapePlaceholders(edit.content);
@@ -644,25 +624,14 @@ export function applyHashlineEdits(
 		const touched = new Set<number>();
 		for (const edit of edits) {
 			switch (edit.op) {
-				case "set":
-					touched.add(edit.tag.line);
-					break;
-				case "replace_range":
-					for (let ln = edit.first.line; ln <= edit.last.line; ln++) touched.add(ln);
-					break;
-				case "append":
-					if (edit.after) {
-						touched.add(edit.after.line);
-					}
-					break;
-				case "prepend":
-					if (edit.before) {
-						touched.add(edit.before.line);
+				case "replace":
+					touched.add(edit.target.line);
+					if (edit.end) {
+						for (let ln = edit.target.line; ln <= edit.end.line; ln++) touched.add(ln);
 					}
 					break;
 				case "insert":
-					touched.add(edit.after.line);
-					touched.add(edit.before.line);
+					touched.add(edit.target.line);
 					break;
 			}
 		}
@@ -685,44 +654,21 @@ export function applyHashlineEdits(
 	}
 	for (const edit of edits) {
 		switch (edit.op) {
-			case "set": {
-				if (!validateRef(edit.tag)) continue;
-				break;
-			}
-			case "append": {
-				if (edit.content.length === 0) {
-					throw new Error('Insert-after edit (src "N#HH..") requires non-empty dst');
-				}
-				if (edit.after && !validateRef(edit.after)) continue;
-				break;
-			}
-			case "prepend": {
-				if (edit.content.length === 0) {
-					throw new Error('Insert-before edit (src "N#HH..") requires non-empty dst');
+			case "replace": {
+				if (!validateRef(edit.target)) continue;
+				if (edit.end) {
+					if (edit.target.line > edit.end.line) {
+						throw new Error(`Range start line ${edit.target.line} must be <= end line ${edit.end.line}`);
+					}
+					if (!validateRef(edit.end)) continue;
 				}
-				if (edit.before && !validateRef(edit.before)) continue;
 				break;
 			}
 			case "insert": {
 				if (edit.content.length === 0) {
-					throw new Error('Insert-between edit (src "A#HH.. B#HH..") requires non-empty dst');
-				}
-				if (edit.before.line <= edit.after.line) {
-					throw new Error(`insert requires after (${edit.after.line}) < before (${edit.before.line})`);
+					throw new Error("Insert edit requires non-empty content");
 				}
-				const afterValid = validateRef(edit.after);
-				const beforeValid = validateRef(edit.before);
-				if (!afterValid || !beforeValid) continue;
-				break;
-			}
-			case "replace_range": {
-				if (edit.first.line > edit.last.line) {
-					throw new Error(`Range start line ${edit.first.line} must be <= end line ${edit.last.line}`);
-				}
-
-				const startValid = validateRef(edit.first);
-				const endValid = validateRef(edit.last);
-				if (!startValid || !endValid) continue;
+				if (!validateRef(edit.target)) continue;
 				break;
 			}
 		}
@@ -730,35 +676,17 @@ export function applyHashlineEdits(
 	if (mismatches.length > 0) {
 		throw new HashlineMismatchError(mismatches, fileLines);
 	}
-	// Deduplicate identical edits targeting the same line(s)
 	const seenEditKeys = new Map<string, number>();
 	const dedupIndices = new Set<number>();
 	for (let i = 0; i < edits.length; i++) {
 		const edit = edits[i];
 		let lineKey: string;
 		switch (edit.op) {
-			case "set":
-				lineKey = `s:${edit.tag.line}`;
-				break;
-			case "replace_range":
-				lineKey = `r:${edit.first.line}:${edit.last.line}`;
-				break;
-			case "append":
-				if (edit.after) {
-					lineKey = `i:${edit.after.line}`;
-					break;
-				}
-				lineKey = "ieof";
-				break;
-			case "prepend":
-				if (edit.before) {
-					lineKey = `ib:${edit.before.line}`;
-					break;
-				}
-				lineKey = "ibef";
+			case "replace":
+				lineKey = edit.end ? `r:${edit.target.line}:${edit.end.line}` : `s:${edit.target.line}`;
 				break;
 			case "insert":
-				lineKey = `ix:${edit.after.line}:${edit.before.line}`;
+				lineKey = `i:${edit.target.line}:${edit.position}`;
 				break;
 		}
 		const dstKey = `${lineKey}:${edit.content.join("\n")}`;
@@ -779,25 +707,13 @@ export function applyHashlineEdits(
 		let sortLine: number;
 		let precedence: number;
 		switch (edit.op) {
-			case "set":
-				sortLine = edit.tag.line;
+			case "replace":
+				sortLine = edit.end ? edit.end.line : edit.target.line;
 				precedence = 0;
 				break;
-			case "replace_range":
-				sortLine = edit.last.line;
-				precedence = 0;
-				break;
-			case "append":
-				sortLine = edit.after ? edit.after.line : fileLines.length + 1;
-				precedence = 1;
-				break;
-			case "prepend":
-				sortLine = edit.before ? edit.before.line : 0;
-				precedence = 2;
-				break;
 			case "insert":
-				sortLine = edit.before.line;
-				precedence = 3;
+				sortLine = edit.target.line;
+				precedence = edit.position === "before" ? 2 : 1;
 				break;
 		}
 		return { edit, idx, sortLine, precedence };
@@ -805,147 +721,83 @@ export function applyHashlineEdits(
 
 	annotated.sort((a, b) => b.sortLine - a.sortLine || a.precedence - b.precedence || a.idx - b.idx);
 
-	// Apply edits bottom-up
 	for (const { edit, idx } of annotated) {
 		switch (edit.op) {
-			case "set": {
-				const merged = autocorrect ? maybeExpandSingleLineMerge(edit.tag.line, edit.content) : null;
-				if (merged) {
-					const origLines = originalFileLines.slice(
-						merged.startLine - 1,
-						merged.startLine - 1 + merged.deleteCount,
-					);
-					let nextLines = merged.newLines;
-					nextLines = restoreIndentForPairedReplacement([origLines[0] ?? ""], nextLines);
-
-					if (origLines.length === nextLines.length && origLines.every((line, i) => line === nextLines[i])) {
-						noopEdits.push({
-							editIndex: idx,
-							loc: `${edit.tag.line}#${edit.tag.hash}`,
-							currentContent: origLines.join("\n"),
-						});
+			case "replace": {
+				const startLine = edit.target.line;
+				const endLine = edit.end ? edit.end.line : edit.target.line;
+				const count = endLine - startLine + 1;
+
+				if (!edit.end) {
+					const merged = autocorrect ? maybeExpandSingleLineMerge(startLine, edit.content) : null;
+					if (merged) {
+						const origLines = originalFileLines.slice(
+							merged.startLine - 1,
+							merged.startLine - 1 + merged.deleteCount,
+						);
+						let nextLines = merged.newLines;
+						nextLines = restoreIndentForPairedReplacement([origLines[0] ?? ""], nextLines);
+
+						if (origLines.length === nextLines.length && origLines.every((line, i) => line === nextLines[i])) {
+							noopEdits.push({
+								editIndex: idx,
+								loc: `${edit.target.line}#${edit.target.hash}`,
+								currentContent: origLines.join("\n"),
+							});
+							break;
+						}
+						fileLines.splice(merged.startLine - 1, merged.deleteCount, ...nextLines);
+						trackFirstChanged(merged.startLine);
 						break;
 					}
-					fileLines.splice(merged.startLine - 1, merged.deleteCount, ...nextLines);
-					trackFirstChanged(merged.startLine);
-					break;
 				}
 
-				const count = 1;
-				const origLines = originalFileLines.slice(edit.tag.line - 1, edit.tag.line);
+				const origLines = originalFileLines.slice(startLine - 1, startLine - 1 + count);
 				let stripped = autocorrect
-					? stripRangeBoundaryEcho(originalFileLines, edit.tag.line, edit.tag.line, edit.content)
+					? stripRangeBoundaryEcho(originalFileLines, startLine, endLine, edit.content)
 					: edit.content;
 				stripped = autocorrect ? restoreOldWrappedLines(origLines, stripped) : stripped;
 				const newLines = autocorrect ? restoreIndentForPairedReplacement(origLines, stripped) : stripped;
 				if (origLines.length === newLines.length && origLines.every((line, i) => line === newLines[i])) {
 					noopEdits.push({
 						editIndex: idx,
-						loc: `${edit.tag.line}#${edit.tag.hash}`,
+						loc: `${edit.target.line}#${edit.target.hash}`,
 						currentContent: origLines.join("\n"),
 					});
 					break;
 				}
-				fileLines.splice(edit.tag.line - 1, count, ...newLines);
-				trackFirstChanged(edit.tag.line);
+				fileLines.splice(startLine - 1, count, ...newLines);
+				trackFirstChanged(startLine);
 				break;
 			}
-			case "replace_range": {
-				const count = edit.last.line - edit.first.line + 1;
-				const origLines = originalFileLines.slice(edit.first.line - 1, edit.first.line - 1 + count);
-				let stripped = autocorrect
-					? stripRangeBoundaryEcho(originalFileLines, edit.first.line, edit.last.line, edit.content)
-					: edit.content;
-				stripped = autocorrect ? restoreOldWrappedLines(origLines, stripped) : stripped;
-				const newLines = autocorrect ? restoreIndentForPairedReplacement(origLines, stripped) : stripped;
-				if (origLines.length === newLines.length && origLines.every((line, i) => line === newLines[i])) {
-					noopEdits.push({
-						editIndex: idx,
-						loc: `${edit.first.line}#${edit.first.hash}`,
-						currentContent: origLines.join("\n"),
-					});
-					break;
-				}
-				fileLines.splice(edit.first.line - 1, count, ...newLines);
-				trackFirstChanged(edit.first.line);
-				break;
-			}
-			case "append": {
-				const inserted = edit.after
-					? autocorrect
-						? stripInsertAnchorEchoAfter(originalFileLines[edit.after.line - 1], edit.content)
-						: edit.content
-					: edit.content;
-				if (inserted.length === 0) {
-					noopEdits.push({
-						editIndex: idx,
-						loc: edit.after ? `${edit.after.line}#${edit.after.hash}` : "EOF",
-						currentContent: edit.after ? originalFileLines[edit.after.line - 1] : "",
-					});
-					break;
-				}
-				if (edit.after) {
-					fileLines.splice(edit.after.line, 0, ...inserted);
-					trackFirstChanged(edit.after.line + 1);
-				} else {
-					if (fileLines.length === 1 && fileLines[0] === "") {
-						fileLines.splice(0, 1, ...inserted);
-						trackFirstChanged(1);
-					} else {
-						fileLines.splice(fileLines.length, 0, ...inserted);
-						trackFirstChanged(fileLines.length - inserted.length + 1);
-					}
-				}
-				break;
-			}
-			case "prepend": {
-				const inserted = edit.before
-					? autocorrect
-						? stripInsertAnchorEchoBefore(originalFileLines[edit.before.line - 1], edit.content)
-						: edit.content
+			case "insert": {
+				const anchorLine = originalFileLines[edit.target.line - 1];
+				const inserted = autocorrect
+					? edit.position === "after"
+						? stripInsertAnchorEchoAfter(anchorLine, edit.content)
+						: stripInsertAnchorEchoBefore(anchorLine, edit.content)
 					: edit.content;
 				if (inserted.length === 0) {
 					noopEdits.push({
 						editIndex: idx,
-						loc: edit.before ? `${edit.before.line}#${edit.before.hash}` : "BOF",
-						currentContent: edit.before ? originalFileLines[edit.before.line - 1] : "",
+						loc: `${edit.target.line}#${edit.target.hash}`,
+						currentContent: anchorLine,
 					});
 					break;
 				}
-				if (edit.before) {
-					fileLines.splice(edit.before.line - 1, 0, ...inserted);
-					trackFirstChanged(edit.before.line);
+				if (edit.position === "after") {
+					fileLines.splice(edit.target.line, 0, ...inserted);
+					trackFirstChanged(edit.target.line + 1);
 				} else {
-					if (fileLines.length === 1 && fileLines[0] === "") {
-						fileLines.splice(0, 1, ...inserted);
-					} else {
-						fileLines.splice(0, 0, ...inserted);
-					}
-					trackFirstChanged(1);
-				}
-				break;
-			}
-			case "insert": {
-				const afterLine = originalFileLines[edit.after.line - 1];
-				const beforeLine = originalFileLines[edit.before.line - 1];
-				const inserted = autocorrect ? stripInsertBoundaryEcho(afterLine, beforeLine, edit.content) : edit.content;
-				if (inserted.length === 0) {
-					noopEdits.push({
-						editIndex: idx,
-						loc: `${edit.after.line}#${edit.after.hash}..${edit.before.line}#${edit.before.hash}`,
-						currentContent: `${afterLine}\n${beforeLine}`,
-					});
-					break;
+					fileLines.splice(edit.target.line - 1, 0, ...inserted);
+					trackFirstChanged(edit.target.line);
 				}
-				fileLines.splice(edit.before.line - 1, 0, ...inserted);
-				trackFirstChanged(edit.before.line);
 				break;
 			}
 		}
 	}
 
 	let finalContent = fileLines.join("\n");
-	// Preserve trailing newline behavior of original content
 	if (hadFinalNewline && !finalContent.endsWith("\n")) {
 		finalContent += "\n";
 	} else if (!hadFinalNewline && finalContent.endsWith("\n")) {
@@ -1063,7 +915,6 @@ export function buildCompactDiffPreview(diff: string, options: CompactDiffOption
 
 	const inputLines = diff.split("\n");
 
-	// Single-pass: group consecutive lines by kind into run spans
 	type Kind = " " | "+" | "-" | "meta";
 	const runs: { kind: Kind; start: number; end: number }[] = [];
 	for (let i = 0; i < inputLines.length; i++) {

package/src/patch/parser.ts

@@ -228,7 +228,6 @@ function parseOneHunk(lines: string[], lineNumber: number, allowMissingContext:
 	const unifiedHeader = isHeaderLine ? parseUnifiedHunkHeader(headerTrimmed) : undefined;
 	const isEmptyContextMarker = /^@@\s*@@$/.test(headerTrimmed);
 
-	// Check for context marker
 	if (isHeaderLine && (headerTrimmed === EMPTY_CHANGE_CONTEXT_MARKER || isEmptyContextMarker)) {
 		startIndex = 1;
 	} else if (unifiedHeader) {
@@ -280,7 +279,6 @@ function parseOneHunk(lines: string[], lineNumber: number, allowMissingContext:
 		throw new ParseError(`Line numbers must be >= 1 (got ${newStartLine})`, lineNumber);
 	}
 
-	// Check for nested @@ anchors on subsequent lines
 	// Format: @@ class Foo
 	//         @@   method
 	while (startIndex < lines.length) {
@@ -290,7 +288,6 @@ function parseOneHunk(lines: string[], lineNumber: number, allowMissingContext:
 		}
 		const trimmed = nextLine.trimEnd();
 
-		// Check if it's another @@ line (nested anchor)
 		if (trimmed.startsWith(CHANGE_CONTEXT_MARKER)) {
 			const nestedContext = trimmed.slice(CHANGE_CONTEXT_MARKER.length);
 			if (nestedContext.trim().length > 0) {
@@ -301,7 +298,6 @@ function parseOneHunk(lines: string[], lineNumber: number, allowMissingContext:
 			// Empty @@ as separator - skip it
 			startIndex++;
 		} else {
-			// Not an @@ line, stop accumulating
 			break;
 		}
 	}
@@ -505,7 +501,6 @@ export function parseHunks(diff: string): DiffHunk[] {
 		const line = lines[i];
 		const trimmed = line.trim();
 
-		// Skip blank lines between hunks
 		if (trimmed === "") {
 			i++;
 			continue;

package/src/patch/schemas.ts

@@ -104,73 +104,36 @@ export function hashlineParseContentString(edit: string | string[] | null): stri
 	return edit;
 }
 
-const hashlineTargetEditSchema = Type.Object(
+const hashlineReplaceOpSchema = Type.Object(
 	{
-		op: Type.Literal("set"),
-		tag: hashlineTagFormat("line being replaced"),
+		op: Type.Literal("replace"),
+		target: hashlineTagFormat("line to replace (or start of range)"),
+		end: Type.Optional(hashlineTagFormat("last line of range")),
 		content: hashlineReplaceContentFormat("Replacement"),
 	},
 	{ additionalProperties: false },
 );
 
-const hashlineAppendEditSchema = Type.Object(
-	{
-		op: Type.Literal("append"),
-		after: Type.Optional(hashlineTagFormat("line after which to append")),
-		content: hashlineInsertContentFormat("Appended"),
-	},
-	{ additionalProperties: false },
-);
-
-const hashlinePrependEditSchema = Type.Object(
-	{
-		op: Type.Literal("prepend"),
-		before: Type.Optional(hashlineTagFormat("line before which to prepend")),
-		content: hashlineInsertContentFormat("Prepended"),
-	},
-	{ additionalProperties: false },
-);
-
-const hashlineRangeEditSchema = Type.Object(
-	{
-		op: Type.Literal("replace_range"),
-		first: hashlineTagFormat("first line"),
-		last: hashlineTagFormat("last line"),
-		content: hashlineReplaceContentFormat("Replacement"),
-	},
-	{ additionalProperties: false },
-);
-
-const hashlineInsertEditSchema = Type.Object(
+const hashlineInsertOpSchema = Type.Object(
 	{
 		op: Type.Literal("insert"),
-		before: hashlineTagFormat("line before which to insert"),
-		after: hashlineTagFormat("line after which to insert"),
+		target: hashlineTagFormat("anchor line"),
+		position: StringEnum(["before", "after"], { description: "Insert before or after the anchor" }),
 		content: hashlineInsertContentFormat("Inserted"),
 	},
 	{ additionalProperties: false },
 );
 
-const hashlineReplaceTextEditSchema = Type.Object(
-	{
-		op: Type.Literal("replaceText"),
-		old_text: Type.String({ description: "Text to find", minLength: 1 }),
-		new_text: hashlineReplaceContentFormat("Replacement"),
-		all: Type.Optional(Type.Boolean({ description: "Replace all occurrences" })),
-	},
-	{ additionalProperties: false },
-);
-
-const HL_REPLACE_ENABLED = Bun.env.ARCANE_HL_REPLACETXT === "1";
+const hashlineEditSpecUnion = Type.Union([hashlineReplaceOpSchema, hashlineInsertOpSchema], {
+	discriminator: { propertyName: "op" },
+});
 
-export const hashlineEditSpecSchema = Type.Union([
-	hashlineTargetEditSchema,
-	hashlineRangeEditSchema,
-	hashlineAppendEditSchema,
-	hashlinePrependEditSchema,
-	hashlineInsertEditSchema,
-	...(HL_REPLACE_ENABLED ? [hashlineReplaceTextEditSchema] : []),
-]);
+// AJV discriminator requires `oneOf`, but TypeBox emits `anyOf`.
+// Swap to `oneOf` so AJV validates only the matching sub-schema.
+export const hashlineEditSpecSchema = (() => {
+	const { anyOf, ...rest } = hashlineEditSpecUnion;
+	return { ...rest, oneOf: anyOf } as unknown as typeof hashlineEditSpecUnion;
+})();
 
 export const hashlineEditSchema = Type.Object(
 	{

package/src/patch/shared.ts

@@ -73,7 +73,6 @@ interface EditRenderArgs {
 	newText?: string;
 	patch?: string;
 	all?: boolean;
-	// Patch mode fields
 	op?: Operation;
 	rename?: string;
 	diff?: string;
@@ -81,15 +80,12 @@ interface EditRenderArgs {
 	 * Computed preview diff (used when tool args don't include a diff, e.g. hashline mode).
 	 */
 	previewDiff?: string;
-	// Hashline mode fields
 	edits?: HashlineEditPreview[];
 }
 
 type HashlineEditPreview =
-	| { target: string; new_content: string[] }
-	| { first: string; last: string; new_content: string[] }
-	| { before?: string; after?: string; inserted_lines: string[] }
-	| { old_text: string; new_text: string; all?: boolean };
+	| { op: "replace"; target: string; end?: string; content: string[] | string | null }
+	| { op: "insert"; target: string; position: "before" | "after"; content: string[] | string };
 
 /** Extended context for edit tool rendering */
 export interface EditRenderContext {
@@ -163,39 +159,29 @@ function formatStreamingHashlineEdits(edits: unknown[], uiTheme: Theme): string
 				dst: "",
 			};
 		}
-		if ("target" in editRecord) {
-			const target = typeof editRecord.target === "string" ? editRecord.target : "…";
-			const newContent = editRecord.new_content;
+		const op = editRecord.op;
+		const target = typeof editRecord.target === "string" ? editRecord.target : "…";
+		const content = editRecord.content;
+		const contentStr =
+			content === null
+				? ""
+				: Array.isArray(content)
+					? (content as string[]).join("\n")
+					: typeof content === "string"
+						? content
+						: "";
+		if (op === "replace") {
+			const end = typeof editRecord.end === "string" ? editRecord.end : undefined;
 			return {
-				srcLabel: `• line ${target}`,
-				dst: Array.isArray(newContent) ? (newContent as string[]).join("\n") : "",
+				srcLabel: end ? `• range ${target}..${end}` : `• line ${target}`,
+				dst: contentStr,
 			};
 		}
-		if ("first" in editRecord || "last" in editRecord) {
-			const first = typeof editRecord.first === "string" ? editRecord.first : "…";
-			const last = typeof editRecord.last === "string" ? editRecord.last : "…";
-			const newContent = editRecord.new_content;
+		if (op === "insert") {
+			const position = typeof editRecord.position === "string" ? editRecord.position : "after";
 			return {
-				srcLabel: `• range ${first}..${last}`,
-				dst: Array.isArray(newContent) ? (newContent as string[]).join("\n") : "",
-			};
-		}
-		if ("old_text" in editRecord || "new_text" in editRecord) {
-			const all = typeof editRecord.all === "boolean" ? editRecord.all : false;
-			return {
-				srcLabel: `• replace old_text→new_text${all ? " (all)" : ""}`,
-				dst: typeof editRecord.new_text === "string" ? editRecord.new_text : "",
-			};
-		}
-		if ("inserted_lines" in editRecord || "before" in editRecord || "after" in editRecord) {
-			const after = typeof editRecord.after === "string" ? editRecord.after : undefined;
-			const before = typeof editRecord.before === "string" ? editRecord.before : undefined;
-			const insertedLines = editRecord.inserted_lines;
-			const text = Array.isArray(insertedLines) ? (insertedLines as string[]).join("\n") : "";
-			const refs = [after, before].filter(Boolean).join("..") || "…";
-			return {
-				srcLabel: `• insert ${refs}`,
-				dst: text,
+				srcLabel: `• insert ${position} ${target}`,
+				dst: contentStr,
 			};
 		}
 		return {
@@ -217,19 +203,16 @@ export const editToolRenderer = {
 		const editIcon = uiTheme.fg("muted", uiTheme.getLangIcon(editLanguage));
 		let pathDisplay = filePath ? uiTheme.fg("accent", filePath) : uiTheme.fg("toolOutput", "…");
 
-		// Add arrow for move/rename operations
 		if (args.rename) {
 			pathDisplay += ` ${uiTheme.fg("dim", "→")} ${uiTheme.fg("accent", shortenPath(args.rename))}`;
 		}
 
-		// Show operation type for patch mode
 		const opTitle = args.op === "create" ? "Create" : args.op === "delete" ? "Delete" : "Edit";
 		const spinner =
 			options?.spinnerFrame !== undefined ? formatStatusIcon("running", uiTheme, options.spinnerFrame) : "";
 		const title = uiTheme.fg("toolTitle", uiTheme.bold(opTitle));
 		let text = `${title} ${spinner ? `${spinner} ` : ""}${editIcon} ${pathDisplay}`;
 
-		// Show streaming preview of diff/content
 		const previewDiffText =
 			args.previewDiff ??
 			(options.renderContext?.editDiffPreview && "diff" in options.renderContext.editDiffPreview
@@ -282,7 +265,6 @@ export const editToolRenderer = {
 			return new Text(`${header}\n${uiTheme.fg("error", replaceTabs(errorText))}`, 0, 0);
 		}
 
-		// Get diff text from result or preview
 		const { renderContext } = options;
 		const editDiffPreview = renderContext?.editDiffPreview;
 		const diffText =
@@ -292,7 +274,6 @@ export const editToolRenderer = {
 
 		const diffStats = diffText ? getDiffStats(diffText) : { added: 0, removed: 0, hunks: 0, lines: 0 };
 
-		// Build header with diff stats
 		let description = filePath || "file";
 		if (rename) description += ` ${uiTheme.fg("dim", "→")} ${shortenPath(rename)}`;
 		const meta: string[] = [];
@@ -302,7 +283,6 @@ export const editToolRenderer = {
 
 		const header = renderStatusLine({ icon: "success", title: opTitle, description, meta }, uiTheme);
 
-		// Tree-style diff body
 		const expanded = options.expanded;
 		const diffLines = diffText ? diffText.split("\n") : [];
 		const maxLines = expanded ? diffLines.length : Math.min(diffLines.length, PREVIEW_LIMITS.DIFF_COLLAPSED_LINES);
@@ -318,7 +298,6 @@ export const editToolRenderer = {
 			treeBody.push(`${uiTheme.fg("dim", `… ${remaining} more lines`)} ${formatClickHint(uiTheme)}`);
 		}
 
-		// Diagnostics
 		if (result.details?.diagnostics) {
 			const diagText = formatDiagnostics(result.details.diagnostics, expanded, uiTheme, (fp: string) =>
 				uiTheme.getLangIcon(getLanguageFromPath(fp)),

package/src/sdk.ts

@@ -1164,7 +1164,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			if (!key) {
 				throw new Error(`No API key found for provider "${provider}"`);
 			}
-			return key;
+			return { key, isOAuth: modelRegistry.isOAuthProvider(provider) };
 		},
 		cursorExecHandlers,
 		transformToolCallArguments: obfuscator?.hasSecrets() ? args => obfuscator!.deobfuscateObject(args) : undefined,