@oh-my-pi/pi-coding-agent 13.2.0 → 13.2.1

package/src/prompts/tools/browser.md

@@ -1,6 +1,4 @@
-# Browser
-
-Navigate, click, type, scroll, drag, query DOM content, and capture screenshots.
+Navigates, clicks, types, scrolls, drags, queries DOM content, and captures screenshots.
 
 <instruction>
 - `"open"` starts a headless session (or implicitly on first action); `"goto"` navigates to `url`; `"close"` releases the browser
@@ -15,10 +13,10 @@ Navigate, click, type, scroll, drag, query DOM content, and capture screenshots.
 </instruction>
 
 <critical>
-**You MUST default to `observe`, not `screenshot`.**
+**You **MUST** default to `observe`, not `screenshot`.**
 - `observe` is cheaper, faster, and returns structured data — use it to understand page state, find elements, and plan interactions.
-- You SHOULD only use `screenshot` when visual appearance matters (verifying layout, debugging CSS, capturing a visual artifact for the user).
-- You MUST NOT screenshot just to "see what's on the page" — `observe` gives you that with element IDs you can act on immediately.
+- You **SHOULD** only use `screenshot` when visual appearance matters (verifying layout, debugging CSS, capturing a visual artifact for the user).
+- You **MUST NOT** screenshot just to "see what's on the page" — `observe` gives you that with element IDs you can act on immediately.
 </critical>
 
 <output>

package/src/prompts/tools/calculator.md

@@ -1,6 +1,4 @@
-# Calculator
-
-Basic calculations.
+Performs basic calculations.
 
 <instruction>
 - Supports +, -, *, /, %, ** and parentheses

package/src/prompts/tools/cancel-job.md

@@ -1,7 +1,5 @@
-# Cancel Job
-
 Cancels a running background job started via async tool execution.
 
-You SHOULD use this when a background `bash` or `task` job is no longer needed or is stuck.
+You **SHOULD** use this when a background `bash` or `task` job is no longer needed or is stuck.
 
-You MAY inspect jobs first with `read jobs://` or `read jobs://<job-id>`.
+You **MAY** inspect jobs first with `read jobs://` or `read jobs://<job-id>`.

package/src/prompts/tools/exit-plan-mode.md

@@ -8,9 +8,9 @@ Use when:
 </conditions>
 
 <instruction>
-- You MUST write plan to plan file BEFORE calling this tool
+- You **MUST** write plan to plan file BEFORE calling this tool
 - Tool reads plan from file—does not take plan content as parameter
-- You MUST provide a `title` argument for the final plan artifact (example: `WP_MIGRATION_PLAN`)
+- You **MUST** provide a `title` argument for the final plan artifact (example: `WP_MIGRATION_PLAN`)
 - `.md` is optional in `title`; it is appended automatically when omitted
 - User sees plan contents when reviewing
 </instruction>
@@ -30,12 +30,12 @@ Unsure about auth method (OAuth vs JWT).
 </example>
 
 <avoid>
-- MUST NOT call before plan is written to file
-- MUST NOT omit `title`
-- MUST NOT use `ask` to request plan approval (this tool does that)
-- MUST NOT call after pure research tasks (no implementation planned)
+- **MUST NOT** call before plan is written to file
+- **MUST NOT** omit `title`
+- **MUST NOT** use `ask` to request plan approval (this tool does that)
+- **MUST NOT** call after pure research tasks (no implementation planned)
 </avoid>
 
 <critical>
-You MUST only use when planning implementation steps. Research tasks (searching, reading, understanding) do not need this tool.
+You **MUST** only use when planning implementation steps. Research tasks (searching, reading, understanding) do not need this tool.
 </critical>

package/src/prompts/tools/fetch.md

@@ -1,5 +1,3 @@
-# Fetch
-
 Retrieves content from a URL and returns it in a clean, readable format.
 
 <instruction>

package/src/prompts/tools/find.md

@@ -1,12 +1,10 @@
-# Find
-
-Fast file pattern matching that works with any codebase size.
+Finds files using fast pattern matching that works with any codebase size.
 
 <instruction>
 - Pattern includes the search path: `src/**/*.ts`, `lib/*.json`, `**/*.md`
 - Simple patterns like `*.ts` automatically search recursively from cwd
 - Includes hidden files by default (use `hidden: false` to exclude)
-- You SHOULD perform multiple searches in parallel when potentially useful
+- You **SHOULD** perform multiple searches in parallel when potentially useful
 </instruction>
 
 <output>
@@ -23,5 +21,5 @@ Matching file paths sorted by modification time (most recent first). Truncated a
 </example>
 
 <avoid>
-For open-ended searches requiring multiple rounds of globbing and grepping, you MUST use Task tool instead.
+For open-ended searches requiring multiple rounds of globbing and grepping, you **MUST** use Task tool instead.
 </avoid>

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

@@ -1,23 +1,7 @@
-# Gemini Image
+Generates or edits images using Gemini image models.
 
-Generate or edit images using Gemini image models.
-
-<instruction>
-You SHOULD provide structured parameters for best results. Tool assembles into optimized prompt.
-
-When using multiple `input_images`, you MUST describe each image's role in `subject` or `scene` field:
-- "Use Image 1 for the character's face and outfit, Image 2 for the pose, Image 3 for the background environment"
-- "Match the color palette from Image 1, apply the lighting style from Image 2"
-</instruction>
-
-<output>
-Returns generated image saved to disk. Response includes file path where image was written.
-</output>
-
-<caution>
-- For photoreal: you SHOULD add "ultra-detailed, realistic, natural skin texture" to style
-- For posters/cards: you SHOULD use 9:16 aspect ratio with negative space for text placement
-- For iteration: you SHOULD use `changes` for targeted adjustments rather than regenerating from scratch
-- For text: you SHOULD add "sharp, legible, correctly spelled" for important text; keep text short
-- For diagrams: you SHOULD include "scientifically accurate" in style and provide facts explicitly
-</caution>
+<instructions>
+- You **MUST** provide a single detailed `subject` prompt for image generation or editing.
+- When using multiple `input`, you **SHOULD** describe each image's role directly in `subject`, e.g. `Image 1` for composition reference, `Image 2` for lighting reference, `Image 3` for background.
+- For text: you **SHOULD** add "sharp, legible, correctly spelled" for important text; keep text short
+</instructions>

package/src/prompts/tools/grep.md

@@ -1,6 +1,4 @@
-# Grep
-
-Powerful search tool built on ripgrep.
+Searches files using powerful regex matching built on ripgrep.
 
 <instruction>
 - Supports full regex syntax (e.g., `log.*Error`, `function\\s+\\w+`); literal braces need escaping (`interface\\{\\}` for `interface{}` in Go)
@@ -20,7 +18,7 @@ Powerful search tool built on ripgrep.
 </output>
 
 <critical>
-- You MUST use Grep when searching for content.
-- You MUST NOT invoke `grep` or `rg` via Bash.
-- If the search is open-ended, requiring multiple rounds, you MUST use Task tool with explore subagent instead.
+- You **MUST** use Grep when searching for content.
+- You **MUST NOT** invoke `grep` or `rg` via Bash.
+- If the search is open-ended, requiring multiple rounds, you **MUST** use Task tool with explore subagent instead.
 </critical>

package/src/prompts/tools/hashline.md

@@ -1,11 +1,9 @@
-# Edit
-
-Apply precise file edits using `LINE#ID` tags from `read` output.
+Applies precise file edits using `LINE#ID` tags from `read` output.
 
 <workflow>
-1. You SHOULD issue a `read` call before editing if you have no tagged context for a file.
-2. You MUST pick the smallest operation per change site.
-3. You MUST submit one `edit` call per file with all operations, think your changes through before submitting.
+1. You **SHOULD** issue a `read` call before editing if you have no tagged context for a file.
+2. You **MUST** pick the smallest operation per change site.
+3. You **MUST** submit one `edit` call per file with all operations, think your changes through before submitting.
 </workflow>
 
 <operations>
@@ -40,16 +38,14 @@ Every edit has `op`, `pos`, and `lines`. Range replaces also have `end`. Both `p
 </operations>
 
 <rules>
-1. **Minimize scope:** You MUST use one logical mutation per operation.
-2. **No no-ops:** replacement MUST differ from current.
-3. **Prefer insertion over neighbor rewrites:** You SHOULD anchor on structural boundaries (`}`, `]`, `},`), not interior lines.
-4. **For swaps/moves:** You SHOULD prefer one range op over multiple single-line ops.
-5. **Range end tag:** When replacing a block (e.g., an `if` body), the `end` tag MUST include the block's closing brace/bracket — not just the last interior line. Verify the `end` tag covers all lines being logically removed, including trailing `}`, `]`, or `)`. An off-by-one on `end` orphans a brace and breaks syntax.
+1. **Minimize scope:** You **MUST** use one logical mutation per operation.
+2. **Prefer insertion over neighbor rewrites:** You **SHOULD** anchor on structural boundaries (`}`, `]`, `},`), not interior lines.
+3. **Range end tag:** When replacing a block (e.g., an `if` body), the `end` tag **MUST** include the block's closing brace/bracket — not just the last interior line. Verify the `end` tag covers all lines being logically removed, including trailing `}`, `]`, or `)`. An off-by-one on `end` orphans a brace and breaks syntax.
 </rules>
 
 <recovery>
-**Tag mismatch (`>>>`):** You MUST retry using fresh tags from the error snippet. Re-read only if snippet lacks context.
-**No-op (`identical`):** You MUST NOT resubmit. Re-read target lines and adjust the edit.
+**Tag mismatch (`>>>`):** You **MUST** retry using fresh tags from the error snippet. If snippet lacks context, or if you repeatedly fail, you **MUST** re-read the file and issue less ambitious edits, i.e. single op.
+**No-op (`identical`):** You **MUST NOT** resubmit. Re-read target lines and adjust the edit.
 </recovery>
 
 <example name="single-line replace">
@@ -186,6 +182,7 @@ Good — anchors to structural line:
 
 <critical>
 - Edit payload: `{ path, edits[] }`. Each entry: `op`, `lines`, optional `pos`/`end`. No extra keys.
-- Every tag MUST be copied exactly from fresh tool result as `N#ID`.
-- You MUST re-read after each edit call before issuing another on same file.
+- Every tag **MUST** be copied exactly from fresh tool result as `N#ID`.
+- You **MUST** re-read after each edit call before issuing another on same file.
+- Formatting is a batch operation. You **MUST** never use this tool for formatting.
 </critical>

package/src/prompts/tools/lsp.md

@@ -1,6 +1,4 @@
-# LSP
-
-Interact with Language Server Protocol servers for code intelligence.
+Interacts with Language Server Protocol servers for code intelligence.
 
 <operations>
 - `definition`: Go to symbol definition → file path + position

package/src/prompts/tools/patch.md

@@ -1,6 +1,4 @@
-# Edit (Patch)
-
-Patch operations on file given diff. Primary tool for existing-file edits.
+Patches files given diff hunks. Primary tool for existing-file edits.
 
 <instruction>
 **Hunk Headers:**
@@ -43,12 +41,12 @@ Returns success/failure; on failure, error message indicates:
 </output>
 
 <critical>
-- You MUST read the target file before editing
-- You MUST copy anchors and context lines verbatim (including whitespace)
-- You MUST NOT use anchors as comments (no line numbers, location labels, placeholders like `@@ @@`)
-- You MUST NOT place new lines outside the intended block
-- If edit fails or breaks structure, you MUST re-read the file and produce a new patch from current content — you MUST NOT retry the same diff
-- **NEVER** use edit to fix indentation, whitespace, or reformat code. Formatting is a single command run once at the end (`bun fmt`, `cargo fmt`, `prettier --write`, etc.)—not N individual edits. If you see inconsistent indentation after an edit, leave it; the formatter will fix all of it in one pass.
+- You **MUST** read the target file before editing
+- You **MUST** copy anchors and context lines verbatim (including whitespace)
+- You **MUST NOT** use anchors as comments (no line numbers, location labels, placeholders like `@@ @@`)
+- You **MUST NOT** place new lines outside the intended block
+- If edit fails or breaks structure, you **MUST** re-read the file and produce a new patch from current content — you **MUST NOT** retry the same diff
+- **NEVER** use edit to fix indentation, whitespace, or reformat code. Formatting is a single command run once at the end (`bun fmt`, `cargo fmt`, `prettier —write`, etc.)—not N individual edits. If you see inconsistent indentation after an edit, leave it; the formatter will fix all of it in one pass.
 </critical>
 
 <example name="create">

package/src/prompts/tools/python.md

@@ -1,23 +1,21 @@
-# Python
-
 Runs Python cells sequentially in persistent IPython kernel.
 
 <instruction>
 Kernel persists across calls and cells; **imports, variables, and functions survive—use this.**
 **Work incrementally:**
-- You SHOULD use one logical step per cell (imports, define function, test it, use it)
-- You SHOULD pass multiple small cells in one call
-- You SHOULD define small functions you can reuse and debug individually
-- You MUST put explanations in assistant message or cell title, MUST NOT put them in code
+- You **SHOULD** use one logical step per cell (imports, define function, test it, use it)
+- You **SHOULD** pass multiple small cells in one call
+- You **SHOULD** define small functions you can reuse and debug individually
+- You **MUST** put explanations in assistant message or cell title, **MUST NOT** put them in code
 **When something fails:**
 - Errors tell you which cell failed (e.g., "Cell 3 failed")
-- You SHOULD resubmit only the fixed cell (or fixed cell + remaining cells)
+- You **SHOULD** resubmit only the fixed cell (or fixed cell + remaining cells)
 </instruction>
 
+{{#if categories.length}}
 <prelude>
 All helpers auto-print results and return values for chaining.
 
-{{#if categories.length}}
 {{#each categories}}
 ### {{name}}
 
@@ -28,10 +26,8 @@ All helpers auto-print results and return values for chaining.
 {{/each}}
 ```
 {{/each}}
-{{else}}
-(Documentation unavailable — Python kernel failed to start)
-{{/if}}
 </prelude>
+{{/if}}
 
 <output>
 User sees output like Jupyter notebook; rich displays render fully:
@@ -39,16 +35,16 @@ User sees output like Jupyter notebook; rich displays render fully:
 - `display(HTML(…))` → rendered HTML
 - `display(Markdown(…))` → formatted markdown
 - `plt.show()` → inline figures
-  **You will see object repr** (e.g., `<IPython.core.display.JSON object>`). Trust `display()`; you MUST NOT assume user sees only repr.
+  **You will see object repr** (e.g., `<IPython.core.display.JSON object>`). Trust `display()`; you **MUST NOT** assume user sees only repr.
 </output>
 
 <caution>
 - Per-call mode uses fresh kernel each call
-- You MUST use `reset: true` to clear state when session mode active
+- You **MUST** use `reset: true` to clear state when session mode active
 </caution>
 
 <critical>
-- You MUST use `run()` for shell commands; you MUST NOT use raw `subprocess`
+- You **MUST** use `run()` for shell commands; you **MUST NOT** use raw `subprocess`
 </critical>
 
 <example name="good">

package/src/prompts/tools/read.md

@@ -1,5 +1,3 @@
-# Read
-
 Reads files from local filesystem or internal URLs.
 
 <instruction>

package/src/prompts/tools/replace.md

@@ -1,12 +1,10 @@
-# Edit (Replace)
-
-String replacements in files with fuzzy whitespace matching.
+Performs string replacements in files with fuzzy whitespace matching.
 
 <instruction>
-- You MUST use the smallest edit that uniquely identifies the change
-- If `old_text` not unique, you MUST expand to include more context or use `all: true` to replace all occurrences
+- You **MUST** use the smallest edit that uniquely identifies the change
+- If `old_text` not unique, you **MUST** expand to include more context or use `all: true` to replace all occurrences
 - Fuzzy matching handles minor whitespace/indentation differences automatically
-- You SHOULD prefer editing existing files over creating new ones
+- You **SHOULD** prefer editing existing files over creating new ones
 </instruction>
 
 <output>
@@ -14,7 +12,7 @@ Returns success/failure status. On success, file modified in place with replacem
 </output>
 
 <critical>
-- You MUST read the file at least once in the conversation before editing. Tool errors if you attempt edit without reading file first.
+- You **MUST** read the file at least once in the conversation before editing. Tool errors if you attempt edit without reading file first.
 </critical>
 
 <bash-alternatives>

package/src/prompts/tools/ssh.md

@@ -1,9 +1,7 @@
-# SSH
-
-Run commands on remote hosts.
+Runs commands on remote hosts.
 
 <instruction>
-You MUST build commands from the reference below
+You **MUST** build commands from the reference below
 </instruction>
 
 <commands>
@@ -24,7 +22,7 @@ You MUST build commands from the reference below
 </commands>
 
 <critical>
-You MUST verify the shell type from "Available hosts" and use matching commands.
+You **MUST** verify the shell type from "Available hosts" and use matching commands.
 </critical>
 
 <example name="linux">

package/src/prompts/tools/task.md

@@ -1,13 +1,11 @@
-# Task
-
 Launches subagents to parallelize workflows.
 
 {{#if asyncEnabled}}
 - Use `read jobs://` to inspect state; `read jobs://<job_id>` for detail.
-- Use the `await` tool to wait until completion. You MUST NOT poll `read jobs://` in a loop.
+- Use the `await` tool to wait until completion. You **MUST NOT** poll `read jobs://` in a loop.
 {{/if}}
 
-Subagents lack your conversation history. Every decision, file content, and user requirement they need MUST be explicit in `context` or `assignment`.
+Subagents lack your conversation history. Every decision, file content, and user requirement they need **MUST** be explicit in `context` or `assignment`.
 
 <parameters>
 - `agent`: Agent type for all tasks.
@@ -16,15 +14,15 @@ Subagents lack your conversation history. Every decision, file content, and user
   - `.assignment`: Complete self-contained instructions. One-liners PROHIBITED; missing acceptance criteria = too vague.
   - `.skills`: Skill names to preload
 - `context`: Shared background prepended to every assignment. Session-specific info only.
-- `schema`: JTD schema for expected output. Format lives here — MUST NOT be duplicated in assignments.
+- `schema`: JTD schema for expected output. Format lives here — **MUST NOT** be duplicated in assignments.
 - `tasks`: Tasks to execute in parallel.
 - `isolated`: Run in isolated git worktree; returns patches. Use when tasks edit overlapping files.
 </parameters>
 
 <critical>
-- MUST NOT include AGENTS.md rules, coding conventions, or style guidelines — subagents already have them.
-- MUST NOT duplicate shared constraints across assignments — put them in `context` once.
-- MUST NOT tell tasks to run project-wide build/test/lint. Parallel agents share the working tree; each task edits, stops. Caller verifies after all complete.
+- **MUST NOT** include AGENTS.md rules, coding conventions, or style guidelines — subagents already have them.
+- **MUST NOT** duplicate shared constraints across assignments — put them in `context` once.
+- **MUST NOT** tell tasks to run project-wide build/test/lint. Parallel agents share the working tree; each task edits, stops. Caller verifies after all complete.
 - For large payloads (traces, JSON blobs), write to `local://<path>` and pass the path in context.
 - If scope is unclear, run a **Discovery task** first to enumerate files and callsites, then fan out.
 </critical>

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

@@ -1,14 +1,12 @@
-# Todo Write
-
-Manage a phased task list. Submit an `ops` array — each op mutates state incrementally.
+Manages a phased task list. Submit an `ops` array — each op mutates state incrementally.
 **Primary op: `update`.** Use it to mark tasks `in_progress` or `completed`. Only reach for other ops when the structure itself needs to change.
 
 <critical>
-You MUST call this tool twice per task:
+You **MUST** call this tool twice per task:
 1. Before beginning — `{op: "update", id: "task-N", status: "in_progress"}`
 2. Immediately after finishing — `{op: "update", id: "task-N", status: "completed"}`
 
-You MUST keep exactly one task `in_progress` at all times. Mark `completed` immediately — no batching.
+You **MUST** keep exactly one task `in_progress` at all times. Mark `completed` immediately — no batching.
 </critical>
 
 <conditions>
@@ -40,10 +38,10 @@ Create a todo list when:
 |`abandoned`|Dropped intentionally|
 
 ## Rules
-- You MUST mark `in_progress` **before** starting work, not after
-- You MUST mark `completed` **immediately** — never defer
-- You MUST keep exactly **one** task `in_progress`
-- You MUST complete phases in order — do not mark later tasks `completed` while earlier ones are `pending`
+- You **MUST** mark `in_progress` **before** starting work, not after
+- You **MUST** mark `completed` **immediately** — never defer
+- You **MUST** keep exactly **one** task `in_progress`
+- You **MUST** complete phases in order — do not mark later tasks `completed` while earlier ones are `pending`
 - On blockers: keep `in_progress`, add a new task describing the blocker
 - Multiple ops can be batched in one call (e.g., complete current + start next)
 </protocol>

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

@@ -1,10 +1,8 @@
-# Web Search
-
-Search the web for up-to-date information beyond Claude's knowledge cutoff.
+Searches the web for up-to-date information beyond Claude's knowledge cutoff.
 
 <instruction>
-- You SHOULD prefer primary sources (papers, official docs) and corroborate key claims with multiple sources
-- You MUST include links for cited sources in the final response
+- You **SHOULD** prefer primary sources (papers, official docs) and corroborate key claims with multiple sources
+- You **MUST** include links for cited sources in the final response
 </instruction>
 
 <caution>

package/src/prompts/tools/write.md

@@ -1,5 +1,3 @@
-# Write
-
 Creates or overwrites file at specified path.
 
 <conditions>
@@ -8,7 +6,7 @@ Creates or overwrites file at specified path.
 </conditions>
 
 <critical>
-- You SHOULD use Edit tool for modifying existing files (more precise, preserves formatting)
-- You MUST NOT create documentation files (*.md, README) unless explicitly requested
-- You MUST NOT use emojis unless requested
+- You **SHOULD** use Edit tool for modifying existing files (more precise, preserves formatting)
+- You **MUST NOT** create documentation files (*.md, README) unless explicitly requested
+- You **MUST NOT** use emojis unless requested
 </critical>

package/src/sdk.ts

@@ -9,8 +9,7 @@ import {
 import { type Message, type Model, supportsXhigh } from "@oh-my-pi/pi-ai";
 import { prewarmOpenAICodexResponses } from "@oh-my-pi/pi-ai/providers/openai-codex-responses";
 import type { Component } from "@oh-my-pi/pi-tui";
-import { $env, logger, postmortem } from "@oh-my-pi/pi-utils";
-import { getAgentDbPath, getAgentDir, getProjectDir } from "@oh-my-pi/pi-utils/dirs";
+import { $env, getAgentDbPath, getAgentDir, getProjectDir, logger, postmortem } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
 import { AsyncJobManager } from "./async";
 import { loadCapability } from "./capability";

package/src/session/agent-session.ts

@@ -23,6 +23,7 @@ import {
 	type AgentMessage,
 	type AgentState,
 	type AgentTool,
+	INTENT_FIELD,
 	type ThinkingLevel,
 } from "@oh-my-pi/pi-agent-core";
 import type {
@@ -38,8 +39,7 @@ import type {
 	UsageReport,
 } from "@oh-my-pi/pi-ai";
 import { isContextOverflow, modelsAreEqual, supportsXhigh } from "@oh-my-pi/pi-ai";
-import { abortableSleep, isEnoent, logger } from "@oh-my-pi/pi-utils";
-import { getAgentDbPath } from "@oh-my-pi/pi-utils/dirs";
+import { abortableSleep, getAgentDbPath, isEnoent, logger } from "@oh-my-pi/pi-utils";
 import type { AsyncJob, AsyncJobManager } from "../async";
 import type { Rule } from "../capability/rule";
 import { MODEL_ROLE_IDS, type ModelRegistry, type ModelRole } from "../config/model-registry";
@@ -84,8 +84,6 @@ import planModeActivePrompt from "../prompts/system/plan-mode-active.md" with {
 import planModeReferencePrompt from "../prompts/system/plan-mode-reference.md" with { type: "text" };
 import ttsrInterruptTemplate from "../prompts/system/ttsr-interrupt.md" with { type: "text" };
 import type { SecretObfuscator } from "../secrets/obfuscator";
-import { closeAllConnections } from "../ssh/connection-manager";
-import { unmountAll } from "../ssh/sshfs-mount";
 import { outputMeta } from "../tools/output-meta";
 import { resolveToCwd } from "../tools/path-utils";
 import { getLatestTodoPhasesFromEntries, type TodoItem, type TodoPhase } from "../tools/todo-write";
@@ -273,15 +271,6 @@ const noOpUIContext: ExtensionUIContext = {
 	setToolsExpanded: () => {},
 };
 
-async function cleanupSshResources(): Promise<void> {
-	const results = await Promise.allSettled([closeAllConnections(), unmountAll()]);
-	for (const result of results) {
-		if (result.status === "rejected") {
-			logger.warn("SSH cleanup failed", { error: String(result.reason) });
-		}
-	}
-}
-
 // ============================================================================
 // AgentSession Class
 // ============================================================================
@@ -1275,13 +1264,19 @@ export class AgentSession {
 	 * Call this when completely done with the session.
 	 */
 	async dispose(): Promise<void> {
+		try {
+			if (this.#extensionRunner?.hasHandlers("session_shutdown")) {
+				await this.#extensionRunner.emit({ type: "session_shutdown" });
+			}
+		} catch (error) {
+			logger.warn("Failed to emit session_shutdown event", { error: String(error) });
+		}
 		const drained = await this.#asyncJobManager?.dispose({ timeoutMs: 3_000 });
 		const deliveryState = this.#asyncJobManager?.getDeliveryState();
 		if (drained === false && deliveryState) {
 			logger.warn("Async job completion deliveries still pending during dispose", { ...deliveryState });
 		}
 		await this.sessionManager.flush();
-		await cleanupSshResources();
 		for (const state of this.#providerSessionState.values()) {
 			state.close();
 		}
@@ -4615,7 +4610,7 @@ Be thorough - include exact file paths, function names, error messages, and tech
 		function formatArgsAsXml(args: Record<string, unknown>, indent = "\t"): string {
 			const parts: string[] = [];
 			for (const [key, value] of Object.entries(args)) {
-				if (key === "agent__intent") continue;
+				if (key === INTENT_FIELD) continue;
 				const text = typeof value === "string" ? value : JSON.stringify(value);
 				parts.push(`${indent}<parameter name="${key}">${text}</parameter>`);
 			}
@@ -4861,15 +4856,4 @@ Be thorough - include exact file paths, function names, error messages, and tech
 	get extensionRunner(): ExtensionRunner | undefined {
 		return this.#extensionRunner;
 	}
-
-	/**
-	 * Emit a custom tool session event (backwards compatibility for older callers).
-	 */
-	async emitCustomToolSessionEvent(reason: "start" | "switch" | "branch" | "tree" | "shutdown"): Promise<void> {
-		if (reason !== "shutdown") return;
-		if (this.#extensionRunner?.hasHandlers("session_shutdown")) {
-			await this.#extensionRunner.emit({ type: "session_shutdown" });
-		}
-		await cleanupSshResources();
-	}
 }

package/src/session/agent-storage.ts

@@ -2,8 +2,7 @@ import { Database, type Statement } from "bun:sqlite";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { type AuthCredential, AuthCredentialStore, type StoredAuthCredential } from "@oh-my-pi/pi-ai";
-import { isRecord, logger } from "@oh-my-pi/pi-utils";
-import { getAgentDbPath } from "@oh-my-pi/pi-utils/dirs";
+import { getAgentDbPath, isRecord, logger } from "@oh-my-pi/pi-utils";
 import type { RawSettings as Settings } from "../config/settings";
 
 /** Row shape for settings table queries */

package/src/session/history-storage.ts

@@ -1,8 +1,7 @@
 import { Database, type Statement } from "bun:sqlite";
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { logger } from "@oh-my-pi/pi-utils";
-import { getAgentDir } from "@oh-my-pi/pi-utils/dirs";
+import { getAgentDir, logger } from "@oh-my-pi/pi-utils";
 
 export interface HistoryEntry {
 	id: number;

package/src/session/session-manager.ts

@@ -4,8 +4,16 @@ import * as path from "node:path";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent, Message, TextContent, Usage } from "@oh-my-pi/pi-ai";
 import { getTerminalId } from "@oh-my-pi/pi-tui";
-import { isEnoent, logger, parseJsonlLenient, Snowflake, toError } from "@oh-my-pi/pi-utils";
-import { getBlobsDir, getAgentDir as getDefaultAgentDir, getProjectDir } from "@oh-my-pi/pi-utils/dirs";
+import {
+	getBlobsDir,
+	getAgentDir as getDefaultAgentDir,
+	getProjectDir,
+	isEnoent,
+	logger,
+	parseJsonlLenient,
+	Snowflake,
+	toError,
+} from "@oh-my-pi/pi-utils";
 import { ArtifactManager } from "./artifacts";
 import { type BlobPutResult, BlobStore, externalizeImageData, isBlobRef, resolveImageData } from "./blob-store";
 import {

package/src/ssh/connection-manager.ts

@@ -1,7 +1,6 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { isEnoent, logger } from "@oh-my-pi/pi-utils";
-import { getRemoteHostDir, getSshControlDir } from "@oh-my-pi/pi-utils/dirs";
+import { getRemoteHostDir, getSshControlDir, isEnoent, logger, postmortem } from "@oh-my-pi/pi-utils";
 import { $ } from "bun";
 import { buildSshTarget, sanitizeHostName } from "./utils";
 
@@ -69,6 +68,7 @@ async function validateKeyPermissions(keyPath?: string): Promise<void> {
 
 function buildCommonArgs(host: SSHConnectionTarget): string[] {
 	const args = [
+		"-n",
 		"-o",
 		"ControlMaster=auto",
 		"-o",
@@ -362,6 +362,8 @@ export async function buildRemoteCommand(host: SSHConnectionTarget, command: str
 	return [...buildCommonArgs(host), buildSshTarget(host.username, host.host), command];
 }
 
+let registered = false;
+
 export async function ensureConnection(host: SSHConnectionTarget): Promise<void> {
 	const key = host.name;
 	const pending = pendingConnections.get(key);
@@ -375,6 +377,13 @@ export async function ensureConnection(host: SSHConnectionTarget): Promise<void>
 		ensureControlDir();
 		await validateKeyPermissions(host.keyPath);
 
+		if (!registered) {
+			registered = true;
+			postmortem.register("ssh-cleanup", async () => {
+				await closeAllConnections();
+			});
+		}
+
 		const target = buildSshTarget(host.username, host.host);
 		const check = await runSshSync(["-O", "check", ...buildCommonArgs(host), target]);
 		if (check.exitCode === 0) {