diff --git a/packages/coding-agent/src/core/tools/patch/index.ts b/packages/coding-agent/src/core/tools/patch/index.ts
index 56ad49a05..004575773 100644
--- a/packages/coding-agent/src/core/tools/patch/index.ts
+++ b/packages/coding-agent/src/core/tools/patch/index.ts
@@ -204,7 +204,8 @@ export class EditTool implements AgentTool<typeof replaceEditSchema | typeof pat
 
 	constructor(session: ToolSession) {
 		this.session = session;
-		this.patchMode = session.settings?.getEditPatchMode?.() ?? true;
+		const envNoPatch = process.env.OMP_NO_PATCH;
+		this.patchMode = envNoPatch !== undefined ? envNoPatch !== "1" : (session.settings?.getEditPatchMode?.() ?? true);
 		this.allowFuzzy = session.settings?.getEditFuzzyMatch() ?? true;
 		this.fuzzyThreshold = session.settings?.getEditFuzzyThreshold?.() ?? DEFAULT_FUZZY_THRESHOLD;
 		const enableLsp = session.enableLsp ?? true;
diff --git a/packages/coding-agent/src/modes/interactive/components/diff.ts b/packages/coding-agent/src/modes/interactive/components/diff.ts
index 7681da70a..507c0d9d0 100644
--- a/packages/coding-agent/src/modes/interactive/components/diff.ts
+++ b/packages/coding-agent/src/modes/interactive/components/diff.ts
@@ -133,9 +133,7 @@ export function renderDiff(diffText: string, _options: RenderDiffOptions = {}):
 			} 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, replaceTabs(removed.content))));
 				}
 				for (const added of addedLines) {
 					result.push(theme.fg("toolDiffAdded", formatLine("+", added.lineNum, replaceTabs(added.content))));