@oh-my-pi/pi-coding-agent 15.1.9 → 15.2.2

package/CHANGELOG.md

@@ -2,6 +2,37 @@
 
 ## [Unreleased]
 
+## [15.2.2] - 2026-05-22
+
+### Fixed
+
+- Fixed `RULES.md` not being injected. The documented sticky-rules file at `~/.omp/agent/RULES.md` and `<repo>/.omp/RULES.md` was never read by any discovery provider; only `.omp/rules/*.md` was scanned. The native provider now loads both as always-apply rules so they re-attach every turn as documented ([#1266](https://github.com/can1357/oh-my-pi/issues/1266)).
+
+## [15.2.1] - 2026-05-21
+
+### Fixed
+
+- Fixed compaction routing to the wrong provider when `modelRoles.default` is set to a different model than the active chat. Auto- and manual compaction now prefer the active session's model and only fall back to role-based candidates when the current model has no usable credentials. Previously, an Anthropic chat with `modelRoles.default = openai/gpt-5` would compact through OpenAI (including the remote-compaction endpoint), even though the live conversation never used OpenAI.
+
+### Fixed
+
+- Fixed context overflow not being detected when the session's model (e.g. `hf:zai-org/GLM-5.1` via `synthetic` provider) returns a 400 with the upstream "400 status code (no body)" message wrapped inside a JSON envelope. The `isContextOverflow` check now matches the no-body status phrase anywhere in the error string rather than requiring it at the very start, so auto-compaction fires correctly instead of leaving the session silently stuck ([#1251](https://github.com/can1357/oh-my-pi/issues/1251)).
+- Fixed `formatCapturedHttpError` not extracting the error text from `{"error":"string"}` response bodies (only object-valued `error` fields were previously handled), resulting in raw JSON in error messages instead of the human-readable string.
+
+## [15.2.0] - 2026-05-21
+
+### Changed
+
+- Changed the interactive working loader and slash-command progress bars to use the active theme's accent shimmer instead of static muted text.
+
+### Fixed
+
+- Fixed false-positive hashline `~ TEXT` separator-padding warning firing on YAML, JSON, Python, Markdown, TOML, and other indent-sensitive file edits. The padding check is now skipped entirely for indentation-sensitive extensions (`.py`, `.yml`/`.yaml`, `.md`/`.mdx`, `.json`/`.jsonc`/`.json5`, `.toml`, `.rst`, `.tf`, `.nix`, `.coffee`, `.haml`/`.slim`/`.pug`, `.sass`/`.styl`, `.nim`, `.cr`, `.elm`, `.fs`, …), and tightened on every other extension to flag only the `~ beta` typo shape (exactly one leading space before non-space content) rather than any leading-space payload.
+
+### Fixed
+
+- Fixed goal state machine: `get` now returns paused goals (was returning null for `enabled=false`), `complete` now works on paused goals after interrupts, `create` is allowed after a previous goal reaches `complete` status, and the goal tool is re-added to the active tool set on session reload when a paused goal is persisted. Added `resume` and `drop` ops to the goal tool so the agent can re-engage or discard a paused goal without requiring user slash commands. ([#1249](https://github.com/can1357/oh-my-pi/issues/1249))
+
 ## [15.1.9] - 2026-05-21
 
 ### Fixed
@@ -24,6 +55,10 @@
 
 - Fixed `web_search` freezing the session when an upstream provider stalled. Bun's WinHTTP backend on Windows can silently drop `AbortSignal` once a TCP/TLS connection hangs (oven-sh/bun#15275, oven-sh/bun#18536), so Esc never reached the in-flight fetch and the only recovery was Ctrl+C + `omp --resume`. Every web-search provider's outbound `fetch` (anthropic, brave, codex, exa, gemini, jina, kagi, kimi, parallel, perplexity, searxng, synthetic, tavily, z.ai) now composes the caller signal with a 60s hard timeout via a shared `withHardTimeout` helper, guaranteeing the request settles within a minute even when Bun's abort fails to propagate. Independently, `executeSearch`'s provider-fallback loop was masking real cancellations as ordinary provider errors and returning "All web search providers failed"; it now re-throws as `ToolAbortError` the moment the caller's signal aborts, so the session sees a clean cancel on every platform. ([#1221](https://github.com/can1357/oh-my-pi/issues/1221))
 
+### Added
+
+- Added OSC 8 terminal hyperlink support for file paths in tool output. When the terminal supports hyperlinks (kitty, Ghostty, WezTerm, iTerm2, Alacritty, VS Code) and the new `tui.hyperlinks` setting is `auto` (default) or `always`, OMP wraps file paths emitted by `read`, `find`, `search`, `edit`, `ast_grep`, and `ast_edit` renderers in `file:///abs/path` hyperlinks. `local://` and other fs-backed internal URLs resolve to their backing path. Set `tui.hyperlinks: off` to disable. ([#1244](https://github.com/can1357/oh-my-pi/issues/1244))
+
 ## [15.1.8] - 2026-05-20
 
 ### Fixed
@@ -8476,4 +8511,4 @@ Initial public release.
 - Git branch display in footer
 - Message queueing during streaming responses
 - OAuth integration for Gmail and Google Calendar access
-- HTML export with syntax highlighting and collapsible sections
+- HTML export with syntax highlighting and collapsible sections

package/dist/types/config/settings-schema.d.ts

@@ -634,6 +634,16 @@ export declare const SETTINGS_SCHEMA: {
         readonly default: 20;
         readonly description: "Maximum height in terminal rows for inline images (default 20). Set to 0 to use only the viewport-based limit (60% of terminal height).";
     };
+    readonly "tui.hyperlinks": {
+        readonly type: "enum";
+        readonly values: readonly ["off", "auto", "always"];
+        readonly default: "auto";
+        readonly ui: {
+            readonly tab: "appearance";
+            readonly label: "Terminal Hyperlinks";
+            readonly description: "Wrap file paths in OSC 8 hyperlinks for terminal-native click-to-open (auto: detect support; off: never; always: unconditional)";
+        };
+    };
     readonly "display.tabWidth": {
         readonly type: "number";
         readonly default: 3;

package/dist/types/eval/py/kernel.d.ts

@@ -21,6 +21,12 @@ export interface KernelExecuteResult {
     cancelled: boolean;
     timedOut: boolean;
     stdinRequested: boolean;
+    /**
+     * True when the kernel subprocess was killed as part of settling this
+     * execution (e.g. SIGINT was ignored and we escalated to shutdown, or the
+     * kernel died unexpectedly). When false, the kernel remains reusable.
+     */
+    kernelKilled?: boolean;
 }
 export interface KernelShutdownResult {
     confirmed: boolean;

package/dist/types/goals/state.d.ts

@@ -17,7 +17,7 @@ export interface GoalModeState {
     goal: Goal;
 }
 export interface GoalToolDetails {
-    op: "create" | "get" | "complete";
+    op: "create" | "get" | "complete" | "resume" | "drop";
     goal?: Goal | null;
     remainingTokens?: number | null;
     completionBudgetReport?: string | null;

package/dist/types/goals/tools/goal-tool.d.ts

@@ -9,7 +9,9 @@ declare const goalSchema: z.ZodObject<{
     op: z.ZodEnum<{
         complete: "complete";
         create: "create";
+        drop: "drop";
         get: "get";
+        resume: "resume";
     }>;
     objective: z.ZodOptional<z.ZodString>;
     token_budget: z.ZodOptional<z.ZodNumber>;
@@ -32,7 +34,9 @@ export declare class GoalTool implements AgentTool<typeof goalSchema, GoalToolDe
         op: z.ZodEnum<{
             complete: "complete";
             create: "create";
+            drop: "drop";
             get: "get";
+            resume: "resume";
         }>;
         objective: z.ZodOptional<z.ZodString>;
         token_budget: z.ZodOptional<z.ZodNumber>;

package/dist/types/hashline/parser.d.ts

@@ -1,7 +1,11 @@
 import type { HashlineCursor, HashlineEdit } from "./types";
 export declare function cloneCursor(cursor: HashlineCursor): HashlineCursor;
-export declare function parseHashline(diff: string): HashlineEdit[];
-export declare function parseHashlineWithWarnings(diff: string): {
+export declare function parseHashline(diff: string, opts?: ParseHashlineOptions): HashlineEdit[];
+export interface ParseHashlineOptions {
+    /** File path the diff targets. Used to suppress indent-sensitive false-positive warnings. */
+    path?: string;
+}
+export declare function parseHashlineWithWarnings(diff: string, opts?: ParseHashlineOptions): {
     edits: HashlineEdit[];
     warnings: string[];
 };

package/dist/types/internal-urls/memory-protocol.d.ts

@@ -1,4 +1,10 @@
 import type { InternalResource, InternalUrl, ProtocolHandler } from "./types";
+/**
+ * Snapshot of memory roots for every registered session, deduped.
+ * Each session has its own cwd (possibly a worktree), so subagents and main
+ * may see different roots.
+ */
+export declare function memoryRootsFromRegistry(): string[];
 /**
  * Resolve a memory:// URL to an absolute filesystem path under memory root.
  */

package/dist/types/modes/theme/shimmer.d.ts

@@ -0,0 +1,27 @@
+import type { Theme, ThemeColor } from "./theme";
+type ShimmerTheme = Pick<Theme, "bold" | "fg">;
+/** Three-tier color stack a shimmer character cycles through as the band sweeps. */
+export interface ShimmerPalette {
+    /** Color for chars outside / at the edge of the band (intensity < 0.2). */
+    low: ThemeColor;
+    /** Color for chars approaching the crest (0.2 <= intensity < 0.6). */
+    mid: ThemeColor;
+    /** Color at the band's crest (intensity >= 0.6). */
+    high: ThemeColor;
+    /** Whether to bold the crest tier. Default `false`. */
+    bold?: boolean;
+}
+/** One run of text that shares a palette inside a larger shimmer sweep. */
+export interface ShimmerSegment {
+    text: string;
+    palette?: ShimmerPalette;
+}
+export declare const DEFAULT_SHIMMER_PALETTE: ShimmerPalette;
+/**
+ * Apply a shimmer sweep across one or more segments, treating them as a single
+ * continuous string for band positioning. Each segment can supply its own
+ * palette so the gradient stays in lockstep while the colors differ.
+ */
+export declare function shimmerSegments(segments: readonly ShimmerSegment[], theme: ShimmerTheme): string;
+export declare function shimmerText(text: string, theme: ShimmerTheme, palette?: ShimmerPalette): string;
+export {};

package/dist/types/slash-commands/helpers/format.d.ts

@@ -1,7 +1,10 @@
+import { type Theme } from "../../modes/theme/theme";
 /** Format a millisecond duration as a coarse-grained human label. */
 export declare function formatDuration(ms: number): string;
+type ProgressBarTheme = Pick<Theme, "bold" | "fg">;
 /**
  * Render an ASCII progress bar with a trailing percent label.
  * `fraction` is clamped to `[0, 1]`. `undefined` renders a dotted placeholder.
  */
-export declare function renderAsciiBar(fraction: number | undefined, width?: number): string;
+export declare function renderAsciiBar(fraction: number | undefined, width?: number, uiTheme?: ProgressBarTheme): string;
+export {};

package/dist/types/tools/ast-edit.d.ts

@@ -31,6 +31,9 @@ export interface AstEditToolDetails {
     /** Pre-formatted text for the user-visible TUI render. Mirrors `result.text` lines but uses
      * a `│` gutter (no model-only hashline anchors). The TUI uses this directly so it never parses model-facing text. */
     displayContent?: string;
+    /** Absolute base directory used during the edit. Used by the renderer to resolve
+     * display-relative paths to absolute paths for OSC 8 hyperlinks. */
+    searchPath?: string;
 }
 export declare class AstEditTool implements AgentTool<typeof astEditSchema, AstEditToolDetails> {
     private readonly session;

package/dist/types/tools/ast-grep.d.ts

@@ -28,6 +28,9 @@ export interface AstGrepToolDetails {
     /** Pre-formatted text for the user-visible TUI render. Mirrors `result.text` lines but uses
      * a `│` gutter and `*` to mark match lines. The TUI uses this directly so it never parses model-facing text. */
     displayContent?: string;
+    /** Absolute base directory used during search. Used by the renderer to resolve
+     * display-relative paths to absolute paths for OSC 8 hyperlinks. */
+    searchPath?: string;
 }
 export declare class AstGrepTool implements AgentTool<typeof astGrepSchema, AstGrepToolDetails> {
     private readonly session;

package/dist/types/tools/browser/launch.d.ts

@@ -48,6 +48,8 @@ export interface UserAgentSession {
     override: UserAgentOverride;
     browserSession: CDPSession | null;
 }
+/** Builds the browser-page stealth bootstrap source for regression tests. */
+export declare function buildStealthInjectionScriptForTest(scripts?: readonly string[]): string;
 /** Apply stealth patches + UA override to a headless page. Idempotent within a tab. */
 export declare function applyStealthPatches(browser: Browser, page: Page, state: {
     browserSession: CDPSession | null;

package/dist/types/tools/find.d.ts

@@ -23,6 +23,9 @@ export interface FindToolDetails {
     files?: string[];
     truncated?: boolean;
     error?: string;
+    /** Working directory at search time. Used by the renderer to resolve relative
+     * file paths to absolute paths for OSC 8 hyperlinks. */
+    cwd?: string;
     /** User-supplied paths whose base directory was missing on disk. The tool
      * skipped these and continued with the surviving entries; surfaced as a
      * non-fatal warning in the renderer and in the model-facing text. */

package/dist/types/tools/search.d.ts

@@ -43,6 +43,9 @@ export interface SearchToolDetails {
      * `result.text` lines but uses a `│` gutter and `*` to mark match lines (vs space for
      * context). The TUI uses this directly so it never parses model-facing hashline anchors. */
     displayContent?: string;
+    /** Absolute base directory used during search. Used by the renderer to resolve
+     * display-relative paths to absolute paths for OSC 8 hyperlinks. */
+    searchPath?: string;
     /** User-supplied paths whose base directory was missing on disk. The tool
      * skipped these and continued with the surviving entries; surfaced as a
      * non-fatal warning in the renderer and in the model-facing text. */

package/dist/types/tui/file-list.d.ts

@@ -4,6 +4,9 @@
 import type { Theme } from "../modes/theme/theme";
 export interface FileEntry {
     path: string;
+    /** Absolute filesystem path. When provided together with {@link FileListOptions.hyperlinkFn}, the
+     * rendered path text is wrapped in an OSC 8 hyperlink. */
+    absPath?: string;
     isDirectory?: boolean;
     meta?: string;
 }
@@ -12,5 +15,8 @@ export interface FileListOptions {
     expanded?: boolean;
     maxCollapsed?: number;
     showIcons?: boolean;
+    /** When provided, called with the entry's absolute path and the ANSI-styled display string to
+     * optionally wrap the path in an OSC 8 hyperlink. Only invoked when {@link FileEntry.absPath} is set. */
+    hyperlinkFn?: (absPath: string, displayText: string) => string;
 }
 export declare function renderFileList(options: FileListOptions, theme: Theme): string[];

package/dist/types/tui/hyperlink.d.ts

@@ -0,0 +1,42 @@
+/**
+ * Returns true when OSC 8 hyperlinks should be emitted.
+ *
+ * Respects `tui.hyperlinks` setting:
+ * - `"off"`: never
+ * - `"auto"`: when `process.stdout.isTTY`, `NO_COLOR` is unset, and the detected terminal reports hyperlink support
+ * - `"always"`: unconditionally (useful for viewers that support OSC 8 without advertising it)
+ */
+export declare function isHyperlinkEnabled(): boolean;
+/**
+ * Wrap `displayText` in an OSC 8 hyperlink pointing at the given absolute file path.
+ *
+ * Returns `displayText` unchanged when hyperlinks are disabled or when
+ * the text already contains an OSC 8 sequence (prevents double-wrapping).
+ *
+ * The caller is responsible for passing an absolute path. Relative paths
+ * produce invalid `file://` URIs and are accepted silently to avoid runtime
+ * errors in renderer hot paths.
+ *
+ * @param absPath - Absolute filesystem path
+ * @param displayText - Text to render as the hyperlink anchor (may contain ANSI codes)
+ * @param opts - Optional line/col position appended as `?line=N&col=M` query params
+ */
+export declare function fileHyperlink(absPath: string, displayText: string, opts?: {
+    line?: number;
+    col?: number;
+}): string;
+/**
+ * Synchronously resolve a filesystem-backed internal URL (e.g. `local://foo.md`,
+ * `memory://root/notes.md`) to its absolute filesystem path. Returns `undefined`
+ * for inputs that aren't fs-backed, aren't resolvable in the current session
+ * registry, or fail to parse.
+ *
+ * Used by renderers to wrap fs-backed internal URLs in OSC 8 hyperlinks even
+ * when the resolved path isn't yet available from tool result details (e.g.
+ * during the call/streaming phase before a result lands).
+ *
+ * Async-resolved schemes (`artifact://`, `agent://`, `skill://`, `rule://`,
+ * `omp://`) are not handled here — those rely on `details.resolvedPath` set
+ * by the read tool's router resolution.
+ */
+export declare function tryResolveInternalUrlSync(input: string): string | undefined;

package/dist/types/tui/index.d.ts

@@ -3,6 +3,7 @@
  */
 export * from "./code-cell";
 export * from "./file-list";
+export * from "./hyperlink";
 export * from "./output-block";
 export * from "./status-line";
 export * from "./tree-list";

package/dist/types/web/search/providers/utils.d.ts

@@ -1,4 +1,4 @@
-import type { SearchSource } from "../../../web/search/types";
+import { SearchProviderError, type SearchProviderId, type SearchSource } from "../../../web/search/types";
 /**
  * Search for an API credential by checking an env-derived key first,
  * then falling back to agent.db stored credentials for the given providers.
@@ -47,3 +47,4 @@ export declare function toSearchSources(sources: ReadonlyArray<{
     snippet?: string;
     publishedDate?: string;
 }>, numResults: number): SearchSource[];
+export declare function classifyProviderHttpError(provider: SearchProviderId, status: number, body: string): SearchProviderError | null;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "15.1.9",
+	"version": "15.2.2",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://omp.sh",
 	"author": "Can Boluk",
@@ -47,12 +47,12 @@
 		"@agentclientprotocol/sdk": "0.21.0",
 		"@babel/parser": "^7.29.3",
 		"@mozilla/readability": "^0.6.0",
-		"@oh-my-pi/omp-stats": "15.1.9",
-		"@oh-my-pi/pi-agent-core": "15.1.9",
-		"@oh-my-pi/pi-ai": "15.1.9",
-		"@oh-my-pi/pi-natives": "15.1.9",
-		"@oh-my-pi/pi-tui": "15.1.9",
-		"@oh-my-pi/pi-utils": "15.1.9",
+		"@oh-my-pi/omp-stats": "15.2.2",
+		"@oh-my-pi/pi-agent-core": "15.2.2",
+		"@oh-my-pi/pi-ai": "15.2.2",
+		"@oh-my-pi/pi-natives": "15.2.2",
+		"@oh-my-pi/pi-tui": "15.2.2",
+		"@oh-my-pi/pi-utils": "15.2.2",
 		"@puppeteer/browsers": "^2.13.0",
 		"@types/turndown": "5.0.6",
 		"@xterm/headless": "^6.0.0",

package/src/config/settings-schema.ts

@@ -583,6 +583,18 @@ export const SETTINGS_SCHEMA = {
 		description:
 			"Maximum height in terminal rows for inline images (default 20). Set to 0 to use only the viewport-based limit (60% of terminal height).",
 	},
+
+	"tui.hyperlinks": {
+		type: "enum",
+		values: ["off", "auto", "always"] as const,
+		default: "auto",
+		ui: {
+			tab: "appearance",
+			label: "Terminal Hyperlinks",
+			description:
+				"Wrap file paths in OSC 8 hyperlinks for terminal-native click-to-open (auto: detect support; off: never; always: unconditional)",
+		},
+	},
 	// Display rendering
 	"display.tabWidth": {
 		type: "number",

package/src/config/settings.ts

@@ -129,6 +129,18 @@ function stringArrayFromUnknown(value: unknown): string[] {
 	return [];
 }
 
+function shallowStringRecord(value: unknown): Record<string, string> {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return {};
+
+	const result: Record<string, string> = {};
+	for (const [key, item] of Object.entries(value)) {
+		if (typeof item === "string") {
+			result[key] = item;
+		}
+	}
+	return result;
+}
+
 function resolvePathScopedStringArray(settingPath: SettingPath, value: unknown, cwd: string): string[] | undefined {
 	if (!PATH_SCOPED_ARRAY_SETTINGS.has(settingPath) || !Array.isArray(value)) return undefined;
 
@@ -424,8 +436,19 @@ export class Settings {
 	 * Set a model role (helper for modelRoles record).
 	 */
 	setModelRole(role: ModelRole | string, modelId: string): void {
-		const current = this.get("modelRoles");
+		const current = shallowStringRecord(getByPath(this.#global, ["modelRoles"]));
+		const runtimeOverrides = getByPath(this.#overrides, ["modelRoles"]);
+		const updateRuntimeOverride =
+			!!runtimeOverrides &&
+			typeof runtimeOverrides === "object" &&
+			!Array.isArray(runtimeOverrides) &&
+			Object.hasOwn(runtimeOverrides, role);
+
 		this.set("modelRoles", { ...current, [role]: modelId });
+
+		if (updateRuntimeOverride) {
+			this.override("modelRoles", { ...shallowStringRecord(runtimeOverrides), [role]: modelId });
+		}
 	}
 
 	/**
@@ -440,20 +463,20 @@ export class Settings {
 	 * Get all model roles (helper for modelRoles record).
 	 */
 	getModelRoles(): ReadOnlyDict<string> {
-		return this.get("modelRoles");
+		return { ...this.get("modelRoles") };
 	}
 
 	/*
 	 * Override model roles (helper for modelRoles record).
 	 */
 	overrideModelRoles(roles: ReadOnlyDict<string>): void {
-		const prev = this.get("modelRoles");
+		const next = shallowStringRecord(getByPath(this.#overrides, ["modelRoles"]));
 		for (const [role, modelId] of Object.entries(roles)) {
 			if (modelId) {
-				prev[role] = modelId;
+				next[role] = modelId;
 			}
 		}
-		this.override("modelRoles", prev);
+		this.override("modelRoles", next);
 	}
 
 	/**

package/src/discovery/builtin.ts

@@ -346,9 +346,39 @@ async function loadRules(ctx: LoadContext): Promise<LoadResult<Rule>> {
 		if (result.warnings) warnings.push(...result.warnings);
 	}
 
+	// Top-level RULES.md is a sticky always-apply rule. Documented in
+	// https://omp.sh/docs/context-files as the file that gets "re-injected near
+	// the current turn so they keep hold across long conversations".
+	// User scope:    ~/.omp/agent/RULES.md
+	// Project scope: nearest .omp/RULES.md walking up from cwd to repoRoot
+	const userRulesFile = path.join(ctx.home, PATHS.userAgent, "RULES.md");
+	const userRule = await loadStickyRulesFile(userRulesFile, "user");
+	if (userRule) items.push(userRule);
+
+	const nearestProjectConfigDir = await findNearestProjectConfigDir(ctx.cwd, ctx.repoRoot);
+	if (nearestProjectConfigDir) {
+		const projectRulesFile = path.join(nearestProjectConfigDir.dir, "RULES.md");
+		const projectRule = await loadStickyRulesFile(projectRulesFile, "project");
+		if (projectRule) items.push(projectRule);
+	}
+
 	return { items, warnings };
 }
 
+/**
+ * Read a top-level `RULES.md` and synthesize an always-apply rule.
+ * Returns null when the file is absent or empty so callers can short-circuit.
+ */
+async function loadStickyRulesFile(filePath: string, level: "user" | "project"): Promise<Rule | null> {
+	const content = await readFile(filePath);
+	if (!content) return null;
+	const source = createSourceMeta(PROVIDER_ID, filePath, level);
+	const rule = buildRuleFromMarkdown("RULES.md", content, filePath, source, { ruleName: "RULES" });
+	// Force alwaysApply regardless of frontmatter — the whole point of RULES.md
+	// is to be reattached every turn.
+	return { ...rule, alwaysApply: true };
+}
+
 registerProvider<Rule>(ruleCapability.id, {
 	id: PROVIDER_ID,
 	displayName: DISPLAY_NAME,

package/src/edit/renderer.ts

@@ -25,7 +25,7 @@ import {
 	truncateDiffByHunk,
 } from "../tools/render-utils";
 import { type VimRenderArgs, vimToolRenderer } from "../tools/vim";
-import { Hasher, type RenderCache, renderStatusLine, truncateToWidth } from "../tui";
+import { fileHyperlink, Hasher, type RenderCache, renderStatusLine, truncateToWidth } from "../tui";
 import type { EditMode } from "../utils/edit-mode";
 import type { VimToolDetails } from "../vim/types";
 import type { DiffError, DiffResult } from "./diff";
@@ -219,14 +219,16 @@ function formatEditPathDisplay(
 	uiTheme: Theme,
 	options?: { rename?: string; firstChangedLine?: number },
 ): string {
-	let pathDisplay = rawPath ? uiTheme.fg("accent", shortenPath(rawPath)) : uiTheme.fg("toolOutput", "…");
+	let pathDisplay = rawPath
+		? fileHyperlink(rawPath, uiTheme.fg("accent", shortenPath(rawPath)))
+		: uiTheme.fg("toolOutput", "…");
 
 	if (options?.firstChangedLine) {
 		pathDisplay += uiTheme.fg("warning", `:${options.firstChangedLine}`);
 	}
 
 	if (options?.rename) {
-		pathDisplay += ` ${uiTheme.fg("dim", "→")} ${uiTheme.fg("accent", shortenPath(options.rename))}`;
+		pathDisplay += ` ${uiTheme.fg("dim", "→")} ${fileHyperlink(options.rename, uiTheme.fg("accent", shortenPath(options.rename)))}`;
 	}
 
 	return pathDisplay;

package/src/eval/py/executor.ts

@@ -209,6 +209,15 @@ function formatTimeoutAnnotation(timeoutMs?: number): string | undefined {
 	return `Command timed out after ${secs} seconds`;
 }
 
+function formatKernelTimeoutAnnotation(timeoutMs: number | undefined, kernelKilled: boolean): string {
+	const secs = timeoutMs === undefined ? undefined : Math.max(1, Math.round(timeoutMs / 1000));
+	if (kernelKilled) {
+		return "eval cell timed out and the kernel was unresponsive to interrupt; the kernel has been killed and will be recreated on the next call.";
+	}
+	const duration = secs === undefined ? "the configured timeout" : `${secs}s`;
+	return `eval cell timed out after ${duration}; kernel interrupted but remains running. Reset the kernel via { reset: true } if state appears corrupted.`;
+}
+
 function createCancelledPythonResult(timedOut: boolean, timeoutMs?: number): PythonResult {
 	const output = timedOut ? (formatTimeoutAnnotation(timeoutMs) ?? "Command timed out") : "";
 	const outputBytes = Buffer.byteLength(output, "utf-8");
@@ -434,7 +443,9 @@ async function executeWithKernel(
 		});
 
 		if (result.cancelled) {
-			const annotation = result.timedOut ? formatTimeoutAnnotation(executionTimeoutMs) : undefined;
+			const annotation = result.timedOut
+				? formatKernelTimeoutAnnotation(executionTimeoutMs, result.kernelKilled ?? false)
+				: undefined;
 			return {
 				exitCode: undefined,
 				cancelled: true,

package/src/eval/py/kernel.ts

@@ -46,8 +46,10 @@ const STARTUP_TIMEOUT_MS = 10_000;
 // How long to wait after SIGINT for the runner to emit `done`. If the cell is
 // stuck in code that ignores Python signals (e.g. a C extension holding the
 // GIL), we escalate to a full subprocess shutdown so the host queue unblocks
-// instead of hanging the session forever.
-const INTERRUPT_ESCALATION_MS = 2_000;
+// instead of hanging the session forever. The grace window is intentionally
+// generous: a clean interrupt is far preferable to losing the persistent
+// kernel's state, so we only kill as a last-resort recovery path.
+const INTERRUPT_ESCALATION_MS = 5_000;
 
 export interface KernelExecuteOptions {
 	signal?: AbortSignal;
@@ -66,6 +68,12 @@ export interface KernelExecuteResult {
 	cancelled: boolean;
 	timedOut: boolean;
 	stdinRequested: boolean;
+	/**
+	 * True when the kernel subprocess was killed as part of settling this
+	 * execution (e.g. SIGINT was ignored and we escalated to shutdown, or the
+	 * kernel died unexpectedly). When false, the kernel remains reusable.
+	 */
+	kernelKilled?: boolean;
 }
 
 export interface KernelShutdownResult {
@@ -162,6 +170,7 @@ interface PendingExecution {
 	cancelled: boolean;
 	timedOut: boolean;
 	stdinRequested: boolean;
+	kernelKilled: boolean;
 	settled: boolean;
 	escalationTimer?: NodeJS.Timeout;
 }
@@ -222,7 +231,7 @@ export class PythonKernel {
 		kernel.#exitedPromise = proc.exited;
 		void kernel.#exitedPromise.then(code => {
 			kernel.#alive = false;
-			kernel.#abortPendingExecutions(`Python kernel exited with code ${code}`);
+			kernel.#abortPendingExecutions(`Python kernel exited with code ${code}`, { kernelKilled: true });
 		});
 
 		kernel.#startReader(proc.stdout as ReadableStream<Uint8Array>);
@@ -261,6 +270,7 @@ export class PythonKernel {
 			timedOut: false,
 			stdinRequested: false,
 			settled: false,
+			kernelKilled: false,
 		};
 		this.#pending.set(msgId, pending);
 
@@ -276,6 +286,7 @@ export class PythonKernel {
 				cancelled: pending.cancelled,
 				timedOut: pending.timedOut,
 				stdinRequested: pending.stdinRequested,
+				kernelKilled: pending.kernelKilled,
 			});
 		};
 
@@ -287,9 +298,12 @@ export class PythonKernel {
 				logger.warn("Python runner did not respond to SIGINT; terminating subprocess", {
 					kernelId: this.id,
 				});
-				// `shutdown()` aborts pending executions immediately and escalates to
-				// SIGTERM/SIGKILL, so the host queue unblocks even if the runner is
-				// stuck in a non-interruptible state.
+				// SIGINT was ignored; mark the cell as kernel-killed so callers can
+				// surface the harsher recovery message. `shutdown()` aborts pending
+				// executions immediately and escalates to SIGTERM/SIGKILL, so the
+				// host queue unblocks even if the runner is stuck in a
+				// non-interruptible state.
+				pending.kernelKilled = true;
 				void this.shutdown();
 			}, INTERRUPT_ESCALATION_MS);
 			escalation.unref?.();
@@ -363,7 +377,7 @@ export class PythonKernel {
 		if (this.#shutdownConfirmed) return { confirmed: true };
 
 		this.#alive = false;
-		this.#abortPendingExecutions("Python kernel shutdown");
+		this.#abortPendingExecutions("Python kernel shutdown", { kernelKilled: true });
 
 		const timeoutMs = options?.timeoutMs ?? SHUTDOWN_GRACE_MS;
 		const proc = this.#proc;
@@ -410,10 +424,11 @@ export class PythonKernel {
 		return { confirmed };
 	}
 
-	#abortPendingExecutions(reason: string): void {
+	#abortPendingExecutions(reason: string, options?: { kernelKilled?: boolean }): void {
 		if (this.#pending.size === 0) return;
 		const pending = Array.from(this.#pending.values());
 		this.#pending.clear();
+		const kernelKilledDefault = options?.kernelKilled ?? false;
 		for (const entry of pending) {
 			if (entry.settled) continue;
 			entry.settled = true;
@@ -425,6 +440,7 @@ export class PythonKernel {
 				stdinRequested: entry.stdinRequested,
 				executionCount: entry.executionCount,
 				error: entry.error,
+				kernelKilled: entry.kernelKilled || kernelKilledDefault,
 			});
 		}
 	}