✦
@@ -1116,7 +1367,67 @@
/[A-Za-z][A-Za-z' ]+/.exec(themeName)?.[0].trim() || themeName;
const stampImg = chrome.querySelector(".dream-skin-composer-stamp img");
if (stampImg.getAttribute("src") !== stampUrl) stampImg.setAttribute("src", stampUrl);
- chrome.querySelector(".dream-skin-composer-stamp span").textContent = copy.quote || "MAKE SOMETHING WONDERFUL";
+ const homeDogBackdrop = chrome.querySelector(".dream-skin-home-dog-backdrop");
+ if (homeDogBackdrop.getAttribute("src") !== artUrl) homeDogBackdrop.setAttribute("src", artUrl);
+ const stampLabel = chrome.querySelector(".dream-skin-composer-stamp span");
+ const stampCopy = copy.quote || "MAKE SOMETHING WONDERFUL";
+ if (THEME.id === "happy-coding-dog" && stampCopy.includes("，")) {
+ const splitAt = stampCopy.indexOf("，") + 1;
+ stampLabel.replaceChildren(
+ document.createTextNode(stampCopy.slice(0, splitAt)),
+ document.createElement("br"),
+ document.createTextNode(stampCopy.slice(splitAt)),
+ );
+ } else {
+ stampLabel.textContent = stampCopy;
+ }
+ if (THEME.id === "happy-coding-dog") {
+ const reviewClasses = [
+ "dream-skin-review-toolbar",
+ "dream-skin-review-tab",
+ "dream-skin-review-close",
+ "dream-skin-review-add",
+ "dream-skin-review-action",
+ ];
+ document.querySelectorAll(reviewClasses.map((name) => `.${name}`).join(",")).forEach((node) => {
+ reviewClasses.forEach((name) => node.classList.remove(name));
+ });
+
+ const reviewLabel = [...document.querySelectorAll("button,[role=\"tab\"],[role=\"button\"],span,div")].find((node) => {
+ const rect = node.getBoundingClientRect();
+ return node.children.length <= 3 && /^(审查|Review)$/i.test((node.textContent || "").trim()) &&
+ rect.width > 0 && rect.width < 320 && rect.height > 0 && rect.top < 84;
+ });
+ const reviewTab = reviewLabel?.closest("button,[role=\"tab\"],[role=\"button\"]") || reviewLabel?.parentElement;
+ let reviewToolbar = null;
+ if (reviewTab) {
+ reviewTab.classList.add("dream-skin-review-tab");
+ let candidate = reviewTab.parentElement;
+ for (let depth = 0; candidate && depth < 8; depth += 1, candidate = candidate.parentElement) {
+ const rect = candidate.getBoundingClientRect();
+ if (rect.top < 66 && rect.width > 280 && rect.height >= 34 && rect.height <= 82) reviewToolbar = candidate;
+ }
+ }
+ if (reviewToolbar) {
+ reviewToolbar.classList.add("dream-skin-review-toolbar");
+ reviewToolbar.querySelectorAll("button,[role=\"button\"]").forEach((button) => {
+ if (button === reviewTab) return;
+ const label = `${button.getAttribute("aria-label") || ""} ${button.title || ""} ${button.textContent || ""}`.trim();
+ if (/关闭|close|dismiss|^[×x]$/i.test(label)) button.classList.add("dream-skin-review-close");
+ else if (/新建|add|new|^\+$/i.test(label)) button.classList.add("dream-skin-review-add");
+ else button.classList.add("dream-skin-review-action");
+ });
+ root.dataset.dreamReviewOpen = "true";
+ } else {
+ delete root.dataset.dreamReviewOpen;
+ }
+
+ const threadPane = document.querySelector("[data-pip-anchor-host=\"codex-main-thread\"]") ||
+ document.querySelector(".thread-scroll-container")?.parentElement;
+ const threadWidth = threadPane?.getBoundingClientRect().width || 0;
+ if (threadWidth > 0 && threadWidth < 580) root.dataset.dreamThreadNarrow = "true";
+ else delete root.dataset.dreamThreadNarrow;
+ }
chrome.querySelector(".dream-skin-silk-heading small").textContent = copy.brandSubtitle || "MIRROR LAKE RIBBON";
chrome.querySelector(".dream-skin-silk-heading span").textContent = THEME.tagline || "一卷湖光，写尽风华。";
chrome.querySelector(".dream-skin-silk-status span").textContent = copy.statusText || "湖光正明";
@@ -1133,6 +1444,13 @@
const retroFriendAvatar = chrome.querySelector(".dream-skin-retro-friend-avatar");
if (retroFriendAvatar.getAttribute("src") !== stampUrl) retroFriendAvatar.setAttribute("src", stampUrl);
const shellBox = shellMain.getBoundingClientRect();
+ if (THEME.id === "happy-coding-dog" && homeDogBackdrop) {
+ const workspaceBox = (mainContentSurface || shellMain).getBoundingClientRect();
+ homeDogBackdrop.style.left = `${Math.max(0, Math.round(workspaceBox.left - shellBox.left))}px`;
+ homeDogBackdrop.style.top = `${Math.max(59, Math.round(workspaceBox.top - shellBox.top + 59))}px`;
+ homeDogBackdrop.style.width = `${Math.round(workspaceBox.width)}px`;
+ homeDogBackdrop.style.height = `${Math.max(240, Math.round(shellBox.bottom - Math.max(workspaceBox.top + 59, shellBox.top + 59)))}px`;
+ }
chrome.style.left = `${Math.round(shellBox.left)}px`;
chrome.style.top = `${Math.round(shellBox.top)}px`;
chrome.style.width = `${Math.round(shellBox.width)}px`;
@@ -1170,22 +1488,49 @@
};
const scheduler = { timeout: null };
+ const observerOptions = {
+ childList: true,
+ subtree: true,
+ attributes: true,
+ characterData: true,
+ attributeFilter: ["class", "data-theme", "data-appearance", "data-color-mode"],
+ };
+ const THEME_STRUCTURE_SELECTOR = "main, aside.app-shell-left-panel, [class*=_MainContent], [class*=_ComposerLayout], [data-message-author-role], [data-testid=home-icon]";
+ const mutationTouchesThemeStructure = (mutation) =>
+ [...mutation.addedNodes, ...mutation.removedNodes].some((node) =>
+ node.nodeType === Node.ELEMENT_NODE &&
+ (node.matches?.(THEME_STRUCTURE_SELECTOR) || node.querySelector?.(THEME_STRUCTURE_SELECTOR)),
+ );
+ const shouldScheduleEnsure = (mutations) => mutations.some((mutation) => {
+ if (mutation.type === "characterData") return false;
+ if (mutation.type === "childList") return mutationTouchesThemeStructure(mutation);
+ if (mutation.type !== "attributes") return false;
+ if (mutation.attributeName !== "class") return true;
+ return mutation.target === document.documentElement ||
+ mutation.target === document.body ||
+ mutation.target.matches?.("main, aside.app-shell-left-panel");
+ });
+ let observer = null;
+ const runEnsure = () => {
+ observer.disconnect();
+ try {
+ ensure();
+ } finally {
+ observer.observe(document.documentElement, observerOptions);
+ }
+ };
const scheduleEnsure = () => {
if (scheduler.timeout) clearTimeout(scheduler.timeout);
scheduler.timeout = setTimeout(() => {
scheduler.timeout = null;
- ensure();
+ runEnsure();
}, 180);
};
- const observer = new MutationObserver(scheduleEnsure);
- observer.observe(document.documentElement, {
- childList: true,
- subtree: true,
- attributes: true,
- characterData: true,
- attributeFilter: ["class", "aria-label", "data-theme", "data-appearance", "data-color-mode", "style"],
+ observer = new MutationObserver((mutations) => {
+ if (shouldScheduleEnsure(mutations)) scheduleEnsure();
});
- const timer = setInterval(ensure, 4000);
+ observer.observe(document.documentElement, observerOptions);
+ const timer = setInterval(runEnsure, 4000);
const resizeHandler = scheduleEnsure;
window.addEventListener("resize", resizeHandler, { passive: true });
@@ -1236,6 +1581,6 @@
detectProductMode,
productMode: detectProductMode(),
};
- ensure();
+ runEnsure();
return { installed: true, version: VERSION, themeId: THEME.id || "custom", shell: detectShellMode() };
})(__DREAM_SKIN_CSS_JSON__, __DREAM_SKIN_ART_JSON__, __DREAM_SKIN_WALLPAPER_JSON__, __DREAM_SKIN_STAMP_JSON__, __DREAM_SKIN_MOTION_JSON__, __DREAM_SKIN_MOTION_POSTER_JSON__, __DREAM_SKIN_THEME_JSON__, __DREAM_SKIN_VARS_JSON__, __DREAM_SKIN_VERSION_JSON__)
diff --git a/assets/presets/happy-coding-dog/hero-workspace-blended.png b/assets/presets/happy-coding-dog/hero-workspace-blended.png
new file mode 100644
index 0000000..0f0cd07
Binary files /dev/null and b/assets/presets/happy-coding-dog/hero-workspace-blended.png differ
diff --git a/assets/presets/happy-coding-dog/hero-workspace-expanded-2400x1600.png b/assets/presets/happy-coding-dog/hero-workspace-expanded-2400x1600.png
new file mode 100644
index 0000000..746c7d2
Binary files /dev/null and b/assets/presets/happy-coding-dog/hero-workspace-expanded-2400x1600.png differ
diff --git a/assets/presets/happy-coding-dog/hero-workspace-safe.png b/assets/presets/happy-coding-dog/hero-workspace-safe.png
new file mode 100644
index 0000000..cc0d051
Binary files /dev/null and b/assets/presets/happy-coding-dog/hero-workspace-safe.png differ
diff --git a/assets/presets/happy-coding-dog/hero-workspace-team.png b/assets/presets/happy-coding-dog/hero-workspace-team.png
new file mode 100644
index 0000000..acc6e80
Binary files /dev/null and b/assets/presets/happy-coding-dog/hero-workspace-team.png differ
diff --git a/assets/presets/happy-coding-dog/hero-workspace.png b/assets/presets/happy-coding-dog/hero-workspace.png
new file mode 100644
index 0000000..ad3d551
Binary files /dev/null and b/assets/presets/happy-coding-dog/hero-workspace.png differ
diff --git a/assets/presets/happy-coding-dog/hero.png b/assets/presets/happy-coding-dog/hero.png
new file mode 100644
index 0000000..6c04b86
Binary files /dev/null and b/assets/presets/happy-coding-dog/hero.png differ
diff --git a/assets/presets/happy-coding-dog/preview.png b/assets/presets/happy-coding-dog/preview.png
new file mode 100644
index 0000000..5878344
Binary files /dev/null and b/assets/presets/happy-coding-dog/preview.png differ
diff --git a/assets/presets/happy-coding-dog/stamp.png b/assets/presets/happy-coding-dog/stamp.png
new file mode 100644
index 0000000..0a86128
Binary files /dev/null and b/assets/presets/happy-coding-dog/stamp.png differ
diff --git a/assets/presets/happy-coding-dog/theme.json b/assets/presets/happy-coding-dog/theme.json
new file mode 100644
index 0000000..515c139
--- /dev/null
+++ b/assets/presets/happy-coding-dog/theme.json
@@ -0,0 +1,78 @@
+{
+ "schemaVersion": 2,
+ "uuid": "preset-happy-coding-dog",
+ "id": "happy-coding-dog",
+ "version": "1.1.0",
+ "minEngineVersion": "2.0.0",
+ "name": "快乐码犬 Happy Coding Dog",
+ "description": "粗线条、亮色块与马克笔笔触组成的快乐狗狗手绘工作台。",
+ "tagline": "新的一天开始啦，今天要做什么？",
+ "tags": [
+ "狗狗",
+ "手绘",
+ "治愈",
+ "高饱和"
+ ],
+ "hero": "hero-workspace-blended.png",
+ "preview": "preview.png",
+ "wallpaper": "wallpaper.png",
+ "stamp": "stamp.png",
+ "light": {
+ "background": "#fff5d8",
+ "panel": "#fffaf0",
+ "panelAlt": "#f4efd9",
+ "surface": "#ffffff",
+ "text": "#20201d",
+ "muted": "#776f62",
+ "border": "rgba(32, 32, 29, 0.24)",
+ "accent": "#087f98",
+ "accentAlt": "#23b7c9",
+ "secondary": "#f04f3d",
+ "highlight": "#f2be16"
+ },
+ "dark": {
+ "background": "#171b1c",
+ "panel": "#202627",
+ "panelAlt": "#293031",
+ "surface": "#242a2b",
+ "text": "#fff5d8",
+ "muted": "#bbb4a6",
+ "border": "rgba(255, 245, 216, 0.19)",
+ "accent": "#38c5d3",
+ "accentAlt": "#77d9df",
+ "secondary": "#ff7261",
+ "highlight": "#ffd84a"
+ },
+ "layout": "dream-banner",
+ "heroFit": "cover",
+ "heroFocusX": 0.62,
+ "heroFocusY": 0.5,
+ "heroZoom": 1,
+ "heroHeight": 360,
+ "heroTextAlign": "left",
+ "heroScrim": 0.16,
+ "wallpaperEnabled": true,
+ "wallpaperFocusX": 0.5,
+ "wallpaperFocusY": 0.5,
+ "wallpaperOpacity": 0.45,
+ "wallpaperBlur": 0,
+ "radius": "xl",
+ "density": "spacious",
+ "fontPreset": "rounded",
+ "glass": false,
+ "shadow": "lg",
+ "decoration": 0.86,
+ "effects": {
+ "particles": 0.16,
+ "aurora": 0,
+ "glow": 0.06,
+ "noise": 0.08,
+ "grid": 0,
+ "float": 0.12
+ },
+ "brandSubtitle": "HAPPY CODING",
+ "projectPrefix": "快乐任务 · ",
+ "projectLabel": "选择今天的任务",
+ "statusText": "TAIL WAGGING · ONLINE",
+ "quote": "人生是旷野，没矿不敢野"
+}
\ No newline at end of file
diff --git a/assets/presets/happy-coding-dog/wallpaper.png b/assets/presets/happy-coding-dog/wallpaper.png
new file mode 100644
index 0000000..746c7d2
Binary files /dev/null and b/assets/presets/happy-coding-dog/wallpaper.png differ
diff --git a/assets/presets/yan-companion/motion-poster.webp b/assets/presets/yan-companion/motion-poster.webp
new file mode 100644
index 0000000..28de698
Binary files /dev/null and b/assets/presets/yan-companion/motion-poster.webp differ
diff --git a/assets/presets/yan-companion/motion.mp4 b/assets/presets/yan-companion/motion.mp4
new file mode 100644
index 0000000..0bd5e13
Binary files /dev/null and b/assets/presets/yan-companion/motion.mp4 differ
diff --git a/assets/presets/yan-companion/preview.png b/assets/presets/yan-companion/preview.png
new file mode 100644
index 0000000..6faf083
Binary files /dev/null and b/assets/presets/yan-companion/preview.png differ
diff --git a/assets/presets/yan-companion/theme.json b/assets/presets/yan-companion/theme.json
new file mode 100644
index 0000000..76ba8aa
--- /dev/null
+++ b/assets/presets/yan-companion/theme.json
@@ -0,0 +1,79 @@
+{
+ "schemaVersion": 2,
+ "uuid": "preset-yan-companion",
+ "id": "yan-companion",
+ "version": "1.0.0",
+ "minEngineVersion": "1.1.0",
+ "galleryVisible": true,
+ "name": "沉浸伴生 Yan Companion",
+ "description": "右侧动态人物、深夜电影光效与左侧玻璃对话层组成的沉浸式 Codex 工作台。",
+ "tagline": "让她陪你把想法写成结果。",
+ "tags": [
+ "动态",
+ "陪伴",
+ "电影感",
+ "沉浸"
+ ],
+ "hero": "motion-poster.webp",
+ "preview": "preview.png",
+ "motionBackground": "motion.mp4",
+ "motionPoster": "motion-poster.webp",
+ "light": {
+ "background": "#03070a",
+ "panel": "#071014",
+ "panelAlt": "#0a171b",
+ "surface": "#071014",
+ "text": "#edf8f6",
+ "muted": "#94aaa7",
+ "border": "rgba(139, 213, 202, 0.2)",
+ "accent": "#65bfae",
+ "accentAlt": "#8be0d2",
+ "secondary": "#bf8f78",
+ "highlight": "#4c8d86"
+ },
+ "dark": {
+ "background": "#020608",
+ "panel": "#061014",
+ "panelAlt": "#09171b",
+ "surface": "#071216",
+ "text": "#edf8f6",
+ "muted": "#94aaa7",
+ "border": "rgba(139, 213, 202, 0.2)",
+ "accent": "#65bfae",
+ "accentAlt": "#8be0d2",
+ "secondary": "#bf8f78",
+ "highlight": "#4c8d86"
+ },
+ "layout": "cinematic-live",
+ "heroFit": "cover",
+ "heroFocusX": 0.72,
+ "heroFocusY": 0.5,
+ "heroZoom": 1,
+ "heroHeight": 340,
+ "heroTextAlign": "left",
+ "heroScrim": 0.24,
+ "wallpaperEnabled": false,
+ "wallpaperFocusX": 0.5,
+ "wallpaperFocusY": 0.5,
+ "wallpaperOpacity": 0,
+ "wallpaperBlur": 0,
+ "radius": "md",
+ "density": "normal",
+ "fontPreset": "system",
+ "glass": true,
+ "shadow": "lg",
+ "decoration": 0.3,
+ "effects": {
+ "particles": 0,
+ "aurora": 0,
+ "glow": 0.18,
+ "noise": 0.08,
+ "grid": 0,
+ "float": 0
+ },
+ "brandSubtitle": "YAN COMPANION",
+ "projectPrefix": "当前项目 · ",
+ "projectLabel": "选择工作项目",
+ "statusText": "OBJECT LIVE · 伴生在线",
+ "quote": "把想法告诉我，我们一起推进"
+}
diff --git a/electron/controller.test.ts b/electron/controller.test.ts
new file mode 100644
index 0000000..4d9d3e7
--- /dev/null
+++ b/electron/controller.test.ts
@@ -0,0 +1,14 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import { canAttemptAutoApply, shouldStopStaleWatcher } from "./controller";
+
+test("a running watcher cannot block auto-apply after its CDP endpoint disappears", () => {
+ assert.equal(shouldStopStaleWatcher(true, false), true);
+ assert.equal(shouldStopStaleWatcher(true, true), false);
+ assert.equal(shouldStopStaleWatcher(false, false), false);
+});
+
+test("auto-apply cannot restart Codex again before the user ends the current run", () => {
+ assert.equal(canAttemptAutoApply(false), true);
+ assert.equal(canAttemptAutoApply(true), false);
+});
diff --git a/electron/controller.ts b/electron/controller.ts
index bf058d4..52f84ac 100644
--- a/electron/controller.ts
+++ b/electron/controller.ts
@@ -15,7 +15,7 @@
import { EventEmitter } from "node:events";
import fs from "node:fs/promises";
-import type { AppState, ApplyResult, ApplyStatus, CodexCliStatus, LayoutKind, LogLine } from "./shared/types";
+import type { AppState, ApplyResult, ApplyStatus, ApplyThemeOptions, CodexCliStatus, LayoutKind, LogLine, ThemeSource } from "./shared/types";
import type { AppPaths } from "./paths";
import { PREFERRED_CDP_PORT, SKIN_VERSION } from "./engine/constants";
import { buildPayload } from "./engine/payload";
@@ -48,6 +48,7 @@ import type {
interface PersistedState {
activeThemeId: string | null;
activeThemeName: string | null;
+ activeThemeSource: ThemeSource | null;
activeLayout: LayoutKind | null;
cdpPort: number | null;
appliedAt: string | null;
@@ -61,11 +62,25 @@ const AUTO_APPLY_SETTLE_MS = 4_000;
const EMPTY_PERSISTED: PersistedState = {
activeThemeId: null,
activeThemeName: null,
+ activeThemeSource: null,
activeLayout: null,
cdpPort: null,
appliedAt: null,
};
+function isThemeSource(value: unknown): value is ThemeSource {
+ return value === "preset" || value === "custom" || value === "imported" || value === "purchased";
+}
+
+export function shouldStopStaleWatcher(watcherActive: boolean, cdpHealthy: boolean): boolean {
+ return watcherActive && !cdpHealthy;
+}
+
+/** Allow at most one automatic restart during one observed Codex run. */
+export function canAttemptAutoApply(restartBlocked: boolean): boolean {
+ return !restartBlocked;
+}
+
/**
* Keep local filesystem paths and Codex thread/turn identifiers in the main
* process. Renderer consumers only need stable UI ids and preview URLs.
@@ -108,6 +123,7 @@ export class ThemeController extends EventEmitter {
private codexRunning = false;
private cdpHealthy = false;
private autoApplyRunningSince: number | null = null;
+ private autoApplyRestartBlocked = false;
private lastAutoApplyAt = 0;
private cliService: CodexCliStatusService;
private jobService: AiThemeJobService;
@@ -149,6 +165,7 @@ export class ThemeController extends EventEmitter {
try {
const dir = await this.store.resolveThemeDir(activeThemeId, {
preferPurchased: true,
+ preferredSource: this.persisted.activeThemeSource ?? undefined,
allowCatalogOnly: false,
});
if (!dir) throw new Error("theme directory is gone");
@@ -275,12 +292,25 @@ export class ThemeController extends EventEmitter {
*/
async tick(): Promise
{
await this.refreshStatus();
+ if (!this.applying && !this.codexRunning) {
+ // A real user-driven quit ends the current run. The next launch may make
+ // one fresh recovery attempt, but a failed recovery cannot loop forever.
+ this.autoApplyRestartBlocked = false;
+ }
+ if (shouldStopStaleWatcher(this.watcher?.active ?? false, this.cdpHealthy)) {
+ this.log("warn", "Codex 调试端口已失效,正在停止旧注入守护并准备恢复主题。");
+ await this.watcher?.stop();
+ this.watcher = null;
+ this.emitState();
+ }
if (!this.settings?.current.autoApply) {
this.autoApplyRunningSince = null;
+ this.autoApplyRestartBlocked = false;
return;
}
const { activeThemeId } = this.persisted;
if (!activeThemeId || this.applying || this.watcher?.active) return;
+ if (!canAttemptAutoApply(this.autoApplyRestartBlocked)) return;
if (!this.install || !this.codexRunning || this.cdpHealthy) {
this.autoApplyRunningSince = null;
return;
@@ -297,9 +327,15 @@ export class ThemeController extends EventEmitter {
this.lastAutoApplyAt = Date.now();
this.autoApplyRunningSince = null;
this.log("info", "检测到 Codex 未带调试端口启动,按偏好设置自动恢复主题…");
- const result = await this.applyTheme(activeThemeId, { confirmRestart: true });
+ const result = await this.applyTheme(activeThemeId, {
+ confirmRestart: true,
+ source: this.persisted.activeThemeSource ?? undefined,
+ });
+ // Whether the launch failed outright or CDP disappeared again shortly
+ // afterwards, do not restart this same observed Codex run a second time.
+ this.autoApplyRestartBlocked = true;
if (!result.ok) {
- this.log("warn", `自动应用失败(将在冷却期后重试):${result.error ?? "未知错误"}`);
+ this.log("warn", `自动应用失败(本次 Codex 运行不再自动重试):${result.error ?? "未知错误"}`);
}
}
@@ -337,7 +373,7 @@ export class ThemeController extends EventEmitter {
// ----------------------------------------------------------------- apply
- async applyTheme(themeId: string, opts: { confirmRestart?: boolean } = {}): Promise {
+ async applyTheme(themeId: string, opts: ApplyThemeOptions = {}): Promise {
if (this.applying) {
return this.result("failed", false, false, [], "另一个主题正在应用中,请稍候。");
}
@@ -360,6 +396,7 @@ export class ThemeController extends EventEmitter {
}
const dir = await this.store.resolveThemeDir(themeId, {
preferPurchased: true,
+ preferredSource: opts.source,
allowCatalogOnly: false,
});
if (!dir) {
@@ -433,6 +470,7 @@ export class ThemeController extends EventEmitter {
// 4) Persist, then soft-verify against a live session.
this.persisted.activeThemeId = themeId;
this.persisted.activeThemeName = themeName;
+ this.persisted.activeThemeSource = opts.source ?? null;
this.persisted.activeLayout = themeLayout;
this.persisted.appliedAt = new Date().toISOString();
await this.writePersisted();
@@ -489,6 +527,7 @@ export class ThemeController extends EventEmitter {
await restoreAppearanceKeys(this.paths.codexConfigPath, this.paths.configBackupFile);
this.persisted.activeThemeId = null;
this.persisted.activeThemeName = null;
+ this.persisted.activeThemeSource = null;
this.persisted.activeLayout = null;
this.persisted.appliedAt = null;
await this.writePersisted();
@@ -556,6 +595,7 @@ export class ThemeController extends EventEmitter {
return {
activeThemeId: typeof raw?.activeThemeId === "string" ? raw.activeThemeId : null,
activeThemeName: typeof raw?.activeThemeName === "string" ? raw.activeThemeName : null,
+ activeThemeSource: isThemeSource(raw?.activeThemeSource) ? raw.activeThemeSource : null,
activeLayout: typeof raw?.activeLayout === "string" ? raw.activeLayout : null,
cdpPort: Number.isInteger(raw?.cdpPort) ? raw.cdpPort : null,
appliedAt: typeof raw?.appliedAt === "string" ? raw.appliedAt : null,
diff --git a/electron/engine/constants.ts b/electron/engine/constants.ts
index d5f219b..3ee7b51 100644
--- a/electron/engine/constants.ts
+++ b/electron/engine/constants.ts
@@ -4,7 +4,7 @@
*/
/** Bumped whenever the injected payload format changes. */
-export const SKIN_VERSION = "1.2.0";
+export const SKIN_VERSION = "1.2.4";
export const LOOPBACK_HOSTS = new Set(["127.0.0.1", "localhost", "[::1]"]);
diff --git a/electron/engine/home-detection.ts b/electron/engine/home-detection.ts
index dd073cd..5512080 100644
--- a/electron/engine/home-detection.ts
+++ b/electron/engine/home-detection.ts
@@ -9,6 +9,7 @@ export interface HomeSurfaceSignals {
connected: boolean;
rendered: boolean;
visibleThemeHome?: boolean;
+ visibleWelcome?: boolean;
visibleGameSource: boolean;
visibleSuggestions: boolean;
visibleTaskContent: boolean;
@@ -20,6 +21,7 @@ export function isActiveHomeSurface(signals: HomeSurfaceSignals): boolean {
signals.rendered &&
!signals.visibleTaskContent &&
(signals.visibleThemeHome === true ||
+ signals.visibleWelcome === true ||
signals.visibleGameSource ||
signals.visibleSuggestions);
}
diff --git a/electron/engine/package-safety.test.ts b/electron/engine/package-safety.test.ts
index 2247b20..5d452b9 100644
--- a/electron/engine/package-safety.test.ts
+++ b/electron/engine/package-safety.test.ts
@@ -216,6 +216,45 @@ describe("ThemeStore package inspection", () => {
assert.equal(resolved, purchasedDir);
});
+ it("honors the selected library source when duplicate theme ids exist", async () => {
+ const presetDir = path.join(root, "presets", "source-collision");
+ const purchasedDir = path.join(purchasedRoot, "source-collision");
+ const baseManifest = JSON.parse(themeJson) as Record;
+ await Promise.all([
+ fs.mkdir(presetDir, { recursive: true }),
+ fs.mkdir(purchasedDir, { recursive: true }),
+ ]);
+ await Promise.all([
+ fs.writeFile(path.join(presetDir, "theme.json"), JSON.stringify({
+ ...baseManifest,
+ uuid: "550e8400-e29b-41d4-a716-446655440011",
+ id: "source-collision",
+ name: "Preset Theme",
+ })),
+ fs.writeFile(path.join(presetDir, "hero.png"), heroPng),
+ fs.writeFile(path.join(purchasedDir, "theme.json"), JSON.stringify({
+ ...baseManifest,
+ uuid: "550e8400-e29b-41d4-a716-446655440012",
+ id: "source-collision",
+ name: "Purchased Theme",
+ })),
+ fs.writeFile(path.join(purchasedDir, "hero.png"), heroPng),
+ ]);
+
+ const preset = await store.resolveThemeDir("source-collision", {
+ preferPurchased: true,
+ preferredSource: "preset",
+ allowCatalogOnly: false,
+ });
+ const purchased = await store.resolveThemeDir("source-collision", {
+ preferPurchased: true,
+ preferredSource: "purchased",
+ allowCatalogOnly: false,
+ });
+ assert.equal(preset, presetDir);
+ assert.equal(purchased, purchasedDir);
+ });
+
it("never resolves a catalog-only placeholder as an applicable theme", async () => {
const placeholderDir = path.join(root, "presets", "preview-only");
const baseManifest = JSON.parse(themeJson) as Record;
diff --git a/electron/engine/theme.test.ts b/electron/engine/theme.test.ts
index 444f13d..66b7e98 100644
--- a/electron/engine/theme.test.ts
+++ b/electron/engine/theme.test.ts
@@ -6,6 +6,8 @@
import { describe, it } from "node:test";
import assert from "node:assert/strict";
+import fs from "node:fs";
+import path from "node:path";
import { normalizeTheme, contrastRatio, validateContrast, deriveDarkPalette } from "./normalize";
import { compileTheme } from "./compiler";
import { buildPayload, loadTheme } from "./payload";
@@ -272,6 +274,18 @@ describe("isActiveHomeSurface", () => {
);
});
+ it("accepts the current new-conversation surface when only its welcome prompt is visible", () => {
+ assert.equal(
+ isActiveHomeSurface({
+ ...activeHome,
+ visibleGameSource: false,
+ visibleSuggestions: false,
+ visibleWelcome: true,
+ }),
+ true,
+ );
+ });
+
it("keeps a visible theme-owned home active while native home content is hidden", () => {
assert.equal(
isActiveHomeSurface({
@@ -415,21 +429,431 @@ describe("loadTheme", () => {
}
});
- it("embeds the Nightbound Companion video and fallback poster", async () => {
+ it("embeds cinematic-live video backgrounds and fallback posters", async () => {
+ for (const id of ["nightbound-companion", "yan-companion"]) {
+ const built = await buildPayload(
+ "./assets/inject",
+ `./assets/presets/${id}`,
+ );
+ assert.equal(built.theme.id, id);
+ assert.equal(built.theme.layout, "cinematic-live");
+ assert.equal(built.theme.resources.motionBackground, "motion.mp4");
+ assert.equal(built.theme.resources.motionPoster, "motion-poster.webp");
+ assert.ok(built.payload.includes("data:video/mp4;base64,"));
+ assert.ok(built.payload.includes("dream-skin-cinematic-video"));
+ assert.ok(built.payload.includes("visibleCinematicHome"));
+ assert.ok(built.payload.includes(".thread-scroll-container"));
+ assert.ok(built.payload.includes("prefers-reduced-motion: reduce"));
+ assert.ok(!built.payload.includes("__DREAM_SKIN_MOTION_JSON__"));
+ assert.ok(!built.payload.includes("__DREAM_SKIN_MOTION_POSTER_JSON__"));
+ assert.doesNotThrow(() => new Function(built.payload));
+ }
+ });
+});
+
+describe("Happy Coding Dog injected skin", () => {
+ it("pauses the mutation observer while refreshing the injected theme", async () => {
const built = await buildPayload(
"./assets/inject",
- "./assets/presets/nightbound-companion",
- );
- assert.equal(built.theme.layout, "cinematic-live");
- assert.equal(built.theme.resources.motionBackground, "motion.mp4");
- assert.equal(built.theme.resources.motionPoster, "motion-poster.webp");
- assert.ok(built.payload.includes("data:video/mp4;base64,"));
- assert.ok(built.payload.includes("dream-skin-cinematic-video"));
- assert.ok(built.payload.includes("visibleCinematicHome"));
- assert.ok(built.payload.includes(".thread-scroll-container"));
- assert.ok(built.payload.includes("prefers-reduced-motion: reduce"));
- assert.ok(!built.payload.includes("__DREAM_SKIN_MOTION_JSON__"));
- assert.ok(!built.payload.includes("__DREAM_SKIN_MOTION_POSTER_JSON__"));
- assert.doesNotThrow(() => new Function(built.payload));
+ "./assets/presets/happy-coding-dog",
+ );
+
+ assert.match(
+ built.payload,
+ /const runEnsure = \(\) => \{[\s\S]*observer\.disconnect\(\)[\s\S]*ensure\(\)[\s\S]*observer\.observe\(document\.documentElement, observerOptions\)/,
+ "theme-owned class and style mutations must not schedule another refresh",
+ );
+ assert.match(built.payload, /setInterval\(runEnsure, 4000\)/);
+ assert.match(built.payload, /\n runEnsure\(\);\n return \{ installed:/);
+ });
+
+ it("ignores cosmetic attribute churn when deciding whether to refresh the theme", async () => {
+ const built = await buildPayload(
+ "./assets/inject",
+ "./assets/presets/happy-coding-dog",
+ );
+
+ assert.match(
+ built.payload,
+ /const shouldScheduleEnsure = \(mutations\) => mutations\.some\([\s\S]*mutation\.target === document\.documentElement[\s\S]*mutation\.target === document\.body/,
+ );
+ assert.match(
+ built.payload,
+ /new MutationObserver\(\(mutations\) => \{[\s\S]*shouldScheduleEnsure\(mutations\)[\s\S]*scheduleEnsure\(\)/,
+ );
+ assert.doesNotMatch(
+ built.payload,
+ /attributeFilter: \[[^\]]*(?:"aria-label"|"style")/,
+ "tooltip animation and accessibility-label churn must not refresh the whole skin",
+ );
+ });
+
+ it("ignores timer text and transient portal nodes outside the themed shell", async () => {
+ const built = await buildPayload(
+ "./assets/inject",
+ "./assets/presets/happy-coding-dog",
+ );
+
+ assert.match(
+ built.payload,
+ /if \(mutation\.type === "characterData"\) return false;/,
+ );
+ assert.match(
+ built.payload,
+ /if \(mutation\.type === "childList"\) return mutationTouchesThemeStructure\(mutation\);/,
+ );
+ assert.match(
+ built.payload,
+ /const THEME_STRUCTURE_SELECTOR = "main, aside\.app-shell-left-panel,[^"]+_ComposerLayout/,
+ );
+ });
+
+ it("turns native sidebar navigation glyphs into color-coded hand-drawn stickers", async () => {
+ const built = await buildPayload(
+ "./assets/inject",
+ "./assets/presets/happy-coding-dog",
+ );
+ const css = fs.readFileSync(path.resolve("assets/inject/dream-skin.css"), "utf8");
+
+ for (const kind of ["new-chat", "pull-requests", "sites", "scheduled", "plugins", "security"]) {
+ assert.ok(
+ built.payload.includes(`["${kind}",`),
+ `the injected sidebar annotator must classify ${kind}`,
+ );
+ assert.ok(
+ css.includes(`[data-dream-dog-icon="${kind}"]`),
+ `missing Happy Coding Dog sticker treatment for ${kind}`,
+ );
+ }
+ assert.match(
+ css,
+ /data-dream-dog-icon[^{}]*svg[^{}]*\{[^}]*stroke-width:\s*2\.35[^}]*filter:\s*drop-shadow/s,
+ "sidebar glyphs should use a heavier hand-drawn line and offset ink shadow",
+ );
+ assert.match(
+ css,
+ /data-dream-dog-project[^{}]*svg[^{}]*\{[^}]*background:\s*var\(--dog-yellow\)/s,
+ "project folders should share the cream-yellow sticker language",
+ );
+ });
+
+ it("styles the sidebar utility actions and keeps icon labels comfortably spaced", async () => {
+ const built = await buildPayload(
+ "./assets/inject",
+ "./assets/presets/happy-coding-dog",
+ );
+ const css = fs.readFileSync(path.resolve("assets/inject/dream-skin.css"), "utf8");
+
+ for (const kind of ["search", "activity", "quick-chat", "profile", "voice", "help"]) {
+ assert.ok(built.payload.includes(`["${kind}",`), `missing utility action mapping for ${kind}`);
+ assert.ok(css.includes(`[data-dream-dog-action="${kind}"]`), `missing utility sticker for ${kind}`);
+ }
+ assert.match(
+ css,
+ /happy-coding-dog[^{}]*aside\.app-shell-left-panel[^{}]*data-dream-dog-icon[^{}]*data-dream-dog-project[^{}]*\{[^}]*column-gap:\s*8px\s*!important/s,
+ "navigation and project rows should keep an 8px gap between icon and label",
+ );
+ assert.match(
+ css,
+ /data-dream-dog-action="voice"[^{}]*\{[^}]*column-gap:\s*8px\s*!important/s,
+ "the bottom voice action should keep its icon away from the label",
+ );
+ });
+
+ it("turns the output and sources popover into a compact hand-drawn resource note", async () => {
+ const built = await buildPayload(
+ "./assets/inject",
+ "./assets/presets/happy-coding-dog",
+ );
+ const css = fs.readFileSync(path.resolve("assets/inject/dream-skin.css"), "utf8");
+
+ for (const hook of [
+ "data-dream-dog-resource-panel",
+ "data-dream-dog-resource-header",
+ "data-dream-dog-resource-add",
+ "data-dream-dog-resource-row",
+ "data-dream-dog-resource-view-all",
+ ]) {
+ assert.ok(built.payload.includes(hook), `missing resource popover DOM hook ${hook}`);
+ assert.ok(css.includes(`[${hook}]`), `missing resource popover styling for ${hook}`);
+ }
+ assert.match(
+ css,
+ /data-dream-dog-resource-panel[^{}]*\{[^}]*border:\s*(?:2|3)px solid var\(--dog-ink\)[^}]*box-shadow:/s,
+ "the resource popover should read as a bordered paper note",
+ );
+ assert.match(
+ css,
+ /data-dream-dog-resource-row[^{}]*\{[^}]*column-gap:\s*8px\s*!important/s,
+ "resource icons need an 8px gap from their labels",
+ );
+ assert.ok(css.includes('[data-dream-dog-resource-header="output"]'));
+ assert.ok(css.includes('[data-dream-dog-resource-header="sources"]'));
+ });
+
+ it("keeps resource popover colors above the generic elevated-panel treatment", () => {
+ const css = fs.readFileSync(path.resolve("assets/inject/dream-skin.css"), "utf8");
+ const genericPanelRule = css.lastIndexOf('body div[class~="rounded-3xl"][class~="bg-surface-elevated-secondary"]');
+ const outputHeaderRule = css.lastIndexOf('[data-dream-dog-resource-header="output"]');
+ const sourcesHeaderRule = css.lastIndexOf('[data-dream-dog-resource-header="sources"]');
+ const addButtonRule = css.lastIndexOf("[data-dream-dog-resource-add]");
+
+ assert.ok(outputHeaderRule > genericPanelRule, "the yellow output label must win the cascade");
+ assert.ok(sourcesHeaderRule > genericPanelRule, "the coral sources label must win the cascade");
+ assert.ok(addButtonRule > genericPanelRule, "the round add stickers must win the cascade");
+ assert.match(
+ css,
+ /data-dream-dog-resource-panel\]\[class~="rounded-3xl"\][^{}]*data-dream-dog-resource-header[^{}]*class~="sticky"/s,
+ "resource headers need enough specificity to beat the generic sticky panel header",
+ );
+ });
+
+ it("recognizes the resource add controls even when they expose an expanded state", async () => {
+ const built = await buildPayload(
+ "./assets/inject",
+ "./assets/presets/happy-coding-dog",
+ );
+
+ assert.match(
+ built.payload,
+ /filter\(\(button\) => !button\.classList\.contains\("group\/section-toggle"\)\)/,
+ "only the section toggle should be excluded from add-button styling",
+ );
+ });
+
+ it("maps the hand-painted treatment to every major Codex shell region", () => {
+ const css = fs.readFileSync(path.resolve("assets/inject/dream-skin.css"), "utf8");
+ const scope = 'html.codex-dream-skin[data-dream-theme="happy-coding-dog"]';
+ const requiredSelectors = [
+ `${scope} body`,
+ `${scope} aside.app-shell-left-panel`,
+ `${scope} main.dream-skin-main-surface`,
+ `${scope} header.app-header-tint`,
+ `${scope} [data-message-author-role]`,
+ `${scope} article`,
+ `${scope} .dream-skin-composer`,
+ `${scope} pre`,
+ `${scope} [class*="_ArtifactPanel_"]`,
+ ];
+
+ for (const selector of requiredSelectors) {
+ assert.ok(css.includes(selector), `missing scoped Happy Coding Dog treatment for ${selector}`);
+ }
+ });
+
+ it("keeps the painted title bar and composer decoration anchored against generic rules", () => {
+ const css = fs.readFileSync(path.resolve("assets/inject/dream-skin.css"), "utf8");
+ const scope = 'html.codex-dream-skin[data-dream-theme="happy-coding-dog"]';
+ assert.ok(
+ css.includes(`${scope} main.dream-skin-main-surface > header.app-header-tint`),
+ "title bar override must outrank the generic main/header selector",
+ );
+ assert.match(
+ css,
+ /data-dream-theme="happy-coding-dog"\][^{}]*\.dream-skin-composer[^{}]*\{[^}]*position:\s*relative\s*!important;/s,
+ "composer must anchor its painted star decoration",
+ );
+ });
+
+ it("keeps scrolled conversation content behind the cream thread header and ribbon", () => {
+ const css = fs.readFileSync(path.resolve("assets/inject/dream-skin.css"), "utf8");
+
+ assert.match(
+ css,
+ /happy-coding-dog[^{}]*main\.dream-skin-main-surface:not\(\.dream-skin-home-shell\)\s*>\s*header\[class~="fixed"\]\[class~="z-30"\][^{}]*\{[^}]*background:[^}]*100% 6px no-repeat[^}]*var\(--dog-cream\)\s*!important[^}]*border-bottom:\s*3px solid var\(--dog-ink\)/s,
+ "the fixed thread header must use opaque cream paper with a narrow painted ribbon",
+ );
+ });
+
+ it("does not place a paper fade over the top of populated conversations", () => {
+ const css = fs.readFileSync(path.resolve("assets/inject/dream-skin.css"), "utf8");
+
+ assert.doesNotMatch(
+ css,
+ /main\.dream-skin-main-surface:not\(\.dream-skin-home-shell\)::after\s*\{[^}]*content:\s*""[^}]*top:\s*46px[^}]*height:\s*44px/s,
+ "the conversation background must remain visible immediately below the fixed toolbar",
+ );
+ });
+
+ it("keeps only the upper titlebar rule on populated task conversations", () => {
+ const css = fs.readFileSync(path.resolve("assets/inject/dream-skin.css"), "utf8");
+
+ assert.match(
+ css,
+ /#codex-dream-skin-chrome:not\(\.dream-skin-home-shell\)::before[^{}]*\{[^}]*background:\s*var\(--dog-dopamine-header\)\s*!important[^}]*border-bottom:\s*0\s*!important[^}]*box-shadow:\s*none\s*!important/s,
+ );
+ assert.match(
+ css,
+ /main:not\(\.dream-skin-home-shell\)\s*\[class\*="_MainContentViewport_"\]::after[^{}]*\{[^}]*background:\s*var\(--dog-dopamine-header\)\s*!important/s,
+ );
+ });
+
+ it("keeps only the upper titlebar rule on the new-conversation home", () => {
+ const css = fs.readFileSync(path.resolve("assets/inject/dream-skin.css"), "utf8");
+
+ assert.match(
+ css,
+ /#codex-dream-skin-chrome\.dream-skin-home-shell::before[^{}]*\{[^}]*background:\s*transparent\s*!important[^}]*border-bottom:\s*0\s*!important[^}]*box-shadow:\s*none\s*!important/s,
+ );
+ assert.match(
+ css,
+ /main\.dream-skin-home-shell\s*\[class\*="_MainContentViewport_"\]::after[^{}]*\{[^}]*background:\s*transparent\s*!important[^}]*border-bottom:\s*0\s*!important/s,
+ );
+ });
+
+ it("covers the complete live Codex workspace instead of only the home preview", () => {
+ const css = fs.readFileSync(path.join(process.cwd(), "assets/inject/dream-skin.css"), "utf8");
+ const requiredWorkspaceHooks = [
+ "[class*=_Thread]",
+ "[class*=_Conversation]",
+ "[class*=_Output]",
+ "[class*=_Sources]",
+ "[class*=_ComposerLayoutRoot_]",
+ "[data-radix-scroll-area-viewport]",
+ "--dog-stroke-texture",
+ ];
+
+ for (const hook of requiredWorkspaceHooks) {
+ assert.match(css, new RegExp(hook.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")));
+ }
+ });
+
+ it("does not clip the painted composer outline, stamp, or hard shadow", () => {
+ const css = fs.readFileSync(path.resolve("assets/inject/dream-skin.css"), "utf8");
+ assert.match(
+ css,
+ /happy-coding-dog[^}]*\}[\s\S]*\[class\*=_ComposerLayoutRoot_\]\.dream-skin-composer-dock\s*\{[^}]*overflow:\s*visible\s*!important/,
+ );
+ assert.match(
+ css,
+ /happy-coding-dog[^}]*\}[\s\S]*\.dream-skin-composer-stamp\s*\{[^}]*border:\s*3px solid var\(--dog-ink\)/,
+ );
+ });
+
+ it("keeps native suggestion glyphs intact while painting their icon container", () => {
+ const css = fs.readFileSync(path.resolve("assets/inject/dream-skin.css"), "utf8");
+
+ assert.match(
+ css,
+ /happy-coding-dog[^}]*home-suggestions[^}]*span:has\(> svg\)[^{]*\{[^}]*border:\s*2px solid var\(--dog-ink\)/s,
+ "the painted circle belongs on the icon container",
+ );
+ assert.match(
+ css,
+ /happy-coding-dog[^}]*home-suggestions[^}]*button svg[^}]*\{[^}]*width:\s*20px[^}]*height:\s*20px[^}]*padding:\s*0/s,
+ "the SVG viewport must remain unpadded so native glyphs are not clipped",
+ );
+ });
+
+ it("aligns the home title and suggestion cards to one centered content rail", () => {
+ const css = fs.readFileSync(path.resolve("assets/inject/dream-skin.css"), "utf8");
+
+ assert.match(
+ css,
+ /happy-coding-dog[^}]*dream-skin-happy-home-title[^}]*group\\\/home-suggestions[^}]*\{[^}]*width:\s*min\(720px, calc\(100% - 48px\)\)[^}]*margin-inline:\s*auto[^}]*transform:\s*none\s*!important/s,
+ "the title and cards must share a centered rail without a viewport-relative offset",
+ );
+ });
+
+ it("renders aligned fallback suggestions when Codex leaves the native host empty", async () => {
+ const built = await buildPayload(
+ "./assets/inject",
+ "./assets/presets/happy-coding-dog",
+ );
+
+ assert.ok(
+ built.payload.includes("dream-skin-happy-fallback-suggestions"),
+ "the live skin must provide cards when the native suggestion host is empty",
+ );
+ assert.ok(
+ built.payload.includes('data-happy-suggestion="understand"'),
+ "the fallback must expose actionable suggestion buttons",
+ );
+ assert.ok(
+ built.payload.includes('querySelector(\':scope > [class*="top-full"]\')'),
+ "the fallback must reuse Codex's title-owned suggestion host",
+ );
+ assert.match(
+ built.payload,
+ /dream-skin-happy-fallback-suggestions[^{}]*\{[^}]*position:\s*absolute\s*!important/s,
+ "the fallback must preserve the native absolute-positioned host",
+ );
+ });
+
+ it("does not decorate the full home wrapper as the voice card", async () => {
+ const built = await buildPayload(
+ "./assets/inject",
+ "./assets/presets/happy-coding-dog",
+ );
+
+ assert.match(
+ built.payload,
+ /if \(voiceCard && isHappyVoiceCardCandidate\(voiceCard\)\)\s*\{\s*voiceCard\.classList\.add\("dream-skin-happy-home-voice"\)/,
+ "the initial voice-label candidate must satisfy the compact-card bounds before decoration",
+ );
+ });
+
+ it("removes the native white top fade from the animal home canvas", () => {
+ const css = fs.readFileSync(path.resolve("assets/inject/dream-skin.css"), "utf8");
+
+ assert.match(
+ css,
+ /happy-coding-dog[^{}]*dream-skin-home-shell[^{}]*\[class\*="_MainContentTopFade_"\][^{}]*\{[^}]*display:\s*none\s*!important/s,
+ "the native white-to-transparent top fade must not sit above the painted background",
+ );
+ });
+
+ it("paints the home titlebar while leaving the removed cover layers transparent", () => {
+ const css = fs.readFileSync(path.resolve("assets/inject/dream-skin.css"), "utf8");
+
+ assert.match(
+ css,
+ /happy-coding-dog[^{}]*main\.dream-skin-home-shell\s*>\s*header\[class~="fixed"\]\[class~="z-30"\][^{}]*\{[^}]*linear-gradient\(100deg[^}]*#ffd84a[^}]*#ff5b49[^}]*#23b7c9[^}]*#78c64b[^}]*#a86be8[^}]*border-bottom:\s*3px solid var\(--dog-ink\)/s,
+ "the fixed home titlebar must keep the hand-painted multicolor treatment",
+ );
+ assert.match(
+ css,
+ /--dog-dopamine-header:\s*linear-gradient\([^;]*#ffd84a[^;]*#ff8a3d[^;]*#ff5b49[^;]*#a86be8[^;]*\);/s,
+ "the header palette must progress from yellow through orange and coral to purple",
+ );
+ assert.doesNotMatch(
+ css,
+ /--dog-dopamine-header:[^;]*(?:#2ab1c5|#67d1df|#8eddea|var\(--dog-blue\)|var\(--dog-cyan\))/s,
+ "the dopamine header must not contain cyan paint",
+ );
+ assert.match(
+ css,
+ /happy-coding-dog[^{}]*dream-skin-home-shell[^{}]*\.dream-skin-brand[^{}]*\{[^}]*background:\s*var\(--dog-cream\)[^}]*border:\s*3px solid var\(--dog-coral\)/s,
+ "the home brand must read as a warm cream-and-coral sticker",
+ );
+ assert.match(
+ css,
+ /happy-coding-dog[^{}]*dream-skin-home-shell[^{}]*\.dream-skin-status[^{}]*\{[^}]*background:\s*var\(--dog-yellow\)[^}]*box-shadow:\s*3px 3px 0 var\(--dog-purple\)/s,
+ "the online status must use yellow paint with a purple sticker shadow",
+ );
+ assert.match(
+ css,
+ /#codex-dream-skin-chrome\.dream-skin-home-shell::before[^{}]*\{[^}]*background:\s*transparent\s*!important/s,
+ "the removed home cover must stay transparent",
+ );
+ });
+
+ it("uses the edge-blended animal team artwork without canvas gutters", () => {
+ const css = fs.readFileSync(path.resolve("assets/inject/dream-skin.css"), "utf8");
+ const theme = JSON.parse(
+ fs.readFileSync(path.resolve("assets/presets/happy-coding-dog/theme.json"), "utf8"),
+ );
+
+ assert.equal(theme.hero, "hero-workspace-blended.png");
+ assert.match(
+ css,
+ /happy-coding-dog[^{}]*dream-skin-native-home-dog[^{}]*\{[^}]*object-fit:\s*cover\s*!important[^}]*object-position:\s*center\s*!important/s,
+ "the workspace-specific artwork must fill the canvas without a side color block",
+ );
+ assert.match(
+ css,
+ /happy-coding-dog[^{}]*dream-skin-happy-home-canvas[^{}]*\{[^}]*scrollbar-gutter:\s*auto\s*!important/s,
+ "the home canvas must not reserve side gutters around the artwork",
+ );
});
});
diff --git a/electron/engine/verify.ts b/electron/engine/verify.ts
index a385a77..2ad57e5 100644
--- a/electron/engine/verify.ts
+++ b/electron/engine/verify.ts
@@ -86,7 +86,10 @@ export async function verifySession(session: CdpSession): Promise
const value = box(node);
return Boolean(value?.visible && node.getClientRects().length > 0);
};
- const shellMain = document.querySelector('main.main-surface') ?? document.querySelector('main');
+ const shellMain = document.querySelector('main.main-surface') ??
+ document.querySelector('main.dream-skin-main-surface') ??
+ document.querySelector('main[class*="_MainContentSurface_"]') ??
+ document.querySelector('main');
const homeCandidates = shellMain
? [
...(shellMain.matches('[role="main"]') ? [shellMain] : []),
@@ -104,7 +107,8 @@ export async function verifySession(session: CdpSession): Promise
visible(candidate.querySelector('.group\\\\/home-suggestions'));
return visible(candidate) && hasHomeContent && !hasVisibleTaskContent;
}) ?? null;
- const home = document.querySelector('[role="main"].dream-skin-home');
+ const home = document.querySelector('[role="main"].dream-skin-home') ??
+ document.querySelector('.dream-skin-role-main.dream-skin-home');
const blueWindowHome = home?.querySelector('#codex-dream-skin-blue-window-home') ?? null;
const suggestions = blueWindowHome?.querySelector('.blue-window-home__quick-actions') ??
home?.querySelector('.group\\\\/home-suggestions') ?? null;
@@ -115,7 +119,10 @@ export async function verifySession(session: CdpSession): Promise
const projectButton = box(blueWindowHome?.querySelector('[data-project-target]')) ??
box(home?.querySelector('.group\\\\/project-selector > button'));
const composer = box(blueWindowHome?.querySelector('.blue-window-home__composer')) ??
- box(document.querySelector('.composer-surface-chrome'));
+ box(document.querySelector('.composer-surface-chrome')) ??
+ box(document.querySelector('.dream-skin-composer')) ??
+ box(document.querySelector('[class*="_ComposerLayoutRoot_"]')) ??
+ box(document.querySelector('.ProseMirror')?.closest('[class]'));
const sidebar = box(document.querySelector('aside.app-shell-left-panel'));
const chrome = document.getElementById('codex-dream-skin-chrome');
const result = {
diff --git a/electron/ipc.ts b/electron/ipc.ts
index a30de21..b9be8cb 100644
--- a/electron/ipc.ts
+++ b/electron/ipc.ts
@@ -10,6 +10,7 @@ import os from "node:os";
import path from "node:path";
import type {
AiThemeMessageInput,
+ ApplyThemeOptions,
CustomThemeInput,
InspectedThemePackage,
OpenThemeAction,
@@ -128,7 +129,7 @@ export function registerIpc(ctx: IpcContext): void {
ipcMain.handle("themes:list", () => store.listThemes());
- ipcMain.handle("themes:apply", (_event, id: string, opts?: { confirmRestart?: boolean }) =>
+ ipcMain.handle("themes:apply", (_event, id: string, opts?: ApplyThemeOptions) =>
controller.applyTheme(id, opts),
);
diff --git a/electron/preload.ts b/electron/preload.ts
index f6365fc..4716e75 100644
--- a/electron/preload.ts
+++ b/electron/preload.ts
@@ -8,6 +8,7 @@ import type {
AiThemeJob,
AppState,
AppUpdateState,
+ ApplyThemeOptions,
AuthState,
CodexApprovalRequest,
CodexThemesApi,
@@ -42,7 +43,7 @@ const api: CodexThemesApi = {
openAppUpdateRelease: () => ipcRenderer.invoke("updater:openRelease"),
openAppUpdateDownload: () => ipcRenderer.invoke("updater:openDownload"),
listThemes: () => ipcRenderer.invoke("themes:list"),
- applyTheme: (id: string, opts?: { confirmRestart?: boolean }) =>
+ applyTheme: (id: string, opts?: ApplyThemeOptions) =>
ipcRenderer.invoke("themes:apply", id, opts),
restoreOfficial: () => ipcRenderer.invoke("themes:restoreOfficial"),
openCodex: () => ipcRenderer.invoke("codex:open"),
diff --git a/electron/shared/types.ts b/electron/shared/types.ts
index c4638b5..11643c5 100644
--- a/electron/shared/types.ts
+++ b/electron/shared/types.ts
@@ -581,6 +581,11 @@ export interface AppState {
export type ApplyStatus = "applied" | "partial" | "failed";
+export interface ApplyThemeOptions {
+ confirmRestart?: boolean;
+ source?: ThemeSource;
+}
+
export interface ApplyResult {
ok: boolean;
status: ApplyStatus;
@@ -988,7 +993,7 @@ export interface CodexThemesApi {
openAppUpdateRelease(): Promise;
openAppUpdateDownload(): Promise;
listThemes(): Promise;
- applyTheme(id: string, opts?: { confirmRestart?: boolean }): Promise;
+ applyTheme(id: string, opts?: ApplyThemeOptions): Promise;
restoreOfficial(): Promise<{ ok: boolean; error?: string }>;
openCodex(): Promise<{ ok: boolean; error?: string }>;
selectCodexDesktop(): Promise;
diff --git a/electron/themes/store.ts b/electron/themes/store.ts
index dd6167b..7fad2f6 100644
--- a/electron/themes/store.ts
+++ b/electron/themes/store.ts
@@ -59,6 +59,8 @@ export interface StorePaths {
export interface ResolveThemeDirOptions {
/** Prefer a downloaded marketplace package over a bundled catalog placeholder. */
preferPurchased?: boolean;
+ /** Prefer the library source selected in the renderer when duplicate ids exist. */
+ preferredSource?: ThemeSource;
/** Catalog-only packages are previews and must never be applied to Codex. */
allowCatalogOnly?: boolean;
}
@@ -202,9 +204,19 @@ export class ThemeStore {
/** Resolve a theme id to its directory. Library operations keep preset-first compatibility. */
async resolveThemeDir(id: string, options: ResolveThemeDirOptions = {}): Promise {
- const roots = options.preferPurchased && this.paths.purchasedThemesRoot
+ const sourceRoots: Record = {
+ preset: this.paths.presetsRoot,
+ custom: this.paths.userThemesRoot,
+ imported: this.paths.userThemesRoot,
+ purchased: this.paths.purchasedThemesRoot,
+ };
+ const preferredRoot = options.preferredSource ? sourceRoots[options.preferredSource] : undefined;
+ const fallbackRoots = options.preferPurchased && this.paths.purchasedThemesRoot
? [this.paths.purchasedThemesRoot, this.paths.userThemesRoot, this.paths.presetsRoot]
: [this.paths.presetsRoot, this.paths.userThemesRoot, ...(this.paths.purchasedThemesRoot ? [this.paths.purchasedThemesRoot] : [])];
+ const roots = preferredRoot
+ ? [preferredRoot, ...fallbackRoots.filter((root) => root !== preferredRoot)]
+ : fallbackRoots;
for (const root of roots) {
let entries: string[] = [];
try {
diff --git a/package-lock.json b/package-lock.json
index a7e74c5..7a8abf2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "codex-themes",
- "version": "0.2.15",
+ "version": "0.2.17",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "codex-themes",
- "version": "0.2.15",
+ "version": "0.2.17",
"license": "MIT",
"dependencies": {
"@supabase/supabase-js": "^2.110.8",
diff --git a/package.json b/package.json
index f2d620a..ce5c954 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "codex-themes",
- "version": "0.2.15",
+ "version": "0.2.17",
"description": "Desktop theme manager for the OpenAI Codex desktop app (CDP injection, no patching)",
"type": "module",
"main": "dist/main/index.js",
@@ -14,7 +14,7 @@
"preview": "electron-vite preview",
"preview:web": "astro preview --root web",
"typecheck": "tsc -p tsconfig.node.json --noEmit && tsc -p tsconfig.server.json --noEmit && tsc -p tsconfig.web.json --noEmit && astro check --root web",
- "test": "esbuild electron/deep-links.test.ts electron/updater-state.test.ts electron/updater-platform.test.ts electron/update-install.test.ts electron/engine/cdp.test.ts electron/engine/theme.test.ts electron/engine/layout-catalog.test.ts electron/ai/ai.test.ts electron/engine/package-safety.test.ts electron/codex-cli/locator.test.ts electron/platform/index.test.ts electron/platform/codex-windows.test.ts electron/gallery-themes.test.ts electron/commerce/config.test.ts server/commerce-api/alipay.test.ts server/commerce-api/avatar.test.ts server/commerce-api/theme-package.test.ts server/downloads/github-release.test.ts --bundle --platform=node --format=esm --external:adm-zip --external:alipay-sdk --external:sharp --alias:electron=./electron/test-stubs/electron-stub.ts --outdir=tmp/tests --out-extension:.js=.mjs && node --test \"tmp/tests/**/*.test.mjs\" scripts/publish-paid-theme.test.mjs scripts/package-macos.test.mjs scripts/package-windows.test.mjs scripts/merge-macos-metadata.test.mjs",
+ "test": "esbuild electron/controller.test.ts electron/deep-links.test.ts electron/updater-state.test.ts electron/updater-platform.test.ts electron/update-install.test.ts electron/engine/cdp.test.ts electron/engine/theme.test.ts electron/engine/layout-catalog.test.ts electron/ai/ai.test.ts electron/engine/package-safety.test.ts electron/codex-cli/locator.test.ts electron/platform/index.test.ts electron/platform/codex-windows.test.ts electron/gallery-themes.test.ts electron/commerce/config.test.ts server/commerce-api/alipay.test.ts server/commerce-api/avatar.test.ts server/commerce-api/theme-package.test.ts server/downloads/github-release.test.ts --bundle --platform=node --format=esm --external:adm-zip --external:alipay-sdk --external:sharp --alias:electron=./electron/test-stubs/electron-stub.ts --outdir=tmp/tests --out-extension:.js=.mjs && node --test \"tmp/tests/**/*.test.mjs\" scripts/publish-paid-theme.test.mjs scripts/package-macos.test.mjs scripts/package-windows.test.mjs scripts/merge-macos-metadata.test.mjs",
"gen:presets": "node scripts/gen-presets.mjs",
"verify:machine": "esbuild scripts/verify-real-machine.mts --bundle --platform=node --format=esm --external:adm-zip --outfile=tmp/verify-real-machine.mjs && node tmp/verify-real-machine.mjs",
"dist": "electron-vite build && node scripts/build-dist.mjs",
diff --git a/scripts/build-standalone-happy-coding.mjs b/scripts/build-standalone-happy-coding.mjs
new file mode 100644
index 0000000..db14c40
--- /dev/null
+++ b/scripts/build-standalone-happy-coding.mjs
@@ -0,0 +1,114 @@
+import { execFile } from "node:child_process";
+import fs from "node:fs/promises";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { promisify } from "node:util";
+import AdmZip from "adm-zip";
+
+const execFileAsync = promisify(execFile);
+const defaultProjectRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
+
+function executableEntry(zip, name, data) {
+ zip.addFile(name, data, "", 0o755);
+}
+
+function installScript() {
+ return `#!/bin/zsh
+set -euo pipefail
+SOURCE_DIR="\${0:A:h}/runtime"
+INSTALL_DIR="\${HOME}/Library/Application Support/Happy Coding Theme"
+AGENT_FILE="\${HOME}/Library/LaunchAgents/com.happycoding.theme.plist"
+LABEL="com.happycoding.theme"
+
+mkdir -p "\${INSTALL_DIR}" "\${HOME}/Library/LaunchAgents"
+/usr/bin/ditto "\${SOURCE_DIR}" "\${INSTALL_DIR}"
+/bin/chmod 755 "\${INSTALL_DIR}/happy-coding-runtime"
+
+/bin/launchctl bootout "gui/\${UID}/\${LABEL}" >/dev/null 2>&1 || true
+/bin/cat > "\${AGENT_FILE}" <
+
+
+Label\${LABEL}
+ProgramArguments\${INSTALL_DIR}/happy-coding-runtime--watch
+RunAtLoadKeepAlive
+StandardOutPath\${INSTALL_DIR}/runtime.log
+StandardErrorPath\${INSTALL_DIR}/runtime-error.log
+
+PLIST
+/bin/launchctl bootstrap "gui/\${UID}" "\${AGENT_FILE}"
+/bin/launchctl kickstart -k "gui/\${UID}/\${LABEL}"
+/usr/bin/osascript -e 'display dialog "Happy Coding 已安装并开始应用。Codex 可能会自动重启一次。" buttons {"好"} default button "好" with title "Happy Coding"'
+`;
+}
+
+function uninstallScript() {
+ return `#!/bin/zsh
+set -euo pipefail
+INSTALL_DIR="\${HOME}/Library/Application Support/Happy Coding Theme"
+AGENT_FILE="\${HOME}/Library/LaunchAgents/com.happycoding.theme.plist"
+LABEL="com.happycoding.theme"
+
+/bin/launchctl bootout "gui/\${UID}/\${LABEL}" >/dev/null 2>&1 || true
+if [[ -x "\${INSTALL_DIR}/happy-coding-runtime" ]]; then
+ "\${INSTALL_DIR}/happy-coding-runtime" --cleanup || true
+fi
+/bin/rm -f "\${AGENT_FILE}"
+/bin/rm -rf "\${INSTALL_DIR}"
+/usr/bin/osascript -e 'display dialog "Happy Coding 已卸载，Codex 已恢复官方外观。" buttons {"好"} default button "好" with title "Happy Coding"'
+`;
+}
+
+export async function buildStandaloneThemePackage({
+ projectRoot = defaultProjectRoot,
+ outputDir = path.join(projectRoot, "output", "standalone"),
+ runtimePath,
+ archiveName = "Happy-Coding-macOS-arm64.zip",
+} = {}) {
+ const themeDir = path.join(projectRoot, "assets", "presets", "happy-coding-dog");
+ const injectDir = path.join(projectRoot, "assets", "inject");
+ const manifest = JSON.parse(await fs.readFile(path.join(themeDir, "theme.json"), "utf8"));
+ const runtime = runtimePath ?? path.join(outputDir, "happy-coding-runtime");
+
+ await fs.mkdir(outputDir, { recursive: true });
+ if (!runtimePath) {
+ const bun = path.join(process.env.HOME ?? "", ".bun", "bin", "bun");
+ await execFileAsync(bun, [
+ "build",
+ path.join(projectRoot, "standalone", "happy-coding-runtime.ts"),
+ "--compile",
+ "--target=bun-darwin-arm64",
+ `--outfile=${runtime}`,
+ ]);
+ }
+
+ const zip = new AdmZip();
+ const prefix = "Happy Coding/";
+ executableEntry(zip, `${prefix}Install Happy Coding.command`, Buffer.from(installScript()));
+ executableEntry(zip, `${prefix}Uninstall Happy Coding.command`, Buffer.from(uninstallScript()));
+ executableEntry(zip, `${prefix}runtime/happy-coding-runtime`, await fs.readFile(runtime));
+ zip.addLocalFile(path.join(injectDir, "dream-skin.css"), `${prefix}runtime/inject`);
+ zip.addLocalFile(path.join(injectDir, "renderer-inject.js"), `${prefix}runtime/inject`);
+ zip.addLocalFile(path.join(themeDir, "theme.json"), `${prefix}runtime/theme`);
+
+ const themeAssets = new Set([manifest.hero, manifest.preview, manifest.wallpaper, manifest.stamp].filter(Boolean));
+ for (const asset of themeAssets) {
+ zip.addLocalFile(path.join(themeDir, asset), `${prefix}runtime/theme`);
+ }
+ zip.addFile(`${prefix}package.json`, Buffer.from(`${JSON.stringify({
+ name: "Happy Coding",
+ themeId: manifest.id,
+ themeVersion: manifest.version,
+ engineVersion: "1.2.4",
+ platform: "darwin-arm64",
+ }, null, 2)}\n`));
+
+ const archivePath = path.join(outputDir, archiveName);
+ zip.writeZip(archivePath);
+ return { archivePath };
+}
+
+if (process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url)) {
+ const result = await buildStandaloneThemePackage();
+ console.log(result.archivePath);
+}
diff --git a/scripts/build-standalone-happy-coding.test.mjs b/scripts/build-standalone-happy-coding.test.mjs
new file mode 100644
index 0000000..6707ac5
--- /dev/null
+++ b/scripts/build-standalone-happy-coding.test.mjs
@@ -0,0 +1,65 @@
+import assert from "node:assert/strict";
+import { execFile } from "node:child_process";
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import test from "node:test";
+import { promisify } from "node:util";
+import AdmZip from "adm-zip";
+
+import { buildStandaloneThemePackage } from "./build-standalone-happy-coding.mjs";
+
+const execFileAsync = promisify(execFile);
+
+test("builds an independent Happy Coding macOS package", async () => {
+ const root = await fs.mkdtemp(path.join(os.tmpdir(), "happy-coding-package-test-"));
+ const fakeRuntime = path.join(root, "happy-coding-runtime");
+ await fs.writeFile(fakeRuntime, "runtime", { mode: 0o755 });
+
+ const result = await buildStandaloneThemePackage({
+ projectRoot: process.cwd(),
+ outputDir: root,
+ runtimePath: fakeRuntime,
+ archiveName: "Happy-Coding-test.zip",
+ });
+
+ const zip = new AdmZip(result.archivePath);
+ const names = zip.getEntries().map((entry) => entry.entryName).sort();
+ assert.ok(names.includes("Happy Coding/Install Happy Coding.command"));
+ assert.ok(names.includes("Happy Coding/Uninstall Happy Coding.command"));
+ assert.ok(names.includes("Happy Coding/runtime/happy-coding-runtime"));
+ assert.ok(names.includes("Happy Coding/runtime/inject/dream-skin.css"));
+ assert.ok(names.includes("Happy Coding/runtime/inject/renderer-inject.js"));
+ assert.ok(names.includes("Happy Coding/runtime/theme/theme.json"));
+ assert.ok(names.includes("Happy Coding/runtime/theme/hero-workspace-blended.png"));
+ assert.ok(names.includes("Happy Coding/runtime/theme/wallpaper.png"));
+ assert.ok(names.includes("Happy Coding/runtime/theme/stamp.png"));
+
+ const install = zip.readAsText("Happy Coding/Install Happy Coding.command");
+ assert.match(install, /com\.happycoding\.theme/);
+ assert.match(install, /LaunchAgents/);
+ assert.match(install, /KeepAlive/);
+ assert.match(install, /happy-coding-runtime/);
+
+ const uninstall = zip.readAsText("Happy Coding/Uninstall Happy Coding.command");
+ assert.match(uninstall, /--cleanup/);
+ assert.match(uninstall, /bootout/);
+
+ const extracted = path.join(root, "extracted");
+ await fs.mkdir(extracted);
+ await execFileAsync("/usr/bin/unzip", ["-q", result.archivePath, "-d", extracted]);
+ for (const relative of [
+ "Happy Coding/Install Happy Coding.command",
+ "Happy Coding/Uninstall Happy Coding.command",
+ "Happy Coding/runtime/happy-coding-runtime",
+ ]) {
+ const mode = (await fs.stat(path.join(extracted, relative))).mode;
+ assert.notEqual(mode & 0o111, 0, `${relative} must remain executable after extraction`);
+ }
+
+ const manifest = JSON.parse(zip.readAsText("Happy Coding/package.json"));
+ assert.equal(manifest.name, "Happy Coding");
+ assert.equal(manifest.themeId, "happy-coding-dog");
+ assert.equal(manifest.engineVersion, "1.2.4");
+ assert.equal(manifest.platform, "darwin-arm64");
+});
diff --git a/src/components/ThemeCard.tsx b/src/components/ThemeCard.tsx
index 2d960a8..c6e56cb 100644
--- a/src/components/ThemeCard.tsx
+++ b/src/components/ThemeCard.tsx
@@ -120,7 +120,7 @@ export function ThemeCard({