beauticode-dsh 1.0.3 → 1.0.5

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

@@ -78,19 +78,66 @@ function packageInsert() {
   ].join("\n");
 }
 
-function hasBridge(text) {
-  return new RegExp(`^\\s*-\\s*id:\\s*${bridgeId}\\s*$`, "m").test(text);
-}
-
-function stripBridge(text) {
-  const patterns = [
-    /(?:^|\r?\n)# beauticode-bridge \(installer\)\r?\n- insert:\r?\n(?:[ \t]+.*\r?\n)*/g,
-    /(?:^|\r?\n)- insert:\r?\n(?:[ \t]+.*\r?\n)*?[ \t]+-\s*id:\s*beauticode-bridge\r?\n(?:[ \t]+.*\r?\n)*/g,
-  ];
-  let next = text;
-  for (const pattern of patterns) next = next.replace(pattern, "\n");
-  return next;
-}
+function hasBridge(text) {
+  return new RegExp(`^\\s*-\\s*id:\\s*${bridgeId}\\s*$`, "m").test(text);
+}
+
+function stripBridge(text) {
+  const lines = text.split(/\r?\n/);
+  const removed = new Array(lines.length).fill(false);
+  const indentOf = (line) => line.match(/^[ \t]*/)?.[0].length ?? 0;
+
+  for (let i = 0; i < lines.length; i += 1) {
+    const insert = lines[i].match(/^([ \t]*)-\s*insert:\s*(?:#.*)?$/);
+    if (!insert) continue;
+    const insertIndent = insert[1].length;
+    let blockEnd = i + 1;
+    while (blockEnd < lines.length) {
+      const line = lines[blockEnd];
+      if (line.trim() && indentOf(line) <= insertIndent) break;
+      blockEnd += 1;
+    }
+
+    let foundBridge = false;
+    for (let j = i + 1; j < blockEnd; ) {
+      const bridge = lines[j].match(
+        /^([ \t]*)-\s*id:\s*beauticode-bridge\s*(?:#.*)?$/,
+      );
+      if (!bridge || bridge[1].length <= insertIndent) {
+        j += 1;
+        continue;
+      }
+      foundBridge = true;
+      const itemIndent = bridge[1].length;
+      let itemEnd = j + 1;
+      while (itemEnd < blockEnd) {
+        const line = lines[itemEnd];
+        if (line.trim() && indentOf(line) <= itemIndent) break;
+        itemEnd += 1;
+      }
+      for (let k = j; k < itemEnd; k += 1) removed[k] = true;
+      j = itemEnd;
+    }
+
+    if (!foundBridge) continue;
+    const marker = `${insert[1]}# beauticode-bridge (installer)`;
+    if (i > 0 && lines[i - 1].trimEnd() === marker) removed[i - 1] = true;
+    const hasSibling = lines
+      .slice(i + 1, blockEnd)
+      .some(
+        (line, offset) =>
+          !removed[i + 1 + offset] &&
+          line.trim() !== "" &&
+          !line.trimStart().startsWith("#"),
+      );
+    if (!hasSibling) {
+      for (let k = i; k < blockEnd; k += 1) removed[k] = true;
+    }
+    i = blockEnd - 1;
+  }
+
+  return lines.filter((_, index) => !removed[index]).join("\n");
+}
 
 function overlayPayload(text) {
   return text
@@ -196,6 +243,83 @@ async function ensureEngine(dest) {
   await stageEngineInto(dest);
 }
 
+function pluginLinkPath(webProfile) {
+  return path.join(webProfile, "node_modules", pluginName);
+}
+
+function legacyPluginLinkPath(webProfile) {
+  return path.join(webProfile, "node_modules", "@beauticode", "dsh-plugin");
+}
+
+function linkSpecFor(pluginHome) {
+  return `link:${path.resolve(pluginHome).replaceAll("\\", "/")}`;
+}
+
+async function sameLinkTarget(link, dest) {
+  try {
+    const stat = await fsp.lstat(link);
+    if (stat.isSymbolicLink()) {
+      const target = await fsp.readlink(link);
+      return path.resolve(path.dirname(link), target) === path.resolve(dest);
+    }
+    if (stat.isDirectory()) {
+      return path.resolve(link) === path.resolve(dest);
+    }
+  } catch {
+    return false;
+  }
+  return false;
+}
+
+async function linkPluginIntoProfile(webProfile, dest) {
+  const link = pluginLinkPath(webProfile);
+  const legacy = legacyPluginLinkPath(webProfile);
+  if (fs.existsSync(legacy)) {
+    await fsp.rm(legacy, { recursive: true, force: true });
+  }
+  await fsp.mkdir(path.dirname(link), { recursive: true });
+  if (fs.existsSync(link)) {
+    if (await sameLinkTarget(link, dest)) return;
+    await fsp.rm(link, { recursive: true, force: true });
+  }
+  const type = process.platform === "win32" ? "junction" : "dir";
+  await fsp.symlink(path.resolve(dest), link, type);
+}
+
+async function ensureWebPackageDep(webPackage, pluginHome) {
+  const raw = await fsp.readFile(webPackage, "utf8");
+  const json = JSON.parse(raw);
+  if (!json.dependencies || typeof json.dependencies !== "object" || Array.isArray(json.dependencies)) {
+    json.dependencies = {};
+  }
+  const spec = linkSpecFor(pluginHome);
+  const hadLegacy = Object.prototype.hasOwnProperty.call(
+    json.dependencies,
+    "@beauticode/dsh-plugin",
+  );
+  delete json.dependencies["@beauticode/dsh-plugin"];
+  const current = json.dependencies[pluginName];
+  if (current === spec && !hadLegacy) return;
+  json.dependencies[pluginName] = spec;
+  await fsp.writeFile(webPackage, `${JSON.stringify(json, null, 2)}\n`, "utf8");
+}
+
+async function removeWebPackageDep(webPackage) {
+  if (!fs.existsSync(webPackage)) return false;
+  const json = JSON.parse(await fsp.readFile(webPackage, "utf8"));
+  if (!json.dependencies || typeof json.dependencies !== "object") return false;
+  let changed = false;
+  for (const name of [pluginName, "@beauticode/dsh-plugin"]) {
+    if (Object.prototype.hasOwnProperty.call(json.dependencies, name)) {
+      delete json.dependencies[name];
+      changed = true;
+    }
+  }
+  if (!changed) return false;
+  await fsp.writeFile(webPackage, `${JSON.stringify(json, null, 2)}\n`, "utf8");
+  return true;
+}
+
 async function install(opts) {
   const dest = path.resolve(opts.pluginHome);
   const dshHome = path.resolve(opts.dshHome);
@@ -213,7 +337,9 @@ async function install(opts) {
   }
 
   if (fs.existsSync(webPackage)) {
-    await writePatch(webPatch, fileUriInsert(toFileUri(indexFile)));
+    await linkPluginIntoProfile(webProfile, dest);
+    await ensureWebPackageDep(webPackage, dest);
+    await writePatch(webPatch, packageInsert());
     if (fs.existsSync(homePatch)) {
       const homeRaw = await fsp.readFile(homePatch, "utf8");
       if (hasBridge(homeRaw)) await removePatch(homePatch);
@@ -234,13 +360,23 @@ async function install(opts) {
 
 async function uninstall(opts) {
   const dshHome = path.resolve(opts.dshHome);
+  const webProfile = path.join(dshHome, "profiles", "web");
   const removed = [];
-  if (await removePatch(path.join(dshHome, "profiles", "web", "cordis.patch.yml"))) {
+  if (await removePatch(path.join(webProfile, "cordis.patch.yml"))) {
     removed.push("web patch");
   }
   if (await removePatch(path.join(dshHome, "cordis.patch.yml"))) {
     removed.push("home patch");
   }
+  if (await removeWebPackageDep(path.join(webProfile, "package.json"))) {
+    removed.push("web package.json");
+  }
+  for (const link of [pluginLinkPath(webProfile), legacyPluginLinkPath(webProfile)]) {
+    if (fs.existsSync(link)) {
+      await fsp.rm(link, { recursive: true, force: true });
+      removed.push(link);
+    }
+  }
   const dest = path.resolve(opts.pluginHome);
   if (fs.existsSync(dest)) {
     await fsp.rm(dest, { recursive: true, force: true });

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 : "已保存主题";
@@ -213,17 +224,18 @@ body:not([data-ds-dark-theme]) #beauticode-console-pop .bc-theme-item:hover{back
   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;
     }
   }
 
@@ -268,6 +280,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") || "";
@@ -288,7 +317,6 @@ body:not([data-ds-dark-theme]) #beauticode-console-pop .bc-theme-item:hover{back
     const file = fileInput.files?.[0];
     fileInput.value = "";
     if (!file) return;
-    currentThemeId = "";
     void run(() =>
       request("/__beauticode/ui/import", {
         method: "POST",

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.3",
+  "version": "1.0.5",
   "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, themeNameFromFilePath } from "./agent.mjs";
 import { callDshControl } from "./control-client.mjs";
 import { createGalleryHandlers, resolveConfiguredSkinCenterUrl } from "./gallery-host.mjs";
 import { hasLiveTray, resolveApplyBackend, stopInProcessSession } from "./host-apply.mjs";
@@ -146,6 +146,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) },
@@ -187,10 +188,14 @@ export function createBeauticodeUi({ dataRoot, baseUrl, getBaseUrl, sendJson, is
       );
       try {
         await pipeline(req, limitBytes(parsed.maxBytes), fs.createWriteStream(tmpPath));
+        const themeName = themeNameFromFilePath(
+          parsed.name,
+          parsed.kind === "video" ? "视频" : "图片",
+        );
         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 +275,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";
@@ -181,7 +181,11 @@ export class DshSession {
                 }
             }
             if (manifest.background) {
-                stagedImage = await this.media.stage(path.join(this.store.paths.activeDir, manifest.background.image));
+                const runtimeImagePath = await this.store.prepareRuntimeImage(manifest);
+                if (!runtimeImagePath) {
+                    throw new Error("DSH image reapply requires a detached runtime copy.");
+                }
+                stagedImage = await this.media.stage(runtimeImagePath);
                 if (manifest.background.type === "video" && manifest.background.video) {
                     const runtimeVideoPath = await this.store.prepareRuntimeVideo(manifest);
                     if (!runtimeVideoPath) {
@@ -254,6 +258,7 @@ export class DshSession {
             fish: this.fishMode,
             muted: this.videoMuted,
             tone: this.backgroundTone,
+            themeId: this.activeThemeId,
         };
     }
     async saveCurrentTheme(name) {
@@ -270,18 +275,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();
     }
@@ -298,7 +301,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/apply-transaction.js

@@ -103,7 +103,7 @@ export class ApplyTransaction {
                 }
             }
             await this.media.commit(staged);
-            await this.store.pruneRuntimeMedia(runtimeVideoPath);
+            await this.store.pruneRuntimeMedia(runtimeKeepPaths(staged, runtimeVideoPath));
             staged = null;
             if (snapshot) {
                 await this.store.clearSnapshot(snapshot);
@@ -141,13 +141,15 @@ export class ApplyTransaction {
         if (!manifest.background) {
             return { image: null, video: null };
         }
-        const imagePath = path.join(this.store.paths.activeDir, manifest.background.image);
-        const image = await this.media.stage(imagePath);
+        // Serve stills and videos from runtime-media copies so Windows can rotate
+        // `active/` while the previous generation is still being read.
+        const runtimeImagePath = await this.store.prepareRuntimeImage(manifest);
+        if (!runtimeImagePath) {
+            throw new Error("Image media staging requires a detached runtime copy.");
+        }
+        const image = await this.media.stage(runtimeImagePath);
         let video = null;
         if (manifest.background.type === "video" && manifest.background.video) {
-            // DSH streams this handle for the lifetime of the active <video>. On
-            // Windows, serving active/background.mp4 directly keeps the active
-            // directory open and the next atomic directory swap fails with EPERM.
             const runtimeVideoPath = await this.store.prepareRuntimeVideo(manifest);
             if (!runtimeVideoPath) {
                 throw new Error("Video media staging requires a detached runtime copy.");
@@ -188,7 +190,7 @@ export class ApplyTransaction {
                 }
             }
             await this.media.commit(restoredMedia);
-            await this.store.pruneRuntimeMedia(runtimeVideoPath);
+            await this.store.pruneRuntimeMedia(runtimeKeepPaths(restoredMedia, runtimeVideoPath));
             restoredMedia = null;
             await this.store.clearSnapshot(snapshot);
         }
@@ -197,6 +199,16 @@ export class ApplyTransaction {
         }
     }
 }
+function runtimeKeepPaths(staged, extra) {
+    const keep = [];
+    if (staged?.image?.filePath)
+        keep.push(staged.image.filePath);
+    if (staged?.video?.filePath)
+        keep.push(staged.video.filePath);
+    if (extra)
+        keep.push(extra);
+    return keep;
+}
 export async function buildHostApplyPayload(store, manifest, staged, cssText, videoStartAt) {
     if (!manifest.background) {
         return {

package/vendor/core/background-store.js

@@ -56,7 +56,7 @@ export class BackgroundStore {
     maxSavedBytes;
     bundledThemes;
     #runtimeSessionName = `session-${process.pid}-${crypto.randomUUID()}`;
-    #runtimeVideoCache = new Map();
+    #runtimeMediaCache = new Map();
     #writeChain = Promise.resolve();
     #writeContext = new AsyncLocalStorage();
     constructor(opts = {}) {
@@ -242,6 +242,24 @@ export class BackgroundStore {
         this.#writeChain = run.then(() => undefined, () => undefined);
         return run;
     }
+    /**
+     * Copy the active still to a renderer-only path outside `active`.
+     *
+     * Serving `active/poster.png` keeps that directory open on Windows, so the
+     * next atomic active-directory rotation fails with EPERM. The detached copy
+     * matches the video runtime path.
+     */
+    async prepareRuntimeImage(manifest) {
+        if (!manifest.background?.image)
+            return null;
+        return this.#prepareRuntimeMedia({
+            generation: manifest.generation,
+            kind: "image",
+            sourceName: manifest.background.image,
+            ext: path.extname(manifest.background.image) || ".png",
+            validate: (filePath) => validateImageFile(filePath),
+        });
+    }
     /**
      * Copy the active video to a renderer-only path outside `active`.
      *
@@ -251,57 +269,73 @@ export class BackgroundStore {
      * renderer lifetime independent from the disk transaction.
      */
     async prepareRuntimeVideo(manifest) {
+        if (manifest.background?.type !== "video" ||
+            !manifest.background.video) {
+            return null;
+        }
+        return this.#prepareRuntimeMedia({
+            generation: manifest.generation,
+            kind: "video",
+            sourceName: manifest.background.video,
+            ext: ".mp4",
+            validate: (filePath) => validateVideoFile(filePath),
+        });
+    }
+    async #prepareRuntimeMedia(opts) {
         return this.#withWriteLock(async () => {
-            if (manifest.background?.type !== "video" ||
-                !manifest.background.video) {
-                return null;
-            }
             await this.init();
-            const cached = this.#runtimeVideoCache.get(manifest.generation);
+            const cacheKey = `${opts.kind}:${opts.generation}`;
+            const cached = this.#runtimeMediaCache.get(cacheKey);
             if (cached) {
                 try {
-                    await validateVideoFile(cached);
+                    await opts.validate(cached);
                     return cached;
                 }
                 catch {
-                    this.#runtimeVideoCache.delete(manifest.generation);
+                    this.#runtimeMediaCache.delete(cacheKey);
                 }
             }
-            const source = path.join(this.paths.activeDir, manifest.background.video);
-            const validated = await validateVideoFile(source);
-            const sessionDir = path.join(this.paths.runtimeMediaDir, this.#runtimeSessionName);
-            if (!isPathInsideRoot(this.paths.runtimeMediaDir, sessionDir)) {
-                throw new MediaValidationError("Runtime media path escaped runtime-media root.");
-            }
-            const runtimeRootStat = await fs.lstat(this.paths.runtimeMediaDir);
-            if (!runtimeRootStat.isDirectory() ||
-                runtimeRootStat.isSymbolicLink()) {
-                throw new MediaValidationError("Runtime media root must be a real directory.");
-            }
-            await fs.mkdir(sessionDir, { recursive: true });
-            const sessionStat = await fs.lstat(sessionDir);
-            if (!sessionStat.isDirectory() || sessionStat.isSymbolicLink()) {
-                throw new MediaValidationError("Runtime media session must be a real directory.");
-            }
-            const [realRuntimeRoot, realSessionDir] = await Promise.all([
-                fs.realpath(this.paths.runtimeMediaDir),
-                fs.realpath(sessionDir),
-            ]);
-            if (!isPathInsideRoot(realRuntimeRoot, realSessionDir)) {
-                throw new MediaValidationError("Runtime media session escaped runtime-media root.");
-            }
-            const destination = path.join(sessionDir, `video-${manifest.generation}-${validated.identity.slice(0, 16)}.mp4`);
+            const source = path.join(this.paths.activeDir, opts.sourceName);
+            const validated = await opts.validate(source);
+            const sessionDir = await this.#ensureRuntimeSessionDir();
+            const safeExt = opts.ext.toLowerCase().startsWith(".")
+                ? opts.ext.toLowerCase()
+                : `.${opts.ext}`;
+            const destination = path.join(sessionDir, `${opts.kind}-${opts.generation}-${validated.identity.slice(0, 16)}${safeExt}`);
             await copyFileAtomic(validated.filePath, destination);
-            const copied = await validateVideoFile(destination);
+            const copied = await opts.validate(destination);
             if (copied.identity !== validated.identity) {
                 await fs.rm(destination, { force: true }).catch(() => { });
-                throw new MediaValidationError("Runtime video copy failed its identity check.");
+                throw new MediaValidationError(`Runtime ${opts.kind} copy failed its identity check.`);
             }
-            this.#runtimeVideoCache.set(manifest.generation, destination);
-            await this.#pruneRuntimeMediaUnlocked(destination);
+            this.#runtimeMediaCache.set(cacheKey, destination);
+            await this.#pruneRuntimeMediaUnlocked([...this.#runtimeMediaCache.values()]);
             return destination;
         });
     }
+    async #ensureRuntimeSessionDir() {
+        const sessionDir = path.join(this.paths.runtimeMediaDir, this.#runtimeSessionName);
+        if (!isPathInsideRoot(this.paths.runtimeMediaDir, sessionDir)) {
+            throw new MediaValidationError("Runtime media path escaped runtime-media root.");
+        }
+        const runtimeRootStat = await fs.lstat(this.paths.runtimeMediaDir);
+        if (!runtimeRootStat.isDirectory() || runtimeRootStat.isSymbolicLink()) {
+            throw new MediaValidationError("Runtime media root must be a real directory.");
+        }
+        await fs.mkdir(sessionDir, { recursive: true });
+        const sessionStat = await fs.lstat(sessionDir);
+        if (!sessionStat.isDirectory() || sessionStat.isSymbolicLink()) {
+            throw new MediaValidationError("Runtime media session must be a real directory.");
+        }
+        const [realRuntimeRoot, realSessionDir] = await Promise.all([
+            fs.realpath(this.paths.runtimeMediaDir),
+            fs.realpath(sessionDir),
+        ]);
+        if (!isPathInsideRoot(realRuntimeRoot, realSessionDir)) {
+            throw new MediaValidationError("Runtime media session escaped runtime-media root.");
+        }
+        return sessionDir;
+    }
     /**
      * Best-effort cleanup. Locked stale files are retained and retried on the
      * next apply/start instead of turning successful theme switching into an
@@ -310,14 +344,15 @@ export class BackgroundStore {
     async pruneRuntimeMedia(keepPath = null) {
         await this.#withWriteLock(async () => {
             await this.init();
-            await this.#pruneRuntimeMediaUnlocked(keepPath);
+            const keep = (Array.isArray(keepPath) ? keepPath : [keepPath]).filter((value) => typeof value === "string" && value.length > 0);
+            await this.#pruneRuntimeMediaUnlocked(keep);
         });
     }
-    async #pruneRuntimeMediaUnlocked(keepPath) {
+    async #pruneRuntimeMediaUnlocked(keepPaths) {
         const runtimeRoot = path.resolve(this.paths.runtimeMediaDir);
-        const keep = keepPath && isPathInsideRoot(runtimeRoot, keepPath)
-            ? path.resolve(keepPath)
-            : null;
+        const keep = new Set(keepPaths
+            .filter((value) => isPathInsideRoot(runtimeRoot, value))
+            .map((value) => path.resolve(value)));
         let sessions;
         try {
             sessions = await fs.readdir(runtimeRoot);
@@ -331,7 +366,8 @@ export class BackgroundStore {
             const sessionDir = path.join(runtimeRoot, name);
             if (!isPathInsideRoot(runtimeRoot, sessionDir))
                 continue;
-            if (!keep || !isPathInsideRoot(sessionDir, keep)) {
+            const keepInSession = [...keep].some((file) => isPathInsideRoot(sessionDir, file));
+            if (!keepInSession) {
                 await rmrf(sessionDir).catch(() => { });
                 continue;
             }
@@ -344,15 +380,15 @@ export class BackgroundStore {
             }
             for (const file of files) {
                 const candidate = path.resolve(sessionDir, file);
-                if (candidate === keep || !isPathInsideRoot(sessionDir, candidate)) {
+                if (keep.has(candidate) || !isPathInsideRoot(sessionDir, candidate)) {
                     continue;
                 }
                 await fs.rm(candidate, { recursive: true, force: true }).catch(() => { });
             }
         }
-        for (const [generation, cached] of this.#runtimeVideoCache) {
-            if (path.resolve(cached) !== keep) {
-                this.#runtimeVideoCache.delete(generation);
+        for (const [key, cached] of this.#runtimeMediaCache) {
+            if (!keep.has(path.resolve(cached))) {
+                this.#runtimeMediaCache.delete(key);
             }
         }
     }
@@ -671,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.`);
             }
@@ -690,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",
@@ -724,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);
@@ -1158,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/media-server.js

@@ -36,6 +36,27 @@ function parseRange(value, size) {
 function makeToken() {
     return randomUUID().replaceAll("-", "");
 }
+function pipeOpenedFile(handle, response, range) {
+    const stream = handle.createReadStream({
+        start: range.start,
+        ...(range.end != null ? { end: range.end } : {}),
+        autoClose: false,
+    });
+    let closed = false;
+    const closeHandle = () => {
+        if (closed)
+            return;
+        closed = true;
+        void handle.close().catch(() => { });
+    };
+    stream.on("error", () => {
+        closeHandle();
+        response.destroy();
+    });
+    stream.on("close", closeHandle);
+    response.on("close", closeHandle);
+    stream.pipe(response);
+}
 async function hashOpenedFile(handle, size) {
     const hash = createHash("sha256");
     const chunk = Buffer.allocUnsafe(1024 * 1024);
@@ -401,11 +422,8 @@ export class LoopbackMediaHub {
                     opened = null;
                     return;
                 }
-                const stream = opened.createReadStream({ start: 0, autoClose: true });
+                pipeOpenedFile(opened, response, { start: 0 });
                 opened = null;
-                stream
-                    .on("error", () => response.destroy())
-                    .pipe(response);
                 return;
             }
             headers["Content-Range"] =
@@ -418,15 +436,11 @@ export class LoopbackMediaHub {
                 opened = null;
                 return;
             }
-            const stream = opened.createReadStream({
+            pipeOpenedFile(opened, response, {
                 start: range.start,
                 end: range.end,
-                autoClose: true,
             });
             opened = null;
-            stream
-                .on("error", () => response.destroy())
-                .pipe(response);
         }
         catch {
             await opened?.close().catch(() => { });