beauticode-dsh 1.0.5 → 1.0.7

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

@@ -221,7 +221,7 @@ body:not([data-ds-dark-theme]) #beauticode-console-pop .bc-theme-del:hover{backg
     }
   }
 
-  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, .bc-theme-del")) button.disabled = true;
@@ -236,8 +236,31 @@ body:not([data-ds-dark-theme]) #beauticode-console-pop .bc-theme-del:hover{backg
     } finally {
       busy = 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();
@@ -313,16 +336,21 @@ body:not([data-ds-dark-theme]) #beauticode-console-pop .bc-theme-del:hover{backg
       }),
     );
   });
-  fileInput.addEventListener("change", () => {
-    const file = fileInput.files?.[0];
-    fileInput.value = "";
-    if (!file) return;
-    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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "beauticode-dsh",
-  "version": "1.0.5",
+  "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, themeNameFromFilePath } 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;
@@ -168,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: "文件过大。" });
@@ -188,10 +218,7 @@ 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 themeName = parsedTheme.name;
         const result =
           parsed.kind === "video"
             ? await actions.applyVideo({ path: tmpPath, themeName })

package/vendor/adapter-dsh/session.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) {

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" ||