beauticode-dsh 1.0.4 → 1.0.7

package/README.zh-CN.md

@@ -2,7 +2,7 @@
 
 该 Cordis 插件向 DSH Web 注入 beautiCode 浏览器客户端，并提供本机鉴权接口。支持图片、MP4、播放位置、静音、摸鱼模式以及清除背景。
 
-装好插件并运行 `dsh web` 后，侧栏「设置」上方会出现「背景」：可从文件夹选图片或 MP4、清除、开关声音、切换已保存主题，以及打开「皮肤中心」安装已审核的社区皮肤。网页控制台没有摸鱼；浅色/深色跟 DSH 自己的外观走。下次打开会恢复上次背景。设置 `BEAUTICODE_SKIN_CENTER` 或填写 `skin-center.json` 后，皮肤中心才会显示远程目录。
+装好插件并运行 `dsh web` 后，侧栏「设置」上方会出现「背景」：可从文件夹选图片或 MP4、清除、开关声音、切换或删除已保存主题，以及打开「皮肤中心」安装已审核的社区皮肤。导入的图片和视频会自动进入已保存主题。网页控制台没有摸鱼；浅色/深色跟 DSH 自己的外观走。下次打开会恢复上次背景。设置 `BEAUTICODE_SKIN_CENTER` 或填写 `skin-center.json` 后，皮肤中心才会显示远程目录。
 
 插件也会注册对话工具（`beauticode_*`）和斜杠命令（`/bg`、`/bg-theme`、`/bg-clear`）。不需要托盘；托盘若已在跑则复用它。
 

package/agent.mjs

@@ -1,3 +1,4 @@
+import path from "node:path";
 import {
   callDshControl,
   formatStatusText,
@@ -5,7 +6,7 @@ import {
   matchSavedTheme,
   stripPathQuotes,
 } from "./control-client.mjs";
-import { resolveApplyBackend, stopInProcessSession } from "./host-apply.mjs";
+import { loadAdapter, resolveApplyBackend, stopInProcessSession } from "./host-apply.mjs";
 import { ATMOSPHERE_PRESETS, effectsForPreset, presetImagePath } from "./presets.mjs";
 
 const APPLY_TIMEOUT_MS = 180_000;
@@ -32,6 +33,55 @@ function fail(error) {
   throw error instanceof Error ? error : new Error(String(error));
 }
 
+export function themeNameFromFilePath(filePath, fallback = "主题") {
+  const base = path.basename(String(filePath ?? "").replaceAll("\\", "/"));
+  const ext = path.extname(base);
+  let name = (ext ? base.slice(0, -ext.length) : base).trim();
+  name = name
+    .replace(/[<>:"/\\|?*]/g, " ")
+    .replace(/[\u0000-\u001f]/g, "")
+    .replace(/\s+/g, " ")
+    .trim();
+  if (!name) name = fallback;
+  if (name.length > 80) name = name.slice(0, 80).trim();
+  if (!name) name = fallback;
+  return name;
+}
+
+async function chineseError(error) {
+  const raw = error instanceof Error ? error.message : String(error ?? "");
+  try {
+    const adapter = await loadAdapter();
+    if (typeof adapter.toChineseErrorMessage === "function") {
+      return adapter.toChineseErrorMessage(error);
+    }
+  } catch {
+    /* keep raw */
+  }
+  return raw || "操作失败。";
+}
+
+async function unwrapApplyResult(result, fallbackMode, message) {
+  if (!result || result.ok === false) {
+    fail(await chineseError(result?.error || "操作失败。"));
+  }
+  return {
+    ok: true,
+    generation: result.generation ?? null,
+    mode: result.mode ?? fallbackMode,
+    message,
+    ...(result.theme
+      ? {
+          theme: {
+            id: result.theme.id,
+            name: result.theme.name,
+            type: result.theme.type ?? null,
+          },
+        }
+      : {}),
+  };
+}
+
 function commandResultFromError(error) {
   return {
     kind: "error",
@@ -57,6 +107,15 @@ function unwrapApply(result, fallbackMode, message) {
     generation: result.generation ?? null,
     mode: result.mode ?? fallbackMode,
     message,
+    ...(result.theme
+      ? {
+          theme: {
+            id: result.theme.id,
+            name: result.theme.name,
+            type: result.theme.type ?? null,
+          },
+        }
+      : {}),
   };
 }
 
@@ -69,6 +128,7 @@ function presentStatus(status) {
     muted: status.muted !== false,
     tone: status.tone ?? "dark",
     background: status.manifest?.background ?? status.background ?? null,
+    themeId: typeof status.themeId === "string" && status.themeId ? status.themeId : null,
     message: formatStatusText(status),
   };
 }
@@ -106,24 +166,40 @@ export function createBeauticodeActions(dataRootOrOptions) {
         fail("beauticode_apply_image 只接受图片文件。");
       }
       const effects = effectsForPreset(options?.effects?.preset) || options?.effects || null;
+      const persistTheme = options?.persistTheme !== false;
+      const themeName =
+        String(options?.themeName ?? "").trim() ||
+        themeNameFromFilePath(inspected.path, "图片");
       const input = { type: "image", imagePath: inspected.path };
       if (effects) input.effects = effects;
       const resolved = await backend();
       if (resolved.kind === "tray") {
-        const body = { imagePath: inspected.path };
+        const body = { imagePath: inspected.path, persistTheme, themeName };
         if (effects) body.effects = effects;
-        return unwrapApply(
-          await request({
-            method: "POST",
-            path: "/apply/image",
-            body,
-            signal,
-          }),
+        const result = await request({
+          method: "POST",
+          path: "/apply/image",
+          body,
+          signal,
+        });
+        return unwrapApplyResult(
+          result,
           "image",
-          "已将图片设为背景。",
+          persistTheme
+            ? `已将「${result.theme?.name || themeName}」设为背景。`
+            : "已将图片设为背景。",
         );
       }
-      return unwrapApply(await resolved.session.apply(input), "image", "已将图片设为背景。");
+      const applied = persistTheme
+        ? await resolved.session.applyImportedMedia(input, { name: themeName })
+        : await resolved.session.apply(input);
+      return unwrapApplyResult(
+        applied,
+        "image",
+        persistTheme
+          ? `已将「${applied.theme?.name || themeName}」设为背景。`
+          : "已将图片设为背景。",
+      );
     },
 
     async applyPreset(id, signal) {
@@ -132,6 +208,7 @@ export function createBeauticodeActions(dataRootOrOptions) {
       if (!preset || !imagePath) fail("未找到内置主题文件。");
       const result = await this.applyImage(imagePath, signal, {
         effects: effectsForPreset(id),
+        persistTheme: false,
       });
       try {
         await this.setTone(preset.tone, signal);
@@ -167,7 +244,11 @@ export function createBeauticodeActions(dataRootOrOptions) {
       if (inspected.kind !== "video") {
         fail("beauticode_apply_video 只接受 .mp4 文件。");
       }
-      const body = { videoPath: inspected.path };
+      const persistTheme = input?.persistTheme !== false;
+      const themeName =
+        String(input?.themeName ?? "").trim() ||
+        themeNameFromFilePath(inspected.path, "视频");
+      const body = { videoPath: inspected.path, persistTheme, themeName };
       const localInput = { type: "video", videoPath: inspected.path };
       if (typeof input.poster === "string" && input.poster.trim()) {
         const poster = await inspectLocalMedia(input.poster);
@@ -186,21 +267,29 @@ export function createBeauticodeActions(dataRootOrOptions) {
       }
       const resolved = await backend();
       if (resolved.kind === "tray") {
-        return unwrapApply(
-          await request({
-            method: "POST",
-            path: "/apply/video",
-            body,
-            signal,
-          }),
+        const result = await request({
+          method: "POST",
+          path: "/apply/video",
+          body,
+          signal,
+        });
+        return unwrapApplyResult(
+          result,
           "video",
-          "已将视频设为背景。",
+          persistTheme
+            ? `已将「${result.theme?.name || themeName}」设为背景。`
+            : "已将视频设为背景。",
         );
       }
-      return unwrapApply(
-        await resolved.session.apply(localInput),
+      const applied = persistTheme
+        ? await resolved.session.applyImportedMedia(localInput, { name: themeName })
+        : await resolved.session.apply(localInput);
+      return unwrapApplyResult(
+        applied,
         "video",
-        "已将视频设为背景。",
+        persistTheme
+          ? `已将「${applied.theme?.name || themeName}」设为背景。`
+          : "已将视频设为背景。",
       );
     },
 
@@ -311,6 +400,32 @@ export function createBeauticodeActions(dataRootOrOptions) {
       };
     },
 
+    async deleteTheme(id, signal) {
+      const themeId = String(id ?? "").trim();
+      if (!themeId) fail("必须提供主题。");
+      const resolved = await backend();
+      if (resolved.kind === "tray") {
+        const result = await request({
+          method: "POST",
+          path: "/theme/delete",
+          body: { id: themeId },
+          signal,
+          timeoutMs: QUICK_TIMEOUT_MS,
+        });
+        if (!result || result.ok === false) {
+          fail(await chineseError(result?.error || "删除主题失败。"));
+        }
+        return { ok: true, deleted: true, message: "已删除主题。" };
+      }
+      try {
+        const deleted = await resolved.session.deleteSavedTheme(themeId);
+        if (!deleted) fail("未找到已保存的主题。");
+        return { ok: true, deleted: true, message: "已删除主题。" };
+      } catch (error) {
+        fail(await chineseError(error));
+      }
+    },
+
     async setFish(enabled, signal) {
       const resolved = await backend();
       const want = Boolean(enabled);

package/cli.js

@@ -46,9 +46,17 @@ function defaultDataRoot() {
   return path.join(os.homedir(), ".beauticode");
 }
 
-function defaultDshHome() {
-  return process.env.DSH_HOME || path.join(os.homedir(), ".dsh");
-}
+function defaultDshHome() {
+  return process.env.DSH_HOME || path.join(os.homedir(), ".dsh");
+}
+
+function defaultPluginHome(dshHome) {
+  return path.join(path.resolve(dshHome), "plugins", pluginName);
+}
+
+function legacyDefaultPluginHome() {
+  return path.join(defaultDataRoot(), "plugin");
+}
 
 function toFileUri(filePath) {
   const full = path.resolve(filePath).replaceAll("\\", "/");
@@ -222,15 +230,34 @@ async function sameInstalledVersion(dest) {
   }
 }
 
-async function copyPackage(dest) {
+async function copyPackage(dest) {
   if (await sameInstalledVersion(dest)) return false;
   await fsp.rm(dest, { recursive: true, force: true });
   await fsp.cp(here, dest, {
     recursive: true,
     filter: (source) => shouldCopy(source),
   });
-  return true;
-}
+  return true;
+}
+
+async function removeLegacyManagedPlugin(legacyHome, currentHome) {
+  if (!legacyHome) return false;
+  const legacy = path.resolve(legacyHome);
+  if (legacy === path.resolve(currentHome) || !fs.existsSync(legacy)) return false;
+  try {
+    const pkg = JSON.parse(await fsp.readFile(path.join(legacy, "package.json"), "utf8"));
+    if (
+      ![pluginName, "@beauticode/dsh-plugin"].includes(pkg.name) ||
+      !fs.existsSync(path.join(legacy, "index.mjs"))
+    ) {
+      return false;
+    }
+  } catch {
+    return false;
+  }
+  await fsp.rm(legacy, { recursive: true, force: true });
+  return true;
+}
 
 async function ensureEngine(dest) {
   const vendor = path.join(dest, "vendor", "adapter-dsh", "index.js");
@@ -320,7 +347,7 @@ async function removeWebPackageDep(webPackage) {
   return true;
 }
 
-async function install(opts) {
+async function install(opts) {
   const dest = path.resolve(opts.pluginHome);
   const dshHome = path.resolve(opts.dshHome);
   const webProfile = path.join(dshHome, "profiles", "web");
@@ -340,21 +367,25 @@ async function install(opts) {
     await linkPluginIntoProfile(webProfile, dest);
     await ensureWebPackageDep(webPackage, dest);
     await writePatch(webPatch, packageInsert());
-    if (fs.existsSync(homePatch)) {
+    if (fs.existsSync(homePatch)) {
       const homeRaw = await fsp.readFile(homePatch, "utf8");
-      if (hasBridge(homeRaw)) await removePatch(homePatch);
-    }
-    console.log(`已写入 ${webPatch}`);
-    console.log(copied ? `插件已安装到 ${dest}` : `已复用已安装的插件 ${dest}`);
-    console.log("请自己运行：npx @deepseek-ai/dsh web");
+      if (hasBridge(homeRaw)) await removePatch(homePatch);
+    }
+    const migrated = await removeLegacyManagedPlugin(opts.legacyPluginHome, dest);
+    console.log(`已写入 ${webPatch}`);
+    console.log(copied ? `插件已安装到 ${dest}` : `已复用已安装的插件 ${dest}`);
+    if (migrated) console.log("已迁移 1.0.5 的旧插件目录，已保留主题数据。");
+    console.log("请自己运行：npx @deepseek-ai/dsh web");
     return { dest, patch: webPatch };
   }
 
-  await fsp.mkdir(dshHome, { recursive: true });
-  await writePatch(homePatch, fileUriInsert(toFileUri(indexFile)));
-  console.log(`DSH web profile 还不存在，已写入 ${homePatch}`);
-  console.log(copied ? `插件已安装到 ${dest}` : `已复用已安装的插件 ${dest}`);
-  console.log("请自己运行：npx @deepseek-ai/dsh web");
+  await fsp.mkdir(dshHome, { recursive: true });
+  await writePatch(homePatch, fileUriInsert(toFileUri(indexFile)));
+  const migrated = await removeLegacyManagedPlugin(opts.legacyPluginHome, dest);
+  console.log(`DSH web profile 还不存在，已写入 ${homePatch}`);
+  console.log(copied ? `插件已安装到 ${dest}` : `已复用已安装的插件 ${dest}`);
+  if (migrated) console.log("已迁移 1.0.5 的旧插件目录，已保留主题数据。");
+  console.log("请自己运行：npx @deepseek-ai/dsh web");
   return { dest, patch: homePatch };
 }
 
@@ -386,11 +417,15 @@ async function uninstall(opts) {
   return { removed };
 }
 
-export async function runCli(argv = process.argv.slice(2)) {
-  const dshHome = argValue(argv, "--dsh-home") || defaultDshHome();
-  const pluginHome =
-    argValue(argv, "--plugin-home") || path.join(defaultDataRoot(), "plugin");
-  const opts = { dshHome, pluginHome };
+export async function runCli(argv = process.argv.slice(2)) {
+  const dshHome = argValue(argv, "--dsh-home") || defaultDshHome();
+  const requestedPluginHome = argValue(argv, "--plugin-home");
+  const pluginHome = requestedPluginHome || defaultPluginHome(dshHome);
+  const opts = {
+    dshHome,
+    pluginHome,
+    legacyPluginHome: requestedPluginHome ? null : legacyDefaultPluginHome(),
+  };
   if (argv.includes("--remove")) return uninstall(opts);
   return install(opts);
 }

package/console.js

@@ -32,9 +32,13 @@ body:not([data-ds-dark-theme]) #beauticode-console-pop .bc-theme-toggle:hover{ba
 #beauticode-console-pop .bc-theme-toggle{width:100%;text-align:left}
 #beauticode-console-pop .bc-theme-list{margin:6px 0 0;max-height:160px;overflow:auto;border:1px solid rgba(255,255,255,.08);border-radius:12px;background:#232830;padding:4px}
 body:not([data-ds-dark-theme]) #beauticode-console-pop .bc-theme-list{border-color:rgba(0,0,0,.08);background:#f4f6f8}
-#beauticode-console-pop .bc-theme-item{cursor:pointer;display:block;width:100%;height:32px;padding:0 8px;border:none;border-radius:8px;background:transparent;color:inherit;font-size:13px;line-height:32px;text-align:left;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+#beauticode-console-pop .bc-theme-row{display:flex;gap:4px;align-items:center}
+#beauticode-console-pop .bc-theme-item{cursor:pointer;display:block;flex:1;min-width:0;height:32px;padding:0 8px;border:none;border-radius:8px;background:transparent;color:inherit;font-size:13px;line-height:32px;text-align:left;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
 #beauticode-console-pop .bc-theme-item:hover{background:rgba(255,255,255,.08)}
 body:not([data-ds-dark-theme]) #beauticode-console-pop .bc-theme-item:hover{background:rgba(0,0,0,.06)}
+#beauticode-console-pop .bc-theme-del{cursor:pointer;flex:none;width:32px;height:32px;padding:0;border:none;border-radius:8px;background:transparent;color:inherit;font-size:12px;opacity:.72}
+#beauticode-console-pop .bc-theme-del:hover{background:rgba(255,255,255,.08);opacity:1}
+body:not([data-ds-dark-theme]) #beauticode-console-pop .bc-theme-del:hover{background:rgba(0,0,0,.06)}
 #beauticode-console-pop .bc-msg{color:var(--dsw-alias-label-secondary,#9aa3ad);font-size:12px;line-height:16px;margin:6px 0 0;max-height:3.2em;overflow:hidden}
 #beauticode-console-file{display:none !important}
 `;
@@ -154,7 +158,11 @@ body:not([data-ds-dark-theme]) #beauticode-console-pop .bc-theme-item:hover{back
             ? "图片"
             : "无背景";
     statusEl.textContent = label;
-    if (data.atmosphere === "gallery") currentThemeId = "builtin-gallery";
+    if (typeof data.themeId === "string" && data.themeId) {
+      currentThemeId = data.themeId;
+    } else if (data.atmosphere === "gallery") {
+      currentThemeId = "builtin-gallery";
+    }
     muted = data.muted !== false;
     soundBtn.classList.toggle("on", !muted);
     soundBtn.textContent = muted ? "声音" : "声音开";
@@ -168,10 +176,13 @@ body:not([data-ds-dark-theme]) #beauticode-console-pop .bc-theme-item:hover{back
     }
     themesBox.hidden = false;
     themeList.innerHTML = themes
-      .map(
-        (theme) =>
-          `<button type="button" class="bc-theme-item" data-theme-id="${escapeAttr(theme.id)}">${escapeText(theme.name)}</button>`,
-      )
+      .map((theme) => {
+        const del =
+          theme.bundled === true
+            ? ""
+            : `<button type="button" class="bc-theme-del" data-theme-delete="${escapeAttr(theme.id)}" data-theme-name="${escapeAttr(theme.name)}" aria-label="删除 ${escapeAttr(theme.name)}">删</button>`;
+        return `<div class="bc-theme-row"><button type="button" class="bc-theme-item" data-theme-id="${escapeAttr(theme.id)}">${escapeText(theme.name)}</button>${del}</div>`;
+      })
       .join("");
     const selected = themes.find((theme) => theme.id === currentThemeId);
     themeToggle.textContent = selected ? selected.name : "已保存主题";
@@ -210,22 +221,46 @@ body:not([data-ds-dark-theme]) #beauticode-console-pop .bc-theme-item:hover{back
     }
   }
 
-  async function run(task) {
+  async function run(task) {
     if (busy) return;
     busy = true;
-    for (const button of pop.querySelectorAll(".bc-btn, .bc-theme-toggle, .bc-theme-item")) button.disabled = true;
+    for (const button of pop.querySelectorAll(".bc-btn, .bc-theme-toggle, .bc-theme-item, .bc-theme-del")) button.disabled = true;
     showMessage("");
     try {
       const result = await task();
+      if (result?.theme?.id) currentThemeId = result.theme.id;
       if (result?.message) showMessage(result.message);
       await refresh();
     } catch (error) {
       showMessage(error instanceof Error ? error.message : String(error));
     } finally {
       busy = false;
-      for (const button of pop.querySelectorAll(".bc-btn, .bc-theme-toggle, .bc-theme-item")) button.disabled = false;
-    }
-  }
+      for (const button of pop.querySelectorAll(".bc-btn, .bc-theme-toggle, .bc-theme-item, .bc-theme-del")) button.disabled = false;
+    }
+  }
+
+  function askThemeName(fileName) {
+    const suggested = String(fileName || "")
+      .replace(/\.[^.]+$/, "")
+      .trim()
+      .slice(0, 80);
+    const entered = window.prompt("请给该主题取个名字（1–80 个字符）：", suggested);
+    if (entered == null) return null;
+    const name = entered.trim();
+    if (!name) {
+      showMessage("主题名不能为空。");
+      return null;
+    }
+    if (name.length > 80) {
+      showMessage("主题名不能超过 80 个字符。");
+      return null;
+    }
+    if (/[<>:"/\\|?*]/.test(name) || /[\u0000-\u001f]/.test(name)) {
+      showMessage('主题名不能包含 < > : " / \\ | ? * 或控制字符。');
+      return null;
+    }
+    return name;
+  }
 
   trigger.addEventListener("click", (event) => {
     event.stopPropagation();
@@ -268,6 +303,23 @@ body:not([data-ds-dark-theme]) #beauticode-console-pop .bc-theme-item:hover{back
     themeToggle.setAttribute("aria-expanded", open ? "true" : "false");
   });
   themeList.addEventListener("click", (event) => {
+    const del = event.target.closest("[data-theme-delete]");
+    if (del) {
+      event.stopPropagation();
+      const id = del.getAttribute("data-theme-delete") || "";
+      const name = del.getAttribute("data-theme-name") || "主题";
+      if (!id) return;
+      if (!window.confirm(`确定删除主题「${name}」？`)) return;
+      if (currentThemeId === id) currentThemeId = "";
+      void run(() =>
+        request("/__beauticode/ui/theme/delete", {
+          method: "POST",
+          headers: { "content-type": "application/json" },
+          body: JSON.stringify({ id }),
+        }),
+      );
+      return;
+    }
     const item = event.target.closest("[data-theme-id]");
     if (!item) return;
     currentThemeId = item.getAttribute("data-theme-id") || "";
@@ -284,17 +336,21 @@ body:not([data-ds-dark-theme]) #beauticode-console-pop .bc-theme-item:hover{back
       }),
     );
   });
-  fileInput.addEventListener("change", () => {
-    const file = fileInput.files?.[0];
-    fileInput.value = "";
-    if (!file) return;
-    currentThemeId = "";
-    void run(() =>
-      request("/__beauticode/ui/import", {
-        method: "POST",
-        headers: { "x-beauticode-filename": encodeURIComponent(file.name) },
-        body: file,
-      }),
+  fileInput.addEventListener("change", () => {
+    const file = fileInput.files?.[0];
+    fileInput.value = "";
+    if (!file) return;
+    const themeName = askThemeName(file.name);
+    if (!themeName) return;
+    void run(() =>
+      request("/__beauticode/ui/import", {
+        method: "POST",
+        headers: {
+          "x-beauticode-filename": encodeURIComponent(file.name),
+          "x-beauticode-theme-name": encodeURIComponent(themeName),
+        },
+        body: file,
+      }),
     );
   });
 

package/index.mjs

@@ -376,6 +376,11 @@ export function apply(ctx, config = {}) {
         path: "/__beauticode/ui/theme/use",
         handler: (req, res) => ui.useTheme(req, res),
       }),
+      ctx.webServer.register({
+        kind: "exact",
+        path: "/__beauticode/ui/theme/delete",
+        handler: (req, res) => ui.deleteTheme(req, res),
+      }),
       ctx.webServer.register({
         kind: "exact",
         path: "/__beauticode/ui/preset",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "beauticode-dsh",
-  "version": "1.0.4",
+  "version": "1.0.7",
   "description": "Cordis plugin: image/video backgrounds for DeepSeek Harness web.",
   "type": "module",
   "main": "./index.mjs",

package/ui-host.mjs

@@ -4,7 +4,7 @@ import path from "node:path";
 import crypto from "node:crypto";
 import { pipeline } from "node:stream/promises";
 import { Transform } from "node:stream";
-import { createBeauticodeActions } from "./agent.mjs";
+import { createBeauticodeActions } from "./agent.mjs";
 import { callDshControl } from "./control-client.mjs";
 import { createGalleryHandlers, resolveConfiguredSkinCenterUrl } from "./gallery-host.mjs";
 import { hasLiveTray, resolveApplyBackend, stopInProcessSession } from "./host-apply.mjs";
@@ -13,7 +13,7 @@ const IMAGE_EXTENSIONS = new Set([".jpg", ".jpeg", ".png", ".webp", ".avif"]);
 const MAX_IMAGE_BYTES = 18 * 1024 * 1024;
 const MAX_VIDEO_BYTES = 800 * 1024 * 1024;
 
-export function parseImportFilename(raw) {
+export function parseImportFilename(raw) {
   if (typeof raw !== "string" || !raw.trim()) {
     return { ok: false, error: "缺少文件名。" };
   }
@@ -35,7 +35,29 @@ export function parseImportFilename(raw) {
     return { ok: true, name, ext, kind: "image", maxBytes: MAX_IMAGE_BYTES };
   }
   return { ok: false, error: "只支持图片（jpg / jpeg / png / webp / avif）或 MP4 视频。" };
-}
+}
+
+export function parseImportThemeName(raw) {
+  if (Array.isArray(raw)) raw = raw[0];
+  if (typeof raw !== "string" || !raw.trim()) {
+    return { ok: false, error: "请先给该主题取名。" };
+  }
+  let decoded = raw.trim();
+  try {
+    decoded = decodeURIComponent(decoded);
+  } catch {
+    return { ok: false, error: "主题名编码无效。" };
+  }
+  const name = decoded.trim();
+  if (!name) return { ok: false, error: "主题名不能为空。" };
+  if (name.length > 80) {
+    return { ok: false, error: "主题名不能超过 80 个字符。" };
+  }
+  if (/[<>:"/\\|?*]/.test(name) || /[\u0000-\u001f]/.test(name)) {
+    return { ok: false, error: "主题名包含非法字符。" };
+  }
+  return { ok: true, name };
+}
 
 function limitBytes(maxBytes) {
   let size = 0;
@@ -146,6 +168,7 @@ export function createBeauticodeUi({ dataRoot, baseUrl, getBaseUrl, sendJson, is
           media: background?.type ?? null,
           muted: status.muted !== false,
           atmosphere: background?.effects?.preset ?? null,
+          themeId: status.themeId || null,
           themes: publicThemes(listed.themes),
           message: status.message,
           skinCenter: { url: center, enabled: Boolean(center) },
@@ -167,13 +190,21 @@ export function createBeauticodeUi({ dataRoot, baseUrl, getBaseUrl, sendJson, is
         res.writeHead(403).end();
         return;
       }
-      const parsed = parseImportFilename(req.headers["x-beauticode-filename"]);
+      const parsed = parseImportFilename(req.headers["x-beauticode-filename"]);
       if (!parsed.ok) {
         req.resume();
         sendJson(res, 400, { ok: false, error: parsed.error });
-        return;
-      }
-      const length = Number(req.headers["content-length"]);
+        return;
+      }
+      const parsedTheme = parseImportThemeName(
+        req.headers["x-beauticode-theme-name"],
+      );
+      if (!parsedTheme.ok) {
+        req.resume();
+        sendJson(res, 400, { ok: false, error: parsedTheme.error });
+        return;
+      }
+      const length = Number(req.headers["content-length"]);
       if (Number.isFinite(length) && length > parsed.maxBytes) {
         req.resume();
         sendJson(res, 413, { ok: false, error: "文件过大。" });
@@ -187,10 +218,11 @@ export function createBeauticodeUi({ dataRoot, baseUrl, getBaseUrl, sendJson, is
       );
       try {
         await pipeline(req, limitBytes(parsed.maxBytes), fs.createWriteStream(tmpPath));
+        const themeName = parsedTheme.name;
         const result =
           parsed.kind === "video"
-            ? await actions.applyVideo({ path: tmpPath })
-            : await actions.applyImage(tmpPath);
+            ? await actions.applyVideo({ path: tmpPath, themeName })
+            : await actions.applyImage(tmpPath, undefined, { themeName });
         sendJson(res, 200, result);
       } catch (error) {
         const status = error?.statusCode === 413 ? 413 : 422;
@@ -270,6 +302,30 @@ export function createBeauticodeUi({ dataRoot, baseUrl, getBaseUrl, sendJson, is
       }
     },
 
+    async deleteTheme(req, res) {
+      if (req.method !== "POST") {
+        res.writeHead(405).end();
+        return;
+      }
+      if (!isSameOrigin(req)) {
+        res.writeHead(403).end();
+        return;
+      }
+      const body = await readJson(req);
+      if (typeof body.id !== "string" || !body.id.trim()) {
+        sendJson(res, 400, { ok: false, error: "必须提供主题。" });
+        return;
+      }
+      try {
+        sendJson(res, 200, await actions.deleteTheme(body.id.trim()));
+      } catch (error) {
+        sendJson(res, 422, {
+          ok: false,
+          error: error instanceof Error ? error.message : String(error),
+        });
+      }
+    },
+
     async galleryConfig(req, res) {
       return gallery.config(req, res, sendJson, isSameOrigin);
     },

package/vendor/adapter-dsh/session.js

@@ -1,6 +1,6 @@
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { ApplyTransaction, BackgroundStore, MediaServerController, buildHostApplyPayload, defaultDataRoot, resolveSessionBundledThemes, } from "../core/index.js";
+import { ApplyTransaction, BackgroundStore, MediaServerController, buildHostApplyPayload, defaultDataRoot, persistAndApplyImportedMedia, resolveSessionBundledThemes, } from "../core/index.js";
 import { DshHostApplier, normalizeDshBaseUrl } from "./bridge.js";
 import { DSH_HOST_DESCRIPTOR } from "./host-descriptor.js";
 import { acquireDshInjectorLock } from "./injector-lock.js";
@@ -93,7 +93,10 @@ export class DshSession {
             this.startHandoffLoop();
             void this.yieldToTrayIfRequested();
         }
-        void this.watchOnce();
+        // Finish the initial restore check before accepting the first user apply.
+        // Otherwise a click immediately after lazy session startup can race the
+        // background reapply and be rejected as a concurrent operation.
+        await this.watchOnce();
         return { port: this.bridgePort() };
     }
     async apply(input) {
@@ -258,6 +261,7 @@ export class DshSession {
             fish: this.fishMode,
             muted: this.videoMuted,
             tone: this.backgroundTone,
+            themeId: this.activeThemeId,
         };
     }
     async saveCurrentTheme(name) {
@@ -274,18 +278,16 @@ export class DshSession {
             }
         }
         const theme = await this.store.saveCurrentTheme(name, { videoPositionSec });
-        if (theme.type === "video") {
-            this.activeThemeId = theme.id;
-            this.lastProgressWriteSec = -1;
-        }
-        else {
-            this.activeThemeId = null;
-        }
+        this.activeThemeId = theme.id;
+        this.lastProgressWriteSec = -1;
         return theme;
     }
     async importSavedTheme(input) {
         return this.store.importSavedThemeFromMedia(input);
     }
+    async applyImportedMedia(input, opts = {}) {
+        return this.trackOperation(persistAndApplyImportedMedia(this, input, opts));
+    }
     async listSavedThemes() {
         return this.store.listSavedThemes();
     }
@@ -302,7 +304,7 @@ export class DshSession {
             const saved = await this.store.loadSavedTheme(themeId);
             const result = await this.apply(saved.input);
             if (result.ok) {
-                this.activeThemeId = saved.input.type === "video" ? saved.themeId : null;
+                this.activeThemeId = saved.themeId;
                 this.lastProgressWriteSec = -1;
             }
             return result;

package/vendor/core/background-store.js

@@ -707,15 +707,32 @@ export class BackgroundStore {
                 if (existing)
                     return existing;
             }
-            const image = await validateImageFile(input.imagePath);
-            const video = input.videoPath
-                ? await validateVideoFile(input.videoPath)
-                : null;
+            const imagePath = String(input.imagePath ?? "").trim();
+            const videoPath = String(input.videoPath ?? "").trim();
+            if (!imagePath && !videoPath) {
+                throw new MediaValidationError("Import requires an image or video file.");
+            }
+            const video = videoPath ? await validateVideoFile(videoPath) : null;
+            let image = null;
+            if (imagePath) {
+                image = await validateImageFile(imagePath);
+            }
+            else if (video) {
+                try {
+                    const previous = await this.readActiveManifest();
+                    if (previous.background?.image) {
+                        image = await validateImageFile(path.join(this.paths.activeDir, previous.background.image));
+                    }
+                }
+                catch {
+                    image = null;
+                }
+            }
             const usage = await this.#savedThemeUsage();
             if (usage.count >= this.maxSavedThemes) {
                 throw new MediaValidationError(`Saved theme limit reached (${this.maxSavedThemes}). Delete one before saving.`);
             }
-            const incomingBytes = image.size + (video?.size ?? 0);
+            const incomingBytes = (image?.size ?? SYNTHETIC_POSTER_PNG.length) + (video?.size ?? 0);
             if (usage.bytes + incomingBytes > this.maxSavedBytes) {
                 throw new MediaValidationError(`Saved theme storage limit exceeded (${this.maxSavedBytes} bytes). Delete a theme before saving.`);
             }
@@ -726,9 +743,17 @@ export class BackgroundStore {
             }
             const stagingDir = await this.#createStagingDir();
             try {
-                const imageBasename = `poster${image.extension === ".jpeg" ? ".jpg" : image.extension}`;
-                assertSafeBasename(imageBasename, "image");
-                await copyFileAtomic(image.filePath, path.join(stagingDir, imageBasename));
+                let imageBasename;
+                if (image) {
+                    imageBasename = `poster${image.extension === ".jpeg" ? ".jpg" : image.extension}`;
+                    assertSafeBasename(imageBasename, "image");
+                    await copyFileAtomic(image.filePath, path.join(stagingDir, imageBasename));
+                }
+                else {
+                    imageBasename = "poster.png";
+                    assertSafeBasename(imageBasename, "image");
+                    await fs.writeFile(path.join(stagingDir, imageBasename), SYNTHETIC_POSTER_PNG);
+                }
                 const background = video
                     ? {
                         type: "video",
@@ -760,6 +785,13 @@ export class BackgroundStore {
                 };
                 if (source)
                     meta.source = source;
+                if (video) {
+                    const pos = normalizeVideoPositionSec(input.videoPositionSec);
+                    if (pos != null) {
+                        meta.videoPositionSec = pos;
+                        meta.videoPositionUpdatedAt = nowIso();
+                    }
+                }
                 await this.#writeJsonAtomic(path.join(stagingDir, SAVED_META_NAME), meta);
                 await this.#validateTree(stagingDir, savedManifest);
                 await fs.rename(stagingDir, dir);
@@ -1194,6 +1226,70 @@ export class BackgroundStore {
         return { count, bytes };
     }
 }
+/**
+ * Display name for an imported file. Id stays a random ASCII folder; this is
+ * only the label shown in 已保存主题.
+ */
+export function themeNameFromFilePath(filePath, fallback = "主题") {
+    const base = path.basename(String(filePath ?? "").replaceAll("\\", "/"));
+    const ext = path.extname(base);
+    let name = (ext ? base.slice(0, -ext.length) : base).trim();
+    name = name
+        .replace(/[<>:"/\\|?*]/g, " ")
+        .replace(/[\u0000-\u001f]/g, "")
+        .replace(/\s+/g, " ")
+        .trim();
+    if (!name)
+        name = fallback;
+    if (name.length > 80)
+        name = name.slice(0, 80).trim();
+    if (!name)
+        name = fallback;
+    return name;
+}
+export function importedThemeInputFromApply(input, name) {
+    if (input.type === "image") {
+        const next = {
+            name: String(name ?? "").trim() || themeNameFromFilePath(input.imagePath, "图片"),
+            imagePath: input.imagePath,
+        };
+        if (input.effects)
+            next.effects = input.effects;
+        return next;
+    }
+    const next = {
+        name: String(name ?? "").trim() || themeNameFromFilePath(input.videoPath, "视频"),
+        videoPath: input.videoPath,
+    };
+    if (input.imagePath)
+        next.imagePath = input.imagePath;
+    const pos = normalizeVideoPositionSec(input.startAt);
+    if (pos != null)
+        next.videoPositionSec = pos;
+    return next;
+}
+export async function persistAndApplyImportedMedia(session, input, opts = {}) {
+    if (input.type !== "image" && input.type !== "video") {
+        return {
+            ok: false,
+            error: "Imported media must be an image or video.",
+            rolledBack: false,
+        };
+    }
+    let theme;
+    try {
+        theme = await session.importSavedTheme(importedThemeInputFromApply(input, opts.name));
+    }
+    catch (error) {
+        return {
+            ok: false,
+            error: error instanceof Error ? error.message : String(error),
+            rolledBack: false,
+        };
+    }
+    const result = await session.useSavedTheme(theme.id);
+    return { ...result, theme };
+}
 /** Normalize a playback position for theme meta. Invalid → null (caller treats as 0). */
 export function normalizeVideoPositionSec(value) {
     const n = typeof value === "number" ? value : Number(value);

package/vendor/core/error-message.js

@@ -126,6 +126,8 @@ export function toChineseErrorMessage(value) {
         [/No active background to save\.?/i, "当前没有可保存的背景。"],
         [/Saved theme limit reached \((\d+)\)\. Delete one before saving\.?/i, (match) => `已达到保存主题数量上限（${match[1]}），请先删除一个主题。`],
         [/Saved theme storage limit exceeded \((\d+) bytes\)\. Delete a theme before saving\.?/i, (match) => `已超过保存主题的存储上限（${match[1]} 字节），请先删除一个主题。`],
+        [/Import requires an image or video file\.?/i, "导入需要图片或视频文件。"],
+        [/Imported media must be an image or video\.?/i, "导入的媒体必须是图片或视频。"],
         [/Built-in theme cannot be deleted\.?/i, "内置主题不能删除。"],
         [/Invalid saved theme id\.?/i, "已保存主题 ID 无效。"],
         [/Invalid skin-center media path\.?/i, "皮肤中心地址无效。"],

package/vendor/core/paths.js

@@ -68,6 +68,7 @@ export async function ensureDataLayout(paths) {
             entry === SNAPSHOTS_DIR_NAME ||
             entry === SAVED_DIR_NAME ||
             entry === RUNTIME_MEDIA_DIR_NAME ||
+            entry === "tmp" ||
             entry === "logs" ||
             entry === "engine-launcher.log" ||
             entry === "injector.lock" ||