osdy-pi 1.11.1 → 1.11.2

package/README.md

@@ -240,12 +240,14 @@ Profile names accept ASCII letters, numbers, and hyphens, up to 63 characters, p
 
 ### See and switch the active account
 
-When Pi was launched through a profile, Osdy Pi shows its profile name in the editor:
+Direct `pi` startup restores the last activated profile label from valid active-account metadata. A valid explicit launcher profile (`OSDY_PI_PROFILE_NAME`) takes precedence. Osdy Pi shows the profile name in the editor:
 
 - **Simple/native editor:** beside the model, for example `gpt-5.6-sol · personal · think high`.
 - **Extended/framed editor:** `personal` replaces the `Osdy-Pi` title.
 - **No managed profile:** the existing model line and `Osdy-Pi` title remain unchanged.
 
+Label recovery is visual only: it does not switch credentials or change the configured default. Missing, invalid, unreadable, or stale active-account metadata keeps the existing fallback.
+
 `account use <name>` activates the profile in Pi's shared agent directory, saves it as active/default, then starts Pi. Inside Pi, `/osdy-account` waits for active work to finish and swaps the canonical `auth.json` in place; the next request resolves the new account without a spawn, shutdown, session handoff, or restart.
 
 To resume a specific session directly from the terminal:

package/extensions/osdy-pi/profile-label.ts

@@ -12,6 +12,46 @@ export function resolveActiveProfileLabel(
 		: undefined;
 }
 
+function isCallable(value: unknown): value is (...args: unknown[]) => unknown {
+	return typeof value === "function";
+}
+
+async function loadAccountProfiles(): Promise<unknown> {
+	const moduleUrl = new URL(
+		"../../scripts/osdy-pi-account-profiles.mjs",
+		import.meta.url,
+	).href;
+	return import(moduleUrl);
+}
+
+/** Read visual identity only; never activate credentials or consult defaults. */
+export async function readLastActiveProfileLabel(
+	env: NodeJS.ProcessEnv = process.env,
+	loadModule: () => Promise<unknown> = loadAccountProfiles,
+): Promise<string | undefined> {
+	try {
+		const profiles = await loadModule();
+		if (
+			typeof profiles !== "object" || profiles === null ||
+			!("getSharedAgentDir" in profiles) ||
+			!isCallable(profiles.getSharedAgentDir) ||
+			!("readActiveAccount" in profiles) ||
+			!isCallable(profiles.readActiveAccount)
+		) return undefined;
+		const directory: unknown = profiles.getSharedAgentDir(env);
+		if (typeof directory !== "string") return undefined;
+		const active: unknown = await profiles.readActiveAccount(directory);
+		if (
+			typeof active !== "object" || active === null ||
+			!("status" in active) || active.status !== "valid" ||
+			!("profile" in active) || typeof active.profile !== "string"
+		) return undefined;
+		return resolveActiveProfileLabel({ OSDY_PI_PROFILE_NAME: active.profile });
+	} catch {
+		return undefined;
+	}
+}
+
 export function formatModelMetadata(
 	model: string,
 	thinkingLevel: string,

package/extensions/osdy-pi/runtime.test.ts

@@ -41,6 +41,8 @@ registerHooks({
 	},
 });
 
+const profileLabels = await import("./profile-label.js");
+
 const { PLUGIN_EVENTS, subscribeQuestionPromptAudioNotification } =
 	await import("./plugin-events.js");
 const {
@@ -211,6 +213,115 @@ void test("TODO command persists on/off in a disposable custom profile before su
  }
 });
 
+void test("startup label reader validates the dynamic module and active metadata only", async () => {
+	const env = { OSDY_PI_SHARED_AGENT_DIR: "/unused/shared" };
+	let reads = 0;
+	for (const [record, expected] of [
+		[{ status: "valid", profile: "work" }, "work"],
+		[{ status: "unset" }, undefined],
+		[{ status: "invalid" }, undefined],
+		[{ status: "valid", profile: "default" }, undefined],
+		[{ status: "valid", profile: "../bad" }, undefined],
+		[null, undefined],
+	] as const) {
+		assert.equal(await profileLabels.readLastActiveProfileLabel(env, () => Promise.resolve({
+			getSharedAgentDir: (received: NodeJS.ProcessEnv) => {
+				assert.equal(received, env);
+				return "/unused/shared";
+			},
+			readActiveAccount: (directory: string) => {
+				assert.equal(directory, "/unused/shared");
+				reads++;
+				return Promise.resolve(record);
+			},
+		})), expected);
+	}
+	assert.equal(reads, 6);
+	for (const module of [null, {}, { getSharedAgentDir: "bad" }, {
+		getSharedAgentDir: () => 42, readActiveAccount: () => { throw new Error("unexpected read"); },
+	}, {
+		getSharedAgentDir: () => "/unused/shared", readActiveAccount: () => { throw new Error("read denied"); },
+	}]) assert.equal(await profileLabels.readLastActiveProfileLabel(env, () => Promise.resolve(module)), undefined);
+	assert.equal(await profileLabels.readLastActiveProfileLabel(env, () => Promise.reject(new Error("import failed"))), undefined);
+});
+
+void test("real session_start restores labels before editor mounting and rejects stale results", async () => {
+	const previousDir = process.env.PI_CODING_AGENT_DIR;
+	const previousName = process.env.OSDY_PI_PROFILE_NAME;
+	// This nonexistent package-local directory prevents reads of personal settings.
+	process.env.PI_CODING_AGENT_DIR = fileURLToPath(new URL("./.startup-test-missing", import.meta.url));
+	try {
+		for (const scenario of ["restore", "invalid-env", "explicit", "unset", "invalid", "deleted", "failure", "replace", "shutdown", "switch"] as const) {
+			delete process.env.OSDY_PI_PROFILE_NAME;
+			if (scenario === "explicit") process.env.OSDY_PI_PROFILE_NAME = "launcher";
+			if (scenario === "invalid-env") process.env.OSDY_PI_PROFILE_NAME = "../invalid";
+			const handlers = new Map<string, Array<(event: unknown, ctx: ExtensionContext) => Promise<void> | void>>();
+			const mounted: string[] = [];
+			let reads = 0;
+			let complete: (value: string | undefined) => void = () => {};
+			let entered: () => void = () => {};
+			const started = new Promise<void>((resolve) => { entered = resolve; });
+			const pending = new Promise<string | undefined>((resolve) => { complete = resolve; });
+			const pi = {
+				on: (name: string, handler: (event: unknown, ctx: ExtensionContext) => Promise<void> | void) => {
+					const registered = handlers.get(name) ?? [];
+					registered.push(handler);
+					handlers.set(name, registered);
+				},
+				registerCommand: () => {}, registerFlag: () => {}, registerMessageRenderer: () => {}, registerEntryRenderer: () => {},
+				events: { on: () => () => {} },
+				exec: () => Promise.resolve({ code: 1, stdout: "", stderr: "unavailable" }),
+			} as unknown as ExtensionAPI;
+			const ctx = {
+				hasUI: true, cwd: process.env.PI_CODING_AGENT_DIR,
+				modelRegistry: { getProviderAuth: () => Promise.resolve(undefined) },
+				ui: {
+					getEditorComponent: () => undefined,
+					setEditorComponent: () => {
+						const label = profileLabels.resolveActiveProfileLabel();
+						mounted.push(`${profileLabels.resolveEditorTitleLabel(label)}|${profileLabels.formatModelMetadata("test-model", "high", label)}`);
+					},
+					setHeader: () => {}, setFooter: () => {}, setWidget: () => {}, setWorkingVisible: () => {},
+				},
+			} as unknown as ExtensionContext;
+			await registerOsdyPi(pi, { readActiveProfile: () => {
+				reads++; entered();
+				return scenario === "failure" ? Promise.reject(new Error("read failed")) : pending;
+			} });
+			// Role-marker resets register first; the runtime lifecycle registers second.
+			const start = handlers.get("session_start")?.[1];
+			const shutdown = handlers.get("session_shutdown")?.[1];
+			assert.ok(start); assert.ok(shutdown);
+			try {
+				const startup = start({}, ctx);
+				if (scenario !== "explicit") {
+					await Promise.race([started, Promise.resolve(startup)]);
+					assert.equal(reads, 1, "session_start must read the last active identity");
+				}
+				if (scenario === "switch") process.env.OSDY_PI_PROFILE_NAME = "new-selection";
+				if (scenario === "shutdown") await shutdown({}, ctx);
+				let replacement: Promise<void> | void = undefined;
+				if (scenario === "replace") {
+					process.env.OSDY_PI_PROFILE_NAME = "new-session";
+					replacement = start({}, { ...ctx });
+				}
+				complete(["unset", "invalid", "deleted"].includes(scenario) ? undefined : "last-active");
+				await startup;
+				await replacement;
+				const expected = scenario === "explicit" ? "launcher" : scenario === "switch" ? "new-selection" : scenario === "replace" ? "new-session" :
+					["unset", "invalid", "deleted", "failure", "shutdown"].includes(scenario) ? undefined : "last-active";
+				assert.equal(process.env.OSDY_PI_PROFILE_NAME, expected, scenario);
+				assert.equal(reads, scenario === "explicit" ? 0 : 1, scenario);
+				assert.equal(mounted.length, scenario === "shutdown" ? 0 : 1, scenario);
+				if (mounted.length) assert.equal(mounted[0], `${expected ?? "Osdy-Pi"}|test-model · ${expected ? `${expected} · ` : ""}think high`, scenario);
+			} finally { await shutdown({}, ctx); }
+		}
+	} finally {
+		if (previousDir === undefined) delete process.env.PI_CODING_AGENT_DIR; else process.env.PI_CODING_AGENT_DIR = previousDir;
+		if (previousName === undefined) delete process.env.OSDY_PI_PROFILE_NAME; else process.env.OSDY_PI_PROFILE_NAME = previousName;
+	}
+});
+
 class TestEventBus {
 	event: string | undefined;
 	handler: ((data: unknown) => void) | undefined;

package/extensions/osdy-pi/runtime.ts

@@ -52,7 +52,7 @@ import {
 } from "./codex-usage.js";
 import { showCodexUsagePanel } from "./codex-usage-ui.js";
 import { modelLabel } from "./metrics.js";
-import { resolveActiveProfileLabel } from "./profile-label.js";
+import { readLastActiveProfileLabel, resolveActiveProfileLabel } from "./profile-label.js";
 import {
 	createWorkingController,
 	type WorkingController,
@@ -961,7 +961,10 @@ async function sdkTodoActive(pi: ExtensionAPI): Promise<boolean> {
  } catch { return false; }
 }
 
-export async function registerOsdyPi(pi: ExtensionAPI): Promise<void> {
+export async function registerOsdyPi(
+	pi: ExtensionAPI,
+	dependencies: { readActiveProfile?: () => Promise<string | undefined> } = {},
+): Promise<void> {
 	const state: OsdyState = {
 		codexUsage: { kind: "idle" },
 		enabled: true,
@@ -1109,6 +1112,20 @@ export async function registerOsdyPi(pi: ExtensionAPI): Promise<void> {
 		cancelOsdyRefreshes();
 		stopResponsive();
 		sessionContext = ctx;
+		const startupProfile = process.env.OSDY_PI_PROFILE_NAME;
+		if (resolveActiveProfileLabel() === undefined) {
+			try {
+				const profile = await (dependencies.readActiveProfile ?? readLastActiveProfileLabel)();
+				if (sessionContext !== ctx) return;
+				if (
+					process.env.OSDY_PI_PROFILE_NAME === startupProfile &&
+					resolveActiveProfileLabel({ OSDY_PI_PROFILE_NAME: profile }) !== undefined
+				) process.env.OSDY_PI_PROFILE_NAME = profile;
+			} catch {
+				// Visual metadata failures must not prevent session startup.
+			}
+		}
+		if (sessionContext !== ctx) return;
 		const editorSettings = await editorSettingsStore.load();
 		if (sessionContext !== ctx) return;
 		state.fallbackEditorFactory = ctx.ui.getEditorComponent();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "osdy-pi",
-	"version": "1.11.1",
+	"version": "1.11.2",
 	"description": "Osdy Pi package: themes, header, and custom editor for Pi.",
 	"license": "MIT",
 	"type": "module",
@@ -83,7 +83,7 @@
 		"typescript": "^5.9.3",
 		"typescript-eslint": "^8.46.3"
 	},
-	"releaseSource": "d1e976e64df61fc489766e9512fdf59b7948e9ca",
+	"releaseSource": "db95251d5b6a8a60eaf0b4e21b2c44e2afa359f9",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/OsdyOrtiz/Osdy-Pi.git"