Bohdan Triapitsyn
85400459e9
Improve OpenChamber responsiveness under large session workloads while fixing cache, synchronization, and persistence correctness across runtimes, projects, directories, and worktrees. - prioritize selected and visible sessions during bootstrap and defer non-critical enrichment work - reduce redundant message loading, event processing, store publication, and hidden sidebar work - prevent stale session and message requests from overwriting newer authoritative state - preserve existing data when authoritative fetches fail instead of treating failures as successful empty responses - scope session materialization, messages, drafts, queues, todos, pins, permissions, folders, tabs, Git state, and pull request data by runtime and directory identity - harden runtime switching, reconnect, cleanup, mutation reconciliation, and persisted-state ordering - preserve live subagent Task linkage when metadata arrives after an older message request or while streaming parts are suspended - coalesce overlapping tail refreshes without losing newer refresh demand - improve cold-session loading by moving deferrable work out of the critical bootstrap path - isolate URL authentication, mobile credentials, native secrets, and other runtime-owned state across endpoint changes - bound long-lived caches and remove avoidable allocations from event and rendering hot paths - limit virtualization to archive collections where it improves rendering without disrupting active sidebar layout - stabilize session folders, pin ordering, expanded state, and persisted sidebar behavior - open skill files through the same secure editor and outside-workspace grant flow used by file navigation, including worktree sessions - expand regression coverage for stale completions, runtime collisions, reconnect behavior, persistence races, authoritative empty results, and subagent refresh ordering - document the updated synchronization, cache ownership, performance, and runtime-isolation invariants
104 lines
3.0 KiB
TypeScript
104 lines
3.0 KiB
TypeScript
import { registerCustomTheme } from '@pierre/diffs';
|
|
|
|
import type { Theme } from '@/types/theme';
|
|
import type { VSCodeTextMateTheme, VSCodeTokenColorRule } from './vscodeTextMateTheme';
|
|
import { buildTextMateThemeFromAppTheme } from './textMateThemeFromAppTheme';
|
|
|
|
export type ShikiThemeRegistrationResolvedLike = VSCodeTextMateTheme & {
|
|
settings: VSCodeTokenColorRule[];
|
|
fg: string;
|
|
bg: string;
|
|
};
|
|
|
|
const isHex8 = (value: string): boolean => /^#[0-9a-fA-F]{8}$/.test(value);
|
|
|
|
const stripAlpha = (value: string): string => {
|
|
if (isHex8(value)) {
|
|
return value.slice(0, 7);
|
|
}
|
|
return value;
|
|
};
|
|
|
|
function withStableStringId<T extends object>(value: T, id: string): T {
|
|
Object.defineProperty(value, 'toString', {
|
|
value: () => id,
|
|
enumerable: false,
|
|
configurable: true,
|
|
});
|
|
|
|
Object.defineProperty(value, Symbol.toPrimitive, {
|
|
value: () => id,
|
|
enumerable: false,
|
|
configurable: true,
|
|
});
|
|
|
|
return value;
|
|
}
|
|
|
|
const MAX_RESOLVED_THEME_CACHE_ENTRIES = 40;
|
|
const resolvedThemeCache = new Map<string, ShikiThemeRegistrationResolvedLike>();
|
|
const registeredPierreThemeSignatures = new Map<string, string>();
|
|
|
|
export const getThemeContentSignature = (theme: Theme): string => JSON.stringify(theme);
|
|
|
|
const toResolvedTheme = (raw: VSCodeTextMateTheme, id: string): ShikiThemeRegistrationResolvedLike => {
|
|
const bgRaw = raw.colors?.['editor.background'];
|
|
const fgRaw = raw.colors?.['editor.foreground'];
|
|
|
|
const bg = bgRaw ? stripAlpha(bgRaw) : undefined;
|
|
const fg = fgRaw ? stripAlpha(fgRaw) : undefined;
|
|
|
|
if (!bg || !fg) {
|
|
throw new Error(`Theme "${id}" is missing editor.background/editor.foreground`);
|
|
}
|
|
|
|
const settings = raw.tokenColors ?? [];
|
|
|
|
return withStableStringId(
|
|
{
|
|
...raw,
|
|
name: id,
|
|
fg,
|
|
bg,
|
|
settings,
|
|
},
|
|
id,
|
|
);
|
|
};
|
|
|
|
const buildTextMateTheme = (theme: Theme): VSCodeTextMateTheme => {
|
|
return buildTextMateThemeFromAppTheme(theme);
|
|
};
|
|
|
|
export const getResolvedShikiTheme = (theme: Theme): ShikiThemeRegistrationResolvedLike => {
|
|
const signature = getThemeContentSignature(theme);
|
|
const cached = resolvedThemeCache.get(signature);
|
|
if (cached) {
|
|
resolvedThemeCache.delete(signature);
|
|
resolvedThemeCache.set(signature, cached);
|
|
return cached;
|
|
}
|
|
|
|
const raw = buildTextMateTheme(theme);
|
|
const resolved = toResolvedTheme(raw, theme.metadata.id);
|
|
resolvedThemeCache.set(signature, resolved);
|
|
while (resolvedThemeCache.size > MAX_RESOLVED_THEME_CACHE_ENTRIES) {
|
|
const oldest = resolvedThemeCache.keys().next().value;
|
|
if (oldest === undefined) break;
|
|
resolvedThemeCache.delete(oldest);
|
|
}
|
|
return resolved;
|
|
};
|
|
|
|
export const ensurePierreThemeRegistered = (theme: Theme): void => {
|
|
const id = theme.metadata.id;
|
|
const signature = getThemeContentSignature(theme);
|
|
if (registeredPierreThemeSignatures.get(id) === signature) {
|
|
return;
|
|
}
|
|
|
|
const resolved = getResolvedShikiTheme(theme);
|
|
registerCustomTheme(id, async () => resolved);
|
|
registeredPierreThemeSignatures.set(id, signature);
|
|
};
|