osdy-pi 1.2.0 → 1.3.0

package/extensions/osdy-pi/account-profiles.test.ts

@@ -1,27 +1,59 @@
 import assert from "node:assert/strict";
-import { EventEmitter } from "node:events";
+import { mkdtemp, mkdir, realpath, symlink } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
 import test from "node:test";
-import type { ChildProcess } from "node:child_process";
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore Node's native TypeScript runner resolves test-only TypeScript source imports.
-import { handoffToAccount, manageAccountProfile, manageAccountProfiles, parseDefaultAccountResult, waitForLauncherReady } from "./account-profiles.ts";
+import {
+	availableProfiles,
+	manageAccountProfile,
+	manageAccountProfiles,
+	parseDefaultAccountResult,
+	sharedAgentDir,
+	switchAccountInPlace,
+	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+	// @ts-ignore Node's native TypeScript runner resolves test-only TypeScript source imports.
+} from "./account-profiles.ts";
 
-class FakeLauncher extends EventEmitter {
-	disconnected = false;
-	unreferenced = false;
-
-	disconnect(): void {
-		this.disconnected = true;
-	}
+void test("uses the account resolver for split-agent roots and explicit overrides", async () => {
+	const candidate = await mkdtemp(join(tmpdir(), "osdy-pi-extension-agent-test-"));
+	const managedParent = await mkdtemp(join(tmpdir(), "osdy-pi-extension-managed-test-"));
+	await mkdir(join(managedParent, "osdy-pi"));
+	await symlink(join(managedParent, "osdy-pi"), join(candidate, "osdy-pi"));
+	assert.equal(
+		await sharedAgentDir({ PI_CODING_AGENT_DIR: candidate }),
+		await realpath(managedParent),
+	);
+	const explicit = await mkdtemp(join(tmpdir(), "osdy-pi-extension-explicit-test-"));
+	assert.equal(
+		await sharedAgentDir({
+			OSDY_PI_SHARED_AGENT_DIR: explicit,
+			PI_CODING_AGENT_DIR: candidate,
+		}),
+		explicit,
+	);
+});
 
-	unref(): void {
-		this.unreferenced = true;
-	}
+void test("does not traverse malformed agent roots during extension profile discovery", async () => {
+	const validCandidate = await mkdtemp(join(tmpdir(), "osdy-pi-extension-list-valid-test-"));
+	const managedParent = await mkdtemp(join(tmpdir(), "osdy-pi-extension-list-managed-test-"));
+	await mkdir(join(managedParent, "osdy-pi", "profiles", "work"), {
+		recursive: true,
+	});
+	await symlink(join(managedParent, "osdy-pi"), join(validCandidate, "osdy-pi"));
+	assert.deepEqual(
+		await availableProfiles(await sharedAgentDir({ PI_CODING_AGENT_DIR: validCandidate })),
+		["work"],
+	);
 
-	asChildProcess(): ChildProcess {
-		return this as unknown as ChildProcess;
-	}
-}
+	const malformedCandidate = await mkdtemp(join(tmpdir(), "osdy-pi-extension-list-malformed-test-"));
+	const wrongChild = await mkdtemp(join(tmpdir(), "osdy-pi-extension-list-wrong-child-test-"));
+	await mkdir(join(wrongChild, "profiles", "private"), { recursive: true });
+	await symlink(wrongChild, join(malformedCandidate, "osdy-pi"));
+	assert.deepEqual(
+		await availableProfiles(await sharedAgentDir({ PI_CODING_AGENT_DIR: malformedCandidate })),
+		[],
+	);
+});
 
 void test("parses default account command output without treating status text as a profile", () => {
 	assert.deepEqual(
@@ -265,6 +297,28 @@ void test("opens a looped account manager and exits cleanly on Cancel", async ()
 	assert.deepEqual(notices, ["Accounts:\nwork (default)"]);
 });
 
+void test("marks active and default profiles case-insensitively while preserving stored spelling", async () => {
+	const notices: string[] = [];
+	const answers = ["Account info", "Cancel"];
+	await manageAccountProfiles(
+		{
+			isIdle: () => true,
+			waitForIdle: () => Promise.resolve(),
+			ui: {
+				notify: (message: string) => notices.push(message),
+				select: () => Promise.resolve(answers.shift()),
+				input: () => Promise.resolve(undefined),
+			},
+		},
+		{
+			profiles: () => Promise.resolve(["Work"]),
+			activeProfile: "WORK",
+			run: () => Promise.resolve({ code: 0, stdout: "work\n", stderr: "" }),
+		},
+	);
+	assert.deepEqual(notices, ["Accounts:\nWork (active) (default)"]);
+});
+
 void test("manages profile rename and permanent removal prompts through authoritative subprocess commands", async (t) => {
 	await t.test("rename sequences target and new name", async () => {
 		const calls: string[][] = [];
@@ -387,61 +441,15 @@ void test("manages profile rename and permanent removal prompts through authorit
 	);
 });
 
-void test("waits for the Pi-ready IPC message before disconnecting the launcher", async () => {
-	const launcher = new FakeLauncher();
-	const ready = waitForLauncherReady(launcher.asChildProcess());
-	assert.equal(launcher.disconnected, false);
-	launcher.emit("spawn");
-	assert.equal(launcher.disconnected, false);
-	launcher.emit("message", { type: "osdy-pi-ready" });
-	await ready;
-	assert.equal(launcher.disconnected, true);
-	assert.equal(launcher.unreferenced, true);
-});
-
-void test("rejects launcher error, early exit, and timeout before readiness", async (t) => {
-	await t.test("error message", async () => {
-		const launcher = new FakeLauncher();
-		const ready = waitForLauncherReady(launcher.asChildProcess());
-		launcher.emit("message", {
-			type: "osdy-pi-error",
-			message: "Pi spawn failed",
-		});
-		await assert.rejects(ready, /Pi spawn failed/);
-	});
-	await t.test("early exit", async () => {
-		const launcher = new FakeLauncher();
-		const ready = waitForLauncherReady(launcher.asChildProcess());
-		launcher.emit("exit", 1, null);
-		await assert.rejects(ready, /exited before confirming readiness/);
-	});
-	await t.test("timeout", async () => {
-		const launcher = new FakeLauncher();
-		let expire: (() => void) | undefined;
-		const ready = waitForLauncherReady(
-			launcher.asChildProcess(),
-			10,
-			(callback) => {
-				expire = callback;
-				return setTimeout(() => undefined, 60_000);
-			},
-		);
-		expire?.();
-		await assert.rejects(ready, /timed out/);
-	});
-});
-
-void test("account handoff waits for idle, starts the launcher with the current session, then shuts down", async () => {
+void test("switches in place after idle without spawning or shutting down", async () => {
 	const events: string[] = [];
-	await handoffToAccount(
+	await switchAccountInPlace(
 		{
 			isIdle: () => false,
 			waitForIdle: () =>
 				Promise.resolve().then(() => {
 					events.push("idle");
 				}),
-			shutdown: () => events.push("shutdown"),
-			sessionManager: { getSessionFile: () => "/tmp/current.jsonl" },
 			ui: {
 				notify: (message: string) => events.push(message),
 				select: () => Promise.resolve(undefined),
@@ -449,30 +457,34 @@ void test("account handoff waits for idle, starts the launcher with the current
 			},
 		},
 		"work",
-		{
-			spawn: (command, args) =>
-				Promise.resolve().then(() => {
-					events.push(`${command} ${args.join(" ")}`);
-					events.push("spawned");
-				}),
+		(profile) =>
+			Promise.resolve().then(() => {
+				events.push(`activate ${profile}`);
+			}),
+		() =>
+			Promise.resolve().then(() => {
+				events.push("refresh");
+			}),
+		() => {
+			events.push(`render ${process.env.OSDY_PI_PROFILE_NAME}`);
 		},
 	);
 	assert.deepEqual(events, [
 		"idle",
-		"osdy-pi account use work -- --session /tmp/current.jsonl",
-		"spawned",
-		"shutdown",
+		"activate work",
+		"render work",
+		"refresh",
+		"Switched to work. Your next request uses this account.",
 	]);
 });
 
-void test("account handoff keeps the current Pi session running when its session cannot be safely resumed", async () => {
+void test("keeps the current account when in-place activation fails", async () => {
 	const notices: string[] = [];
-	await handoffToAccount(
+	let renderRequested = false;
+	await switchAccountInPlace(
 		{
 			isIdle: () => true,
 			waitForIdle: () => Promise.resolve(),
-			shutdown: () => assert.fail("must not shut down"),
-			sessionManager: { getSessionFile: () => undefined },
 			ui: {
 				notify: (message: string) => notices.push(message),
 				select: () => Promise.resolve(undefined),
@@ -480,38 +492,40 @@ void test("account handoff keeps the current Pi session running when its session
 			},
 		},
 		"work",
-		{ spawn: () => Promise.resolve().then(() => assert.fail("must not launch")) },
+		() => Promise.reject(new Error("unsafe auth")),
+		() => Promise.resolve(assert.fail("must not refresh")),
+		() => {
+			renderRequested = true;
+		},
 	);
+	assert.equal(renderRequested, false);
 	assert.deepEqual(notices, [
-		"Cannot switch accounts: the current session has not been saved yet.",
+		"Cannot switch accounts: the account files could not be safely activated.",
 	]);
 });
 
-void test("account handoff keeps the current Pi session running when the launcher fails asynchronously", async () => {
-	const events: string[] = [];
-	await handoffToAccount(
+void test("reports a successful switch when usage refresh rejects unexpectedly", async () => {
+	const notices: string[] = [];
+	let refreshAttempted = false;
+	await switchAccountInPlace(
 		{
 			isIdle: () => true,
 			waitForIdle: () => Promise.resolve(),
-			shutdown: () => events.push("shutdown"),
-			sessionManager: { getSessionFile: () => "/tmp/current.jsonl" },
 			ui: {
-				notify: (message: string) => events.push(message),
+				notify: (message: string) => notices.push(message),
 				select: () => Promise.resolve(undefined),
 				input: () => Promise.resolve(undefined),
 			},
 		},
 		"work",
-		{
-			spawn: () =>
-				Promise.resolve().then(() => {
-					events.push("launch attempted");
-					throw new Error("not found");
-				}),
+		() => Promise.resolve(),
+		() => {
+			refreshAttempted = true;
+			return Promise.reject(new Error("unexpected refresh failure"));
 		},
 	);
-	assert.deepEqual(events, [
-		"launch attempted",
-		"Cannot switch accounts: unable to start the replacement Pi process.",
+	assert.equal(refreshAttempted, true);
+	assert.deepEqual(notices, [
+		"Switched to work. Your next request uses this account.",
 	]);
 });

package/extensions/osdy-pi/account-profiles.ts

@@ -1,94 +1,75 @@
 import { spawn as spawnChild } from "node:child_process";
-import type { ChildProcess } from "node:child_process";
-import { readdir } from "node:fs/promises";
-import { homedir } from "node:os";
 import { fileURLToPath } from "node:url";
-import { isAbsolute, join, resolve } from "node:path";
 import type {
 	ExtensionCommandContext,
 	ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
 
-const PROFILE_NAME = /^[a-z0-9](?:[a-z0-9-]{0,62})$/;
+const PROFILE_NAME = /^[A-Za-z0-9](?:[A-Za-z0-9-]{0,62})$/;
 const RESERVED_PROFILE_NAMES = new Set(["default", "profiles", "auth.json"]);
 
+function sameProfile(left: string | undefined, right: string | undefined): boolean {
+	return left?.toLowerCase() === right?.toLowerCase();
+}
+
 export type AccountContext = Pick<
 	ExtensionCommandContext,
-	"isIdle" | "waitForIdle" | "shutdown"
+	"isIdle" | "waitForIdle"
 > & {
-	sessionManager: Pick<
+	shutdown?: ExtensionCommandContext["shutdown"];
+	sessionManager?: Pick<
 		ExtensionCommandContext["sessionManager"],
 		"getSessionFile"
 	>;
 	ui: Pick<ExtensionContext["ui"], "notify" | "select" | "input">;
 };
 
-export interface AccountHandoffDependencies {
-	spawn(command: string, args: string[]): Promise<void>;
-	launcher?: string;
-}
-
 export interface AccountManagementDependencies {
 	profiles(): Promise<string[]>;
 	run(args: string[]): Promise<{ code: number; stdout: string; stderr: string }>;
 	activeProfile?: string | undefined;
-	handoff?: (profile: string) => Promise<void>;
+	activate?: (profile: string) => Promise<void>;
+	refreshUsage?: (() => Promise<void>) | undefined;
+	requestRender?: (() => void) | undefined;
 }
 
-type LauncherMessage =
-	| { type: "osdy-pi-ready" }
-	| { type: "osdy-pi-error"; message: string };
-
-type ScheduleTimeout = (callback: () => void, delay: number) => NodeJS.Timeout;
-
-const LAUNCHER_READY_TIMEOUT_MS = 10_000;
-
-function isProfileName(value: string): boolean {
-	return PROFILE_NAME.test(value) && !RESERVED_PROFILE_NAMES.has(value);
-}
-
-function sharedAgentDir(env: NodeJS.ProcessEnv): string {
-	return resolve(
-		env.OSDY_PI_SHARED_AGENT_DIR ??
-			env.PI_CODING_AGENT_DIR ??
-			join(homedir(), ".pi", "agent"),
-	);
+export interface AccountProfilesCommandDependencies {
+	refreshUsage?: (() => Promise<void>) | undefined;
+	requestRender?: (() => void) | undefined;
 }
 
-async function availableProfiles(baseDir: string): Promise<string[]> {
-	try {
-		const entries = await readdir(join(baseDir, "osdy-pi", "profiles"), {
-			withFileTypes: true,
-		});
-		const profiles: string[] = [];
-		for (const entry of entries) {
-			if (entry.isDirectory() && isProfileName(entry.name))
-				profiles.push(entry.name);
-		}
-		return profiles.sort(compareStrings);
-	} catch (error: unknown) {
-		if (isErrorCode(error, "ENOENT")) return [];
-		throw error;
-	}
+function isProfileName(value: string): boolean {
+	return PROFILE_NAME.test(value) && !RESERVED_PROFILE_NAMES.has(value.toLowerCase());
 }
 
-function isErrorCode(error: unknown, code: string): boolean {
-	return (
-		typeof error === "object" &&
-		error !== null &&
-		"code" in error &&
-		error.code === code
-	);
+export async function sharedAgentDir(env: NodeJS.ProcessEnv): Promise<string> {
+	const moduleUrl = new URL(
+		"../../scripts/osdy-pi-account-profiles.mjs",
+		import.meta.url,
+	).href;
+	const profiles = (await import(moduleUrl)) as {
+		getSharedAgentDir(env: NodeJS.ProcessEnv): string;
+	};
+	return profiles.getSharedAgentDir(env);
 }
 
-function compareStrings(left: string, right: string): number {
-	return left < right ? -1 : left > right ? 1 : 0;
+export async function availableProfiles(baseDir: string): Promise<string[]> {
+	const moduleUrl = new URL(
+		"../../scripts/osdy-pi-account-profiles.mjs",
+		import.meta.url,
+	).href;
+	const profiles = (await import(moduleUrl)) as {
+		listProfiles(baseDir: string): Promise<string[]>;
+	};
+	return profiles.listProfiles(baseDir);
 }
 
-export async function handoffToAccount(
+export async function switchAccountInPlace(
 	ctx: AccountContext,
 	profile: string,
-	dependencies: AccountHandoffDependencies,
+	activate: (profile: string) => Promise<void>,
+	refreshUsage?: () => Promise<void>,
+	requestRender?: () => void,
 ): Promise<void> {
 	if (!isProfileName(profile)) {
 		ctx.ui.notify(
@@ -97,92 +78,29 @@ export async function handoffToAccount(
 		);
 		return;
 	}
-	const sessionPath = ctx.sessionManager.getSessionFile();
-	if (!sessionPath || !isAbsolute(sessionPath)) {
-		ctx.ui.notify(
-			"Cannot switch accounts: the current session has not been saved yet.",
-			"warning",
-		);
-		return;
-	}
 	if (!ctx.isIdle()) await ctx.waitForIdle();
-	const launcher = dependencies.launcher ?? "osdy-pi";
 	try {
-		await dependencies.spawn(launcher, [
-			"account",
-			"use",
-			profile,
-			"--",
-			"--session",
-			sessionPath,
-		]);
+		await activate(profile);
 	} catch {
 		ctx.ui.notify(
-			"Cannot switch accounts: unable to start the replacement Pi process.",
+			"Cannot switch accounts: the account files could not be safely activated.",
 			"warning",
 		);
 		return;
 	}
-	ctx.shutdown();
-}
-
-function isLauncherMessage(message: unknown): message is LauncherMessage {
-	if (typeof message !== "object" || message === null || !("type" in message))
-		return false;
-	if (message.type === "osdy-pi-ready") return true;
-	return (
-		message.type === "osdy-pi-error" &&
-		"message" in message &&
-		typeof message.message === "string"
+	process.env.OSDY_PI_PROFILE_NAME = profile;
+	requestRender?.();
+	try {
+		await refreshUsage?.();
+	} catch {
+		// Usage refresh failures must not make a completed account activation appear failed.
+	}
+	ctx.ui.notify(
+		`Switched to ${profile}. Your next request uses this account.`,
+		"info",
 	);
 }
 
-export function waitForLauncherReady(
-	child: ChildProcess,
-	timeoutMs = LAUNCHER_READY_TIMEOUT_MS,
-	scheduleTimeout: ScheduleTimeout = setTimeout,
-): Promise<void> {
-	return new Promise((resolveReady, rejectReady) => {
-		let settled = false;
-		const cleanup = (): void => {
-			clearTimeout(timeout);
-			child.removeListener("error", onError);
-			child.removeListener("exit", onExit);
-			child.removeListener("message", onMessage);
-		};
-		const fail = (error: Error): void => {
-			if (settled) return;
-			settled = true;
-			cleanup();
-			rejectReady(error);
-		};
-		const onError = (error: Error): void => fail(error);
-		const onExit = (): void =>
-			fail(new Error("Replacement Pi exited before confirming readiness."));
-		const onMessage = (message: unknown): void => {
-			if (!isLauncherMessage(message)) return;
-			if (message.type === "osdy-pi-error") {
-				fail(new Error(message.message));
-				return;
-			}
-			if (settled) return;
-			settled = true;
-			cleanup();
-			child.disconnect();
-			child.unref();
-			resolveReady();
-		};
-		const timeout = scheduleTimeout(
-			() =>
-				fail(new Error("Replacement Pi timed out before confirming readiness.")),
-			timeoutMs,
-		);
-		child.once("error", onError);
-		child.once("exit", onExit);
-		child.on("message", onMessage);
-	});
-}
-
 function bundledLauncherPath(): string {
 	return fileURLToPath(new URL("../../bin/osdy-pi.mjs", import.meta.url));
 }
@@ -247,7 +165,7 @@ function markedProfiles(
 ): string[] {
 	return profiles.map(
 		(profile) =>
-			`${profile}${profile === activeProfile ? " (active)" : ""}${profile === defaultProfile ? " (default)" : ""}`,
+			`${profile}${sameProfile(profile, activeProfile) ? " (active)" : ""}${sameProfile(profile, defaultProfile) ? " (default)" : ""}`,
 	);
 }
 
@@ -290,7 +208,7 @@ export async function manageAccountProfile(
 	const target =
 		activeMarker === -1 ? selected : selected.slice(0, activeMarker);
 	if (!profiles.includes(target)) return;
-	if (target === dependencies.activeProfile) {
+	if (sameProfile(target, dependencies.activeProfile)) {
 		ctx.ui.notify(
 			"Cannot change the active profile. Switch to another profile first.",
 			"warning",
@@ -302,7 +220,7 @@ export async function manageAccountProfile(
 		if (newName === undefined) return;
 		if (!validProfileName(newName)) {
 			ctx.ui.notify(
-				"Profile names use lowercase letters, numbers, and hyphens only.",
+				"Profile names use ASCII letters, numbers, and hyphens only.",
 				"warning",
 			);
 			return;
@@ -331,10 +249,10 @@ export async function manageAccountProfile(
 		return;
 	}
 	let replacement: string | undefined;
-	if (defaultState.status === "valid" && defaultState.profile === target) {
+	if (defaultState.status === "valid" && sameProfile(defaultState.profile, target)) {
 		replacement = await ctx.ui.select(
 			"Choose a new default account",
-			profiles.filter((profile) => profile !== target),
+			profiles.filter((profile) => !sameProfile(profile, target)),
 		);
 		if (replacement === undefined) return;
 	}
@@ -404,7 +322,7 @@ export async function manageAccountProfiles(
 			if (name === undefined) continue;
 			if (!validProfileName(name)) {
 				ctx.ui.notify(
-					"Profile names use lowercase letters, numbers, and hyphens only.",
+					"Profile names use ASCII letters, numbers, and hyphens only.",
 					"warning",
 				);
 				continue;
@@ -501,11 +419,18 @@ export async function manageAccountProfiles(
 		const marker = target.indexOf(" (");
 		const profile = marker === -1 ? target : target.slice(0, marker);
 		if (!profiles.includes(profile)) continue;
-		if (profile === dependencies.activeProfile) {
+		if (sameProfile(profile, dependencies.activeProfile)) {
 			ctx.ui.notify("That account is already active.", "info");
 			continue;
 		}
-		if (dependencies.handoff) await dependencies.handoff(profile);
+		if (dependencies.activate)
+			await switchAccountInPlace(
+				ctx,
+				profile,
+				dependencies.activate,
+				dependencies.refreshUsage,
+				dependencies.requestRender,
+			);
 		return;
 	}
 }
@@ -534,17 +459,20 @@ function runBundledCommand(
 	});
 }
 
-export function registerAccountProfilesCommand(pi: {
-	registerCommand(
-		name: string,
-		options: {
-			description: string;
-			handler: (args: string, ctx: ExtensionCommandContext) => Promise<void>;
-		},
-	): void;
-}): void {
+export function registerAccountProfilesCommand(
+	pi: {
+		registerCommand(
+			name: string,
+			options: {
+				description: string;
+				handler: (args: string, ctx: ExtensionCommandContext) => Promise<void>;
+			},
+		): void;
+	},
+	commandDependencies: AccountProfilesCommandDependencies = {},
+): void {
 	pi.registerCommand("osdy-account", {
-		description: "Restart Pi with another isolated OpenAI account profile.",
+		description: "Switch the active OpenAI account without restarting Pi.",
 		handler: async (args, ctx) => {
 			const mode = args.trim();
 			if ((ctx as ExtensionCommandContext & { hasUI?: boolean }).hasUI === false) {
@@ -552,20 +480,21 @@ export function registerAccountProfilesCommand(pi: {
 				return;
 			}
 			const dependencies: AccountManagementDependencies = {
-				profiles: () => availableProfiles(sharedAgentDir(process.env)),
+				profiles: async () => availableProfiles(await sharedAgentDir(process.env)),
 				run: runBundledCommand,
 				activeProfile: process.env.OSDY_PI_PROFILE_NAME,
-				handoff: (profile) =>
-					handoffToAccount(ctx, profile, {
-						launcher: bundledLauncherPath(),
-						spawn: (command, launchArgs) =>
-							waitForLauncherReady(
-								spawnChild(process.execPath, [command, ...launchArgs], {
-									detached: true,
-									stdio: ["ignore", "ignore", "ignore", "ipc"],
-								}),
-							),
-					}),
+				refreshUsage: commandDependencies.refreshUsage,
+				requestRender: commandDependencies.requestRender,
+				activate: async (profile) => {
+					const moduleUrl = new URL(
+						"../../scripts/osdy-pi-account-profiles.mjs",
+						import.meta.url,
+					).href;
+					const profiles = (await import(moduleUrl)) as {
+						switchAccountAuth(baseDir: string, name: string): Promise<void>;
+					};
+					await profiles.switchAccountAuth(await sharedAgentDir(process.env), profile);
+				},
 			};
 			if (mode === "rename" || mode === "remove") {
 				await manageAccountProfile(ctx, mode, dependencies);