@herbertgao/pi-extensions 2026.9.4 → 2026.9.5

package/node_modules/@dietrichgebert/ponytail/hooks/ponytail-runtime.js

@@ -4,14 +4,37 @@ const os = require('os');
 const { getClaudeDir, getConfigDir } = require('./ponytail-config');
 
 const STATE_FILE = '.ponytail-active';
-const isCopilot = Boolean(process.env.COPILOT_PLUGIN_DATA);
+
+// ponytail: VS Code Copilot never sets COPILOT_PLUGIN_DATA — it only injects
+// CLAUDE_PLUGIN_ROOT, pointed at an install path under .vscode/agent-plugins/
+// (#528). Without this fallback isCopilot was false, so ponytail assumed
+// native Claude Code and emitted the statusline nudge, which VS Code Copilot
+// doesn't read.
+function isVsCodeCopilotRoot(pluginRoot) {
+  if (!pluginRoot) return false;
+  return pluginRoot.split(/[\\/]+/).includes('agent-plugins') &&
+    pluginRoot.toLowerCase().includes('.vscode');
+}
+
+const isCopilot = Boolean(process.env.COPILOT_PLUGIN_DATA) ||
+  isVsCodeCopilotRoot(process.env.CLAUDE_PLUGIN_ROOT);
 const isCodex = !isCopilot && Boolean(process.env.PLUGIN_DATA);
 const isQoder = !isCopilot && !isCodex && Boolean(process.env.QODER_SESSION_ID);
+// Cursor (#817): CURSOR_VERSION is set only in the environment Cursor builds
+// for hook processes (Cursor 3.20.17 assigns it in exactly one place, the hook
+// env builder), so it never leaks into a Claude Code session running inside
+// Cursor's terminal. Cursor also sets it when it runs a Claude-format plugin's
+// hooks next to CLAUDE_PLUGIN_ROOT, and it needs Cursor-shaped JSON either
+// way, so this check comes after the hosts with their own data dirs.
+const isCursor = !isCopilot && !isCodex && !isQoder && Boolean(process.env.CURSOR_VERSION);
 
 let stateDir = getClaudeDir();
 if (isCodex) stateDir = process.env.PLUGIN_DATA;
-if (isCopilot) stateDir = process.env.COPILOT_PLUGIN_DATA;
+// COPILOT_PLUGIN_DATA is unset under VS Code Copilot, so fall back to
+// getClaudeDir() rather than building a path from undefined.
+if (isCopilot) stateDir = process.env.COPILOT_PLUGIN_DATA || getClaudeDir();
 if (isQoder) stateDir = path.join(os.homedir(), '.qoder');
+if (isCursor) stateDir = path.join(os.homedir(), '.cursor');
 
 const statePath = path.join(stateDir, STATE_FILE);
 
@@ -33,6 +56,27 @@ function readMode() {
   }
 }
 
+// Cursor's always-on project rule (.cursor/rules/ponytail.mdc) already puts the
+// ruleset in front of every prompt and no hook can switch a rule off, so while
+// it is in the workspace the hooks step back instead of injecting a second,
+// possibly contradicting, copy (#817). Cursor hands every hook the workspace
+// root as CURSOR_PROJECT_DIR; project hooks also run from that directory.
+// ponytail: first workspace root only, a rule in a secondary folder of a
+// multi-root workspace goes undetected.
+function cursorRulePath() {
+  const root = process.env.CURSOR_PROJECT_DIR || process.cwd();
+  const rule = path.join(root, '.cursor', 'rules', 'ponytail.mdc');
+  return fs.existsSync(rule) ? rule : null;
+}
+
+function cursorRuleNotice(rule) {
+  return 'PONYTAIL: the always-on Cursor rule ' + rule + ' is active in this workspace and ' +
+    'already carries the ponytail ruleset, so the ponytail hooks injected nothing further. ' +
+    'Mode switching (/ponytail lite|full|ultra|off, "stop ponytail") is unavailable while ' +
+    'that rule exists. When the user tries to switch or turn off ponytail, tell them to ' +
+    'delete that rule so hooks.json can manage the level.';
+}
+
 function writeHookOutput(event, mode, context = '') {
   if (isCopilot) {
     // Copilot reads additionalContext on SessionStart; ignores output elsewhere.
@@ -64,6 +108,18 @@ function writeHookOutput(event, mode, context = '') {
     process.stdout.write(JSON.stringify(output));
     return;
   }
+  if (isCursor) {
+    // Cursor parses stdout as JSON and treats empty stdout as "nothing to
+    // say"; raw text would be logged as a parse error. sessionStart takes
+    // additional_context into the conversation's system context;
+    // beforeSubmitPrompt needs continue:true and, in Cursor 3.20.17, injects
+    // additional_context into that turn (docs/cursor-hooks.md).
+    if (!context) return;
+    const output = { additional_context: context };
+    if (event === 'UserPromptSubmit') output.continue = true;
+    process.stdout.write(JSON.stringify(output));
+    return;
+  }
   // Native Claude: SessionStart accepts raw stdout, but SubagentStart needs the
   // hookSpecificOutput JSON form or the context is dropped.
   if (event === 'SubagentStart') {
@@ -76,8 +132,11 @@ function writeHookOutput(event, mode, context = '') {
 
 module.exports = {
   clearMode,
+  cursorRuleNotice,
+  cursorRulePath,
   isCodex,
   isCopilot,
+  isCursor,
   isQoder,
   readMode,
   setMode,

package/node_modules/@dietrichgebert/ponytail/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dietrichgebert/ponytail",
-  "version": "4.9.0",
+  "version": "4.10.0",
   "description": "Lazy senior dev mode for AI agents. The best code is the code you never wrote.",
   "keywords": ["opencode-plugin", "opencode", "ponytail", "pi-package", "pi", "skills", "qoder"],
   "license": "MIT",
@@ -30,6 +30,7 @@
     ".qoder-plugin/",
     "pi-extension/",
     "scripts/uninstall.js",
+    "scripts/cursor-hooks.js",
     "assets/",
     "LICENSE"
   ],

package/node_modules/@dietrichgebert/ponytail/scripts/cursor-hooks.js

@@ -0,0 +1,135 @@
+#!/usr/bin/env node
+// ponytail — install or remove the Cursor hooks (hooks/cursor-hooks.json) in
+// ~/.cursor/hooks.json (default) or <cwd>/.cursor/hooks.json (--project),
+// merging with whatever hooks are already there. Only entries that run one of
+// ponytail's own hooks/ponytail-*.js scripts are added or removed; every other
+// hook stays as it was.
+//
+//   node scripts/cursor-hooks.js install [--project]
+//   node scripts/cursor-hooks.js uninstall [--project]
+
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+const { isShellSafe } = require('../hooks/ponytail-config');
+
+const ROOT = path.join(__dirname, '..');
+const TEMPLATE = path.join(ROOT, 'hooks', 'cursor-hooks.json');
+const PONYTAIL_HOOK = /ponytail-[\w-]+\.js/;
+
+function isPonytailHook(entry) {
+  return Boolean(entry && typeof entry.command === 'string' && PONYTAIL_HOOK.test(entry.command));
+}
+
+function hooksPath(scope) {
+  return scope === 'project'
+    ? path.join(process.cwd(), '.cursor', 'hooks.json')
+    : path.join(os.homedir(), '.cursor', 'hooks.json');
+}
+
+// Missing file → empty config. Malformed JSON throws a SyntaxError so the
+// caller can refuse to touch the file rather than overwrite it.
+function readConfig(file) {
+  let config = {};
+  try {
+    config = JSON.parse(fs.readFileSync(file, 'utf8').replace(/^\uFEFF/, ''));
+  } catch (e) {
+    if (e.code !== 'ENOENT') throw e;
+  }
+  if (!config || typeof config !== 'object' || Array.isArray(config)) config = {};
+  if (!config.hooks || typeof config.hooks !== 'object' || Array.isArray(config.hooks)) config.hooks = {};
+  return config;
+}
+
+function writeConfig(file, config) {
+  fs.mkdirSync(path.dirname(file), { recursive: true });
+  fs.writeFileSync(file, JSON.stringify(config, null, 2) + '\n', 'utf8');
+}
+
+// The template's PONYTAIL_DIR placeholder becomes this checkout's absolute
+// path. Forward slashes run unchanged under cmd, PowerShell and bash, and the
+// same allowlist that guards the statusline snippet keeps shell metacharacters
+// out of the command string.
+function ponytailEntries() {
+  const root = ROOT.replace(/\\/g, '/');
+  if (!isShellSafe(root)) {
+    throw new Error('ponytail is checked out at a path with shell metacharacters (' + ROOT +
+      '); move it, or copy hooks/cursor-hooks.json by hand and quote the path for your shell');
+  }
+  const template = JSON.parse(fs.readFileSync(TEMPLATE, 'utf8'));
+  const hooks = {};
+  for (const [event, entries] of Object.entries(template.hooks)) {
+    hooks[event] = entries.map((entry) => ({ ...entry, command: entry.command.replace(/PONYTAIL_DIR/g, root) }));
+  }
+  return hooks;
+}
+
+function stripPonytail(config) {
+  for (const [event, entries] of Object.entries(config.hooks)) {
+    if (!Array.isArray(entries)) continue;
+    const kept = entries.filter((entry) => !isPonytailHook(entry));
+    if (kept.length) config.hooks[event] = kept;
+    else delete config.hooks[event];
+  }
+}
+
+function install(scope) {
+  const file = hooksPath(scope);
+  const config = readConfig(file);
+  if (config.version === undefined) config.version = 1;
+  // Re-running replaces stale ponytail entries instead of duplicating them.
+  stripPonytail(config);
+  for (const [event, entries] of Object.entries(ponytailEntries())) {
+    config.hooks[event] = [...(config.hooks[event] || []), ...entries];
+  }
+  writeConfig(file, config);
+  return file;
+}
+
+// Returns the file it changed, or null when there was nothing of ponytail's in it.
+function uninstall(scope) {
+  const file = hooksPath(scope);
+  if (!fs.existsSync(file)) return null;
+  const config = readConfig(file);
+  const before = JSON.stringify(config);
+  stripPonytail(config);
+  if (JSON.stringify(config) === before) return null;
+  const otherKeys = Object.keys(config).filter((k) => k !== 'version' && k !== 'hooks');
+  if (Object.keys(config.hooks).length === 0 && otherKeys.length === 0) {
+    // Only ponytail lived here: drop the file rather than leave an empty husk.
+    fs.unlinkSync(file);
+  } else {
+    writeConfig(file, config);
+  }
+  return file;
+}
+
+if (require.main === module) {
+  const args = process.argv.slice(2);
+  const action = args[0];
+  const scope = args.includes('--project') ? 'project' : 'user';
+  try {
+    if (action === 'install') {
+      const file = install(scope);
+      console.log('Installed ponytail hooks in ' + file);
+      console.log('Cursor reloads hooks.json on save; start a new chat to activate.');
+    } else if (action === 'uninstall') {
+      const file = uninstall(scope);
+      console.log(file
+        ? 'Removed ponytail hooks from ' + file
+        : 'No ponytail hooks in ' + hooksPath(scope));
+    } else {
+      console.error('usage: node scripts/cursor-hooks.js install|uninstall [--project]');
+      process.exit(1);
+    }
+  } catch (e) {
+    if (e instanceof SyntaxError) {
+      console.error(hooksPath(scope) + ' is not valid JSON; nothing was changed, fix it by hand (' + e.message + ')');
+    } else {
+      console.error(e.message);
+    }
+    process.exit(1);
+  }
+}
+
+module.exports = { hooksPath, install, isPonytailHook, uninstall };

package/node_modules/@dietrichgebert/ponytail/scripts/uninstall.js

@@ -1,13 +1,15 @@
 #!/usr/bin/env node
 // ponytail — removes state ponytail wrote outside the plugin's own files:
-// the mode flag, the config file, and the statusLine entry it added to
-// settings.json. Plugin files themselves are removed by each host's own
-// uninstall command (see README); this only cleans up what those commands
-// can't see.
+// the mode flag, the config file, the statusLine entry it added to
+// settings.json, and its entries in ~/.cursor/hooks.json. Plugin files
+// themselves are removed by each host's own uninstall command (see README);
+// this only cleans up what those commands can't see.
 
 const fs = require('fs');
+const os = require('os');
 const path = require('path');
 const { getConfigPath, getClaudeDir } = require('../hooks/ponytail-config');
+const cursorHooks = require('./cursor-hooks');
 
 const STATUSLINE_SCRIPT = 'ponytail-statusline';
 
@@ -21,8 +23,23 @@ function removeIfExists(filePath, label) {
 }
 
 removeIfExists(path.join(getClaudeDir(), '.ponytail-active'), 'mode flag');
+removeIfExists(path.join(os.homedir(), '.cursor', '.ponytail-active'), 'Cursor mode flag');
 removeIfExists(getConfigPath(), 'config file');
 
+// Cursor hooks (#817): drop only ponytail's entries from ~/.cursor/hooks.json,
+// keep every other hook the user configured there.
+try {
+  const hooksFile = cursorHooks.uninstall('user');
+  if (hooksFile) console.log(`Removed ponytail hooks from ${hooksFile}`);
+} catch (e) {
+  if (e instanceof SyntaxError) {
+    // ponytail: malformed hooks.json — can't safely edit it; leave intact, warn
+    console.warn(`~/.cursor/hooks.json is malformed — could not remove the ponytail hook entries. Remove them manually from: ${cursorHooks.hooksPath('user')} (${e.message})`);
+  } else {
+    throw e;
+  }
+}
+
 const settingsPath = path.join(getClaudeDir(), 'settings.json');
 try {
   const raw = fs.readFileSync(settingsPath, 'utf8').replace(/^\uFEFF/, '');

package/node_modules/@herbertgao/pi-cc-extensions/extensions/feature/reference/index.ts

@@ -334,6 +334,7 @@ export function createAutocompleteProvider(
 	current: AutocompleteProvider,
 	getReferences: () => Promise<SessionReference[]>,
 	currentCwd: string,
+	isCurrent: () => boolean = () => true,
 ): AutocompleteProvider {
 	return {
 		triggerCharacters: ["@"],
@@ -346,14 +347,15 @@ export function createAutocompleteProvider(
 			const currentLine = lines[cursorLine] ?? "";
 			const query = extractMentionQuery(currentLine.slice(0, cursorCol));
 			if (query === undefined) {
-				return current.getSuggestions(lines, cursorLine, cursorCol, options);
+				const suggestions = await current.getSuggestions(lines, cursorLine, cursorCol, options);
+				return options.signal.aborted || !isCurrent() ? null : suggestions;
 			}
 
 			const [baseSuggestions, references] = await Promise.all([
 				current.getSuggestions(lines, cursorLine, cursorCol, options),
 				getReferences(),
 			]);
-			if (options.signal.aborted) return null;
+			if (options.signal.aborted || !isCurrent()) return null;
 
 			const sessionItems = filterSessions(references, query, currentCwd);
 			const fileItems = baseSuggestions?.prefix === `@${query}` ? baseSuggestions.items : [];
@@ -416,6 +418,7 @@ export default function sessionReferenceExtension(pi: ExtensionAPI): void {
 		subagentIds.clear();
 		clearLiveSubagentRecords();
 		let loadErrorShown = false;
+		const currentCwd = ctx.cwd;
 		const currentSessionId = ctx.sessionManager.getSessionId();
 		const currentSessionFile = ctx.sessionManager.getSessionFile();
 		let sessionsPromise: Promise<SessionInfo[]> | undefined;
@@ -429,7 +432,7 @@ export default function sessionReferenceExtension(pi: ExtensionAPI): void {
 					),
 				)
 				.catch((error: unknown) => {
-					if (!loadErrorShown) {
+					if (!loadErrorShown && generation === sessionGeneration) {
 						loadErrorShown = true;
 						const reason = error instanceof Error ? error.message : String(error);
 						ctx.ui.notify(`session-reference: failed to load sessions: ${reason}`, "error");
@@ -445,6 +448,8 @@ export default function sessionReferenceExtension(pi: ExtensionAPI): void {
 			| undefined;
 		const getReferences = async (): Promise<SessionReference[]> => {
 			const sessions = await getSessions();
+			// Session replacement can invalidate this closure while listAll() is pending.
+			if (generation !== sessionGeneration) return [];
 			const subagentKey = [...subagentIds].join("\0");
 			if (
 				referencesCache &&
@@ -455,21 +460,27 @@ export default function sessionReferenceExtension(pi: ExtensionAPI): void {
 			}
 			const ordered = orderSessionReferences(
 				mergeReferences(sessions, liveSubagentReferences(subagentIds, currentSessionId)),
-				ctx.cwd,
+				currentCwd,
 			);
 			referencesCache = { sessions, subagentKey, ordered };
 			return ordered;
 		};
 
 		getAvailableReferences = getReferences;
-		if (ctx.mode === "tui") {
+		const isTui = ctx.mode === "tui";
+		if (isTui) {
 			void getReferences();
 			// Register after other session_start handlers. pi-fff claims every @
 			// prefix, so a provider installed before it would never see session mentions.
 			setTimeout(() => {
 				if (generation !== sessionGeneration) return;
 				ctx.ui.addAutocompleteProvider((current) =>
-					createAutocompleteProvider(current, getReferences, ctx.cwd),
+					createAutocompleteProvider(
+						current,
+						getReferences,
+						currentCwd,
+						() => generation === sessionGeneration,
+					),
 				);
 			}, 0);
 		}
@@ -479,14 +490,23 @@ export default function sessionReferenceExtension(pi: ExtensionAPI): void {
 		const referenceIds = extractSessionReferenceIds(event.prompt);
 		if (referenceIds.length === 0) return;
 
+		const generation = sessionGeneration;
 		const currentSessionId = ctx.sessionManager.getSessionId();
 		const references = await (getAvailableReferences?.() ??
-			SessionManager.listAll().then((sessions) =>
-				mergeReferences(
-					sessions.filter((session) => session.id !== currentSessionId),
-					liveSubagentReferences(subagentIds, currentSessionId),
-				),
-			));
+			SessionManager.listAll()
+				.then((sessions) =>
+					mergeReferences(
+						sessions.filter((session) => session.id !== currentSessionId),
+						liveSubagentReferences(subagentIds, currentSessionId),
+					),
+				)
+				.catch((error: unknown) => {
+					if (generation !== sessionGeneration) return [];
+					const reason = error instanceof Error ? error.message : String(error);
+					ctx.ui.notify(`session-reference: failed to load sessions: ${reason}`, "error");
+					return [];
+				}));
+		if (generation !== sessionGeneration) return;
 		const referencesById = new Map<string, SessionReference>();
 		const referencesByName = new Map<string, SessionReference>();
 		const ambiguousNames = new Set<string>();
@@ -565,9 +585,7 @@ export default function sessionReferenceExtension(pi: ExtensionAPI): void {
 	});
 
 	pi.on("session_before_switch", () => {
-		subagentIds.clear();
-		clearLiveSubagentRecords();
-		getAvailableReferences = undefined;
+		// This event can cancel; preserve current-session state until shutdown.
 	});
 
 	pi.on("session_shutdown", () => {

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/mouse/interaction.ts

@@ -42,11 +42,13 @@ import {
 	isScrollBottomInput,
 	renderScrollButton,
 	resetScrollButtonState,
+	restoreOfficialScrollToEnd,
 	scheduleScrollButtonSync,
 	setScrollButtonHovered,
 	setScrollButtonVisible,
 	setScrollButtonWidget,
 	setToolMouseTui,
+	syncOfficialScrollToEnd,
 	getScrollButtonVisible,
 	getScrollButtonWidget,
 	getToolMouseTui,
@@ -879,6 +881,7 @@ export function teardownToolMouseInteraction(
 	}
 	restoreToolMouseRenderPatch();
 	restoreFullscreenViewportInput(getToolMouseTui());
+	restoreOfficialScrollToEnd(getToolMouseTui());
 	resetScrollButtonState();
 	setToolMouseTui(null);
 	toolMouseUi = null;
@@ -894,6 +897,7 @@ export function resetToolHoverState(): void {
 	setHoveredCompactAssistant(null);
 	setScrollButtonVisible(false);
 	setScrollButtonHovered(false);
+	restoreOfficialScrollToEnd(getToolMouseTui());
 	releaseFullscreenToolMouseMotion(getToolMouseTui());
 }
 
@@ -916,12 +920,12 @@ export function installToolMouseInteraction(
 		setToolMouseTui(tui);
 		setToolTuiFullscreen(fullscreenLazyTui(tui));
 		if (isLazyProxyTui(tui)) {
-			disableOfficialScrollToEnd(tui);
+			syncOfficialScrollToEnd(tui);
 			patchFullscreenViewportInput(tui);
 			ensureFullscreenToolMouseMotion(tui);
 			setScrollButtonWidget({
 				render: (width: number) => {
-					disableOfficialScrollToEnd(tui);
+					syncOfficialScrollToEnd(tui);
 					patchFullscreenViewportInput(tui);
 					ensureFullscreenToolMouseMotion(tui);
 					return renderScrollButton(width, theme);

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/mouse/scroll.ts

@@ -83,9 +83,31 @@ export function fullscreenLazyTui(tui: any): boolean {
 	return isLazyProxyTui(tui) && tui.mode === "fullscreen";
 }
 
+const OFFICIAL_SCROLL_TO_END_KEY = Symbol.for("pi.ccstyle.official-scroll-to-end");
+
 /** 关掉 pi 0.85 Jump to latest overlay，避免和本仓库 dock 按钮叠两层。 */
 export function disableOfficialScrollToEnd(tui: any): void {
-	if (typeof tui?.scrollToEndIndicator === "function") tui.scrollToEndIndicator = undefined;
+	if (!tui) return;
+	const current = tui.scrollToEndIndicator;
+	if (typeof current !== "function") return;
+	if (!tui[OFFICIAL_SCROLL_TO_END_KEY]) {
+		tui[OFFICIAL_SCROLL_TO_END_KEY] = { original: current };
+	}
+	tui.scrollToEndIndicator = undefined;
+}
+
+/** /ccstyle off 或 teardown 时还回官方 overlay。 */
+export function restoreOfficialScrollToEnd(tui: any): void {
+	if (!tui) return;
+	const original = tui[OFFICIAL_SCROLL_TO_END_KEY]?.original;
+	if (typeof original === "function") tui.scrollToEndIndicator = original;
+	tui[OFFICIAL_SCROLL_TO_END_KEY] = undefined;
+}
+
+/** on/compact 用 dock 按钮；off 还回 pi 原生 Jump to latest。 */
+export function syncOfficialScrollToEnd(tui: any): void {
+	if (toolMouseInteractionActive()) disableOfficialScrollToEnd(tui);
+	else restoreOfficialScrollToEnd(tui);
 }
 
 /** 官方 fullscreen：是否已跟随 transcript 底部（按钮隐藏条件）。 */

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/tool/diff/diff-renderer.ts

@@ -50,7 +50,7 @@ interface DiffTheme {
 }
 
 type DiffLineKind = "add" | "remove" | "context";
-type DiffEntryKind = "line" | "meta" | "hunk" | "file";
+type DiffEntryKind = "line" | "omission" | "meta" | "hunk" | "file";
 
 export interface DiffLineEntry {
 	kind: "line";
@@ -64,13 +64,19 @@ export interface DiffLineEntry {
 	hunkIndex: number;
 }
 
+export interface DiffOmissionEntry {
+	kind: "omission";
+	raw: string;
+	hunkIndex: number;
+}
+
 interface DiffMetaEntry {
-	kind: Exclude<DiffEntryKind, "line">;
+	kind: Exclude<DiffEntryKind, "line" | "omission">;
 	raw: string;
 	hunkIndex: number;
 }
 
-type ParsedDiffEntry = DiffLineEntry | DiffMetaEntry;
+type ParsedDiffEntry = DiffLineEntry | DiffOmissionEntry | DiffMetaEntry;
 
 export interface ParsedDiff {
 	entries: ParsedDiffEntry[];
@@ -94,6 +100,7 @@ interface RenderedRow {
 interface SplitDiffRow {
 	left?: DiffLineEntry;
 	right?: DiffLineEntry;
+	omission?: DiffOmissionEntry;
 	meta?: DiffMetaEntry;
 	hunkIndex: number | null;
 }
@@ -544,7 +551,7 @@ export function parseDiff(diffText: string): ParsedDiff {
 
 		// Pi 用空白行号填充省略上下文；它不是源码行，也不推进行号游标。
 		if (!hasHunkHeader && PI_OMISSION_LINE_PATTERN.test(rawLine)) {
-			entries.push(createMetaEntry(rawLine, hunkIndex));
+			entries.push({ kind: "omission", raw: rawLine, hunkIndex });
 			continue;
 		}
 
@@ -816,6 +823,12 @@ function buildSplitRows(entries: ParsedDiffEntry[]): SplitDiffRow[] {
 			break;
 		}
 
+		if (entry.kind === "omission") {
+			rows.push({ omission: entry, hunkIndex: entry.hunkIndex || null });
+			index++;
+			continue;
+		}
+
 		if (entry.kind !== "line") {
 			rows.push({ meta: entry, hunkIndex: entry.hunkIndex || null });
 			index++;
@@ -1799,8 +1812,44 @@ interface DiffRenderContext {
 	showHashlineAnchors: boolean;
 }
 
-function processDiffEntries(
+const OMISSION_GLYPH = "⋮";
+
+function createOmissionRenderLine(entry: DiffOmissionEntry, compact = false): DiffLineEntry {
+	return {
+		kind: "line",
+		lineKind: "context",
+		oldLineNumber: null,
+		newLineNumber: null,
+		fallbackLineNumber: compact ? "" : OMISSION_GLYPH,
+		content: compact ? OMISSION_GLYPH : "",
+		raw: entry.raw,
+		hunkIndex: entry.hunkIndex,
+	};
+}
+
+function materializeOmissionEntries(
 	entries: ParsedDiffEntry[],
+	compact = false,
+): (DiffLineEntry | DiffMetaEntry)[] {
+	return entries.map((entry) =>
+		entry.kind === "omission" ? createOmissionRenderLine(entry, compact) : entry,
+	);
+}
+
+function omitTerminalOmissions(entries: ParsedDiffEntry[]): ParsedDiffEntry[] {
+	let lastLineIndex = -1;
+	for (let index = entries.length - 1; index >= 0; index--) {
+		if (entries[index]?.kind === "line") {
+			lastLineIndex = index;
+			break;
+		}
+	}
+
+	return entries.filter((entry, index) => entry.kind !== "omission" || index < lastLineIndex);
+}
+
+function processDiffEntries(
+	entries: (DiffLineEntry | DiffMetaEntry)[],
 	ctx: DiffRenderContext,
 	processLine: (entry: DiffLineEntry) => string[],
 ): RenderedRow[] {
@@ -1821,7 +1870,7 @@ function renderUnified(
 	ctx: DiffRenderContext,
 	lineNumberWidth: number,
 ): RenderedRow[] {
-	return processDiffEntries(entries, ctx, (entry) => {
+	return processDiffEntries(materializeOmissionEntries(entries), ctx, (entry) => {
 		const lineNumber =
 			entry.lineKind === "add"
 				? formatLineNumberLabel(
@@ -1871,6 +1920,10 @@ function toUnifiedFallbackRows(
 ): RenderedRow[] {
 	const flattened: ParsedDiffEntry[] = [];
 	for (const row of rows) {
+		if (row.omission) {
+			flattened.push(row.omission);
+			continue;
+		}
 		if (row.meta) {
 			flattened.push(row.meta);
 			continue;
@@ -1886,7 +1939,7 @@ function toUnifiedFallbackRows(
 }
 
 function renderCompact(entries: ParsedDiffEntry[], ctx: DiffRenderContext): RenderedRow[] {
-	return processDiffEntries(entries, ctx, (entry) => {
+	return processDiffEntries(materializeOmissionEntries(entries, true), ctx, (entry) => {
 		const codeText = normalizeCodeWhitespace(
 			getCompactLineRenderContent(entry, ctx.showHashlineAnchors),
 		);
@@ -2105,8 +2158,9 @@ function renderSplit(
 			continue;
 		}
 
+		const omissionLine = row.omission ? createOmissionRenderLine(row.omission) : undefined;
 		const leftCells = renderSplitCell(
-			row.left,
+			omissionLine ?? row.left,
 			"left",
 			leftWidth,
 			splitLineNumberWidth,
@@ -2120,7 +2174,7 @@ function renderSplit(
 			showHashlineAnchors,
 		);
 		const rightCells = renderSplitCell(
-			row.right,
+			omissionLine ?? row.right,
 			"right",
 			rightWidth,
 			splitLineNumberWidth,
@@ -2575,18 +2629,19 @@ export function renderEditDiffResult(
 		return new Text(theme.fg("muted", "↳ no diff data"), 0, 0);
 	}
 
-	const splitRows = buildSplitRows(parsed.entries);
+	const renderEntries = omitTerminalOmissions(parsed.entries);
+	const splitRows = buildSplitRows(renderEntries);
 	const showHashlineAnchors =
 		options.expanded === true &&
-		parsed.entries.some((entry) => entry.kind === "line" && !!entry.hashlineAnchorContent);
-	const lineNumberWidth = getLineNumberWidth(parsed.entries, showHashlineAnchors);
+		renderEntries.some((entry) => entry.kind === "line" && !!entry.hashlineAnchorContent);
+	const lineNumberWidth = getLineNumberWidth(renderEntries, showHashlineAnchors);
 	const palette = resolveDiffPalette(theme);
 	// Rich diffs use ccstyle's self shell. Keep the panel transparent so the
 	// separator cannot leak toolSuccessBg across the entire new column.
 	const containerBgAnsi = undefined;
 	const language = resolveLanguageFromPath(options.filePath);
 	const cache = createDiffRenderCache();
-	const highlightLine = createCodeLineHighlighter(language, theme, parsed.entries, () => {
+	const highlightLine = createCodeLineHighlighter(language, theme, renderEntries, () => {
 		cache.invalidate();
 		options.invalidate?.();
 	});
@@ -2635,7 +2690,7 @@ export function renderEditDiffResult(
 			const processBudget = resolveDiffProcessBudget(displayLimit, wordWrap);
 			// Only highlight/render a prefix that can fill the display limit; full-diff
 			// LCS + syntax highlight on thousands of hidden lines is pure waste when collapsed.
-			const entryBudget = takeEntriesForLineBudget(parsed.entries, processBudget);
+			const entryBudget = takeEntriesForLineBudget(renderEntries, processBudget);
 			const splitBudget = takeSplitRowsForBudget(splitRows, processBudget);
 			const inlineHighlights = buildInlineHighlightMap(splitBudget.rows);
 			const renderCtx: DiffRenderContext = {