@oh-my-pi/pi-coding-agent 3.32.0 → 3.34.0

package/CHANGELOG.md

@@ -2,7 +2,44 @@
 
 ## [Unreleased]
 
+## [3.34.0] - 2026-01-09
+
+### Added
+
+- Added caching for system environment detection to improve startup performance
+- Added disk usage information to automatic environment detection in system prompt
+- Added `compat` option for SSH hosts to wrap commands in a POSIX shell on Windows systems
+- Added automatic working directory handling for PowerShell and cmd.exe on Windows SSH hosts
+- Added automatic environment detection to system prompt including OS, distro, kernel, CPU, GPU, shell, terminal, desktop environment, and window manager information
+- Added SSH tool with project ssh.json/.ssh.json discovery, persistent connections, and optional sshfs mounts
+- Added SSH host OS/shell detection with compat mode and persistent host info cache
+
+### Changed
+
+- Changed GPU detection on Linux to prioritize discrete GPUs (NVIDIA, AMD) over integrated graphics and skip server management adapters
+- Changed SSH host info cache to use versioned format for automatic refresh on schema changes
+- Changed SSH compat shell detection to actively probe for bash/sh availability on Windows hosts
+- Changed SSH tool description to show detected shell type and available commands per host
+
+## [3.33.0] - 2026-01-08
+
+### Added
+
+- Added `env` support in `settings.json` for automatically setting environment variables on startup
+- Added environment variable management methods to SettingsManager (get/set/clear)
+
+### Fixed
+
+- Fixed bash output previews to recompute on resize, preventing TUI line width overflow crashes
+- Fixed session title generation to retry alternate smol models when the primary model errors or is rate-limited
+- Fixed file mentions to resolve extensionless paths and directories, using read tool truncation limits for injected content
+- Fixed interactive UI to show auto-read file mention indicators
+- Fixed task tool tree rendering to use consistent tree connectors for progress, findings, and results
+- Fixed last-branch tree connector symbol in the TUI
+- Fixed output tool previews to use compact JSON when outputs are formatted with leading braces
+
 ## [3.32.0] - 2026-01-08
+
 ### Added
 
 - Added progress indicator when starting LSP servers at session startup
@@ -88,6 +125,7 @@
 - Fixed byte counting in task output truncation to handle multi-byte Unicode characters correctly
 
 ## [3.30.0] - 2026-01-07
+
 ### Added
 
 - Added environment variable configuration for task limits: `OMP_TASK_MAX_PARALLEL`, `OMP_TASK_MAX_CONCURRENCY`, `OMP_TASK_MAX_OUTPUT_BYTES`, `OMP_TASK_MAX_OUTPUT_LINES`, and `OMP_TASK_MAX_AGENTS_IN_DESCRIPTION`
@@ -107,6 +145,7 @@
 - Fixed markitdown tool installation to use automatic tool installer instead of requiring manual installation
 
 ## [3.25.0] - 2026-01-07
+
 ### Added
 
 - Added `complete` tool for structured subagent output with JSON schema validation
@@ -122,6 +161,7 @@
 - Simplified worker agent system prompt to be more concise and focused
 
 ## [3.24.0] - 2026-01-07
+
 ### Added
 
 - Added `ToolSession` interface to unify tool creation with session context including cwd, UI availability, and rulebook rules
@@ -164,7 +204,7 @@
 
 ### Changed
 
-- Switched from local `@oh-my-pi/pi-ai` to upstream `@mariozechner/pi-ai` package
+- Switched from local `@oh-my-pi/pi-ai` to upstream `@oh-my-pi/pi-ai` package
 
 ### Added
 
@@ -805,7 +845,7 @@ See [docs/custom-tools.md](docs/custom-tools.md) and [examples/custom-tools/](ex
 - `AppMessage` → `AgentMessage`
 - `sessionFile` returns `string | undefined` (was `string | null`)
 - `model` returns `Model | undefined` (was `Model | null`)
-- `Attachment` type removed. Use `ImageContent` from `@mariozechner/pi-ai` instead. Add images directly to message content arrays.
+- `Attachment` type removed. Use `ImageContent` from `@oh-my-pi/pi-ai` instead. Add images directly to message content arrays.
 
 **AgentSession API:**
 
@@ -1031,7 +1071,7 @@ Total color count increased from 46 to 50. See [docs/theme.md](docs/theme.md) fo
   - `createAgentSession()` now accepts `authStorage` and `modelRegistry` options
   - Removed `configureOAuthStorage()`, `defaultGetApiKey()`, `findModel()`, `discoverAvailableModels()`
   - Removed `getApiKey` callback option (use `AuthStorage.setRuntimeApiKey()` for runtime overrides)
-  - Use `getModel()` from `@mariozechner/pi-ai` for built-in models, `modelRegistry.find()` for custom models + built-in models
+  - Use `getModel()` from `@oh-my-pi/pi-ai` for built-in models, `modelRegistry.find()` for custom models + built-in models
   - See updated [SDK documentation](docs/sdk.md) and [README](README.md)
 
 - **Settings changes**: Removed `apiKeys` from `settings.json`. Use `auth.json` instead. ([#296](https://github.com/badlogic/pi-mono/issues/296))
@@ -1334,7 +1374,7 @@ Total color count increased from 46 to 50. See [docs/theme.md](docs/theme.md) fo
   - `rpc.md`: Added missing `hook_error` event documentation
   - `README.md`: Complete settings table, condensed philosophy section, standardized OAuth docs
 
-- Hooks loader now supports same import aliases as custom tools (`@sinclair/typebox`, `@mariozechner/pi-ai`, `@oh-my-pi/pi-tui`, `@oh-my-pi/pi-coding-agent`).
+- Hooks loader now supports same import aliases as custom tools (`@sinclair/typebox`, `@oh-my-pi/pi-ai`, `@oh-my-pi/pi-tui`, `@oh-my-pi/pi-coding-agent`).
 
 ### Breaking Changes
 
@@ -1356,7 +1396,7 @@ Total color count increased from 46 to 50. See [docs/theme.md](docs/theme.md) fo
 
 - Fixed TUI performance regression caused by Box component lacking render caching. Built-in tools now use Text directly (like v0.22.5), and Box has proper caching for custom tool rendering.
 
-- Fixed custom tools failing to load from `~/.omp/agent/tools/` when omp is installed globally. Module imports (`@sinclair/typebox`, `@oh-my-pi/pi-tui`, `@mariozechner/pi-ai`) are now resolved via aliases.
+- Fixed custom tools failing to load from `~/.omp/agent/tools/` when omp is installed globally. Module imports (`@sinclair/typebox`, `@oh-my-pi/pi-tui`, `@oh-my-pi/pi-ai`) are now resolved via aliases.
 
 ## [0.23.0] - 2025-12-17
 
@@ -1396,7 +1436,7 @@ Total color count increased from 46 to 50. See [docs/theme.md](docs/theme.md) fo
 
 - **Tool output display**: When collapsed, tool output now shows the last N lines instead of the first N lines, making streaming output more useful.
 
-- Updated `@mariozechner/pi-ai` with X-Initiator header support for GitHub Copilot, ensuring agent calls are not deducted from quota. ([#200](https://github.com/badlogic/pi-mono/pull/200) by [@kim0](https://github.com/kim0))
+- Updated `@oh-my-pi/pi-ai` with X-Initiator header support for GitHub Copilot, ensuring agent calls are not deducted from quota. ([#200](https://github.com/badlogic/pi-mono/pull/200) by [@kim0](https://github.com/kim0))
 
 ### Fixed
 
@@ -1408,7 +1448,7 @@ Total color count increased from 46 to 50. See [docs/theme.md](docs/theme.md) fo
 
 ### Changed
 
-- Updated `@mariozechner/pi-ai` with interleaved thinking enabled by default for Anthropic Claude 4 models.
+- Updated `@oh-my-pi/pi-ai` with interleaved thinking enabled by default for Anthropic Claude 4 models.
 
 ## [0.22.1] - 2025-12-15
 
@@ -1416,7 +1456,7 @@ _Dedicated to Peter's shoulder ([@steipete](https://twitter.com/steipete))_
 
 ### Changed
 
-- Updated `@mariozechner/pi-ai` with interleaved thinking support for Anthropic models.
+- Updated `@oh-my-pi/pi-ai` with interleaved thinking support for Anthropic models.
 
 ## [0.22.0] - 2025-12-15
 
@@ -1914,4 +1954,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/README.md

@@ -338,10 +338,22 @@ When disabled, neither case triggers automatic compaction (use `/compact` manual
 		"enabled": true,
 		"reserveTokens": 16384,
 		"keepRecentTokens": 20000
+	},
+	"env": {
+		"ANTHROPIC_API_KEY": "sk-ant-...",
+		"OPENAI_API_KEY": "sk-proj-...",
+		"GEMINI_API_KEY": "AIzaSyD...",
+		"CUSTOM_VAR": "custom-value"
 	}
 }
 ```
 
+**Environment Variables (`env`):**
+- Automatically sets environment variables when the application starts
+- Only sets variables that aren't already present in `process.env`
+- Supports any environment variable, not just API keys
+- Order of precedence: existing env vars > settings.json env vars > auth.json env vars
+
 > **Note:** Compaction is lossy. The agent loses full conversation access afterward. Size tasks to avoid context limits when possible. For critical context, ask the agent to write a summary to a file, iterate on it until it covers everything, then start a new session with that file. The full session history is preserved in the JSONL file; use `/tree` to revisit any previous point.
 
 See [docs/compaction.md](docs/compaction.md) for how compaction works internally and how to customize it via hooks.

package/docs/custom-tools.md

@@ -94,7 +94,7 @@ Custom tools can import from these packages:
 | --------------------------- | --------------------------------------------------------- | --------------------------------------------------- |
 | `@sinclair/typebox`         | Schema definitions (`Type.Object`, `Type.String`, etc.)   | Via `pi.typebox.*` (injected)                       |
 | `@oh-my-pi/pi-coding-agent` | Types and utilities                                       | Via `pi.pi.*` (injected) or direct import for types |
-| `@mariozechner/pi-ai`       | AI utilities (`StringEnum` for Google-compatible enums)   | Via `pi.pi.*` (re-exported through coding-agent)    |
+| `@oh-my-pi/pi-ai`           | AI utilities (`StringEnum` for Google-compatible enums)   | Via `pi.pi.*` (re-exported through coding-agent)    |
 | `@oh-my-pi/pi-tui`          | TUI components (`Text`, `Box`, etc. for custom rendering) | Via `pi.pi.*` (re-exported through coding-agent)    |
 
 Node.js built-in modules (`node:fs`, `node:path`, etc.) are also available.

package/docs/extensions.md

@@ -167,7 +167,7 @@ The `package.json` approach enables:
 | --------------------------- | ------------------------------------------------------------ |
 | `@oh-my-pi/pi-coding-agent` | Extension types (`ExtensionAPI`, `ExtensionContext`, events) |
 | `@sinclair/typebox`         | Schema definitions for tool parameters                       |
-| `@mariozechner/pi-ai`       | AI utilities (`StringEnum` for Google-compatible enums)      |
+| `@oh-my-pi/pi-ai`           | AI utilities (`StringEnum` for Google-compatible enums)      |
 | `@oh-my-pi/pi-tui`          | TUI components for custom rendering                          |
 
 npm dependencies work too. Add a `package.json` next to your extension (or in a parent directory), run `npm install`, and imports from `node_modules/` are resolved automatically.
@@ -608,7 +608,7 @@ Register a custom tool callable by the LLM. See [Custom Tools](#custom-tools) fo
 
 ```typescript
 import { Type } from "@sinclair/typebox";
-import { StringEnum } from "@mariozechner/pi-ai";
+import { StringEnum } from "@oh-my-pi/pi-ai";
 
 pi.registerTool({
   name: "my_tool",
@@ -793,7 +793,7 @@ Register tools the LLM can call via `pi.registerTool()`. Tools appear in the sys
 
 ```typescript
 import { Type } from "@sinclair/typebox";
-import { StringEnum } from "@mariozechner/pi-ai";
+import { StringEnum } from "@oh-my-pi/pi-ai";
 import { Text } from "@oh-my-pi/pi-tui";
 
 pi.registerTool({
@@ -833,7 +833,7 @@ pi.registerTool({
 });
 ```
 
-**Important:** Use `StringEnum` from `@mariozechner/pi-ai` for string enums. `Type.Union`/`Type.Literal` doesn't work with Google's API.
+**Important:** Use `StringEnum` from `@oh-my-pi/pi-ai` for string enums. `Type.Union`/`Type.Literal` doesn't work with Google's API.
 
 ### Multiple Tools
 

package/docs/hooks.md

@@ -72,7 +72,7 @@ Additional paths via `settings.json`:
 | --------------------------------- | --------------------------------------------- |
 | `@oh-my-pi/pi-coding-agent/hooks` | Hook types (`HookAPI`, `HookContext`, events) |
 | `@oh-my-pi/pi-coding-agent`       | Additional types if needed                    |
-| `@mariozechner/pi-ai`             | AI utilities                                  |
+| `@oh-my-pi/pi-ai`                 | AI utilities                                  |
 | `@oh-my-pi/pi-tui`                | TUI components                                |
 
 Node.js built-ins (`node:fs`, `node:path`, etc.) are also available.
@@ -548,7 +548,7 @@ Current model, or `undefined` if none selected yet. Use for LLM calls in hooks:
 ```typescript
 if (ctx.model) {
 	const apiKey = await ctx.modelRegistry.getApiKey(ctx.model);
-	// Use with @mariozechner/pi-ai complete()
+	// Use with @oh-my-pi/pi-ai complete()
 }
 ```
 

package/docs/sdk.md

@@ -248,7 +248,7 @@ const { session } = await createAgentSession({
 ### Model
 
 ```typescript
-import { getModel } from "@mariozechner/pi-ai";
+import { getModel } from "@oh-my-pi/pi-ai";
 import { discoverAuthStorage, discoverModels } from "@oh-my-pi/pi-coding-agent";
 
 const authStorage = discoverAuthStorage();
@@ -385,11 +385,7 @@ All tools are defined in `BUILTIN_TOOLS`:
 For advanced use cases, you can create tools directly using `createTools`:
 
 ```typescript
-import {
-	BUILTIN_TOOLS,
-	createTools,
-	type ToolSession,
-} from "@oh-my-pi/pi-coding-agent";
+import { BUILTIN_TOOLS, createTools, type ToolSession } from "@oh-my-pi/pi-coding-agent";
 
 const session: ToolSession = {
 	cwd: "/path/to/project",
@@ -733,7 +729,7 @@ Project overrides global. Nested objects merge keys. Setters only modify global
 All discovery functions accept optional `cwd` and `agentDir` parameters.
 
 ```typescript
-import { getModel } from "@mariozechner/pi-ai";
+import { getModel } from "@oh-my-pi/pi-ai";
 import {
 	AuthStorage,
 	ModelRegistry,
@@ -806,7 +802,7 @@ interface CreateAgentSessionResult {
 ## Complete Example
 
 ```typescript
-import { getModel } from "@mariozechner/pi-ai";
+import { getModel } from "@oh-my-pi/pi-ai";
 import { Type } from "@sinclair/typebox";
 import {
 	AuthStorage,

package/examples/custom-tools/README.md

@@ -48,7 +48,7 @@ See [docs/custom-tools.md](../../docs/custom-tools.md) for full documentation.
 
 ```typescript
 import { Type } from "@sinclair/typebox";
-import { StringEnum } from "@mariozechner/pi-ai";
+import { StringEnum } from "@oh-my-pi/pi-ai";
 import { Text } from "@oh-my-pi/pi-tui";
 import type { CustomToolFactory } from "@oh-my-pi/pi-coding-agent";
 
@@ -99,7 +99,7 @@ renderResult(result, { expanded, isPartial }, theme) {
 **Use StringEnum for string parameters** (required for Google API compatibility):
 
 ```typescript
-import { StringEnum } from "@mariozechner/pi-ai";
+import { StringEnum } from "@oh-my-pi/pi-ai";
 
 // Good
 action: StringEnum(["list", "add"] as const);

package/examples/extensions/README.md

@@ -113,7 +113,7 @@ export default function (pi: ExtensionAPI) {
 **Use StringEnum for string parameters** (required for Google API compatibility):
 
 ```typescript
-import { StringEnum } from "@mariozechner/pi-ai";
+import { StringEnum } from "@oh-my-pi/pi-ai";
 
 // Good
 action: StringEnum(["list", "add"] as const);

package/examples/extensions/todo.ts

@@ -10,7 +10,7 @@
  * correct for that point in history.
  */
 
-import { StringEnum } from "@mariozechner/pi-ai";
+import { StringEnum } from "@oh-my-pi/pi-ai";
 import type { ExtensionAPI, ExtensionContext, Theme } from "@oh-my-pi/pi-coding-agent";
 import { matchesKey, Text, truncateToWidth } from "@oh-my-pi/pi-tui";
 import { Type } from "@sinclair/typebox";

package/examples/hooks/custom-compaction.ts

@@ -13,7 +13,7 @@
  *   omp --hook examples/hooks/custom-compaction.ts
  */
 
-import { complete, getModel } from "@mariozechner/pi-ai";
+import { complete, getModel } from "@oh-my-pi/pi-ai";
 import type { HookAPI } from "@oh-my-pi/pi-coding-agent";
 import { convertToLlm, serializeConversation } from "@oh-my-pi/pi-coding-agent";
 
@@ -42,7 +42,9 @@ export default function (pi: HookAPI) {
 		const allMessages = [...messagesToSummarize, ...turnPrefixMessages];
 
 		ctx.ui.notify(
-			`Custom compaction: summarizing ${allMessages.length} messages (${tokensBefore.toLocaleString()} tokens) with ${model.id}...`,
+			`Custom compaction: summarizing ${allMessages.length} messages (${tokensBefore.toLocaleString()} tokens) with ${
+				model.id
+			}...`,
 			"info",
 		);
 

package/examples/hooks/handoff.ts

@@ -12,7 +12,7 @@
  * The generated prompt appears as a draft in the editor for review/editing.
  */
 
-import { complete, type Message } from "@mariozechner/pi-ai";
+import { complete, type Message } from "@oh-my-pi/pi-ai";
 import type { HookAPI, SessionEntry } from "@oh-my-pi/pi-coding-agent";
 import { BorderedLoader, convertToLlm, serializeConversation } from "@oh-my-pi/pi-coding-agent";
 

package/examples/hooks/qna.ts

@@ -7,7 +7,7 @@
  * 3. Loads the result into the editor for user to fill in answers
  */
 
-import { complete, type UserMessage } from "@mariozechner/pi-ai";
+import { complete, type UserMessage } from "@oh-my-pi/pi-ai";
 import type { HookAPI } from "@oh-my-pi/pi-coding-agent";
 import { BorderedLoader } from "@oh-my-pi/pi-coding-agent";
 

package/examples/sdk/02-custom-model.ts

@@ -4,7 +4,7 @@
  * Shows how to select a specific model and thinking level.
  */
 
-import { getModel } from "@mariozechner/pi-ai";
+import { getModel } from "@oh-my-pi/pi-ai";
 import { createAgentSession, discoverAuthStorage, discoverModels } from "@oh-my-pi/pi-coding-agent";
 
 // Set up auth storage and model registry

package/examples/sdk/README.md

@@ -29,7 +29,7 @@ npx tsx examples/sdk/01-minimal.ts
 ## Quick Reference
 
 ```typescript
-import { getModel } from "@mariozechner/pi-ai";
+import { getModel } from "@oh-my-pi/pi-ai";
 import {
 	AuthStorage,
 	createAgentSession,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "3.32.0",
+	"version": "3.34.0",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"type": "module",
 	"ompConfig": {
@@ -39,10 +39,10 @@
 		"prepublishOnly": "bun run generate-template && bun run clean && bun run build"
 	},
 	"dependencies": {
-		"@mariozechner/pi-ai": "^0.37.8",
-		"@oh-my-pi/pi-agent-core": "3.32.0",
-		"@oh-my-pi/pi-git-tool": "3.32.0",
-		"@oh-my-pi/pi-tui": "3.32.0",
+		"@oh-my-pi/pi-ai": "3.34.0",
+		"@oh-my-pi/pi-agent-core": "3.34.0",
+		"@oh-my-pi/pi-git-tool": "3.34.0",
+		"@oh-my-pi/pi-tui": "3.34.0",
 		"@openai/agents": "^0.3.7",
 		"@sinclair/typebox": "^0.34.46",
 		"ajv": "^8.17.1",

package/src/capability/ssh.ts

@@ -0,0 +1,42 @@
+/**
+ * SSH Hosts Capability
+ *
+ * Canonical shape for SSH host entries, regardless of source format.
+ */
+
+import { defineCapability } from "./index";
+import type { SourceMeta } from "./types";
+
+/**
+ * Canonical SSH host entry.
+ */
+export interface SSHHost {
+	/** Host name (config key) */
+	name: string;
+	/** Host address or DNS name */
+	host: string;
+	/** Optional username override */
+	username?: string;
+	/** Optional port override */
+	port?: number;
+	/** Optional identity key path */
+	keyPath?: string;
+	/** Optional host description */
+	description?: string;
+	/** Optional compatibility mode flag */
+	compat?: boolean;
+	/** Source metadata (added by loader) */
+	_source: SourceMeta;
+}
+
+export const sshCapability = defineCapability<SSHHost>({
+	id: "ssh",
+	displayName: "SSH Hosts",
+	description: "SSH host entries for remote command execution",
+	key: (host) => host.name,
+	validate: (host) => {
+		if (!host.name) return "Missing name";
+		if (!host.host) return "Missing host";
+		return undefined;
+	},
+});

package/src/cli/file-processor.ts

@@ -4,7 +4,7 @@
 
 import { existsSync, readFileSync, statSync } from "node:fs";
 import { resolve } from "node:path";
-import type { ImageContent } from "@mariozechner/pi-ai";
+import type { ImageContent } from "@oh-my-pi/pi-ai";
 import chalk from "chalk";
 import { resolveReadPath } from "../core/tools/path-utils";
 import { formatDimensionNote, resizeImage } from "../utils/image-resize";

package/src/cli/list-models.ts

@@ -2,7 +2,7 @@
  * List available models with optional fuzzy search
  */
 
-import type { Api, Model } from "@mariozechner/pi-ai";
+import type { Api, Model } from "@oh-my-pi/pi-ai";
 import type { ModelRegistry } from "../core/model-registry";
 import { fuzzyFilter } from "../utils/fuzzy";
 

package/src/core/agent-session.ts

@@ -13,9 +13,9 @@
  * Modes use this class and add their own I/O layer on top.
  */
 
-import type { AssistantMessage, ImageContent, Message, Model, TextContent, Usage } from "@mariozechner/pi-ai";
-import { isContextOverflow, modelsAreEqual, supportsXhigh } from "@mariozechner/pi-ai";
 import type { Agent, AgentEvent, AgentMessage, AgentState, AgentTool, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
+import type { AssistantMessage, ImageContent, Message, Model, TextContent, Usage } from "@oh-my-pi/pi-ai";
+import { isContextOverflow, modelsAreEqual, supportsXhigh } from "@oh-my-pi/pi-ai";
 import type { Rule } from "../capability/rule";
 import { getAuthPath } from "../config";
 import { theme } from "../modes/interactive/theme/theme";
@@ -45,6 +45,7 @@ import type {
 } from "./extensions";
 import { extractFileMentions, generateFileMentionMessages } from "./file-mentions";
 import type { HookCommandContext } from "./hooks/types";
+import { logger } from "./logger";
 import type { BashExecutionMessage, CustomMessage } from "./messages";
 import type { ModelRegistry } from "./model-registry";
 import { parseModelString } from "./model-resolver";
@@ -52,6 +53,8 @@ import { expandPromptTemplate, type PromptTemplate, parseCommandArgs } from "./p
 import type { BranchSummaryEntry, CompactionEntry, NewSessionOptions, SessionManager } from "./session-manager";
 import type { SettingsManager, SkillsSettings } from "./settings-manager";
 import { expandSlashCommand, type FileSlashCommand } from "./slash-commands";
+import { closeAllConnections } from "./ssh/connection-manager";
+import { unmountAll } from "./ssh/sshfs-mount";
 import type { TtsrManager } from "./ttsr";
 
 /** Session-specific events that extend the core AgentEvent */
@@ -167,6 +170,15 @@ const noOpUIContext: ExtensionUIContext = {
 	},
 };
 
+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
 // ============================================================================
@@ -377,7 +389,8 @@ export class AgentSession {
 			} else if (
 				event.message.role === "user" ||
 				event.message.role === "assistant" ||
-				event.message.role === "toolResult"
+				event.message.role === "toolResult" ||
+				event.message.role === "fileMention"
 			) {
 				// Regular LLM message - persist as SessionMessageEntry
 				this.sessionManager.appendMessage(event.message);
@@ -533,6 +546,7 @@ export class AgentSession {
 	 */
 	async dispose(): Promise<void> {
 		await this.sessionManager.flush();
+		await cleanupSshResources();
 		this._disconnectFromAgent();
 		this._eventListeners = [];
 	}
@@ -2471,9 +2485,10 @@ export class AgentSession {
 	 * Emit a custom tool session event (backwards compatibility for older callers).
 	 */
 	async emitCustomToolSessionEvent(reason: "start" | "switch" | "branch" | "tree" | "shutdown"): Promise<void> {
-		if (!this._extensionRunner) return;
 		if (reason !== "shutdown") return;
-		if (!this._extensionRunner.hasHandlers("session_shutdown")) return;
-		await this._extensionRunner.emit({ type: "session_shutdown" });
+		if (this._extensionRunner?.hasHandlers("session_shutdown")) {
+			await this._extensionRunner.emit({ type: "session_shutdown" });
+		}
+		await cleanupSshResources();
 	}
 }

package/src/core/auth-storage.ts

@@ -15,7 +15,7 @@ import {
 	loginOpenAICodex,
 	type OAuthCredentials,
 	type OAuthProvider,
-} from "@mariozechner/pi-ai";
+} from "@oh-my-pi/pi-ai";
 import { logger } from "./logger";
 
 export type ApiKeyCredential = {

package/src/core/compaction/branch-summarization.ts

@@ -5,9 +5,9 @@
  * a summary of the branch being left so context isn't lost.
  */
 
-import type { Model } from "@mariozechner/pi-ai";
-import { completeSimple } from "@mariozechner/pi-ai";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
+import type { Model } from "@oh-my-pi/pi-ai";
+import { completeSimple } from "@oh-my-pi/pi-ai";
 import branchSummaryPrompt from "../../prompts/branch-summary.md" with { type: "text" };
 import branchSummaryPreamble from "../../prompts/branch-summary-preamble.md" with { type: "text" };
 import {

package/src/core/compaction/compaction.ts

@@ -5,9 +5,9 @@
  * and after compaction the session is reloaded.
  */
 
-import type { AssistantMessage, Model, Usage } from "@mariozechner/pi-ai";
-import { complete, completeSimple } from "@mariozechner/pi-ai";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
+import type { AssistantMessage, Model, Usage } from "@oh-my-pi/pi-ai";
+import { complete, completeSimple } from "@oh-my-pi/pi-ai";
 import compactionSummaryPrompt from "../../prompts/compaction-summary.md" with { type: "text" };
 import compactionTurnPrefixPrompt from "../../prompts/compaction-turn-prefix.md" with { type: "text" };
 import compactionUpdateSummaryPrompt from "../../prompts/compaction-update-summary.md" with { type: "text" };

package/src/core/compaction/utils.ts

@@ -2,8 +2,8 @@
  * Shared utilities for compaction and branch summarization.
  */
 
-import type { Message } from "@mariozechner/pi-ai";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
+import type { Message } from "@oh-my-pi/pi-ai";
 import summarizationSystemPrompt from "../../prompts/summarization-system.md" with { type: "text" };
 
 // ============================================================================

package/src/core/custom-tools/types.ts

@@ -5,8 +5,8 @@
  * They can provide custom rendering for tool calls and results in the TUI.
  */
 
-import type { Model } from "@mariozechner/pi-ai";
 import type { AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
+import type { Model } from "@oh-my-pi/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
 import type { Static, TSchema } from "@sinclair/typebox";
 import type { Theme } from "../../modes/interactive/theme/theme";

package/src/core/extensions/runner.ts

@@ -2,8 +2,8 @@
  * Extension runner - executes extensions and manages their lifecycle.
  */
 
-import type { ImageContent, Model } from "@mariozechner/pi-ai";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
+import type { ImageContent, Model } from "@oh-my-pi/pi-ai";
 import type { KeyId } from "@oh-my-pi/pi-tui";
 import { theme } from "../../modes/interactive/theme/theme";
 import type { ModelRegistry } from "../model-registry";

package/src/core/extensions/types.ts

@@ -8,8 +8,8 @@
  * - Interact with the user via UI primitives
  */
 
-import type { ImageContent, Model, TextContent, ToolResultMessage } from "@mariozechner/pi-ai";
 import type { AgentMessage, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
+import type { ImageContent, Model, TextContent, ToolResultMessage } from "@oh-my-pi/pi-ai";
 import type { Component, KeyId, TUI } from "@oh-my-pi/pi-tui";
 import type { Static, TSchema } from "@sinclair/typebox";
 import type { Theme } from "../../modes/interactive/theme/theme";

package/src/core/extensions/wrapper.ts

@@ -2,8 +2,8 @@
  * Tool wrappers for extensions.
  */
 
-import type { ImageContent, TextContent } from "@mariozechner/pi-ai";
 import type { AgentTool, AgentToolContext, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
+import type { ImageContent, TextContent } from "@oh-my-pi/pi-ai";
 import type { Theme } from "../../modes/interactive/theme/theme";
 import type { ExtensionRunner } from "./runner";
 import type { ExtensionContext, RegisteredTool, ToolCallEventResult, ToolResultEventResult } from "./types";