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

package/src/session/auth-storage.ts

@@ -2,9 +2,8 @@
  * Credential storage for API keys and OAuth tokens.
  * Handles loading, saving, and refreshing credentials from agent.db.
  */
-
 import { Buffer } from "node:buffer";
-import { dirname, join } from "node:path";
+import * as path from "node:path";
 import {
 	antigravityUsageProvider,
 	claudeUsageProvider,
@@ -32,8 +31,8 @@ import {
 	type UsageReport,
 	zaiUsageProvider,
 } from "@oh-my-pi/pi-ai";
-import { getAgentDbPath, getAuthPath } from "@oh-my-pi/pi-coding-agent/config";
 import { logger } from "@oh-my-pi/pi-utils";
+import { getAgentDbPath, getAuthPath } from "../config";
 import { AgentStorage } from "./agent-storage";
 import { migrateJsonStorage } from "./storage-migration";
 
@@ -94,7 +93,7 @@ const DEFAULT_USAGE_PROVIDERS: UsageProvider[] = [
 ];
 
 const DEFAULT_USAGE_PROVIDER_MAP = new Map<Provider, UsageProvider>(
-	DEFAULT_USAGE_PROVIDERS.map((provider) => [provider.id, provider]),
+	DEFAULT_USAGE_PROVIDERS.map(provider => [provider.id, provider]),
 );
 
 const USAGE_CACHE_PREFIX = "usage_cache:";
@@ -162,17 +161,14 @@ export class AuthStorage {
 	private usageLogger?: UsageLogger;
 	private fallbackResolver?: (provider: string) => string | undefined;
 
-	/**
-	 * @param authPath - Legacy auth.json path used for migration and locating agent.db
-	 * @param fallbackPaths - Additional auth.json paths to migrate (legacy support)
-	 */
-	constructor(
+	private constructor(
 		private authPath: string,
 		private fallbackPaths: string[] = [],
+		storage: AgentStorage,
 		options: AuthStorageOptions = {},
 	) {
 		this.dbPath = AuthStorage.resolveDbPath(authPath);
-		this.storage = AgentStorage.open(this.dbPath);
+		this.storage = storage;
 		this.usageProviderResolver = options.usageProviderResolver ?? resolveDefaultUsageProvider;
 		this.usageCache = options.usageCache ?? new AuthStorageUsageCache(this.storage);
 		this.usageFetch = options.usageFetch ?? fetch;
@@ -185,17 +181,35 @@ export class AuthStorage {
 			} satisfies UsageLogger);
 	}
 
+	/**
+	 * 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)
+	 */
+	static async create(
+		authPath: string,
+		fallbackPaths: string[] = [],
+		options: AuthStorageOptions = {},
+	): Promise<AuthStorage> {
+		const dbPath = AuthStorage.resolveDbPath(authPath);
+		const storage = await AgentStorage.open(dbPath);
+		return new AuthStorage(authPath, fallbackPaths, storage, options);
+	}
+
 	/**
 	 * Create an in-memory AuthStorage instance from serialized data.
 	 * Used by subagent workers to bypass discovery and use parent's credentials.
 	 */
-	static fromSerialized(data: SerializedAuthStorage, options: AuthStorageOptions = {}): AuthStorage {
-		const instance = Object.create(AuthStorage.prototype) as AuthStorage;
+	static async fromSerialized(data: SerializedAuthStorage, options: AuthStorageOptions = {}): Promise<AuthStorage> {
 		const authPath = data.authPath ?? data.dbPath ?? getAuthPath();
+		const dbPath = data.dbPath ?? AuthStorage.resolveDbPath(authPath);
+		const storage = await AgentStorage.open(dbPath);
+
+		const instance = Object.create(AuthStorage.prototype) as AuthStorage;
 		instance.authPath = authPath;
 		instance.fallbackPaths = [];
-		instance.dbPath = data.dbPath ?? AuthStorage.resolveDbPath(authPath);
-		instance.storage = AgentStorage.open(instance.dbPath);
+		instance.dbPath = dbPath;
+		instance.storage = storage;
 		instance.data = new Map();
 		instance.runtimeOverrides = new Map();
 		instance.providerRoundRobinIndex = new Map();
@@ -215,7 +229,7 @@ export class AuthStorage {
 		for (const [provider, creds] of Object.entries(data.credentials)) {
 			instance.data.set(
 				provider,
-				creds.map((c) => ({
+				creds.map(c => ({
 					id: c.id,
 					credential:
 						c.type === "api_key"
@@ -240,7 +254,7 @@ export class AuthStorage {
 	serialize(): SerializedAuthStorage {
 		const credentials: SerializedAuthStorage["credentials"] = {};
 		for (const [provider, creds] of this.data.entries()) {
-			credentials[provider] = creds.map((c) => ({
+			credentials[provider] = creds.map(c => ({
 				id: c.id,
 				type: c.credential.type,
 				data: c.credential.type === "api_key" ? { key: c.credential.key } : { ...c.credential },
@@ -267,7 +281,7 @@ export class AuthStorage {
 		if (authPath.endsWith(".db")) {
 			return authPath;
 		}
-		return getAgentDbPath(dirname(authPath));
+		return getAgentDbPath(path.dirname(authPath));
 	}
 
 	/**
@@ -298,10 +312,10 @@ export class AuthStorage {
 	 * Migrates legacy auth.json/settings.json on first load.
 	 */
 	async reload(): Promise<void> {
-		const agentDir = dirname(this.dbPath);
+		const agentDir = path.dirname(this.dbPath);
 		await migrateJsonStorage({
 			agentDir,
-			settingsPath: join(agentDir, "settings.json"),
+			settingsPath: path.join(agentDir, "settings.json"),
 			authPaths: [this.authPath, ...this.fallbackPaths],
 		});
 
@@ -410,7 +424,7 @@ export class AuthStorage {
 				deduped.push(credential);
 				continue;
 			}
-			if (identifiers.some((identifier) => seen.has(identifier))) {
+			if (identifiers.some(identifier => seen.has(identifier))) {
 				continue;
 			}
 			for (const identifier of identifiers) {
@@ -437,7 +451,7 @@ export class AuthStorage {
 				kept.push(entry);
 				continue;
 			}
-			if (identifiers.some((identifier) => seen.has(identifier))) {
+			if (identifiers.some(identifier => seen.has(identifier))) {
 				removed.push(entry);
 				continue;
 			}
@@ -457,7 +471,7 @@ export class AuthStorage {
 
 	/** Returns all credentials for a provider as an array */
 	private getCredentialsForProvider(provider: string): AuthCredential[] {
-		return this.getStoredCredentials(provider).map((entry) => entry.credential);
+		return this.getStoredCredentials(provider).map(entry => entry.credential);
 	}
 
 	/** Composite key for round-robin tracking: "anthropic:oauth" or "openai:api_key" */
@@ -645,7 +659,7 @@ export class AuthStorage {
 		const stored = this.storage.replaceAuthCredentialsForProvider(provider, deduped);
 		this.setStoredCredentials(
 			provider,
-			stored.map((record) => ({ id: record.id, credential: record.credential })),
+			stored.map(record => ({ id: record.id, credential: record.credential })),
 		);
 		this.resetProviderAssignments(provider);
 	}
@@ -689,7 +703,7 @@ export class AuthStorage {
 	 * Check if OAuth credentials are configured for a provider.
 	 */
 	hasOAuth(provider: string): boolean {
-		return this.getCredentialsForProvider(provider).some((credential) => credential.type === "oauth");
+		return this.getCredentialsForProvider(provider).some(credential => credential.type === "oauth");
 	}
 
 	/**
@@ -707,7 +721,7 @@ export class AuthStorage {
 	getAll(): AuthStorageData {
 		const result: AuthStorageData = {};
 		for (const [provider, entries] of this.data.entries()) {
-			const credentials = entries.map((entry) => entry.credential);
+			const credentials = entries.map(entry => entry.credential);
 			if (credentials.length === 1) {
 				result[provider] = credentials[0];
 			} else if (credentials.length > 1) {
@@ -758,7 +772,7 @@ export class AuthStorage {
 				break;
 			case "cursor":
 				credentials = await loginCursor(
-					(url) => ctrl.onAuth({ url }),
+					url => ctrl.onAuth({ url }),
 					ctrl.onProgress ? () => ctrl.onProgress?.("Waiting for browser authentication...") : undefined,
 				);
 				break;
@@ -832,7 +846,7 @@ export class AuthStorage {
 		if (username) identifiers.push(`account:${username}`);
 		const scopeAccountId = this.getUsageReportScopeAccountId(report);
 		if (scopeAccountId) identifiers.push(`account:${scopeAccountId}`);
-		return identifiers.map((identifier) => `${report.provider}:${identifier.toLowerCase()}`);
+		return identifiers.map(identifier => `${report.provider}:${identifier.toLowerCase()}`);
 	}
 
 	private mergeUsageReportGroup(reports: UsageReport[]): UsageReport {
@@ -844,7 +858,7 @@ export class AuthStorage {
 		});
 		const base = sorted[0];
 		const mergedLimits = [...base.limits];
-		const limitIds = new Set(mergedLimits.map((limit) => limit.id));
+		const limitIds = new Set(mergedLimits.map(limit => limit.id));
 		const mergedMetadata: Record<string, unknown> = { ...(base.metadata ?? {}) };
 		let fetchedAt = base.fetchedAt;
 
@@ -897,7 +911,7 @@ export class AuthStorage {
 			}
 		}
 
-		const deduped = groups.map((group) => this.mergeUsageReportGroup(group));
+		const deduped = groups.map(group => this.mergeUsageReportGroup(group));
 		if (deduped.length !== reports.length) {
 			this.usageLogger?.debug("Usage reports deduped", {
 				before: reports.length,
@@ -920,7 +934,7 @@ export class AuthStorage {
 
 	/** Returns true if usage indicates rate limit has been reached. */
 	private isUsageLimitReached(report: UsageReport): boolean {
-		return report.limits.some((limit) => this.isUsageLimitExhausted(limit));
+		return report.limits.some(limit => this.isUsageLimitExhausted(limit));
 	}
 
 	/** Extracts the earliest reset timestamp from exhausted windows (in ms). */
@@ -985,10 +999,7 @@ export class AuthStorage {
 		if (!resolver || !cache) return null;
 
 		const tasks: Array<Promise<UsageReport | null>> = [];
-		const providers = new Set<string>([
-			...this.data.keys(),
-			...DEFAULT_USAGE_PROVIDERS.map((provider) => provider.id),
-		]);
+		const providers = new Set<string>([...this.data.keys(), ...DEFAULT_USAGE_PROVIDERS.map(provider => provider.id)]);
 		this.usageLogger?.debug("Usage fetch requested", {
 			providers: Array.from(providers).sort(),
 		});
@@ -1033,7 +1044,7 @@ export class AuthStorage {
 							now: this.usageNow,
 							logger: this.usageLogger,
 						})
-						.catch((error) => {
+						.catch(error => {
 							logger.debug("AuthStorage usage fetch failed", {
 								provider,
 								error: String(error),
@@ -1076,7 +1087,7 @@ export class AuthStorage {
 							now: this.usageNow,
 							logger: this.usageLogger,
 						})
-						.catch((error) => {
+						.catch(error => {
 							logger.debug("AuthStorage usage fetch failed", {
 								provider,
 								error: String(error),
@@ -1092,7 +1103,7 @@ export class AuthStorage {
 		const reports = results.filter((report): report is UsageReport => report !== null);
 		const deduped = this.dedupeUsageReports(reports);
 		this.usageLogger?.debug("Usage fetch resolved", {
-			reports: deduped.map((report) => {
+			reports: deduped.map(report => {
 				const accountLabel =
 					this.getUsageReportMetadataValue(report, "email") ??
 					this.getUsageReportMetadataValue(report, "accountId") ??
@@ -1149,7 +1160,7 @@ export class AuthStorage {
 					entry.credential.type === sessionCredential.type && entry.index !== sessionCredential.index,
 			);
 
-		return remainingCredentials.some((candidate) => !this.isCredentialBlocked(providerKey, candidate.index));
+		return remainingCredentials.some(candidate => !this.isCredentialBlocked(providerKey, candidate.index));
 	}
 
 	/**
@@ -1270,7 +1281,7 @@ export class AuthStorage {
 				error: String(error),
 			});
 			this.removeCredentialAt(provider, selection.index);
-			if (this.getCredentialsForProvider(provider).some((credential) => credential.type === "oauth")) {
+			if (this.getCredentialsForProvider(provider).some(credential => credential.type === "oauth")) {
 				return this.getApiKey(provider, sessionId, options);
 			}
 		}

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

@@ -4,22 +4,19 @@
  * When navigating to a different point in the session tree, this generates
  * a summary of the branch being left so context isn't lost.
  */
-
 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 { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-import branchSummaryPrompt from "@oh-my-pi/pi-coding-agent/prompts/compaction/branch-summary.md" with { type: "text" };
-import branchSummaryPreamble from "@oh-my-pi/pi-coding-agent/prompts/compaction/branch-summary-preamble.md" with {
-	type: "text",
-};
+import { renderPromptTemplate } from "../../config/prompt-templates";
+import branchSummaryPrompt from "../../prompts/compaction/branch-summary.md" with { type: "text" };
+import branchSummaryPreamble from "../../prompts/compaction/branch-summary-preamble.md" with { type: "text" };
 import {
 	convertToLlm,
 	createBranchSummaryMessage,
 	createCompactionSummaryMessage,
 	createCustomMessage,
-} from "@oh-my-pi/pi-coding-agent/session/messages";
-import type { ReadonlySessionManager, SessionEntry } from "@oh-my-pi/pi-coding-agent/session/session-manager";
+} from "../../session/messages";
+import type { ReadonlySessionManager, SessionEntry } from "../../session/session-manager";
 import { estimateTokens } from "./compaction";
 import {
 	computeFileLists,
@@ -107,7 +104,7 @@ export function collectEntriesForBranchSummary(
 	}
 
 	// Find common ancestor (deepest node that's on both paths)
-	const oldPath = new Set(session.getBranch(oldLeafId).map((e) => e.id));
+	const oldPath = new Set(session.getBranch(oldLeafId).map(e => e.id));
 	const targetPath = session.getBranch(targetId);
 
 	// targetPath is root-first, so iterate backwards to find deepest common ancestor
@@ -300,7 +297,7 @@ export async function generateBranchSummary(
 
 	let summary = response.content
 		.filter((c): c is { type: "text"; text: string } => c.type === "text")
-		.map((c) => c.text)
+		.map(c => c.text)
 		.join("\n");
 
 	// Prepend preamble to provide context about the branch summary

package/src/session/compaction/compaction.ts

@@ -4,26 +4,15 @@
  * Pure functions for compaction logic. The session manager handles I/O,
  * and after compaction the session is reloaded.
  */
-
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { AssistantMessage, Model, Usage } from "@oh-my-pi/pi-ai";
 import { completeSimple } from "@oh-my-pi/pi-ai";
-import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-import compactionSummaryPrompt from "@oh-my-pi/pi-coding-agent/prompts/compaction/compaction-summary.md" with {
-	type: "text",
-};
-import compactionTurnPrefixPrompt from "@oh-my-pi/pi-coding-agent/prompts/compaction/compaction-turn-prefix.md" with {
-	type: "text",
-};
-import compactionUpdateSummaryPrompt from "@oh-my-pi/pi-coding-agent/prompts/compaction/compaction-update-summary.md" with {
-	type: "text",
-};
-import {
-	convertToLlm,
-	createBranchSummaryMessage,
-	createCustomMessage,
-} from "@oh-my-pi/pi-coding-agent/session/messages";
-import type { CompactionEntry, SessionEntry } from "@oh-my-pi/pi-coding-agent/session/session-manager";
+import { renderPromptTemplate } from "../../config/prompt-templates";
+import compactionSummaryPrompt from "../../prompts/compaction/compaction-summary.md" with { type: "text" };
+import compactionTurnPrefixPrompt from "../../prompts/compaction/compaction-turn-prefix.md" with { type: "text" };
+import compactionUpdateSummaryPrompt from "../../prompts/compaction/compaction-update-summary.md" with { type: "text" };
+import { convertToLlm, createBranchSummaryMessage, createCustomMessage } from "../../session/messages";
+import type { CompactionEntry, SessionEntry } from "../../session/session-manager";
 import {
 	computeFileLists,
 	createFileOps,
@@ -454,7 +443,7 @@ export async function generateSummary(
 
 	const textContent = response.content
 		.filter((c): c is { type: "text"; text: string } => c.type === "text")
-		.map((c) => c.text)
+		.map(c => c.text)
 		.join("\n");
 
 	return textContent;
@@ -675,6 +664,6 @@ async function generateTurnPrefixSummary(
 
 	return response.content
 		.filter((c): c is { type: "text"; text: string } => c.type === "text")
-		.map((c) => c.text)
+		.map(c => c.text)
 		.join("\n");
 }

package/src/session/compaction/utils.ts

@@ -1,14 +1,11 @@
 /**
  * Shared utilities for compaction and branch summarization.
  */
-
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { Message } from "@oh-my-pi/pi-ai";
-import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-import fileOperationsTemplate from "@oh-my-pi/pi-coding-agent/prompts/system/file-operations.md" with { type: "text" };
-import summarizationSystemPrompt from "@oh-my-pi/pi-coding-agent/prompts/system/summarization-system.md" with {
-	type: "text",
-};
+import { renderPromptTemplate } from "../../config/prompt-templates";
+import fileOperationsTemplate from "../../prompts/system/file-operations.md" with { type: "text" };
+import summarizationSystemPrompt from "../../prompts/system/summarization-system.md" with { type: "text" };
 
 // ============================================================================
 // File Operation Tracking
@@ -66,7 +63,7 @@ export function extractFileOpsFromMessage(message: AgentMessage, fileOps: FileOp
  */
 export function computeFileLists(fileOps: FileOperations): { readFiles: string[]; modifiedFiles: string[] } {
 	const modified = new Set([...fileOps.edited, ...fileOps.written]);
-	const readOnly = [...fileOps.read].filter((f) => !modified.has(f)).sort();
+	const readOnly = [...fileOps.read].filter(f => !modified.has(f)).sort();
 	const modifiedFiles = [...modified].sort();
 	return { readFiles: readOnly, modifiedFiles };
 }
@@ -98,7 +95,7 @@ export function serializeConversation(messages: Message[]): string {
 					? msg.content
 					: msg.content
 							.filter((c): c is { type: "text"; text: string } => c.type === "text")
-							.map((c) => c.text)
+							.map(c => c.text)
 							.join("");
 			if (content) parts.push(`[User]: ${content}`);
 		} else if (msg.role === "assistant") {
@@ -132,7 +129,7 @@ export function serializeConversation(messages: Message[]): string {
 		} else if (msg.role === "toolResult") {
 			const content = msg.content
 				.filter((c): c is { type: "text"; text: string } => c.type === "text")
-				.map((c) => c.text)
+				.map(c => c.text)
 				.join("");
 			if (content) {
 				parts.push(`[Tool result]: ${content}`);

package/src/session/history-storage.ts

@@ -1,8 +1,8 @@
 import { Database } from "bun:sqlite";
-import { mkdirSync } from "node:fs";
-import { dirname, join } from "node:path";
-import { getAgentDir } from "@oh-my-pi/pi-coding-agent/config";
+import * as fs from "node:fs";
+import * as path from "node:path";
 import { logger } from "@oh-my-pi/pi-utils";
+import { getAgentDir } from "../config";
 
 export interface HistoryEntry {
 	id: number;
@@ -81,7 +81,7 @@ END;
 		this.lastPromptCache = last?.prompt ?? null;
 	}
 
-	static open(dbPath: string = join(getAgentDir(), "history.db")): HistoryStorage {
+	static open(dbPath: string = path.join(getAgentDir(), "history.db")): HistoryStorage {
 		if (!HistoryStorage.instance) {
 			HistoryStorage.instance = new HistoryStorage(dbPath);
 		}
@@ -110,7 +110,7 @@ END;
 
 		try {
 			const rows = this.recentStmt.all(safeLimit) as HistoryRow[];
-			return rows.map((row) => this.toEntry(row));
+			return rows.map(row => this.toEntry(row));
 		} catch (error) {
 			logger.error("HistoryStorage getRecent failed", { error: String(error) });
 			return [];
@@ -126,7 +126,7 @@ END;
 
 		try {
 			const rows = this.searchStmt.all(ftsQuery, safeLimit) as HistoryRow[];
-			return rows.map((row) => this.toEntry(row));
+			return rows.map(row => this.toEntry(row));
 		} catch (error) {
 			logger.error("HistoryStorage search failed", { error: String(error) });
 			return [];
@@ -134,8 +134,8 @@ END;
 	}
 
 	private ensureDir(dbPath: string): void {
-		const dir = dirname(dbPath);
-		mkdirSync(dir, { recursive: true });
+		const dir = path.dirname(dbPath);
+		fs.mkdirSync(dir, { recursive: true });
 	}
 
 	private normalizeLimit(limit: number): number {
@@ -148,13 +148,13 @@ END;
 		const tokens = query
 			.trim()
 			.split(/\s+/)
-			.map((token) => token.trim())
+			.map(token => token.trim())
 			.filter(Boolean);
 
 		if (tokens.length === 0) return null;
 
 		return tokens
-			.map((token) => {
+			.map(token => {
 				const escaped = token.replace(/"/g, '""');
 				return `"${escaped}"*`;
 			})

package/src/session/messages.ts

@@ -4,11 +4,10 @@
  * Extends the base AgentMessage type with coding-agent specific message types,
  * and provides a transformer to convert them to LLM-compatible messages.
  */
-
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent, Message, TextContent } from "@oh-my-pi/pi-ai";
-import type { OutputMeta } from "@oh-my-pi/pi-coding-agent/tools/output-meta";
-import { formatOutputNotice } from "@oh-my-pi/pi-coding-agent/tools/output-meta";
+import type { OutputMeta } from "../tools/output-meta";
+import { formatOutputNotice } from "../tools/output-meta";
 
 export const COMPACTION_SUMMARY_PREFIX = `The conversation history before this point was compacted into the following summary:
 
@@ -255,7 +254,7 @@ 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(f => `<file path="${f.path}">\n${f.content}\n</file>`).join("\n\n");
 					return {
 						role: "user",
 						content: [{ type: "text" as const, text: `<system-reminder>\n${fileContents}\n</system-reminder>` }],
@@ -272,5 +271,5 @@ export function convertToLlm(messages: AgentMessage[]): Message[] {
 					return undefined;
 			}
 		})
-		.filter((m) => m !== undefined);
+		.filter(m => m !== undefined);
 }