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

package/src/core/file-mentions.ts

@@ -9,14 +9,148 @@
 import path from "node:path";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { FileMentionMessage } from "./messages";
+import { resolveReadPath } from "./tools/path-utils";
+import { formatAge } from "./tools/render-utils";
+import { DEFAULT_MAX_BYTES, formatSize, truncateHead, truncateStringToBytesFromStart } from "./tools/truncate";
 
 /** Regex to match @filepath patterns in text */
-const FILE_MENTION_REGEX = /@((?:[^\s@]+\/)*[^\s@]+\.[a-zA-Z0-9]+)/g;
+const FILE_MENTION_REGEX = /@([^\s@]+)/g;
+const LEADING_PUNCTUATION_REGEX = /^[`"'([{<]+/;
+const TRAILING_PUNCTUATION_REGEX = /[)\]}>.,;:!?"'`]+$/;
+const MENTION_BOUNDARY_REGEX = /[\s([{<"'`]/;
+const DEFAULT_DIR_LIMIT = 500;
+
+function isMentionBoundary(text: string, index: number): boolean {
+	if (index === 0) return true;
+	return MENTION_BOUNDARY_REGEX.test(text[index - 1]);
+}
+
+function sanitizeMentionPath(rawPath: string): string | null {
+	let cleaned = rawPath.trim();
+	cleaned = cleaned.replace(LEADING_PUNCTUATION_REGEX, "");
+	cleaned = cleaned.replace(TRAILING_PUNCTUATION_REGEX, "");
+	cleaned = cleaned.trim();
+	return cleaned.length > 0 ? cleaned : null;
+}
+
+function buildTextOutput(textContent: string): { output: string; lineCount: number } {
+	const allLines = textContent.split("\n");
+	const totalFileLines = allLines.length;
+	const truncation = truncateHead(textContent);
+
+	if (truncation.firstLineExceedsLimit) {
+		const firstLine = allLines[0] ?? "";
+		const firstLineBytes = Buffer.byteLength(firstLine, "utf-8");
+		const snippet = truncateStringToBytesFromStart(firstLine, DEFAULT_MAX_BYTES);
+		let outputText = snippet.text;
+
+		if (outputText.length > 0) {
+			outputText += `\n\n[Line 1 is ${formatSize(firstLineBytes)}, exceeds ${formatSize(
+				DEFAULT_MAX_BYTES,
+			)} limit. Showing first ${formatSize(snippet.bytes)} of the line.]`;
+		} else {
+			outputText = `[Line 1 is ${formatSize(firstLineBytes)}, exceeds ${formatSize(
+				DEFAULT_MAX_BYTES,
+			)} limit. Unable to display a valid UTF-8 snippet.]`;
+		}
+
+		return { output: outputText, lineCount: totalFileLines };
+	}
+
+	let outputText = truncation.content;
+
+	if (truncation.truncated) {
+		const endLineDisplay = truncation.outputLines;
+		const nextOffset = endLineDisplay + 1;
+
+		if (truncation.truncatedBy === "lines") {
+			outputText += `\n\n[Showing lines 1-${endLineDisplay} of ${totalFileLines}. Use offset=${nextOffset} to continue]`;
+		} else {
+			outputText += `\n\n[Showing lines 1-${endLineDisplay} of ${totalFileLines} (${formatSize(
+				DEFAULT_MAX_BYTES,
+			)} limit). Use offset=${nextOffset} to continue]`;
+		}
+	}
+
+	return { output: outputText, lineCount: totalFileLines };
+}
+
+async function buildDirectoryListing(absolutePath: string): Promise<{ output: string; lineCount: number }> {
+	let entries: string[];
+	try {
+		entries = await Array.fromAsync(new Bun.Glob("*").scan({ cwd: absolutePath, dot: true, onlyFiles: false }));
+	} catch {
+		return { output: "(empty directory)", lineCount: 1 };
+	}
+
+	entries.sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()));
+
+	const results: string[] = [];
+	let entryLimitReached = false;
+
+	for (const entry of entries) {
+		if (results.length >= DEFAULT_DIR_LIMIT) {
+			entryLimitReached = true;
+			break;
+		}
+
+		const fullPath = path.join(absolutePath, entry);
+		let suffix = "";
+		let age = "";
+
+		try {
+			const stat = await Bun.file(fullPath).stat();
+			if (stat.isDirectory()) {
+				suffix = "/";
+			}
+			const ageSeconds = Math.floor((Date.now() - stat.mtimeMs) / 1000);
+			age = formatAge(ageSeconds);
+		} catch {
+			continue;
+		}
+
+		const line = age ? `${entry}${suffix} (${age})` : `${entry}${suffix}`;
+		results.push(line);
+	}
+
+	if (results.length === 0) {
+		return { output: "(empty directory)", lineCount: 1 };
+	}
+
+	const rawOutput = results.join("\n");
+	const truncation = truncateHead(rawOutput, { maxLines: Number.MAX_SAFE_INTEGER });
+	let output = truncation.content;
+
+	const notices: string[] = [];
+	if (entryLimitReached) {
+		notices.push(`${DEFAULT_DIR_LIMIT} entries limit reached. Use limit=${DEFAULT_DIR_LIMIT * 2} for more`);
+	}
+	if (truncation.truncated) {
+		notices.push(`${formatSize(DEFAULT_MAX_BYTES)} limit reached`);
+	}
+	if (notices.length > 0) {
+		output += `\n\n[${notices.join(". ")}]`;
+	}
+
+	return { output, lineCount: output.split("\n").length };
+}
 
 /** Extract all @filepath mentions from text */
 export function extractFileMentions(text: string): string[] {
 	const matches = [...text.matchAll(FILE_MENTION_REGEX)];
-	return [...new Set(matches.map((m) => m[1]))];
+	const mentions: string[] = [];
+
+	for (const match of matches) {
+		const index = match.index ?? 0;
+		if (!isMentionBoundary(text, index)) continue;
+
+		const cleaned = sanitizeMentionPath(match[1]);
+		if (!cleaned) continue;
+
+		mentions.push(cleaned);
+	}
+
+	return [...new Set(mentions)];
 }
 
 /**
@@ -29,11 +163,19 @@ export async function generateFileMentionMessages(filePaths: string[], cwd: stri
 	const files: FileMentionMessage["files"] = [];
 
 	for (const filePath of filePaths) {
+		const absolutePath = resolveReadPath(filePath, cwd);
+
 		try {
-			const absolutePath = path.resolve(cwd, filePath);
+			const stat = await Bun.file(absolutePath).stat();
+			if (stat.isDirectory()) {
+				const { output, lineCount } = await buildDirectoryListing(absolutePath);
+				files.push({ path: filePath, content: output, lineCount });
+				continue;
+			}
+
 			const content = await Bun.file(absolutePath).text();
-			const lineCount = content.split("\n").length;
-			files.push({ path: filePath, content, lineCount });
+			const { output, lineCount } = buildTextOutput(content);
+			files.push({ path: filePath, content: output, lineCount });
 		} catch {
 			// File doesn't exist or isn't readable - skip silently
 		}

package/src/core/hooks/runner.ts

@@ -2,8 +2,8 @@
  * Hook runner - executes hooks and manages their lifecycle.
  */
 
-import type { Model } from "@mariozechner/pi-ai";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
+import type { Model } from "@oh-my-pi/pi-ai";
 import { theme } from "../../modes/interactive/theme/theme";
 import type { ModelRegistry } from "../model-registry";
 import type { SessionManager } from "../session-manager";
@@ -400,7 +400,7 @@ export class HookRunner {
 	 */
 	async emitBeforeAgentStart(
 		prompt: string,
-		images?: import("@mariozechner/pi-ai").ImageContent[],
+		images?: import("@oh-my-pi/pi-ai").ImageContent[],
 	): Promise<BeforeAgentStartEventResult | undefined> {
 		const ctx = this.createContext();
 		let result: BeforeAgentStartEventResult | undefined;

package/src/core/hooks/types.ts

@@ -5,8 +5,8 @@
  * and interact with the user via UI primitives.
  */
 
-import type { ImageContent, Message, Model, TextContent, ToolResultMessage } from "@mariozechner/pi-ai";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
+import type { ImageContent, Message, Model, TextContent, ToolResultMessage } from "@oh-my-pi/pi-ai";
 import type { Component, TUI } from "@oh-my-pi/pi-tui";
 import type { Theme } from "../../modes/interactive/theme/theme";
 import type { CompactionPreparation, CompactionResult } from "../compaction/index";

package/src/core/index.ts

@@ -38,5 +38,16 @@ export {
 	type MCPToolsLoadResult,
 	type MCPTransport,
 } from "./mcp/index";
+export {
+	buildRemoteCommand,
+	closeAllConnections,
+	closeConnection,
+	ensureConnection,
+	getControlDir,
+	getControlPathTemplate,
+	type SSHConnectionTarget,
+} from "./ssh/connection-manager";
+export { executeSSH, type SSHExecutorOptions, type SSHResult } from "./ssh/ssh-executor";
+export { hasSshfs, isMounted, mountRemote, unmountAll, unmountRemote } from "./ssh/sshfs-mount";
 
 export * as utils from "./utils";

package/src/core/messages.ts

@@ -5,8 +5,8 @@
  * and provides a transformer to convert them to LLM-compatible messages.
  */
 
-import type { ImageContent, Message, TextContent } from "@mariozechner/pi-ai";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
+import type { ImageContent, Message, TextContent } from "@oh-my-pi/pi-ai";
 
 export const COMPACTION_SUMMARY_PREFIX = `The conversation history before this point was compacted into the following summary:
 

package/src/core/model-registry.ts

@@ -11,7 +11,7 @@ import {
 	type KnownProvider,
 	type Model,
 	normalizeDomain,
-} from "@mariozechner/pi-ai";
+} from "@oh-my-pi/pi-ai";
 import { type Static, Type } from "@sinclair/typebox";
 import AjvModule from "ajv";
 import type { AuthStorage } from "./auth-storage";

package/src/core/model-resolver.ts

@@ -2,8 +2,8 @@
  * Model resolution, scoping, and initial selection
  */
 
-import { type Api, type KnownProvider, type Model, modelsAreEqual } from "@mariozechner/pi-ai";
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
+import { type Api, type KnownProvider, type Model, modelsAreEqual } from "@oh-my-pi/pi-ai";
 import chalk from "chalk";
 import { minimatch } from "minimatch";
 import { isValidThinkingLevel } from "../cli/args";
@@ -25,6 +25,7 @@ export const defaultModelPerProvider: Record<KnownProvider, string> = {
 	cerebras: "zai-glm-4.6",
 	zai: "glm-4.6",
 	mistral: "devstral-medium-latest",
+	opencode: "claude-sonnet-4-5",
 };
 
 export interface ScopedModel {
@@ -33,7 +34,7 @@ export interface ScopedModel {
 }
 
 /** Priority chain for auto-discovering smol/fast models */
-export const SMOL_MODEL_PRIORITY = ["claude-haiku-4-5", "haiku", "flash", "mini"];
+export const SMOL_MODEL_PRIORITY = ["cerebras/zai-glm-4.6", "claude-haiku-4-5", "haiku", "flash", "mini"];
 
 /** Priority chain for auto-discovering slow/comprehensive models (reasoning, codex) */
 export const SLOW_MODEL_PRIORITY = ["gpt-5.2-codex", "gpt-5.2", "codex", "gpt", "opus", "pro"];
@@ -443,12 +444,16 @@ export async function findSmolModel(
 
 	// 2. Try priority chain
 	for (const pattern of SMOL_MODEL_PRIORITY) {
+		// Try exact match with provider prefix
+		const providerMatch = availableModels.find((m) => `${m.provider}/${m.id}`.toLowerCase() === pattern);
+		if (providerMatch) return providerMatch;
+
 		// Try exact match first
-		const exactMatch = availableModels.find((m) => m.id.toLowerCase() === pattern.toLowerCase());
+		const exactMatch = availableModels.find((m) => m.id.toLowerCase() === pattern);
 		if (exactMatch) return exactMatch;
 
 		// Try fuzzy match (substring)
-		const fuzzyMatch = availableModels.find((m) => m.id.toLowerCase().includes(pattern.toLowerCase()));
+		const fuzzyMatch = availableModels.find((m) => m.id.toLowerCase().includes(pattern));
 		if (fuzzyMatch) return fuzzyMatch;
 	}
 

package/src/core/sdk.ts

@@ -27,8 +27,8 @@
  */
 
 import { join } from "node:path";
-import type { Model } from "@mariozechner/pi-ai";
 import { Agent, type AgentTool, type ThinkingLevel } 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 chalk from "chalk";
 // Import discovery to register all providers on startup
@@ -37,6 +37,7 @@ import { loadSync as loadCapability } from "../capability/index";
 import { type Rule, ruleCapability } from "../capability/rule";
 import { getAgentDir, getConfigDirPaths } from "../config";
 import { initializeWithSettings } from "../discovery";
+import { registerAsyncCleanup } from "../modes/cleanup";
 import { AgentSession } from "./agent-session";
 import { AuthStorage } from "./auth-storage";
 import {
@@ -67,6 +68,8 @@ import { SessionManager } from "./session-manager";
 import { type Settings, SettingsManager, type SkillsSettings } from "./settings-manager";
 import { loadSkills as loadSkillsInternal, type Skill } from "./skills";
 import { type FileSlashCommand, loadSlashCommands as loadSlashCommandsInternal } from "./slash-commands";
+import { closeAllConnections } from "./ssh/connection-manager";
+import { unmountAll } from "./ssh/sshfs-mount";
 import {
 	buildSystemPrompt as buildSystemPromptInternal,
 	loadProjectContextFiles as loadContextFilesInternal,
@@ -83,6 +86,7 @@ import {
 	createGrepTool,
 	createLsTool,
 	createReadTool,
+	createSshTool,
 	createTools,
 	createWriteTool,
 	filterRulebookRules,
@@ -204,6 +208,7 @@ export {
 	// Individual tool factories (for custom usage)
 	createReadTool,
 	createBashTool,
+	createSshTool,
 	createEditTool,
 	createWriteTool,
 	createGrepTool,
@@ -399,6 +404,23 @@ function isCustomTool(tool: CustomTool | ToolDefinition): tool is CustomTool {
 
 const TOOL_DEFINITION_MARKER = Symbol("__isToolDefinition");
 
+let sshCleanupRegistered = false;
+
+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) });
+		}
+	}
+}
+
+function registerSshCleanup(): void {
+	if (sshCleanupRegistered) return;
+	sshCleanupRegistered = true;
+	registerAsyncCleanup(() => cleanupSshResources());
+}
+
 function customToolToDefinition(tool: CustomTool): ToolDefinition {
 	const definition: ToolDefinition & { [TOOL_DEFINITION_MARKER]: true } = {
 		name: tool.name,
@@ -471,7 +493,7 @@ function createCustomToolsExtension(tools: CustomTool[]): ExtensionFactory {
  * const { session } = await createAgentSession();
  *
  * // With explicit model
- * import { getModel } from '@mariozechner/pi-ai';
+ * import { getModel } from '@oh-my-pi/pi-ai';
  * const { session } = await createAgentSession({
  *   model: getModel('anthropic', 'claude-opus-4-5'),
  *   thinkingLevel: 'high',
@@ -498,6 +520,8 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	const agentDir = options.agentDir ?? getDefaultAgentDir();
 	const eventBus = options.eventBus ?? createEventBus();
 
+	registerSshCleanup();
+
 	// Use provided or create AuthStorage and ModelRegistry
 	const authStorage = options.authStorage ?? (await discoverAuthStorage(agentDir));
 	const modelRegistry = options.modelRegistry ?? (await discoverModels(authStorage, agentDir));

package/src/core/session-manager.ts

@@ -1,6 +1,6 @@
 import { basename, join, resolve } from "node:path";
-import type { ImageContent, Message, TextContent, Usage } from "@mariozechner/pi-ai";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
+import type { ImageContent, Message, TextContent, Usage } from "@oh-my-pi/pi-ai";
 import { nanoid } from "nanoid";
 import { getAgentDir as getDefaultAgentDir } from "../config";
 import { resizeImage } from "../utils/image-resize";
@@ -11,6 +11,7 @@ import {
 	createBranchSummaryMessage,
 	createCompactionSummaryMessage,
 	createCustomMessage,
+	type FileMentionMessage,
 	type HookMessage,
 } from "./messages";
 import type { SessionStorage, SessionStorageWriter } from "./session-storage";
@@ -1179,7 +1180,7 @@ export class SessionManager {
 	 * so it is easier to find them.
 	 * These need to be appended via appendCompaction() and appendBranchSummary() methods.
 	 */
-	appendMessage(message: Message | CustomMessage | HookMessage | BashExecutionMessage): string {
+	appendMessage(message: Message | CustomMessage | HookMessage | BashExecutionMessage | FileMentionMessage): string {
 		const entry: SessionMessageEntry = {
 			type: "message",
 			id: generateId(this.byId),

package/src/core/settings-manager.ts

@@ -179,6 +179,8 @@ export interface Settings {
 	shellPath?: string; // Custom shell path (e.g., for Cygwin users on Windows)
 	collapseChangelog?: boolean; // Show condensed changelog after update (use /changelog for full)
 	doubleEscapeAction?: "branch" | "tree"; // Action for double-escape with empty editor (default: "tree")
+	/** Environment variables to set automatically on startup */
+	env?: Record<string, string>;
 	extensions?: string[]; // Array of extension file paths
 	skills?: SkillsSettings;
 	commands?: CommandsSettings;
@@ -379,6 +381,29 @@ export class SettingsManager {
 		this.globalSettings = initialSettings;
 		const projectSettings = this.loadProjectSettings();
 		this.settings = normalizeSettings(deepMergeSettings(this.globalSettings, projectSettings));
+
+		// Apply environment variables from settings
+		this.applyEnvironmentVariables();
+	}
+
+	/**
+	 * Apply environment variables from settings to process.env
+	 * Only sets variables that are not already set in the environment
+	 */
+	applyEnvironmentVariables(): void {
+		const envVars = this.settings.env;
+		if (!envVars || typeof envVars !== "object") {
+			return;
+		}
+
+		for (const [key, value] of Object.entries(envVars)) {
+			if (typeof key === "string" && typeof value === "string") {
+				// Only set if not already present in environment (allow override with env vars)
+				if (!(key in process.env)) {
+					process.env[key] = value;
+				}
+			}
+		}
 	}
 
 	/** Create a SettingsManager that loads from files */
@@ -1169,4 +1194,49 @@ export class SettingsManager {
 		this.globalSettings.doubleEscapeAction = action;
 		this.save();
 	}
+
+	/**
+	 * Get environment variables from settings
+	 */
+	getEnvironmentVariables(): Record<string, string> {
+		return { ...(this.settings.env ?? {}) };
+	}
+
+	/**
+	 * Set environment variables in settings (not process.env)
+	 * This will be applied on next startup or reload
+	 */
+	setEnvironmentVariables(envVars: Record<string, string>): void {
+		this.globalSettings.env = { ...envVars };
+		this.save();
+	}
+
+	/**
+	 * Clear all environment variables from settings
+	 */
+	clearEnvironmentVariables(): void {
+		delete this.globalSettings.env;
+		this.save();
+	}
+
+	/**
+	 * Set a single environment variable in settings
+	 */
+	setEnvironmentVariable(key: string, value: string): void {
+		if (!this.globalSettings.env) {
+			this.globalSettings.env = {};
+		}
+		this.globalSettings.env[key] = value;
+		this.save();
+	}
+
+	/**
+	 * Remove a single environment variable from settings
+	 */
+	removeEnvironmentVariable(key: string): void {
+		if (this.globalSettings.env) {
+			delete this.globalSettings.env[key];
+			this.save();
+		}
+	}
 }