getcompanion-ai/co-mono
1
0
Fork 0
mirror of https://github.com/getcompanion-ai/co-mono.git synced 2026-04-15 17:00:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use globalThis for theme to share across module loaders

Browse source 
When running with tsx in dev mode, jiti loads extensions in a separate
module cache. This caused the theme to be undefined in jiti's copy of
theme.ts since initTheme() was only called on tsx's copy.

Using globalThis with Symbol.for() ensures all module instances share
the same theme, regardless of which loader created them.
This commit is contained in:
Mario Zechner 2026-01-12 17:51:41 +01:00
parent 5f380822ea
commit f8e5fe1ed0
1 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

32
packages/coding-agent/src/modes/interactive/theme/theme.ts
View file

@ -593,7 +593,23 @@ function getDefaultTheme(): string {
// Global Theme Instance
// ============================================================================
export let theme: Theme;
// Use globalThis to share theme across module loaders (tsx + jiti in dev mode)
const THEME_KEY = Symbol.for("@mariozechner/pi-coding-agent:theme");
// Export theme as a getter that reads from globalThis
// This ensures all module instances (tsx, jiti) see the same theme
export const theme: Theme = new Proxy({} as Theme, {
get(_target, prop) {
const t = (globalThis as Record<symbol, Theme>)[THEME_KEY];
if (!t) throw new Error("Theme not initialized. Call initTheme() first.");
return (t as unknown as Record<string | symbol, unknown>)[prop];
},
});
function setGlobalTheme(t: Theme): void {
(globalThis as Record<symbol, Theme>)[THEME_KEY] = t;
}
let currentThemeName: string | undefined;
let themeWatcher: fs.FSWatcher | undefined;
let onThemeChangeCallback: (() => void) | undefined;
@ -602,14 +618,14 @@ export function initTheme(themeName?: string, enableWatcher: boolean = false): v
const name = themeName ?? getDefaultTheme();
currentThemeName = name;
try {
theme = loadTheme(name);
setGlobalTheme(loadTheme(name));
if (enableWatcher) {
startThemeWatcher();
}
} catch (_error) {
// Theme is invalid - fall back to dark theme silently
currentThemeName = "dark";
theme = loadTheme("dark");
setGlobalTheme(loadTheme("dark"));
// Don't start watcher for fallback theme
}
}
@ -617,7 +633,7 @@ export function initTheme(themeName?: string, enableWatcher: boolean = false): v
export function setTheme(name: string, enableWatcher: boolean = false): { success: boolean; error?: string } {
currentThemeName = name;
try {
theme = loadTheme(name);
setGlobalTheme(loadTheme(name));
if (enableWatcher) {
startThemeWatcher();
}
@ -628,7 +644,7 @@ export function setTheme(name: string, enableWatcher: boolean = false): { succes
} catch (error) {
// Theme is invalid - fall back to dark theme
currentThemeName = "dark";
theme = loadTheme("dark");
setGlobalTheme(loadTheme("dark"));
// Don't start watcher for fallback theme
return {
success: false,
@ -638,7 +654,7 @@ export function setTheme(name: string, enableWatcher: boolean = false): { succes
}
export function setThemeInstance(themeInstance: Theme): void {
theme = themeInstance;
setGlobalTheme(themeInstance);
currentThemeName = "<in-memory>";
stopThemeWatcher(); // Can't watch a direct instance
if (onThemeChangeCallback) {
@ -677,7 +693,7 @@ function startThemeWatcher(): void {
setTimeout(() => {
try {
// Reload the theme
theme = loadTheme(currentThemeName!);
setGlobalTheme(loadTheme(currentThemeName!));
// Notify callback (to invalidate UI)
if (onThemeChangeCallback) {
onThemeChangeCallback();
@ -691,7 +707,7 @@ function startThemeWatcher(): void {
setTimeout(() => {
if (!fs.existsSync(themeFile)) {
currentThemeName = "dark";
theme = loadTheme("dark");
setGlobalTheme(loadTheme("dark"));
if (themeWatcher) {
themeWatcher.close();
themeWatcher = undefined;