@oh-my-pi/pi-coding-agent 11.0.3 → 11.2.0

package/src/session/agent-session.ts

@@ -329,6 +329,7 @@ export class AgentSession {
 	private _streamingEditAbortTriggered = false;
 	private _streamingEditCheckedLineCounts = new Map<string, number>();
 	private _streamingEditFileCache = new Map<string, string>();
+	private _promptInFlight = false;
 
 	constructor(config: AgentSessionConfig) {
 		this.agent = config.agent;
@@ -693,7 +694,11 @@ export class AgentSession {
 			.map(line => line.slice(1));
 		if (removedLines.length > 0) {
 			const resolvedPath = resolveToCwd(path, this.sessionManager.getCwd());
-			const cachedContent = this._streamingEditFileCache.get(resolvedPath);
+			let cachedContent = this._streamingEditFileCache.get(resolvedPath);
+			if (cachedContent === undefined) {
+				this._ensureFileCache(resolvedPath);
+				cachedContent = this._streamingEditFileCache.get(resolvedPath);
+			}
 			if (cachedContent !== undefined) {
 				const missing = removedLines.find(line => !cachedContent.includes(normalizeToLF(line)));
 				if (missing) {
@@ -898,7 +903,7 @@ export class AgentSession {
 
 	/** Whether agent is currently streaming a response */
 	get isStreaming(): boolean {
-		return this.agent.state.isStreaming;
+		return this.agent.state.isStreaming || this._promptInFlight;
 	}
 
 	/** Current retry attempt (0 if not retrying) */
@@ -1014,6 +1019,23 @@ export class AgentSession {
 		this._planReferenceSent = true;
 	}
 
+	/**
+	 * Inject the plan mode context message into the conversation history.
+	 */
+	async sendPlanModeContext(options?: { deliverAs?: "steer" | "followUp" | "nextTurn" }): Promise<void> {
+		const message = await this._buildPlanModeMessage();
+		if (!message) return;
+		await this.sendCustomMessage(
+			{
+				customType: message.customType,
+				content: message.content,
+				display: message.display,
+				details: message.details,
+			},
+			options ? { deliverAs: options.deliverAs } : undefined,
+		);
+	}
+
 	resolveRoleModel(role: ModelRole): Model | undefined {
 		return this._resolveRoleModel(role, this._modelRegistry.getAvailable(), this.model);
 	}
@@ -1229,93 +1251,100 @@ export class AgentSession {
 		expandedText: string,
 		options?: Pick<PromptOptions, "toolChoice" | "images">,
 	): Promise<void> {
-		// Flush any pending bash messages before the new prompt
-		this._flushPendingBashMessages();
-		this._flushPendingPythonMessages();
+		this._promptInFlight = true;
+		try {
+			// Flush any pending bash messages before the new prompt
+			this._flushPendingBashMessages();
+			this._flushPendingPythonMessages();
 
-		// Reset todo reminder count on new user prompt
-		this._todoReminderCount = 0;
+			// Reset todo reminder count on new user prompt
+			this._todoReminderCount = 0;
 
-		// Validate model
-		if (!this.model) {
-			throw new Error(
-				"No model selected.\n\n" +
-					`Use /login, set an API key environment variable, or create ${getAgentDbPath()}\n\n` +
-					"Then use /model to select a model.",
-			);
-		}
+			// Validate model
+			if (!this.model) {
+				throw new Error(
+					"No model selected.\n\n" +
+						`Use /login, set an API key environment variable, or create ${getAgentDbPath()}\n\n` +
+						"Then use /model to select a model.",
+				);
+			}
 
-		// Validate API key
-		const apiKey = await this._modelRegistry.getApiKey(this.model, this.sessionId);
-		if (!apiKey) {
-			throw new Error(
-				`No API key found for ${this.model.provider}.\n\n` +
-					`Use /login, set an API key environment variable, or create ${getAgentDbPath()}`,
-			);
-		}
+			// Validate API key
+			const apiKey = await this._modelRegistry.getApiKey(this.model, this.sessionId);
+			if (!apiKey) {
+				throw new Error(
+					`No API key found for ${this.model.provider}.\n\n` +
+						`Use /login, set an API key environment variable, or create ${getAgentDbPath()}`,
+				);
+			}
 
-		// Check if we need to compact before sending (catches aborted responses)
-		const lastAssistant = this._findLastAssistantMessage();
-		if (lastAssistant) {
-			await this._checkCompaction(lastAssistant, false);
-		}
+			// Check if we need to compact before sending (catches aborted responses)
+			const lastAssistant = this._findLastAssistantMessage();
+			if (lastAssistant) {
+				await this._checkCompaction(lastAssistant, false);
+			}
 
-		// Build messages array (custom messages if any, then user message)
-		const messages: AgentMessage[] = [];
-		const planReferenceMessage = await this._buildPlanReferenceMessage?.();
-		if (planReferenceMessage) {
-			messages.push(planReferenceMessage);
-		}
-		const planModeMessage = await this._buildPlanModeMessage();
-		if (planModeMessage) {
-			messages.push(planModeMessage);
-		}
+			// Build messages array (custom messages if any, then user message)
+			const messages: AgentMessage[] = [];
+			const planReferenceMessage = await this._buildPlanReferenceMessage?.();
+			if (planReferenceMessage) {
+				messages.push(planReferenceMessage);
+			}
+			const planModeMessage = await this._buildPlanModeMessage();
+			if (planModeMessage) {
+				messages.push(planModeMessage);
+			}
 
-		messages.push(message);
+			messages.push(message);
 
-		// Inject any pending "nextTurn" messages as context alongside the user message
-		for (const msg of this._pendingNextTurnMessages) {
-			messages.push(msg);
-		}
-		this._pendingNextTurnMessages = [];
+			// Inject any pending "nextTurn" messages as context alongside the user message
+			for (const msg of this._pendingNextTurnMessages) {
+				messages.push(msg);
+			}
+			this._pendingNextTurnMessages = [];
 
-		// Auto-read @filepath mentions
-		const fileMentions = extractFileMentions(expandedText);
-		if (fileMentions.length > 0) {
-			const fileMentionMessages = await generateFileMentionMessages(fileMentions, this.sessionManager.getCwd());
-			messages.push(...fileMentionMessages);
-		}
+			// Auto-read @filepath mentions
+			const fileMentions = extractFileMentions(expandedText);
+			if (fileMentions.length > 0) {
+				const fileMentionMessages = await generateFileMentionMessages(fileMentions, this.sessionManager.getCwd(), {
+					autoResizeImages: this.settings.get("images.autoResize"),
+				});
+				messages.push(...fileMentionMessages);
+			}
 
-		// Emit before_agent_start extension event
-		if (this._extensionRunner) {
-			const result = await this._extensionRunner.emitBeforeAgentStart(
-				expandedText,
-				options?.images,
-				this._baseSystemPrompt,
-			);
-			if (result?.messages) {
-				for (const msg of result.messages) {
-					messages.push({
-						role: "custom",
-						customType: msg.customType,
-						content: msg.content,
-						display: msg.display,
-						details: msg.details,
-						timestamp: Date.now(),
-					});
+			// Emit before_agent_start extension event
+			if (this._extensionRunner) {
+				const result = await this._extensionRunner.emitBeforeAgentStart(
+					expandedText,
+					options?.images,
+					this._baseSystemPrompt,
+				);
+				if (result?.messages) {
+					for (const msg of result.messages) {
+						messages.push({
+							role: "custom",
+							customType: msg.customType,
+							content: msg.content,
+							display: msg.display,
+							details: msg.details,
+							timestamp: Date.now(),
+						});
+					}
 				}
-			}
 
-			if (result?.systemPrompt !== undefined) {
-				this.agent.setSystemPrompt(result.systemPrompt);
-			} else {
-				this.agent.setSystemPrompt(this._baseSystemPrompt);
+				if (result?.systemPrompt !== undefined) {
+					this.agent.setSystemPrompt(result.systemPrompt);
+				} else {
+					this.agent.setSystemPrompt(this._baseSystemPrompt);
+				}
 			}
-		}
 
-		const agentPromptOptions = options?.toolChoice ? { toolChoice: options.toolChoice } : undefined;
-		await this.agent.prompt(messages, agentPromptOptions);
-		await this.waitForRetry();
+			const agentPromptOptions = options?.toolChoice ? { toolChoice: options.toolChoice } : undefined;
+			await this.agent.prompt(messages, agentPromptOptions);
+			await this.waitForRetry();
+		} finally {
+			this._promptInFlight = false;
+		}
 	}
 
 	/**
@@ -1811,7 +1840,7 @@ export class AgentSession {
 		this.settings.setModelRole(role, `${model.provider}/${model.id}`);
 		this.settings.getStorage()?.recordModelUsage(`${model.provider}/${model.id}`);
 
-		// Re-clamp thinking level for new model's capabilities
+		// Re-clamp thinking level for new model's capabilities without persisting settings
 		this.setThinkingLevel(this.thinkingLevel);
 	}
 
@@ -1830,7 +1859,7 @@ export class AgentSession {
 		this.sessionManager.appendModelChange(`${model.provider}/${model.id}`, "temporary");
 		this.settings.getStorage()?.recordModelUsage(`${model.provider}/${model.id}`);
 
-		// Re-clamp thinking level for new model's capabilities
+		// Re-clamp thinking level for new model's capabilities without persisting settings
 		this.setThinkingLevel(this.thinkingLevel);
 	}
 
@@ -1956,7 +1985,7 @@ export class AgentSession {
 		this.settings.setModelRole("default", `${nextModel.provider}/${nextModel.id}`);
 		this.settings.getStorage()?.recordModelUsage(`${nextModel.provider}/${nextModel.id}`);
 
-		// Re-clamp thinking level for new model's capabilities
+		// Re-clamp thinking level for new model's capabilities without persisting settings
 		this.setThinkingLevel(this.thinkingLevel);
 
 		return { model: nextModel, thinkingLevel: this.thinkingLevel, isScoped: false };
@@ -1978,12 +2007,12 @@ export class AgentSession {
 	 * Clamps to model capabilities based on available thinking levels.
 	 * Saves to session, with optional persistence to settings.
 	 */
-	setThinkingLevel(level: ThinkingLevel, options?: { persist?: boolean }): void {
+	setThinkingLevel(level: ThinkingLevel, persist: boolean = false): void {
 		const availableLevels = this.getAvailableThinkingLevels();
 		const effectiveLevel = availableLevels.includes(level) ? level : this._clampThinkingLevel(level, availableLevels);
 		this.agent.setThinkingLevel(effectiveLevel);
 		this.sessionManager.appendThinkingLevelChange(effectiveLevel);
-		if (options?.persist !== false) {
+		if (persist) {
 			this.settings.set("defaultThinkingLevel", effectiveLevel);
 		}
 	}
@@ -2000,7 +2029,7 @@ export class AgentSession {
 		const nextIndex = (currentIndex + 1) % levels.length;
 		const nextLevel = levels[nextIndex];
 
-		this.setThinkingLevel(nextLevel, { persist: false });
+		this.setThinkingLevel(nextLevel);
 		return nextLevel;
 	}
 
@@ -3941,7 +3970,12 @@ Be thorough - include exact file paths, function names, error messages, and tech
 				lines.push("## File Mention\n");
 				for (const file of fileMsg.files) {
 					lines.push(`<file path="${file.path}">`);
-					lines.push(file.content);
+					if (file.content) {
+						lines.push(file.content);
+					}
+					if (file.image) {
+						lines.push("[Image attached]");
+					}
 					lines.push("</file>\n");
 				}
 				lines.push("\n");

package/src/session/auth-storage.ts

@@ -2,8 +2,6 @@
  * Credential storage for API keys and OAuth tokens.
  * Handles loading, saving, and refreshing credentials from agent.db.
  */
-import { Buffer } from "node:buffer";
-import * as path from "node:path";
 import {
 	antigravityUsageProvider,
 	claudeUsageProvider,
@@ -35,9 +33,8 @@ import {
 	zaiUsageProvider,
 } from "@oh-my-pi/pi-ai";
 import { logger } from "@oh-my-pi/pi-utils";
-import { getAgentDbPath, getAuthPath } from "../config";
+import { getAgentDbPath } from "../config";
 import { AgentStorage } from "./agent-storage";
-import { migrateJsonStorage } from "./storage-migration";
 
 export type ApiKeyCredential = {
 	type: "api_key";
@@ -68,7 +65,6 @@ export interface SerializedAuthStorage {
 		}>
 	>;
 	runtimeOverrides?: Record<string, string>;
-	authPath?: string;
 	dbPath?: string;
 }
 
@@ -141,16 +137,13 @@ class AuthStorageUsageCache implements UsageCache {
 
 /**
  * Credential storage backed by agent.db.
- * Reads from SQLite and migrates legacy auth.json paths.
+ * Reads from SQLite (agent.db).
  */
 export class AuthStorage {
 	private static readonly defaultBackoffMs = 60_000; // Default backoff when no reset time available
 
 	/** Provider -> credentials cache, populated from agent.db on reload(). */
 	private data: Map<string, StoredCredential[]> = new Map();
-	private storage: AgentStorage;
-	/** Resolved path to agent.db (derived from authPath or used directly if .db). */
-	private dbPath: string;
 	private runtimeOverrides: Map<string, string> = new Map();
 	/** Tracks next credential index per provider:type key for round-robin distribution (non-session use). */
 	private providerRoundRobinIndex: Map<string, number> = new Map();
@@ -166,13 +159,9 @@ export class AuthStorage {
 	private fallbackResolver?: (provider: string) => string | undefined;
 
 	private constructor(
-		private authPath: string,
-		private fallbackPaths: string[] = [],
-		storage: AgentStorage,
+		private storage: AgentStorage,
 		options: AuthStorageOptions = {},
 	) {
-		this.dbPath = AuthStorage.resolveDbPath(authPath);
-		this.storage = storage;
 		this.usageProviderResolver = options.usageProviderResolver ?? resolveDefaultUsageProvider;
 		this.usageCache = options.usageCache ?? new AuthStorageUsageCache(this.storage);
 		this.usageFetch = options.usageFetch ?? fetch;
@@ -187,17 +176,11 @@ export class AuthStorage {
 
 	/**
 	 * Create an AuthStorage instance.
-	 * @param authPath - Legacy auth.json path used for migration and locating agent.db
-	 * @param fallbackPaths - Additional auth.json paths to migrate (legacy support)
+	 * @param dbPath - Path to agent.db
 	 */
-	static async create(
-		authPath: string,
-		fallbackPaths: string[] = [],
-		options: AuthStorageOptions = {},
-	): Promise<AuthStorage> {
-		const dbPath = AuthStorage.resolveDbPath(authPath);
+	static async create(dbPath: string, options: AuthStorageOptions = {}): Promise<AuthStorage> {
 		const storage = await AgentStorage.open(dbPath);
-		return new AuthStorage(authPath, fallbackPaths, storage, options);
+		return new AuthStorage(storage, options);
 	}
 
 	/**
@@ -205,14 +188,10 @@ export class AuthStorage {
 	 * Used by subagent workers to bypass discovery and use parent's credentials.
 	 */
 	static async fromSerialized(data: SerializedAuthStorage, options: AuthStorageOptions = {}): Promise<AuthStorage> {
-		const authPath = data.authPath ?? data.dbPath ?? getAuthPath();
-		const dbPath = data.dbPath ?? AuthStorage.resolveDbPath(authPath);
+		const dbPath = data.dbPath ?? getAgentDbPath();
 		const storage = await AgentStorage.open(dbPath);
 
 		const instance = Object.create(AuthStorage.prototype) as AuthStorage;
-		instance.authPath = authPath;
-		instance.fallbackPaths = [];
-		instance.dbPath = dbPath;
 		instance.storage = storage;
 		instance.data = new Map();
 		instance.runtimeOverrides = new Map();
@@ -271,23 +250,9 @@ export class AuthStorage {
 		return {
 			credentials,
 			runtimeOverrides: Object.keys(runtimeOverrides).length > 0 ? runtimeOverrides : undefined,
-			authPath: this.authPath,
-			dbPath: this.dbPath,
 		};
 	}
 
-	/**
-	 * Converts legacy auth.json path to agent.db path, or returns .db path as-is.
-	 * @param authPath - Path to auth.json or agent.db
-	 * @returns Resolved path to agent.db
-	 */
-	private static resolveDbPath(authPath: string): string {
-		if (authPath.endsWith(".db")) {
-			return authPath;
-		}
-		return getAgentDbPath(path.dirname(authPath));
-	}
-
 	/**
 	 * Set a runtime API key override (not persisted to disk).
 	 * Used for CLI --api-key flag.
@@ -313,16 +278,9 @@ export class AuthStorage {
 
 	/**
 	 * Reload credentials from agent.db.
-	 * Migrates legacy auth.json/settings.json on first load.
+	 * Reloads credentials from the database.
 	 */
 	async reload(): Promise<void> {
-		const agentDir = path.dirname(this.dbPath);
-		await migrateJsonStorage({
-			agentDir,
-			settingsPath: path.join(agentDir, "settings.json"),
-			authPaths: [this.authPath, ...this.fallbackPaths],
-		});
-
 		const records = this.storage.listAuthCredentials();
 		const grouped = new Map<string, StoredCredential[]>();
 		for (const record of records) {
@@ -388,9 +346,10 @@ export class AuthStorage {
 		const parts = token.split(".");
 		if (parts.length !== 3) return undefined;
 		const payloadRaw = parts[1];
+		const decoder = new TextDecoder("utf-8");
 		try {
 			const payload = JSON.parse(
-				Buffer.from(payloadRaw.replace(/-/g, "+").replace(/_/g, "/"), "base64").toString("utf8"),
+				decoder.decode(Uint8Array.fromBase64(payloadRaw, { alphabet: "base64url" })),
 			) as Record<string, unknown>;
 			if (!payload || typeof payload !== "object") return undefined;
 			const identifiers: string[] = [];

package/src/session/messages.ts

@@ -113,7 +113,8 @@ export interface FileMentionMessage {
 	files: Array<{
 		path: string;
 		content: string;
-		lineCount: number;
+		lineCount?: number;
+		image?: ImageContent;
 	}>;
 	timestamp: number;
 }
@@ -274,10 +275,23 @@ export function convertToLlm(messages: AgentMessage[]): Message[] {
 						timestamp: m.timestamp,
 					};
 				case "fileMention": {
-					const fileContents = m.files.map(f => `<file path="${f.path}">\n${f.content}\n</file>`).join("\n\n");
+					const fileContents = m.files
+						.map(file => {
+							const inner = file.content ? `\n${file.content}\n` : "\n";
+							return `<file path="${file.path}">${inner}</file>`;
+						})
+						.join("\n\n");
+					const content: (TextContent | ImageContent)[] = [
+						{ type: "text" as const, text: `<system-reminder>\n${fileContents}\n</system-reminder>` },
+					];
+					for (const file of m.files) {
+						if (file.image) {
+							content.push(file.image);
+						}
+					}
 					return {
 						role: "user",
-						content: [{ type: "text" as const, text: `<system-reminder>\n${fileContents}\n</system-reminder>` }],
+						content,
 						timestamp: m.timestamp,
 					};
 				}

package/src/session/session-manager.ts

@@ -279,26 +279,30 @@ function migrateToCurrentVersion(entries: FileEntry[]): boolean {
 	return true;
 }
 
-function parseJsonlEntries<T>(content: string): T[] {
-	if (!content.trim()) return [];
-	const entries: T[] = [];
-	let buffer = content;
+function parseJsonlEntries<T>(buffer: string): T[] {
+	let entries: T[] | undefined;
+
 	while (buffer.length > 0) {
-		const result = Bun.JSONL.parseChunk(buffer);
-		if (result.values.length > 0) {
-			entries.push(...(result.values as T[]));
+		const { values, error, read, done } = Bun.JSONL.parseChunk(buffer);
+		if (values.length > 0) {
+			const ext = values as T[];
+			if (!entries) {
+				entries = ext;
+			} else {
+				entries.push(...ext);
+			}
 		}
-		if (result.error) {
-			const nextNewline = buffer.indexOf("\n", result.read);
+		if (error) {
+			const nextNewline = buffer.indexOf("\n", read);
 			if (nextNewline === -1) break;
-			buffer = buffer.slice(nextNewline + 1);
+			buffer = buffer.substring(nextNewline + 1);
 			continue;
 		}
-		if (result.read === 0) break;
-		buffer = buffer.slice(result.read);
-		if (result.done) break;
+		if (read === 0) break;
+		buffer = buffer.substring(read);
+		if (done) break;
 	}
-	return entries;
+	return entries ?? [];
 }
 
 /** Exported for testing */
@@ -506,17 +510,16 @@ function sanitizeSessionName(value: string | undefined): string | undefined {
 }
 
 class RecentSessionInfo {
-	readonly path: string;
-	readonly mtime: number;
-
 	#fullName: string | undefined;
 	#name: string | undefined;
 	#timeAgo: string | undefined;
 
-	constructor(path: string, mtime: number, header: Record<string, unknown>, firstPrompt?: string) {
-		this.path = path;
-		this.mtime = mtime;
-
+	constructor(
+		readonly path: string,
+		readonly mtime: number,
+		header: Record<string, unknown>,
+		firstPrompt?: string,
+	) {
 		// Extract title from session header, falling back to first user prompt, then id
 		const trystr = (v: unknown) => (typeof v === "string" ? v : undefined);
 		this.#fullName =
@@ -975,9 +978,6 @@ export class SessionManager {
 	private sessionId: string = "";
 	private sessionName: string | undefined;
 	private sessionFile: string | undefined;
-	private sessionDir: string;
-	private cwd: string;
-	private persist: boolean;
 	private flushed: boolean = false;
 	private fileEntries: FileEntry[] = [];
 	private byId: Map<string, SessionEntry> = new Map();
@@ -989,13 +989,13 @@ export class SessionManager {
 	private persistChain: Promise<void> = Promise.resolve();
 	private persistError: Error | undefined;
 	private persistErrorReported = false;
-	private storage: SessionStorage;
 
-	private constructor(cwd: string, sessionDir: string, persist: boolean, storage: SessionStorage) {
-		this.cwd = cwd;
-		this.sessionDir = sessionDir;
-		this.persist = persist;
-		this.storage = storage;
+	private constructor(
+		private readonly cwd: string,
+		private readonly sessionDir: string,
+		private readonly persist: boolean,
+		private readonly storage: SessionStorage,
+	) {
 		if (persist && sessionDir) {
 			this.storage.ensureDirSync(sessionDir);
 		}

package/src/session/streaming-output.ts

@@ -140,7 +140,7 @@ export class OutputSink {
 			await this.push(dec.decode());
 		};
 
-		return new WritableStream<Uint8Array | string>({
+		return new WritableStream({
 			write: async chunk => {
 				if (typeof chunk === "string") {
 					await this.push(chunk);

package/src/ssh/ssh-executor.ts

@@ -79,6 +79,7 @@ export async function executeSSH(
 	using child = ptree.spawn(["ssh", ...(await buildRemoteCommand(host, resolvedCommand))], {
 		signal: options?.signal,
 		timeout: options?.timeout,
+		stderr: "full",
 	});
 
 	const sink = new OutputSink({
@@ -87,9 +88,11 @@ export async function executeSSH(
 		artifactId: options?.artifactId,
 	});
 
-	await Promise.allSettled([child.stdout.pipeTo(sink.createInput()), child.stderr.pipeTo(sink.createInput())]).catch(
-		() => {},
-	);
+	const streams = [child.stdout.pipeTo(sink.createInput())];
+	if (child.stderr) {
+		streams.push(child.stderr.pipeTo(sink.createInput()));
+	}
+	await Promise.allSettled(streams).catch(() => {});
 
 	try {
 		return {

package/src/task/agents.ts

@@ -48,6 +48,7 @@ const EMBEDDED_AGENT_DEFS: EmbeddedAgentDef[] = [
 			description: "General-purpose subagent with full capabilities for delegated multi-step tasks",
 			spawns: "*",
 			model: "default",
+			thinkingLevel: "medium",
 		},
 		template: taskMd,
 	},
@@ -57,6 +58,7 @@ const EMBEDDED_AGENT_DEFS: EmbeddedAgentDef[] = [
 			name: "quick_task",
 			description: "Low-reasoning agent for strictly mechanical updates or data collection only",
 			model: "pi/smol",
+			thinkingLevel: "minimal",
 		},
 		template: taskMd,
 	},

package/src/task/discovery.ts

@@ -66,7 +66,7 @@ export async function discoverAgents(cwd: string): Promise<DiscoveryResult> {
 		}));
 
 	// Get project directories by walking up from cwd (priority order)
-	const projectDirs = (await findAllNearestProjectConfigDirs("agents", resolvedCwd))
+	const projectDirs = findAllNearestProjectConfigDirs("agents", resolvedCwd)
 		.filter(entry => agentSources.includes(entry.source))
 		.map(entry => ({
 			...entry,