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

package/src/migrations.ts

@@ -1,175 +0,0 @@
-/**
- * One-time migrations that run on startup.
- */
-import * as fs from "node:fs";
-import * as path from "node:path";
-import { isEnoent, logger } from "@oh-my-pi/pi-utils";
-import chalk from "chalk";
-import { getAgentDbPath, getAgentDir } from "./config";
-import { AgentStorage } from "./session/agent-storage";
-import type { AuthCredential } from "./session/auth-storage";
-
-type SessionHeader = {
-	type: "session";
-	cwd: string;
-};
-
-function isSessionHeader(value: unknown): value is SessionHeader {
-	if (!value || typeof value !== "object") return false;
-	const record = value as Record<string, unknown>;
-	return record.type === "session" && typeof record.cwd === "string" && record.cwd.length > 0;
-}
-
-/**
- * Migrate legacy oauth.json and settings.json apiKeys to agent.db.
- *
- * @returns Array of provider names that were migrated
- */
-export async function migrateAuthToAgentDb(): Promise<string[]> {
-	const agentDir = getAgentDir();
-	const oauthPath = path.join(agentDir, "oauth.json");
-	const settingsPath = path.join(agentDir, "settings.json");
-	const storage = await AgentStorage.open(getAgentDbPath(agentDir));
-
-	const migrated: Record<string, AuthCredential[]> = {};
-	const providers: string[] = [];
-
-	try {
-		const oauth = await Bun.file(oauthPath).json();
-		try {
-			for (const [provider, cred] of Object.entries(oauth)) {
-				if (storage.listAuthCredentials(provider).length > 0) {
-					continue;
-				}
-				migrated[provider] = [{ type: "oauth", ...(cred as object) } as AuthCredential];
-				providers.push(provider);
-			}
-			await fs.promises.rename(oauthPath, `${oauthPath}.migrated`);
-		} catch (error) {
-			logger.warn("Failed to migrate oauth.json", { path: oauthPath, error: String(error) });
-		}
-	} catch (err) {
-		if (!isEnoent(err)) {
-			logger.warn("Failed to read oauth.json", { path: oauthPath, error: String(err) });
-		}
-	}
-
-	try {
-		const settings = await Bun.file(settingsPath).json();
-		try {
-			if (settings.apiKeys && typeof settings.apiKeys === "object") {
-				for (const [provider, key] of Object.entries(settings.apiKeys)) {
-					if (typeof key !== "string") continue;
-					if (migrated[provider]) continue;
-					if (storage.listAuthCredentials(provider).length > 0) continue;
-					migrated[provider] = [{ type: "api_key", key }];
-					providers.push(provider);
-				}
-				delete settings.apiKeys;
-				await Bun.write(settingsPath, JSON.stringify(settings, null, 2));
-			}
-		} catch (error) {
-			logger.warn("Failed to migrate settings.json apiKeys", { path: settingsPath, error: String(error) });
-		}
-	} catch (err) {
-		if (!isEnoent(err)) {
-			logger.warn("Failed to read settings.json", { path: settingsPath, error: String(err) });
-		}
-	}
-
-	for (const [provider, credentials] of Object.entries(migrated)) {
-		storage.replaceAuthCredentialsForProvider(provider, credentials);
-	}
-
-	return providers;
-}
-
-/**
- * Migrate sessions from ~/.omp/agent/*.jsonl to proper session directories.
- *
- * Bug in v0.30.0: Sessions were saved to ~/.omp/agent/ instead of
- * ~/.omp/agent/sessions/<encoded-cwd>/. This migration moves them
- * to the correct location based on the cwd in their session header.
- *
- * See: https://github.com/badlogic/pi-mono/issues/320
- */
-export async function migrateSessionsFromAgentRoot(): Promise<void> {
-	const agentDir = getAgentDir();
-
-	// Find all .jsonl files directly in agentDir (not in subdirectories)
-	let files: string[];
-	try {
-		const entries = await fs.promises.readdir(agentDir);
-		files = entries.filter(f => f.endsWith(".jsonl")).map(f => path.join(agentDir, f));
-	} catch (error) {
-		logger.warn("Failed to read agent directory for session migration", { path: agentDir, error: String(error) });
-		return;
-	}
-
-	if (files.length === 0) return;
-
-	for (const file of files) {
-		try {
-			// Read first line to get session header
-			let content: string;
-			try {
-				content = await Bun.file(file).text();
-			} catch (err) {
-				if (isEnoent(err)) continue;
-				throw err;
-			}
-			const entries: unknown[] = Bun.JSONL.parse(content);
-			const header = entries[0];
-			if (!isSessionHeader(header)) continue;
-
-			const cwd = header.cwd;
-
-			// Compute the correct session directory (same encoding as session-manager.ts)
-			const safePath = `--${cwd.replace(/^[/\\]/, "").replace(/[/\\:]/g, "-")}--`;
-			const correctDir = path.join(agentDir, "sessions", safePath);
-
-			// Create directory if needed
-			await fs.promises.mkdir(correctDir, { recursive: true });
-
-			// Move the file
-			const fileName = file.split("/").pop() || file.split("\\").pop();
-			const newPath = path.join(correctDir, fileName!);
-
-			if (fs.existsSync(newPath)) continue; // Skip if target exists
-
-			await fs.promises.rename(file, newPath);
-		} catch (error) {
-			logger.warn("Failed to migrate session file", { path: file, error: String(error) });
-		}
-	}
-}
-
-/**
- * Run all migrations. Called once on startup.
- *
- * @param _cwd - Current working directory (reserved for future project-local migrations)
- * @returns Object with migration results
- */
-export async function runMigrations(_cwd: string): Promise<{
-	migratedAuthProviders: string[];
-	deprecationWarnings: string[];
-}> {
-	// Then: run data migrations
-	const migratedAuthProviders = await migrateAuthToAgentDb();
-	await migrateSessionsFromAgentRoot();
-
-	return { migratedAuthProviders, deprecationWarnings: [] };
-}
-
-/**
- * Display deprecation warnings to the user in interactive mode.
- *
- * @param warnings - Array of deprecation warning messages
- */
-export async function showDeprecationWarnings(warnings: string[]): Promise<void> {
-	console.log(chalk.yellow("\n⚠ Deprecation Warnings:"));
-	for (const warning of warnings) {
-		console.log(chalk.yellow(`  • ${warning}`));
-	}
-	console.log();
-}

package/src/session/storage-migration.ts

@@ -1,173 +0,0 @@
-/**
- * Migrates legacy auth.json to SQLite-based agent.db.
- * Auth credentials merge per-provider when missing.
- * Original JSON files are backed up to .bak and removed after successful migration.
- *
- * NOTE: Settings migration is now handled by SettingsManager.migrateToYaml(),
- * which migrates from both settings.json and agent.db to config.yaml.
- */
-import { logger } from "@oh-my-pi/pi-utils";
-import { getAgentDbPath } from "../config";
-import { AgentStorage } from "./agent-storage";
-import type { AuthCredential, AuthCredentialEntry, AuthStorageData } from "./auth-storage";
-
-/** Paths configuration for the storage migration process. */
-type MigrationPaths = {
-	/** Directory containing agent.db */
-	agentDir: string;
-	/** Path to legacy settings.json file (kept for API compatibility, no longer used) */
-	settingsPath: string;
-	/** Candidate paths to search for auth.json (checked in order) */
-	authPaths: string[];
-};
-
-/** Result of the JSON-to-SQLite storage migration. */
-export interface StorageMigrationResult {
-	/** Whether settings.json was migrated (always false - settings migration is handled elsewhere) */
-	migratedSettings: boolean;
-	/** Whether auth.json was migrated to agent.db */
-	migratedAuth: boolean;
-	/** Non-fatal issues encountered during migration */
-	warnings: string[];
-}
-
-/**
- * Type guard for plain objects.
- * @param value - Value to check
- * @returns True if value is a non-null, non-array object
- */
-function isRecord(value: unknown): value is Record<string, unknown> {
-	return !!value && typeof value === "object" && !Array.isArray(value);
-}
-
-/**
- * Normalizes credential entries to array format (legacy stored single credentials).
- * @param entry - Single credential or array of credentials
- * @returns Array of credentials (empty if entry is undefined)
- */
-function normalizeCredentialEntry(entry: AuthCredentialEntry | undefined): AuthCredential[] {
-	if (!entry) return [];
-	return Array.isArray(entry) ? entry : [entry];
-}
-
-/**
- * Reads and parses a JSON file.
- * @param path - Path to the JSON file
- * @returns Parsed JSON content, or null if file doesn't exist or parsing fails
- */
-async function readJsonFile<T>(path: string): Promise<T | null> {
-	try {
-		const file = Bun.file(path);
-		if (!(await file.exists())) return null;
-		const content = await file.text();
-		return JSON.parse(content) as T;
-	} catch (error) {
-		logger.warn("Storage migration failed to read JSON", { path, error: String(error) });
-		return null;
-	}
-}
-
-/**
- * Backs up a JSON file to .bak and removes the original.
- * Prevents re-migration on subsequent runs.
- * @param path - Path to the JSON file to backup
- */
-async function backupJson(path: string): Promise<void> {
-	const file = Bun.file(path);
-	if (!(await file.exists())) return;
-
-	const backupPath = `${path}.bak`;
-	try {
-		const content = await file.arrayBuffer();
-		await Bun.write(backupPath, content);
-		await file.unlink();
-	} catch (error) {
-		logger.warn("Storage migration failed to backup JSON", { path, error: String(error) });
-	}
-}
-
-/**
- * Finds the first valid auth.json from candidate paths (checked in priority order).
- * @param authPaths - Candidate paths to search (e.g., project-local before global)
- * @returns First valid auth file with its path and parsed data, or null if none found
- */
-async function findFirstAuthJson(authPaths: string[]): Promise<{ path: string; data: AuthStorageData } | null> {
-	for (const authPath of authPaths) {
-		const data = await readJsonFile<AuthStorageData>(authPath);
-		if (data && isRecord(data)) {
-			return { path: authPath, data };
-		}
-	}
-	return null;
-}
-
-/**
- * Validates that a credential has a recognized type.
- * @param entry - Credential to validate
- * @returns True if credential type is api_key or oauth
- */
-function isValidCredential(entry: AuthCredential): boolean {
-	return entry.type === "api_key" || entry.type === "oauth";
-}
-
-/**
- * Migrates auth.json to SQLite storage for providers missing in agent.db.
- * @param storage - AgentStorage instance to migrate into
- * @param authPaths - Candidate paths to search for auth.json
- * @param warnings - Array to collect non-fatal warnings
- * @returns True if migration was performed
- */
-async function migrateAuth(storage: AgentStorage, authPaths: string[], warnings: string[]): Promise<boolean> {
-	const authJson = await findFirstAuthJson(authPaths);
-	if (!authJson) return false;
-
-	let sawValid = false;
-	let migratedAny = false;
-
-	for (const [provider, entry] of Object.entries(authJson.data)) {
-		const credentials = normalizeCredentialEntry(entry)
-			.filter(isValidCredential)
-			.map(credential => credential);
-
-		if (credentials.length === 0) continue;
-		sawValid = true;
-
-		if (storage.listAuthCredentials(provider).length > 0) {
-			continue;
-		}
-
-		storage.replaceAuthCredentialsForProvider(provider, credentials);
-		migratedAny = true;
-	}
-
-	if (sawValid) {
-		await backupJson(authJson.path);
-	}
-
-	if (!migratedAny && sawValid) {
-		warnings.push(`auth.json entries already present in agent.db: ${authJson.path}`);
-	}
-
-	return migratedAny;
-}
-
-/**
- * Migrates legacy auth.json to SQLite-based agent.db.
- * Settings migration is handled separately by SettingsManager.migrateToYaml().
- * @param paths - Configuration specifying locations of legacy files and target DB
- * @returns Result indicating what was migrated and any warnings encountered
- */
-export async function migrateJsonStorage(paths: MigrationPaths): Promise<StorageMigrationResult> {
-	const storage = await AgentStorage.open(getAgentDbPath(paths.agentDir));
-	const warnings: string[] = [];
-
-	const migratedAuth = await migrateAuth(storage, paths.authPaths, warnings);
-
-	if (warnings.length > 0) {
-		for (const warning of warnings) {
-			logger.warn("Storage migration warning", { warning });
-		}
-	}
-
-	return { migratedSettings: false, migratedAuth, warnings };
-}