@oh-my-pi/pi-coding-agent 8.0.20 → 8.2.0

package/src/session/agent-session.ts

@@ -13,7 +13,7 @@
  * Modes use this class and add their own I/O layer on top.
  */
 
-import { existsSync, readFileSync } from "node:fs";
+import * as fs from "node:fs";
 import type { Agent, AgentEvent, AgentMessage, AgentState, AgentTool, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type {
 	AssistantMessage,
@@ -26,21 +26,23 @@ import type {
 	UsageReport,
 } from "@oh-my-pi/pi-ai";
 import { isContextOverflow, modelsAreEqual, supportsXhigh } from "@oh-my-pi/pi-ai";
-import type { Rule } from "@oh-my-pi/pi-coding-agent/capability/rule";
-import { getAgentDbPath } from "@oh-my-pi/pi-coding-agent/config";
-import type { ModelRegistry } from "@oh-my-pi/pi-coding-agent/config/model-registry";
-import { parseModelString } from "@oh-my-pi/pi-coding-agent/config/model-resolver";
+import { abortableSleep, isEnoent, logger } from "@oh-my-pi/pi-utils";
+import { YAML } from "bun";
+import type { Rule } from "../capability/rule";
+import { getAgentDbPath } from "../config";
+import type { ModelRegistry } from "../config/model-registry";
+import { parseModelString } from "../config/model-resolver";
 import {
 	expandPromptTemplate,
 	type PromptTemplate,
 	parseCommandArgs,
 	renderPromptTemplate,
-} from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-import type { SettingsManager, SkillsSettings } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
-import { type BashResult, executeBash as executeBashCommand } from "@oh-my-pi/pi-coding-agent/exec/bash-executor";
-import { exportSessionToHtml } from "@oh-my-pi/pi-coding-agent/export/html/index";
-import type { TtsrManager } from "@oh-my-pi/pi-coding-agent/export/ttsr";
-import type { LoadedCustomCommand } from "@oh-my-pi/pi-coding-agent/extensibility/custom-commands/index";
+} from "../config/prompt-templates";
+import type { SettingsManager, SkillsSettings } from "../config/settings-manager";
+import { type BashResult, executeBash as executeBashCommand } from "../exec/bash-executor";
+import { exportSessionToHtml } from "../export/html";
+import type { TtsrManager } from "../export/ttsr";
+import type { LoadedCustomCommand } from "../extensibility/custom-commands";
 import type {
 	ExtensionCommandContext,
 	ExtensionRunner,
@@ -52,23 +54,21 @@ import type {
 	TreePreparation,
 	TurnEndEvent,
 	TurnStartEvent,
-} from "@oh-my-pi/pi-coding-agent/extensibility/extensions";
-import type { CompactOptions, ContextUsage } from "@oh-my-pi/pi-coding-agent/extensibility/extensions/types";
-import type { HookCommandContext } from "@oh-my-pi/pi-coding-agent/extensibility/hooks/types";
-import type { Skill, SkillWarning } from "@oh-my-pi/pi-coding-agent/extensibility/skills";
-import { expandSlashCommand, type FileSlashCommand } from "@oh-my-pi/pi-coding-agent/extensibility/slash-commands";
-import { executePython as executePythonCommand, type PythonResult } from "@oh-my-pi/pi-coding-agent/ipy/executor";
-import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import { normalizeDiff, normalizeToLF, ParseError, previewPatch, stripBom } from "@oh-my-pi/pi-coding-agent/patch";
-import ttsrInterruptTemplate from "@oh-my-pi/pi-coding-agent/prompts/system/ttsr-interrupt.md" with { type: "text" };
-import { closeAllConnections } from "@oh-my-pi/pi-coding-agent/ssh/connection-manager";
-import { unmountAll } from "@oh-my-pi/pi-coding-agent/ssh/sshfs-mount";
-import { outputMeta } from "@oh-my-pi/pi-coding-agent/tools/output-meta";
-import { resolveToCwd } from "@oh-my-pi/pi-coding-agent/tools/path-utils";
-import type { TodoItem } from "@oh-my-pi/pi-coding-agent/tools/todo-write";
-import { extractFileMentions, generateFileMentionMessages } from "@oh-my-pi/pi-coding-agent/utils/file-mentions";
-import { abortableSleep, logger } from "@oh-my-pi/pi-utils";
-import { YAML } from "bun";
+} from "../extensibility/extensions";
+import type { CompactOptions, ContextUsage } from "../extensibility/extensions/types";
+import type { HookCommandContext } from "../extensibility/hooks/types";
+import type { Skill, SkillWarning } from "../extensibility/skills";
+import { expandSlashCommand, type FileSlashCommand } from "../extensibility/slash-commands";
+import { executePython as executePythonCommand, type PythonResult } from "../ipy/executor";
+import { theme } from "../modes/theme/theme";
+import { normalizeDiff, normalizeToLF, ParseError, previewPatch, stripBom } from "../patch";
+import ttsrInterruptTemplate from "../prompts/system/ttsr-interrupt.md" with { type: "text" };
+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 type { TodoItem } from "../tools/todo-write";
+import { extractFileMentions, generateFileMentionMessages } from "../utils/file-mentions";
 import {
 	type CompactionResult,
 	calculateContextTokens,
@@ -78,7 +78,7 @@ import {
 	generateBranchSummary,
 	prepareCompaction,
 	shouldCompact,
-} from "./compaction/index";
+} from "./compaction";
 import {
 	type BashExecutionMessage,
 	type BranchSummaryMessage,
@@ -214,9 +214,9 @@ const noOpUIContext: ExtensionUIContext = {
 	get theme() {
 		return theme;
 	},
-	getAllThemes: () => [],
-	getTheme: () => undefined,
-	setTheme: (_theme) => ({ success: false, error: "UI not available" }),
+	getAllThemes: () => Promise.resolve([]),
+	getTheme: () => Promise.resolve(undefined),
+	setTheme: _theme => Promise.resolve({ success: false, error: "UI not available" }),
 	setFooter: () => {},
 	setHeader: () => {},
 	setEditorComponent: () => {},
@@ -542,7 +542,7 @@ export class AgentSession {
 	private _getTtsrInjectionContent(): string | undefined {
 		if (this._pendingTtsrInjections.length === 0) return undefined;
 		const content = this._pendingTtsrInjections
-			.map((r) => renderPromptTemplate(ttsrInterruptTemplate, { name: r.name, path: r.path, content: r.content }))
+			.map(r => renderPromptTemplate(ttsrInterruptTemplate, { name: r.name, path: r.path, content: r.content }))
 			.join("\n\n");
 		this._pendingTtsrInjections = [];
 		return content;
@@ -553,10 +553,10 @@ export class AgentSession {
 		if (message.role !== "user") return "";
 		const content = message.content;
 		if (typeof content === "string") return content;
-		const textBlocks = content.filter((c) => c.type === "text");
-		const text = textBlocks.map((c) => (c as TextContent).text).join("");
+		const textBlocks = content.filter(c => c.type === "text");
+		const text = textBlocks.map(c => (c as TextContent).text).join("");
 		if (text.length > 0) return text;
-		const hasImages = content.some((c) => c.type === "image");
+		const hasImages = content.some(c => c.type === "image");
 		return hasImages ? "[Image]" : "";
 	}
 
@@ -578,7 +578,7 @@ export class AgentSession {
 		this._streamingEditFileCache.clear();
 	}
 
-	private _preCacheStreamingEditFile(event: AgentEvent): void {
+	private async _preCacheStreamingEditFile(event: AgentEvent): Promise<void> {
 		if (!this.settingsManager.getEditStreamingAbort()) return;
 		if (event.type !== "message_update") return;
 		const assistantEvent = event.assistantMessageEvent;
@@ -606,13 +606,11 @@ export class AgentSession {
 		if (this._streamingEditFileCache.has(resolvedPath)) return;
 
 		try {
-			if (existsSync(resolvedPath)) {
-				const rawText = readFileSync(resolvedPath, "utf8");
-				const { text } = stripBom(rawText);
-				this._streamingEditFileCache.set(resolvedPath, normalizeToLF(text));
-			}
+			const rawText = fs.readFileSync(resolvedPath, "utf-8");
+			const { text } = stripBom(rawText);
+			this._streamingEditFileCache.set(resolvedPath, normalizeToLF(text));
 		} catch {
-			// Don't cache on read errors - let the edit tool handle them
+			// Don't cache on read errors (including ENOENT) - let the edit tool handle them
 		}
 	}
 
@@ -655,7 +653,7 @@ export class AgentSession {
 		const normalizedDiff = normalizeDiff(diffForCheck.replace(/\r/g, ""));
 		if (!normalizedDiff) return;
 		const lines = normalizedDiff.split("\n");
-		const hasChangeLine = lines.some((line) => line.startsWith("+") || line.startsWith("-"));
+		const hasChangeLine = lines.some(line => line.startsWith("+") || line.startsWith("-"));
 		if (!hasChangeLine) return;
 
 		const lineCount = lines.length;
@@ -666,13 +664,13 @@ export class AgentSession {
 		const rename = typeof args.rename === "string" ? args.rename : undefined;
 
 		const removedLines = lines
-			.filter((line) => line.startsWith("-") && !line.startsWith("--- "))
-			.map((line) => line.slice(1));
+			.filter(line => line.startsWith("-") && !line.startsWith("--- "))
+			.map(line => line.slice(1));
 		if (removedLines.length > 0) {
 			const resolvedPath = resolveToCwd(path, this.sessionManager.getCwd());
 			const cachedContent = this._streamingEditFileCache.get(resolvedPath);
 			if (cachedContent !== undefined) {
-				const missing = removedLines.find((line) => !cachedContent.includes(normalizeToLF(line)));
+				const missing = removedLines.find(line => !cachedContent.includes(normalizeToLF(line)));
 				if (missing) {
 					this._streamingEditAbortTriggered = true;
 					logger.warn("Streaming edit aborted due to patch preview failure", {
@@ -701,10 +699,9 @@ export class AgentSession {
 	): Promise<void> {
 		if (this._streamingEditAbortTriggered) return;
 		try {
-			if (!(await Bun.file(resolvedPath).exists())) return;
 			const { text } = stripBom(await Bun.file(resolvedPath).text());
 			const normalizedContent = normalizeToLF(text);
-			const missing = removedLines.find((line) => !normalizedContent.includes(normalizeToLF(line)));
+			const missing = removedLines.find(line => !normalizedContent.includes(normalizeToLF(line)));
 			if (missing) {
 				this._streamingEditAbortTriggered = true;
 				logger.warn("Streaming edit aborted due to patch preview failure", {
@@ -714,8 +711,12 @@ export class AgentSession {
 				});
 				this.agent.abort();
 			}
-		} catch {
-			// Ignore errors during async fallback
+		} catch (err) {
+			// Ignore ENOENT (file not found) - let the edit tool handle missing files
+			// Also ignore other errors during async fallback
+			if (!isEnoent(err)) {
+				// Log unexpected errors but don't abort
+			}
 		}
 	}
 
@@ -885,7 +886,7 @@ export class AgentSession {
 	 * Returns the names of tools currently set on the agent.
 	 */
 	getActiveToolNames(): string[] {
-		return this.agent.state.tools.map((t) => t.name);
+		return this.agent.state.tools.map(t => t.name);
 	}
 
 	/**
@@ -1178,7 +1179,7 @@ export class AgentSession {
 			hasQueuedMessages: () => this.queuedMessageCount > 0,
 			getContextUsage: () => this.getContextUsage(),
 			waitForIdle: () => this.agent.waitForIdle(),
-			newSession: async (options) => {
+			newSession: async options => {
 				const success = await this.newSession({ parentSession: options?.parentSession });
 				if (!success) {
 					return { cancelled: true };
@@ -1188,7 +1189,7 @@ export class AgentSession {
 				}
 				return { cancelled: false };
 			},
-			branch: async (entryId) => {
+			branch: async entryId => {
 				const result = await this.branch(entryId);
 				return { cancelled: result.cancelled };
 			},
@@ -1196,7 +1197,7 @@ export class AgentSession {
 				const result = await this.navigateTree(targetId, { summarize: options?.summarize });
 				return { cancelled: result.cancelled };
 			},
-			compact: async (instructionsOrOptions) => {
+			compact: async instructionsOrOptions => {
 				const instructions = typeof instructionsOrOptions === "string" ? instructionsOrOptions : undefined;
 				const options =
 					instructionsOrOptions && typeof instructionsOrOptions === "object" ? instructionsOrOptions : undefined;
@@ -1218,7 +1219,7 @@ export class AgentSession {
 		const argsString = spaceIndex === -1 ? "" : text.slice(spaceIndex + 1);
 
 		// Find matching command
-		const loaded = this._customCommands.find((c) => c.command.name === commandName);
+		const loaded = this._customCommands.find(c => c.command.name === commandName);
 		if (!loaded) return null;
 
 		// Get command context from extension runner (includes session control methods)
@@ -1605,10 +1606,10 @@ export class AgentSession {
 			const parsed = parseModelString(roleModelStr);
 			let match: Model<any> | undefined;
 			if (parsed) {
-				match = availableModels.find((m) => m.provider === parsed.provider && m.id === parsed.id);
+				match = availableModels.find(m => m.provider === parsed.provider && m.id === parsed.id);
 			}
 			if (!match) {
-				match = availableModels.find((m) => m.id.toLowerCase() === roleModelStr.toLowerCase());
+				match = availableModels.find(m => m.id.toLowerCase() === roleModelStr.toLowerCase());
 			}
 			if (!match) continue;
 
@@ -1619,8 +1620,8 @@ export class AgentSession {
 
 		const lastRole = this.sessionManager.getLastModelChangeRole();
 		let currentIndex = lastRole
-			? roleModels.findIndex((entry) => entry.role === lastRole)
-			: roleModels.findIndex((entry) => modelsAreEqual(entry.model, currentModel));
+			? roleModels.findIndex(entry => entry.role === lastRole)
+			: roleModels.findIndex(entry => modelsAreEqual(entry.model, currentModel));
 		if (currentIndex === -1) currentIndex = 0;
 
 		const nextIndex = (currentIndex + 1) % roleModels.length;
@@ -1639,7 +1640,7 @@ export class AgentSession {
 		if (this._scopedModels.length <= 1) return undefined;
 
 		const currentModel = this.model;
-		let currentIndex = this._scopedModels.findIndex((sm) => modelsAreEqual(sm.model, currentModel));
+		let currentIndex = this._scopedModels.findIndex(sm => modelsAreEqual(sm.model, currentModel));
 
 		if (currentIndex === -1) currentIndex = 0;
 		const len = this._scopedModels.length;
@@ -1668,7 +1669,7 @@ export class AgentSession {
 		if (availableModels.length <= 1) return undefined;
 
 		const currentModel = this.model;
-		let currentIndex = availableModels.findIndex((m) => modelsAreEqual(m, currentModel));
+		let currentIndex = availableModels.findIndex(m => modelsAreEqual(m, currentModel));
 
 		if (currentIndex === -1) currentIndex = 0;
 		const len = availableModels.length;
@@ -1898,7 +1899,7 @@ export class AgentSession {
 			this.agent.replaceMessages(sessionContext.messages);
 
 			// Get the saved compaction entry for the hook
-			const savedCompactionEntry = newEntries.find((e) => e.type === "compaction" && e.summary === summary) as
+			const savedCompactionEntry = newEntries.find(e => e.type === "compaction" && e.summary === summary) as
 				| CompactionEntry
 				| undefined;
 
@@ -1975,7 +1976,7 @@ export class AgentSession {
 		// The error shouldn't trigger another compaction since we already compacted.
 		// Example: opus fails → switch to codex → compact → switch back to opus → opus error
 		// is still in context but shouldn't trigger compaction again.
-		const compactionEntry = this.sessionManager.getBranch().find((e) => e.type === "compaction");
+		const compactionEntry = this.sessionManager.getBranch().find(e => e.type === "compaction");
 		const errorIsFromBeforeCompaction =
 			compactionEntry && assistantMessage.timestamp < new Date(compactionEntry.timestamp).getTime();
 
@@ -2022,22 +2023,20 @@ export class AgentSession {
 		if (!sessionFile) return;
 
 		const todoPath = `${sessionFile.slice(0, -6)}/todos.json`;
-		const file = Bun.file(todoPath);
-		if (!(await file.exists())) {
-			this._todoReminderCount = 0;
-			return;
-		}
 
 		let todos: TodoItem[];
 		try {
-			const data = await file.json();
+			const data = await Bun.file(todoPath).json();
 			todos = data?.todos ?? [];
-		} catch {
+		} catch (err) {
+			if (isEnoent(err)) {
+				this._todoReminderCount = 0;
+			}
 			return;
 		}
 
 		// Check for incomplete todos
-		const incomplete = todos.filter((t) => t.status !== "completed");
+		const incomplete = todos.filter(t => t.status !== "completed");
 		if (incomplete.length === 0) {
 			this._todoReminderCount = 0;
 			return;
@@ -2045,7 +2044,7 @@ export class AgentSession {
 
 		// Build reminder message
 		this._todoReminderCount++;
-		const todoList = incomplete.map((t) => `- ${t.content}`).join("\n");
+		const todoList = incomplete.map(t => `- ${t.content}`).join("\n");
 		const reminder =
 			`<system_reminder>\n` +
 			`You stopped with ${incomplete.length} incomplete todo item(s):\n${todoList}\n\n` +
@@ -2094,10 +2093,10 @@ export class AgentSession {
 
 		const parsed = parseModelString(roleModelStr);
 		if (parsed) {
-			return availableModels.find((m) => m.provider === parsed.provider && m.id === parsed.id);
+			return availableModels.find(m => m.provider === parsed.provider && m.id === parsed.id);
 		}
 		const roleLower = roleModelStr.toLowerCase();
-		return availableModels.find((m) => m.id.toLowerCase() === roleLower);
+		return availableModels.find(m => m.id.toLowerCase() === roleLower);
 	}
 
 	private _getCompactionModelCandidates(availableModels: Model<any>[]): Model<any>[] {
@@ -2295,7 +2294,7 @@ export class AgentSession {
 			this.agent.replaceMessages(sessionContext.messages);
 
 			// Get the saved compaction entry for the hook
-			const savedCompactionEntry = newEntries.find((e) => e.type === "compaction" && e.summary === summary) as
+			const savedCompactionEntry = newEntries.find(e => e.type === "compaction" && e.summary === summary) as
 				| CompactionEntry
 				| undefined;
 
@@ -2822,7 +2821,7 @@ export class AgentSession {
 				const provider = defaultModelStr.slice(0, slashIdx);
 				const modelId = defaultModelStr.slice(slashIdx + 1);
 				const availableModels = this._modelRegistry.getAvailable();
-				const match = availableModels.find((m) => m.provider === provider && m.id === modelId);
+				const match = availableModels.find(m => m.provider === provider && m.id === modelId);
 				if (match) {
 					this.agent.setModel(match);
 				}
@@ -3026,7 +3025,7 @@ export class AgentSession {
 					? targetEntry.content
 					: targetEntry.content
 							.filter((c): c is { type: "text"; text: string } => c.type === "text")
-							.map((c) => c.text)
+							.map(c => c.text)
 							.join("");
 		} else {
 			// Non-user message: leaf = selected node
@@ -3092,7 +3091,7 @@ export class AgentSession {
 		if (Array.isArray(content)) {
 			return content
 				.filter((c): c is { type: "text"; text: string } => c.type === "text")
-				.map((c) => c.text)
+				.map(c => c.text)
 				.join("");
 		}
 		return "";
@@ -3103,9 +3102,9 @@ export class AgentSession {
 	 */
 	getSessionStats(): SessionStats {
 		const state = this.state;
-		const userMessages = state.messages.filter((m) => m.role === "user").length;
-		const assistantMessages = state.messages.filter((m) => m.role === "assistant").length;
-		const toolResults = state.messages.filter((m) => m.role === "toolResult").length;
+		const userMessages = state.messages.filter(m => m.role === "user").length;
+		const assistantMessages = state.messages.filter(m => m.role === "assistant").length;
+		const toolResults = state.messages.filter(m => m.role === "toolResult").length;
 
 		let toolCalls = 0;
 		let totalInput = 0;
@@ -3125,7 +3124,7 @@ export class AgentSession {
 		for (const message of state.messages) {
 			if (message.role === "assistant") {
 				const assistantMsg = message as AssistantMessage;
-				toolCalls += assistantMsg.content.filter((c) => c.type === "toolCall").length;
+				toolCalls += assistantMsg.content.filter(c => c.type === "toolCall").length;
 				totalInput += assistantMsg.usage.input;
 				totalOutput += assistantMsg.usage.output;
 				totalCacheRead += assistantMsg.usage.cacheRead;
@@ -3193,7 +3192,7 @@ export class AgentSession {
 		const authStorage = this._modelRegistry.authStorage;
 		if (!authStorage.fetchUsageReports) return null;
 		return authStorage.fetchUsageReports({
-			baseUrlResolver: (provider) => this._modelRegistry.getProviderBaseUrl?.(provider),
+			baseUrlResolver: provider => this._modelRegistry.getProviderBaseUrl?.(provider),
 		});
 	}
 
@@ -3274,7 +3273,7 @@ export class AgentSession {
 		const lastAssistant = this.messages
 			.slice()
 			.reverse()
-			.find((m) => {
+			.find(m => {
 				if (m.role !== "assistant") return false;
 				const msg = m as AssistantMessage;
 				// Skip aborted messages with no content

package/src/session/agent-storage.ts

@@ -1,9 +1,9 @@
 import { Database } from "bun:sqlite";
-import { chmodSync, existsSync, mkdirSync } from "node:fs";
-import { dirname } from "node:path";
-import { getAgentDbPath } from "@oh-my-pi/pi-coding-agent/config";
-import type { Settings } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
+import * as fs from "node:fs";
+import * as path from "node:path";
 import { logger } from "@oh-my-pi/pi-utils";
+import { getAgentDbPath } from "../config";
+import type { Settings } from "../config/settings-manager";
 import type { AuthCredential } from "./auth-storage";
 
 /** Prepared SQLite statement type from bun:sqlite */
@@ -116,8 +116,6 @@ export class AgentStorage {
 	private static instances = new Map<string, AgentStorage>();
 
 	private listSettingsStmt: Statement;
-	private insertSettingStmt: Statement;
-	private deleteSettingsStmt: Statement;
 	private getCacheStmt: Statement;
 	private upsertCacheStmt: Statement;
 	private deleteExpiredCacheStmt: Statement;
@@ -137,10 +135,6 @@ export class AgentStorage {
 		this.hardenPermissions(dbPath);
 
 		this.listSettingsStmt = this.db.prepare("SELECT key, value FROM settings");
-		this.insertSettingStmt = this.db.prepare(
-			"INSERT INTO settings (key, value, updated_at) VALUES (?, ?, unixepoch())",
-		);
-		this.deleteSettingsStmt = this.db.prepare("DELETE FROM settings");
 
 		this.getCacheStmt = this.db.prepare("SELECT value FROM cache WHERE key = ? AND expires_at > unixepoch()");
 		this.upsertCacheStmt = this.db.prepare(
@@ -197,8 +191,8 @@ CREATE TABLE IF NOT EXISTS schema_version (version INTEGER PRIMARY KEY);
 
 		const settingsInfo = this.db.prepare("PRAGMA table_info(settings)").all() as Array<{ name?: string }>;
 		const hasSettingsTable = settingsInfo.length > 0;
-		const hasKey = settingsInfo.some((column) => column.name === "key");
-		const hasValue = settingsInfo.some((column) => column.name === "value");
+		const hasKey = settingsInfo.some(column => column.name === "key");
+		const hasValue = settingsInfo.some(column => column.name === "value");
 
 		if (!hasSettingsTable) {
 			this.db.exec(`
@@ -264,20 +258,43 @@ CREATE TABLE settings (
 
 	/**
 	 * Returns singleton instance for the given database path, creating if needed.
+	 * Retries on SQLITE_BUSY with exponential backoff.
 	 * @param dbPath - Path to the SQLite database file (defaults to config path)
 	 * @returns AgentStorage instance for the given path
 	 */
-	static open(dbPath: string = getAgentDbPath()): AgentStorage {
+	static async open(dbPath: string = getAgentDbPath()): Promise<AgentStorage> {
 		const existing = AgentStorage.instances.get(dbPath);
 		if (existing) return existing;
-		const storage = new AgentStorage(dbPath);
-		AgentStorage.instances.set(dbPath, storage);
-		return storage;
+
+		const maxRetries = 3;
+		const baseDelayMs = 100;
+		let lastError: Error | undefined;
+
+		for (let attempt = 0; attempt < maxRetries; attempt++) {
+			try {
+				const storage = new AgentStorage(dbPath);
+				AgentStorage.instances.set(dbPath, storage);
+				return storage;
+			} catch (err) {
+				const isSqliteBusy = err && typeof err === "object" && (err as { code?: string }).code === "SQLITE_BUSY";
+				if (!isSqliteBusy) {
+					throw err;
+				}
+				lastError = err as Error;
+				const delayMs = baseDelayMs * 2 ** attempt;
+				await Bun.sleep(delayMs);
+			}
+		}
+
+		throw lastError ?? new Error("Failed to open database after retries");
 	}
 
 	/**
-	 * Retrieves all settings from storage.
+	 * Retrieves all settings from storage (legacy, for migration only).
+	 * Settings are now stored in config.yml. This method is only used
+	 * during migration from agent.db to config.yml.
 	 * @returns Settings object, or null if no settings are stored
+	 * @deprecated Use config.yml instead. This is only for migration.
 	 */
 	getSettings(): Settings | null {
 		const rows = (this.listSettingsStmt.all() as SettingsRow[]) ?? [];
@@ -297,26 +314,13 @@ CREATE TABLE settings (
 	}
 
 	/**
-	 * Atomically replaces all settings in storage.
-	 * Uses delete-then-insert within a transaction for consistency.
-	 * @param settings - Settings object to persist
+	 * @deprecated Settings are now stored in config.yml, not agent.db.
+	 * This method is kept for backward compatibility but does nothing.
 	 */
 	saveSettings(settings: Settings): void {
-		const entries = Object.entries(settings).filter(([, value]) => value !== undefined);
-		const replace = this.db.transaction((rows: Array<[string, unknown]>) => {
-			this.deleteSettingsStmt.run();
-			for (const [key, value] of rows) {
-				const serialized = JSON.stringify(value);
-				if (serialized === undefined) continue;
-				this.insertSettingStmt.run(key, serialized);
-			}
+		logger.warn("AgentStorage.saveSettings is deprecated - settings are now stored in config.yml", {
+			keys: Object.keys(settings),
 		});
-
-		try {
-			replace(entries);
-		} catch (error) {
-			logger.error("AgentStorage failed to save settings", { error: String(error) });
-		}
 	}
 
 	/**
@@ -480,20 +484,20 @@ CREATE TABLE settings (
 	 * @param dbPath - Path to the database file
 	 */
 	private ensureDir(dbPath: string): void {
-		mkdirSync(dirname(dbPath), { recursive: true });
+		fs.mkdirSync(path.dirname(dbPath), { recursive: true });
 	}
 
 	private hardenPermissions(dbPath: string): void {
-		const dir = dirname(dbPath);
+		const dir = path.dirname(dbPath);
 		try {
-			chmodSync(dir, 0o700);
+			fs.chmodSync(dir, 0o700);
 		} catch (error) {
 			logger.warn("AgentStorage failed to chmod agent dir", { path: dir, error: String(error) });
 		}
 
-		if (!existsSync(dbPath)) return;
+		if (!fs.existsSync(dbPath)) return;
 		try {
-			chmodSync(dbPath, 0o600);
+			fs.chmodSync(dbPath, 0o600);
 		} catch (error) {
 			logger.warn("AgentStorage failed to chmod db file", { path: dbPath, error: String(error) });
 		}

package/src/session/artifacts.ts

@@ -4,9 +4,8 @@
  * Artifacts are stored in a directory alongside the session file,
  * accessible via artifact:// URLs or the $ARTIFACTS environment variable.
  */
-
-import { mkdir, readdir } from "node:fs/promises";
-import { join } from "node:path";
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
 
 /**
  * Manages artifact storage for a session.
@@ -18,6 +17,7 @@ export class ArtifactManager {
 	#nextId = 0;
 	readonly #dir: string;
 	#dirCreated = false;
+	#initialized = false;
 
 	/**
 	 * @param sessionFile Path to the session .jsonl file
@@ -37,9 +37,31 @@ export class ArtifactManager {
 
 	async #ensureDir(): Promise<void> {
 		if (!this.#dirCreated) {
-			await mkdir(this.#dir, { recursive: true });
+			await fs.mkdir(this.#dir, { recursive: true });
 			this.#dirCreated = true;
 		}
+		if (!this.#initialized) {
+			await this.#scanExistingIds();
+			this.#initialized = true;
+		}
+	}
+
+	/**
+	 * Scan existing artifact files to find the next available ID.
+	 * This ensures we don't overwrite artifacts when resuming a session.
+	 */
+	async #scanExistingIds(): Promise<void> {
+		const files = await this.listFiles();
+		let maxId = -1;
+		for (const file of files) {
+			// Files are named: {id}.{toolType}.log
+			const match = file.match(/^(\d+)\..*\.log$/);
+			if (match) {
+				const id = parseInt(match[1], 10);
+				if (id > maxId) maxId = id;
+			}
+		}
+		this.#nextId = maxId + 1;
 	}
 
 	/**
@@ -58,8 +80,8 @@ export class ArtifactManager {
 	async allocatePath(toolType: string): Promise<{ id: string; path: string }> {
 		await this.#ensureDir();
 		const id = String(this.allocateId());
-		const filename = `${id}.${toolType}.txt`;
-		return { id, path: join(this.#dir, filename) };
+		const filename = `${id}.${toolType}.log`;
+		return { id, path: path.join(this.#dir, filename) };
 	}
 
 	/**
@@ -81,7 +103,7 @@ export class ArtifactManager {
 	 */
 	async exists(id: string): Promise<boolean> {
 		const files = await this.listFiles();
-		return files.some((f) => f.startsWith(`${id}.`));
+		return files.some(f => f.startsWith(`${id}.`));
 	}
 
 	/**
@@ -90,7 +112,7 @@ export class ArtifactManager {
 	 */
 	async listFiles(): Promise<string[]> {
 		try {
-			return await readdir(this.#dir);
+			return await fs.readdir(this.#dir);
 		} catch {
 			return [];
 		}
@@ -104,7 +126,7 @@ export class ArtifactManager {
 	 */
 	async getPath(id: string): Promise<string | null> {
 		const files = await this.listFiles();
-		const match = files.find((f) => f.startsWith(`${id}.`));
-		return match ? join(this.#dir, match) : null;
+		const match = files.find(f => f.startsWith(`${id}.`));
+		return match ? path.join(this.#dir, match) : null;
 	}
 }