osdy-pi 1.2.0 → 1.3.0

package/scripts/osdy-pi-gentle-coexistence.mjs

@@ -0,0 +1,200 @@
+import {
+	access,
+	mkdir,
+	readFile,
+	rename,
+	stat,
+	writeFile,
+} from "node:fs/promises";
+import { constants } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, isAbsolute, join, resolve } from "node:path";
+
+const GENTLE_PACKAGE_NAME = "gentle-pi";
+const REQUIRED_EXTENSIONS = [
+	"gentle-todo.ts",
+	"ask-user-question.ts",
+	"gentle-agents.ts",
+];
+const EXCLUDED_EXTENSIONS = REQUIRED_EXTENSIONS.map(
+	(extension) => `-extensions/${extension}`,
+);
+const OSDY_ONLY_PACKAGE_SOURCES = [
+	"npm:@juicesharp/rpiv-ask-user-question",
+	"npm:pi-subagents-j0k3r",
+];
+
+const nodeFileSystem = { access, mkdir, readFile, rename, stat, writeFile };
+
+function isRecord(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function isGentleNpmSource(value) {
+	return typeof value === "string" && /^npm:gentle-pi(?:@[^\s]+)?$/i.test(value);
+}
+
+function isOsdyOnlyPackageSource(value) {
+	return (
+		typeof value === "string" &&
+		OSDY_ONLY_PACKAGE_SOURCES.includes(value.trim().toLowerCase())
+	);
+}
+
+function isOsdyPackageSource(value) {
+	return (
+		typeof value === "string" &&
+		/^(?:git:github\.com\/osdyortiz\/osdy-pi|npm:osdy-pi(?:@[^\s]+)?)$/i.test(
+			value.trim(),
+		)
+	);
+}
+
+function packageSource(entry) {
+	if (typeof entry === "string") return entry;
+	if (isRecord(entry) && typeof entry.source === "string") return entry.source;
+	return undefined;
+}
+
+function canonicalPackage(sourcePath) {
+	return {
+		source: sourcePath,
+		extensions: [...EXCLUDED_EXTENSIONS],
+		themes: [],
+	};
+}
+
+function canonicalOsdyOnlyPackages() {
+	return [...OSDY_ONLY_PACKAGE_SOURCES];
+}
+
+export function getPiSettingsPath(env = process.env, home = homedir()) {
+	const configuredDir = env.PI_CODING_AGENT_DIR?.trim();
+	return join(configuredDir || join(home, ".pi", "agent"), "settings.json");
+}
+
+export function reconcileGentlePackages(settings, sourcePath) {
+	if (!isRecord(settings))
+		throw new Error("settings.json must contain an object.");
+	if (settings.packages !== undefined && !Array.isArray(settings.packages))
+		throw new Error("settings.json packages must be an array.");
+
+	const packages = settings.packages ?? [];
+	const retained = packages.filter((entry) => {
+		const source = packageSource(entry);
+		return (
+			source !== sourcePath &&
+			!isGentleNpmSource(source) &&
+			!isOsdyOnlyPackageSource(source)
+		);
+	});
+	const canonicalPackages = [
+		canonicalPackage(sourcePath),
+		...canonicalOsdyOnlyPackages(),
+	];
+	const firstOsdyIndex = retained.findIndex((entry) =>
+		isOsdyPackageSource(packageSource(entry)),
+	);
+	const nextPackages = [...retained];
+	if (firstOsdyIndex === -1) nextPackages.push(...canonicalPackages);
+	else nextPackages.splice(firstOsdyIndex, 0, ...canonicalPackages);
+	const nextSettings = {
+		...settings,
+		packages: nextPackages,
+	};
+	const changed = JSON.stringify(nextSettings) !== JSON.stringify(settings);
+	return { changed, settings: changed ? nextSettings : settings };
+}
+
+async function validateGentleSource(sourcePath, fileSystem) {
+	if (typeof sourcePath !== "string" || !isAbsolute(sourcePath))
+		throw new Error("Gentle source path must be an absolute path.");
+
+	const resolvedSource = resolve(sourcePath);
+	let sourceStats;
+	try {
+		sourceStats = await fileSystem.stat(resolvedSource);
+	} catch {
+		throw new Error("Gentle source path must be an existing directory.");
+	}
+	if (!sourceStats.isDirectory())
+		throw new Error("Gentle source path must be an existing directory.");
+
+	const packagePath = join(resolvedSource, "package.json");
+	let packageContents;
+	try {
+		await fileSystem.access(packagePath, constants.R_OK);
+		packageContents = await fileSystem.readFile(packagePath, "utf8");
+	} catch {
+		throw new Error("Gentle source package.json must be readable.");
+	}
+	let packageJson;
+	try {
+		packageJson = JSON.parse(packageContents);
+	} catch {
+		throw new Error("Gentle source package.json is not valid JSON.");
+	}
+	if (!isRecord(packageJson) || packageJson.name !== GENTLE_PACKAGE_NAME)
+		throw new Error('Gentle source package name must be exactly "gentle-pi".');
+
+	for (const extension of REQUIRED_EXTENSIONS) {
+		const extensionPath = join(resolvedSource, "extensions", extension);
+		try {
+			await fileSystem.access(extensionPath, constants.R_OK);
+			const extensionStats = await fileSystem.stat(extensionPath);
+			if (!extensionStats.isFile()) throw new Error("not a file");
+		} catch {
+			throw new Error(`Gentle extension is not readable: extensions/${extension}`);
+		}
+	}
+	return resolvedSource;
+}
+
+async function loadSettings(settingsPath, fileSystem) {
+	try {
+		const contents = await fileSystem.readFile(settingsPath, "utf8");
+		try {
+			return { exists: true, settings: JSON.parse(contents) };
+		} catch {
+			throw new Error("settings.json is not valid JSON.");
+		}
+	} catch (error) {
+		if (error && typeof error === "object" && error.code === "ENOENT")
+			return { exists: false, settings: {} };
+		throw error;
+	}
+}
+
+async function writeSettingsAtomically(settingsPath, settings, fileSystem) {
+	const directory = dirname(settingsPath);
+	const temporaryPath = `${settingsPath}.${process.pid}.${Date.now()}.tmp`;
+	await fileSystem.mkdir(directory, { recursive: true });
+	await fileSystem.writeFile(
+		temporaryPath,
+		`${JSON.stringify(settings, null, 2)}\n`,
+		"utf8",
+	);
+	await fileSystem.rename(temporaryPath, settingsPath);
+}
+
+export async function configureGentleCoexistence(sourcePath, options = {}) {
+	const fileSystem = { ...nodeFileSystem, ...options.fileSystem };
+	const settingsPath =
+		options.settingsPath ?? getPiSettingsPath(options.env, options.home);
+	const selectedSource = await validateGentleSource(sourcePath, fileSystem);
+	const loaded = await loadSettings(settingsPath, fileSystem);
+	const reconciled = reconcileGentlePackages(loaded.settings, selectedSource);
+	if (!reconciled.changed)
+		return {
+			status: "already configured",
+			settingsPath,
+			sourcePath: selectedSource,
+		};
+
+	await writeSettingsAtomically(settingsPath, reconciled.settings, fileSystem);
+	return {
+		status: loaded.exists ? "updated" : "configured",
+		settingsPath,
+		sourcePath: selectedSource,
+	};
+}

package/scripts/osdy-pi-profile-setup.mjs

@@ -0,0 +1,175 @@
+import { randomUUID } from "node:crypto";
+import { constants } from "node:fs";
+import { access, lstat, mkdir, readFile, readdir, realpath, rename, stat, symlink, unlink, writeFile } from "node:fs/promises";
+import { basename, dirname, isAbsolute, join, resolve, sep } from "node:path";
+
+const GENTLE_EXTENSIONS = ["gentle-todo.ts", "ask-user-question.ts", "gentle-agents.ts"];
+const ISOLATED_NAMES = new Set(["settings.json", "sessions", "pi-crash.log", "run-history.jsonl", ".DS_Store"]);
+const ASK_PACKAGE = "npm:@juicesharp/rpiv-ask-user-question";
+const AGENT_PACKAGE = "npm:pi-subagents-j0k3r";
+
+function record(value) {
+	return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+
+function packageSource(entry) {
+	return typeof entry === "string" ? entry : record(entry) && typeof entry.source === "string" ? entry.source : "";
+}
+
+async function settingsFrom(path, label) {
+	let settings;
+	try {
+		settings = JSON.parse(await readFile(path, "utf8"));
+	} catch (error) {
+		throw new Error(`${label} settings.json must be readable valid JSON: ${error.message}`);
+	}
+	if (!record(settings) || (settings.packages !== undefined && !Array.isArray(settings.packages)))
+		throw new Error(`${label} settings.json must be an object with an array of packages.`);
+	return settings;
+}
+
+async function validatePackage(path, expected) {
+	if (typeof path !== "string" || !isAbsolute(path))
+		throw new Error(`${expected} source must be an absolute directory path.`);
+	const root = resolve(path);
+	try {
+		if (!(await stat(root)).isDirectory()) throw new Error("not a directory");
+		const manifest = JSON.parse(await readFile(join(root, "package.json"), "utf8"));
+		if (!record(manifest) || manifest.name !== expected) throw new Error("wrong package name");
+		if (expected === "gentle-pi") {
+			for (const file of GENTLE_EXTENSIONS) {
+				const extension = join(root, "extensions", file);
+				if (!(await stat(extension)).isFile()) throw new Error(`${file} is not a file`);
+				await access(extension, constants.R_OK);
+			}
+		}
+	} catch (error) {
+		throw new Error(`${expected === "gentle-pi" ? "Gentle" : "Osdy"} source invalid at ${root}: ${error.message}`);
+	}
+	return root;
+}
+
+async function chooseGentleRoot(packages, explicitRoot) {
+	if (explicitRoot !== undefined) return validatePackage(explicitRoot, "gentle-pi");
+	const candidates = new Set();
+	for (const entry of packages) {
+		const source = packageSource(entry);
+		if (!isAbsolute(source)) continue;
+		try {
+			candidates.add(await validatePackage(source, "gentle-pi"));
+		} catch {
+			// Other absolute local packages are not Gentle.
+		}
+	}
+	if (candidates.size !== 1)
+		throw new Error("Gentle source must be unique in official settings; set GENTLE_PI_EXTENSION_ROOT to an absolute gentle-pi checkout.");
+	return [...candidates][0];
+}
+
+function reconciledSettings(official, existing, gentleRoot, osdyRoot) {
+	const packages = (official.packages ?? []).filter((entry) => {
+		const source = packageSource(entry);
+		const lower = source.toLowerCase();
+		return source !== gentleRoot && source !== osdyRoot &&
+			!/^npm:gentle-pi(?:@[^\s]+)?$/.test(lower) &&
+			!/^npm:osdy-pi(?:@[^\s]+)?$/.test(lower) &&
+			!/^git:github\.com\/osdyortiz\/osdy-pi(?:@[^\s]+)?$/.test(lower) &&
+			lower !== ASK_PACKAGE && lower !== AGENT_PACKAGE;
+	});
+	const theme = existing?.theme;
+	return {
+		...official,
+		...(typeof theme === "string" && theme ? { theme } : {}),
+		packages: [...packages,
+			{ source: gentleRoot, extensions: GENTLE_EXTENSIONS.map((name) => `-extensions/${name}`), themes: [] },
+			ASK_PACKAGE, AGENT_PACKAGE, { source: osdyRoot },
+		],
+	};
+}
+
+async function optionalEntry(path) {
+	try { return await lstat(path); }
+	catch (error) {
+		if (error.code === "ENOENT") return undefined;
+		throw error;
+	}
+}
+
+export async function resourceLinkType(source, platform = process.platform) {
+	if (platform !== "win32") return undefined;
+	return (await stat(source)).isDirectory() ? "junction" : "file";
+}
+
+async function canonicalDestination(path) {
+	try {
+		return await realpath(path);
+	} catch (error) {
+		if (error.code !== "ENOENT") throw error;
+		const parent = dirname(path);
+		if (parent === path) throw error;
+		return join(await canonicalDestination(parent), basename(path));
+	}
+}
+
+/** Create or reconcile the Osdy-owned settings and links, without writing official Pi state. */
+export async function setupOsdyProfile({ officialDir, profileDir, osdyRoot, gentleRoot }) {
+	for (const [name, value] of Object.entries({ officialDir, profileDir, osdyRoot })) {
+		if (typeof value !== "string" || !isAbsolute(value))
+			throw new Error(`${name} must be an absolute path.`);
+	}
+	const sourceDir = resolve(officialDir);
+	const targetDir = resolve(profileDir);
+	const canonicalSource = await canonicalDestination(sourceDir);
+	const canonicalTarget = await canonicalDestination(targetDir);
+	if (canonicalSource === canonicalTarget ||
+		canonicalTarget.startsWith(`${canonicalSource}${sep}`) ||
+		canonicalSource.startsWith(`${canonicalTarget}${sep}`))
+		throw new Error("Official and isolated profile directories must be separate, non-nested paths.");
+	const sourceSettings = join(sourceDir, "settings.json");
+	if (!(await optionalEntry(sourceSettings))?.isFile())
+		throw new Error("Official settings.json must be a regular file, not a symlink.");
+	const official = await settingsFrom(sourceSettings, "Official");
+	const gentle = await chooseGentleRoot(official.packages ?? [], gentleRoot);
+	const osdy = await validatePackage(osdyRoot, "osdy-pi");
+	const profileState = await optionalEntry(targetDir);
+	if (profileState && !profileState.isDirectory())
+		throw new Error("Isolated profile directory must not be a symlink or file.");
+	const targetSettings = join(targetDir, "settings.json");
+	const settingsState = await optionalEntry(targetSettings);
+	if (settingsState && !settingsState.isFile())
+		throw new Error("Isolated settings.json must be a regular file, not a symlink.");
+	const sessions = join(targetDir, "sessions");
+	const sessionsState = await optionalEntry(sessions);
+	if (sessionsState && !sessionsState.isDirectory())
+		throw new Error("Isolated sessions must be a directory, not a symlink.");
+	const existing = settingsState ? await settingsFrom(targetSettings, "Isolated") : undefined;
+	const next = `${JSON.stringify(reconciledSettings(official, existing, gentle, osdy), null, 2)}\n`;
+	const current = settingsState ? await readFile(targetSettings, "utf8") : undefined;
+	const names = await readdir(sourceDir);
+	// Validate first: an existing entry always belongs to the user; never replace it.
+	const links = [];
+	for (const name of names) {
+		if (ISOLATED_NAMES.has(name)) continue;
+		const destination = join(targetDir, name);
+		if (await optionalEntry(destination)) continue;
+		const source = join(sourceDir, name);
+		links.push({ destination, source, type: await resourceLinkType(source) });
+	}
+	if (!profileState) await mkdir(targetDir, { recursive: true, mode: 0o700 });
+	if (!sessionsState) await mkdir(sessions, { mode: 0o700 });
+	for (const { destination, source, type } of links) {
+		// Never overwrite a user entry created between validation and linking.
+		try { await symlink(source, destination, type); }
+		catch (error) { if (error.code !== "EEXIST") throw error; }
+	}
+	if (current !== next) {
+		const temp = join(targetDir, `.settings.${randomUUID()}.tmp`);
+		try {
+			await writeFile(temp, next, { flag: "wx", mode: 0o600 });
+			await rename(temp, targetSettings);
+		} finally {
+			await unlink(temp).catch(() => {});
+		}
+	}
+	return { status: current === next && links.length === 0 && sessionsState ? "already configured" : "configured", profileDir: targetDir };
+}

package/themes/osdy-pi-catppuccin-frappe.json

@@ -45,10 +45,14 @@
     "scrollbarThumb": "overlay1",
     "searchMatchBg": "surface0",
     "searchMatchText": "text",
-    "userMessageBg": "mantle",
-    "userMessageText": "text",
     "customMessageBg": "surface0",
     "customMessageText": "text",
+    "assistantMessageBg": "surface0",
+    "assistantMessageAccentBg": "blue",
+    "assistantMessageText": "text",
+    "userMessageAccentBg": "#FFFFFF",
+    "userMessageBg": "mantle",
+    "userMessageText": "text",
     "customMessageLabel": "blue",
     "toolPendingBg": "mantle",
     "toolSuccessBg": "surface0",

package/themes/osdy-pi-catppuccin-latte.json

@@ -45,10 +45,14 @@
     "scrollbarThumb": "overlay1",
     "searchMatchBg": "surface0",
     "searchMatchText": "text",
-    "userMessageBg": "mantle",
-    "userMessageText": "text",
     "customMessageBg": "surface0",
     "customMessageText": "text",
+    "assistantMessageBg": "surface0",
+    "assistantMessageAccentBg": "blue",
+    "assistantMessageText": "text",
+    "userMessageAccentBg": "#FFFFFF",
+    "userMessageBg": "mantle",
+    "userMessageText": "text",
     "customMessageLabel": "blue",
     "toolPendingBg": "mantle",
     "toolSuccessBg": "surface0",

package/themes/osdy-pi-catppuccin-macchiato.json

@@ -45,10 +45,14 @@
     "scrollbarThumb": "overlay1",
     "searchMatchBg": "surface0",
     "searchMatchText": "text",
-    "userMessageBg": "mantle",
-    "userMessageText": "text",
     "customMessageBg": "surface0",
     "customMessageText": "text",
+    "assistantMessageBg": "surface0",
+    "assistantMessageAccentBg": "blue",
+    "assistantMessageText": "text",
+    "userMessageAccentBg": "#FFFFFF",
+    "userMessageBg": "mantle",
+    "userMessageText": "text",
     "customMessageLabel": "blue",
     "toolPendingBg": "mantle",
     "toolSuccessBg": "surface0",

package/themes/osdy-pi-catppuccin-mocha.json

@@ -45,10 +45,14 @@
     "scrollbarThumb": "overlay1",
     "searchMatchBg": "surface0",
     "searchMatchText": "text",
-    "userMessageBg": "mantle",
-    "userMessageText": "text",
     "customMessageBg": "surface0",
     "customMessageText": "text",
+    "assistantMessageBg": "surface0",
+    "assistantMessageAccentBg": "blue",
+    "assistantMessageText": "text",
+    "userMessageAccentBg": "#FFFFFF",
+    "userMessageBg": "mantle",
+    "userMessageText": "text",
     "customMessageLabel": "blue",
     "toolPendingBg": "mantle",
     "toolSuccessBg": "surface0",

package/themes/osdy-pi-dark.json

@@ -30,10 +30,14 @@
     "text": "textSoft",
     "thinkingText": "lavenderGray",
     "selectedBg": "surface2",
-    "userMessageBg": "surface",
-    "userMessageText": "textSoft",
     "customMessageBg": "#1C1230",
     "customMessageText": "textSoft",
+    "assistantMessageBg": "#1C1230",
+    "assistantMessageAccentBg": "pink",
+    "assistantMessageText": "textSoft",
+    "userMessageAccentBg": "#FFFFFF",
+    "userMessageBg": "surface",
+    "userMessageText": "textSoft",
     "customMessageLabel": "pink",
     "toolPendingBg": "#17112B",
     "toolSuccessBg": "#10261F",

package/themes/osdy-pi-dracula.json

@@ -34,10 +34,14 @@
     "scrollbarThumb": "lighter",
     "searchMatchBg": "selection",
     "searchMatchText": "foreground",
-    "userMessageBg": "dark",
-    "userMessageText": "foreground",
     "customMessageBg": "light",
     "customMessageText": "foreground",
+    "assistantMessageBg": "light",
+    "assistantMessageAccentBg": "purple",
+    "assistantMessageText": "foreground",
+    "userMessageAccentBg": "#FFFFFF",
+    "userMessageBg": "dark",
+    "userMessageText": "foreground",
     "customMessageLabel": "cyan",
     "toolPendingBg": "dark",
     "toolSuccessBg": "light",

package/themes/osdy-pi-kanagawa-dragon.json

@@ -42,10 +42,14 @@
     "scrollbarThumb": "border",
     "searchMatchBg": "search",
     "searchMatchText": "text",
-    "userMessageBg": "panel",
-    "userMessageText": "text",
     "customMessageBg": "raised",
     "customMessageText": "text",
+    "assistantMessageBg": "raised",
+    "assistantMessageAccentBg": "blue",
+    "assistantMessageText": "text",
+    "userMessageAccentBg": "#FFFFFF",
+    "userMessageBg": "panel",
+    "userMessageText": "text",
     "customMessageLabel": "cyan",
     "toolPendingBg": "panel",
     "toolSuccessBg": "raised",

package/themes/osdy-pi-kanagawa-lotus.json

@@ -43,10 +43,14 @@
     "scrollbarThumb": "border",
     "searchMatchBg": "selection",
     "searchMatchText": "text",
-    "userMessageBg": "panel",
-    "userMessageText": "text",
     "customMessageBg": "raised",
     "customMessageText": "text",
+    "assistantMessageBg": "raised",
+    "assistantMessageAccentBg": "blue",
+    "assistantMessageText": "text",
+    "userMessageAccentBg": "#FFFFFF",
+    "userMessageBg": "panel",
+    "userMessageText": "text",
     "customMessageLabel": "blue",
     "toolPendingBg": "panel",
     "toolSuccessBg": "raised",

package/themes/osdy-pi-kanagawa-wave.json

@@ -42,10 +42,14 @@
     "scrollbarThumb": "border",
     "searchMatchBg": "search",
     "searchMatchText": "text",
-    "userMessageBg": "panel",
-    "userMessageText": "text",
     "customMessageBg": "raised",
     "customMessageText": "text",
+    "assistantMessageBg": "raised",
+    "assistantMessageAccentBg": "blue",
+    "assistantMessageText": "text",
+    "userMessageAccentBg": "#FFFFFF",
+    "userMessageBg": "panel",
+    "userMessageText": "text",
     "customMessageLabel": "cyan",
     "toolPendingBg": "panel",
     "toolSuccessBg": "raised",

package/themes/osdy-pi-lucent-orange.json

@@ -31,10 +31,14 @@
     "scrollbarThumb": "subtle",
     "searchMatchBg": "orange",
     "searchMatchText": "accent",
-    "userMessageBg": "",
-    "userMessageText": "text",
     "customMessageBg": "",
     "customMessageText": "text",
+    "assistantMessageBg": "subtle",
+    "assistantMessageAccentBg": "orange",
+    "assistantMessageText": "text",
+    "userMessageAccentBg": "#FFFFFF",
+    "userMessageBg": "",
+    "userMessageText": "text",
     "customMessageLabel": "secondary",
     "toolPendingBg": "subtle",
     "toolSuccessBg": "subtle",

package/themes/osdy-pi-matrix.json

@@ -34,10 +34,14 @@
     "scrollbarThumb": "matrixInk3",
     "searchMatchBg": "rainPurple",
     "searchMatchText": "matrixInk0",
-    "userMessageBg": "matrixInk1",
-    "userMessageText": "rainGreenHi",
     "customMessageBg": "matrixInk2",
     "customMessageText": "rainGreenHi",
+    "assistantMessageBg": "matrixInk2",
+    "assistantMessageAccentBg": "rainGreen",
+    "assistantMessageText": "rainGreenHi",
+    "userMessageAccentBg": "#FFFFFF",
+    "userMessageBg": "matrixInk1",
+    "userMessageText": "rainGreenHi",
     "customMessageLabel": "rainCyan",
     "toolPendingBg": "matrixInk1",
     "toolSuccessBg": "matrixInk2",

package/themes/osdy-pi-new.json

@@ -42,10 +42,14 @@
     "scrollbarThumb": "slate",
     "searchMatchBg": "violet",
     "searchMatchText": "pureWhite",
-    "userMessageBg": "surface",
-    "userMessageText": "cyanText",
     "customMessageBg": "plasmaSurface",
     "customMessageText": "violetText",
+    "assistantMessageBg": "plasmaSurface",
+    "assistantMessageAccentBg": "cyan",
+    "assistantMessageText": "violetText",
+    "userMessageAccentBg": "#FFFFFF",
+    "userMessageBg": "surface",
+    "userMessageText": "cyanText",
     "customMessageLabel": "cyanSoft",
     "toolPendingBg": "surface",
     "toolSuccessBg": "card",

package/themes/osdy-pi-sexy.json

@@ -35,10 +35,14 @@
     "scrollbarThumb": "muted",
     "searchMatchBg": "accentPink",
     "searchMatchText": "text",
-    "userMessageBg": "surface",
-    "userMessageText": "text",
     "customMessageBg": "elevated",
     "customMessageText": "text",
+    "assistantMessageBg": "elevated",
+    "assistantMessageAccentBg": "accentPink",
+    "assistantMessageText": "text",
+    "userMessageAccentBg": "#FFFFFF",
+    "userMessageBg": "surface",
+    "userMessageText": "text",
     "customMessageLabel": "brightPink",
     "toolPendingBg": "surface",
     "toolSuccessBg": "elevated",

package/themes/osdy-pi-tokyo-night.json

@@ -34,10 +34,14 @@
     "scrollbarThumb": "border",
     "searchMatchBg": "purple",
     "searchMatchText": "background",
-    "userMessageBg": "panel",
-    "userMessageText": "text",
     "customMessageBg": "elevated",
     "customMessageText": "text",
+    "assistantMessageBg": "elevated",
+    "assistantMessageAccentBg": "blue",
+    "assistantMessageText": "text",
+    "userMessageAccentBg": "#FFFFFF",
+    "userMessageBg": "panel",
+    "userMessageText": "text",
     "customMessageLabel": "cyan",
     "toolPendingBg": "panel",
     "toolSuccessBg": "elevated",