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

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/slash-commands/builtin-registry.ts

@@ -259,7 +259,32 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<BuiltinSlashCommandSpec> = [
 	{
 		name: "login",
 		description: "Login with OAuth provider",
-		handle: (_command, runtime) => {
+		inlineHint: "[redirect URL]",
+		allowArgs: true,
+		handle: (command, runtime) => {
+			const manualInput = runtime.ctx.oauthManualInput;
+			const args = command.args.trim();
+			if (args.length > 0) {
+				const submitted = manualInput.submit(args);
+				if (submitted) {
+					runtime.ctx.showStatus("OAuth callback received; completing login…");
+				} else {
+					runtime.ctx.showWarning("No OAuth login is waiting for a manual callback.");
+				}
+				runtime.ctx.editor.setText("");
+				return;
+			}
+
+			if (manualInput.hasPending()) {
+				const provider = manualInput.pendingProviderId;
+				const message = provider
+					? `OAuth login already in progress for ${provider}. Paste the redirect URL with /login <url>.`
+					: "OAuth login already in progress. Paste the redirect URL with /login <url>.";
+				runtime.ctx.showWarning(message);
+				runtime.ctx.editor.setText("");
+				return;
+			}
+
 			void runtime.ctx.showOAuthSelector("login");
 			runtime.ctx.editor.setText("");
 		},

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) {

package/src/ssh/sshfs-mount.ts

@@ -1,6 +1,6 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { getRemoteDir } from "@oh-my-pi/pi-utils/dirs";
+import { getRemoteDir, postmortem } from "@oh-my-pi/pi-utils";
 import { $ } from "bun";
 import { getControlDir, getControlPathTemplate, type SSHConnectionTarget } from "./connection-manager";
 import { buildSshTarget, sanitizeHostName } from "./utils";
@@ -83,6 +83,8 @@ export async function isMounted(path: string): Promise<boolean> {
 	return result.exitCode === 0;
 }
 
+let registered = false;
+
 export async function mountRemote(host: SSHConnectionTarget, remotePath = "/"): Promise<string | undefined> {
 	if (!hasSshfs()) return undefined;
 
@@ -90,6 +92,10 @@ export async function mountRemote(host: SSHConnectionTarget, remotePath = "/"):
 	await Promise.all([ensureDir(REMOTE_DIR), ensureDir(CONTROL_DIR), ensureDir(mountPath)]);
 
 	if (await isMounted(mountPath)) {
+		if (!registered) {
+			registered = true;
+			postmortem.register("sshfs-cleanup", unmountAll);
+		}
 		mountedPaths.add(mountPath);
 		return mountPath;
 	}

package/src/system-prompt.ts

@@ -5,8 +5,7 @@
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { $env, hasFsCode, isEnoent, logger } from "@oh-my-pi/pi-utils";
-import { getGpuCachePath, getProjectDir } from "@oh-my-pi/pi-utils/dirs";
+import { $env, getGpuCachePath, getProjectDir, hasFsCode, isEnoent, logger } from "@oh-my-pi/pi-utils";
 import { $ } from "bun";
 import { contextFileCapability } from "./capability/context-file";
 import { systemPromptCapability } from "./capability/system-prompt";
@@ -16,7 +15,6 @@ import { type ContextFile, loadCapability, type SystemPrompt as SystemPromptFile
 import { loadSkills, type Skill } from "./extensibility/skills";
 import customSystemPromptTemplate from "./prompts/system/custom-system-prompt.md" with { type: "text" };
 import systemPromptTemplate from "./prompts/system/system-prompt.md" with { type: "text" };
-import type { ToolName } from "./tools";
 
 type PreloadedSkill = { name: string; content: string };
 
@@ -206,65 +204,6 @@ function getTerminalName(): string | undefined {
 	return term ?? undefined;
 }
 
-function normalizeDesktopValue(value: string): string | undefined {
-	const trimmed = value.trim();
-	if (!trimmed) return undefined;
-	const parts = trimmed
-		.split(":")
-		.map(part => part.trim())
-		.filter(Boolean);
-	return parts[0] ?? trimmed;
-}
-
-function getDesktopEnvironment(): string | undefined {
-	if (Bun.env.KDE_FULL_SESSION === "true") return "KDE";
-	const raw = firstNonEmpty(
-		Bun.env.XDG_CURRENT_DESKTOP,
-		Bun.env.DESKTOP_SESSION,
-		Bun.env.XDG_SESSION_DESKTOP,
-		Bun.env.GDMSESSION,
-	);
-	return raw ? normalizeDesktopValue(raw) : undefined;
-}
-
-function matchKnownWindowManager(value: string): string | null {
-	const normalized = value.toLowerCase();
-	const candidates = [
-		"sway",
-		"i3",
-		"i3wm",
-		"bspwm",
-		"openbox",
-		"awesome",
-		"herbstluftwm",
-		"fluxbox",
-		"icewm",
-		"dwm",
-		"hyprland",
-		"wayfire",
-		"river",
-		"labwc",
-		"qtile",
-	];
-	for (const candidate of candidates) {
-		if (normalized.includes(candidate)) return candidate;
-	}
-	return null;
-}
-
-function getWindowManager(): string | undefined {
-	const explicit = firstNonEmpty(Bun.env.WINDOWMANAGER);
-	if (explicit) return explicit;
-
-	const desktop = firstNonEmpty(Bun.env.XDG_CURRENT_DESKTOP, Bun.env.DESKTOP_SESSION);
-	if (desktop) {
-		const matched = matchKnownWindowManager(desktop);
-		if (matched) return matched;
-	}
-
-	return undefined;
-}
-
 /** Cached system info structure */
 interface GpuCache {
 	gpu: string;
@@ -308,13 +247,11 @@ async function getEnvironmentInfo(): Promise<Array<{ label: string; value: strin
 		{ label: "Distro", value: os.type() },
 		{ label: "Kernel", value: os.version() },
 		{ label: "Arch", value: os.arch() },
-		{ label: "CPU", value: `${cpus.length}x ${cpus[0]?.model}` },
+		{ label: "CPU", value: `${cpus[0]?.model}` },
 		{ label: "GPU", value: gpu },
 		{ label: "Terminal", value: getTerminalName() },
-		{ label: "DE", value: getDesktopEnvironment() },
-		{ label: "WM", value: getWindowManager() },
 	];
-	return entries.filter((e): e is { label: string; value: string } => e.value != null && e.value !== "unknown");
+	return entries.filter((e): e is { label: string; value: string } => !!e.value);
 }
 
 /** Resolve input as file path or literal string */
@@ -421,6 +358,8 @@ export interface BuildSystemPromptOptions {
 	rules?: Array<{ name: string; description?: string; path: string; globs?: string[] }>;
 	/** Intent field name injected into every tool schema. If set, explains the field in the prompt. */
 	intentField?: string;
+	/** Encourage the agent to delegate via tasks unless changes are trivial. */
+	eagerTasks?: boolean;
 }
 
 /** Build the system prompt with tools, guidelines, and context */
@@ -435,13 +374,14 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		appendSystemPrompt,
 		repeatToolDescriptions = false,
 		skillsSettings,
-		toolNames,
+		toolNames: providedToolNames,
 		cwd,
 		contextFiles: providedContextFiles,
 		skills: providedSkills,
 		preloadedSkills: providedPreloadedSkills,
 		rules,
 		intentField,
+		eagerTasks = false,
 	} = options;
 	const resolvedCwd = cwd ?? getProjectDir();
 	const preloadedSkills = providedPreloadedSkills;
@@ -554,25 +494,24 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		timeZoneName: "short",
 	});
 
-	// Build tool descriptions array
-	// Priority: toolNames (explicit list) > tools (Map) > defaults
+	// Build tool metadata for system prompt rendering
+	// Priority: explicit list > tools map > defaults
 	// Default includes both bash and python; actual availability determined by settings in createTools
-	const defaultToolNames: ToolName[] = ["read", "bash", "python", "edit", "write"];
-	let toolNamesArray: string[];
-	if (toolNames !== undefined) {
-		// Explicit toolNames list provided (could be empty)
-		toolNamesArray = toolNames;
-	} else if (tools !== undefined) {
-		// Tools map provided
-		toolNamesArray = Array.from(tools.keys());
-	} else {
-		// Use defaults
-		toolNamesArray = defaultToolNames;
+	let toolNames = providedToolNames;
+	if (!toolNames) {
+		if (tools) {
+			// Tools map provided
+			toolNames = Array.from(tools.keys());
+		} else {
+			// Use defaults
+			toolNames = ["read", "bash", "python", "edit", "write"]; // TODO: Why?
+		}
 	}
 
 	// Build tool descriptions for system prompt rendering
-	const toolDescriptions = toolNamesArray.map(name => ({
+	const toolInfo = toolNames.map(name => ({
 		name,
+		label: tools?.get(name)?.label ?? "",
 		description: tools?.get(name)?.description ?? "",
 	}));
 
@@ -580,29 +519,15 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 	const hasRead = tools?.has("read");
 	const filteredSkills = preloadedSkills === undefined && hasRead ? skills : [];
 
-	if (resolvedCustomPrompt) {
-		return renderPromptTemplate(customSystemPromptTemplate, {
-			systemPromptCustomization: systemPromptCustomization ?? "",
-			customPrompt: resolvedCustomPrompt,
-			appendPrompt: resolvedAppendPrompt ?? "",
-			contextFiles,
-			agentsMdSearch,
-			skills: filteredSkills,
-			preloadedSkills: preloadedSkillContents,
-			rules: rules ?? [],
-			date,
-			dateTime,
-			cwd: resolvedCwd,
-		});
-	}
-
 	const environment = await logger.timeAsync("getEnvironmentInfo", getEnvironmentInfo);
-	return renderPromptTemplate(systemPromptTemplate, {
-		tools: toolNamesArray,
-		toolDescriptions,
+	const data = {
+		systemPromptCustomization: systemPromptCustomization ?? "",
+		customPrompt: resolvedCustomPrompt,
+		appendPrompt: resolvedAppendPrompt ?? "",
+		tools: toolNames,
+		toolInfo,
 		repeatToolDescriptions,
 		environment,
-		systemPromptCustomization: systemPromptCustomization ?? "",
 		contextFiles,
 		agentsMdSearch,
 		skills: filteredSkills,
@@ -611,8 +536,9 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		date,
 		dateTime,
 		cwd: resolvedCwd,
-		appendSystemPrompt: resolvedAppendPrompt ?? "",
 		intentTracing: !!intentField,
 		intentField: intentField ?? "",
-	});
+		eagerTasks,
+	};
+	return renderPromptTemplate(resolvedCustomPrompt ? customSystemPromptTemplate : systemPromptTemplate, data);
 }

package/src/task/agents.ts

@@ -108,7 +108,7 @@ export function parseAgent(
 	});
 	const fields = parseAgentFields(frontmatter);
 	if (!fields) {
-		throw new AgentParsingError(new Error("Invalid agent fields"), filePath);
+		throw new AgentParsingError(new Error(`Invalid agent field: ${filePath}\n${content}`), filePath);
 	}
 	return {
 		...fields,