dsh-folia 4.3.0 → 4.4.0

package/lib/client.js

@@ -17212,12 +17212,21 @@ window.__ModuleLoader__.load({
 				  const [state, setState] = React.useState(null);
 				  const [busy, setBusy] = React.useState("");
 				  const [note, setNote] = React.useState(null);
+				  const [importable, setImportable] = React.useState([]);
 
 				  const load = React.useCallback(async (force) => {
 				    try {
 				      const resp = await apiJson("/pets/list" + (force ? "?refresh=1" : ""), { parse: "always" });
 				      const doc = (resp && resp.data) || null;
-				      if (resp && resp.ok && doc && doc.ok) setState(doc);
+				      if (resp && resp.ok && doc && doc.ok) {
+				        setState(doc);
+				        // 顺带问一下本机其它宠物插件里有哪些可导入的（失败不影响主列表）。
+				        try {
+				          const im = await apiJson("/pets/importable", { parse: "always" });
+				          const imDoc = (im && im.data) || null;
+				          if (imDoc && imDoc.ok) setImportable(imDoc.pets || []);
+				        } catch { /* 无外部目录是正常情况 */ }
+				      }
 				      else setNote({ ok: false, text: weT("读取失败：") + ((resp && resp.error) || "unknown") });
 				    } catch (e) {
 				      setNote({ ok: false, text: weT("请求失败：") + ((e && e.message) || weT("网络错误")) });
@@ -17235,6 +17244,7 @@ window.__ModuleLoader__.load({
 				      if (resp && resp.ok && r && r.ok) {
 				        if (kind === "install") setNote({ ok: true, text: weT("已安装并启用：") + (label || "") });
 				        if (kind === "remove") setNote({ ok: true, text: weT("已卸载：") + (label || "") });
+				        if (kind === "import") setNote({ ok: true, text: weT("已导入并启用：") + (label || "") });
 				        if (kind === "config") setNote({ ok: true, text: weT("已保存") });
 				        await load(true);
 				      } else {
@@ -17345,10 +17355,20 @@ window.__ModuleLoader__.load({
 				        actions.push(btn(isActive ? weT("使用中") : weT("使用"), () => act("config", { enabled: true, petId: p.dirId }, p.name), isActive || Boolean(busy)));
 				        actions.push(btn(weT("卸载"), () => act("remove", { id: p.dirId }, p.name), Boolean(busy)));
 				        return React.createElement("div", { key, style: PET_STYLE.card },
-				          React.createElement("img", {
-				            src: p.sheet, alt: "", loading: "lazy", decoding: "async",
-				            style: { width: "100%", maxHeight: "96px", objectFit: "contain", background: "rgba(0,0,0,0.25)", borderRadius: "6px" },
-				            onError: (e) => { e.target.style.display = "none"; },
+				          // 预览只显示**第一帧**：雪碧图是 8×9 网格，直接贴图会看到一整排小人（用户实测反馈"看着很乱"）。
+				          // 用 background-size = 列数/行数 × 100% + position 0 0 裁出左上角那一格。
+				          React.createElement("div", {
+				            style: {
+				              width: "100%",
+				              aspectRatio: (p.cell ? p.cell.width + " / " + p.cell.height : "192 / 208"),
+				              maxHeight: "96px",
+				              backgroundImage: "url(" + apiUrl(p.sheet) + ")",
+				              backgroundSize: (Number(p.columns) || 8) * 100 + "% " + (Array.isArray(p.frames) ? p.frames.length : 9) * 100 + "%",
+				              backgroundPosition: "0 0",
+				              backgroundRepeat: "no-repeat",
+				              backgroundColor: "rgba(0,0,0,0.25)",
+				              borderRadius: "6px",
+				            },
 				          }),
 				          React.createElement("div", { style: PET_STYLE.title }, p.name),
 				          React.createElement("div", { style: PET_STYLE.meta },
@@ -17359,6 +17379,26 @@ window.__ModuleLoader__.load({
 				      : React.createElement("div", { className: "we-picker__hint" }, weT("还没有安装任何桌宠 —— 从下面的站点清单里挑一只。")),
 				  ));
 
+				  // 本机其它宠物插件里可导入的（dsh-pet 等下载的宠物就落在 $DSH_HOME/pets）
+				  if (importable.length) {
+				    children.push(React.createElement("div", { key: "impHead", className: "we-picker__section-head", style: { marginTop: "14px" } },
+				      React.createElement("span", { className: "we-picker__section-label" },
+				        weT("本机可导入") + "  ·  " + importable.length),
+				    ));
+				    children.push(React.createElement("div", { key: "imp", style: PET_STYLE.grid },
+				      importable.map((it) => {
+				        const isBusy = busy === "import:" + it.id;
+				        return React.createElement("div", { key: "imp:" + it.id, style: PET_STYLE.card },
+				          React.createElement("div", { style: PET_STYLE.title }, it.name || it.id),
+				          React.createElement("div", { style: PET_STYLE.meta },
+				            weT("来自其它宠物插件 · ") + petFmtBytes(it.bytes)),
+				          React.createElement("div", { style: PET_STYLE.row },
+				            btn(isBusy ? weT("导入中…") : weT("导入"), () => act("import", { id: it.id }, it.name || it.id), Boolean(busy))),
+				        );
+				      }),
+				    ));
+				  }
+
 				  // 站点：未装的可安装
 				  const available = site.filter((s) => !installedIds.has(s.id));
 				  children.push(React.createElement("div", { key: "siteHead", className: "we-picker__section-head", style: { marginTop: "14px" } },
@@ -17420,6 +17460,25 @@ window.__ModuleLoader__.load({
 
 				const PET_LAYER_ID = "we-pet-layer";
 				const PET_ROW = { idle: 0, runRight: 1, runLeft: 2, wave: 3, jump: 4, fail: 5, wait: 6, work: 7, done: 8 };
+				/**
+				 * 行号 → 轨道名的**候选表**。
+				 *
+				 * ⚠️ dsh-pet 的 manifest 用的是 kebab 命名（`running-right` / `waving` / `failed` …），
+				 * 我最初按驼峰（`runRight` / `wave`）去查，结果**一次都没命中** —— 每帧都退回默认 120ms，
+				 * 于是所有动作的节奏都是同一个硬速度，看起来就像"动作不对/没几个动作"。
+				 * 这里按「标准名 → 驼峰别名 → 其它常见写法」依次找，命中即用。
+				 */
+				const PET_TRACK_ALIASES = [
+				  ['idle'],
+				  ['running-right', 'runRight', 'right'],
+				  ['running-left', 'runLeft', 'left'],
+				  ['waving', 'wave'],
+				  ['jumping', 'jump'],
+				  ['failed', 'fail'],
+				  ['waiting', 'wait'],
+				  ['running', 'working', 'work'],
+				  ['review', 'done', 'completed'],
+				];
 				const PET_DEFAULT_FRAME_MS = 120;
 				/**
 				 * 活动检测：DSH 的客户端 `ctx` 只暴露 effect/get/slots/surface，没有会话事件，
@@ -17437,6 +17496,36 @@ window.__ModuleLoader__.load({
 				const PET_ACTIVITY_POLL_MS = 500;
 				/** 光标静止后多久切回 idle（毫秒）。 */
 				const PET_WAVE_IDLE_MS = 9000;
+				/**
+				 * 日常动作调度：没在干活时，每隔 5~11 秒随机演一个。
+				 *
+				 * 为什么需要它：只播 idle 的宠物看起来是"一张会呼吸的图"，不像活物。这里把 manifest 的
+				 * 9 条轨道都用上 —— 走一段（左右跑）、挥手、跳一下、发会儿呆 —— 用**随机间隔**而不是固定节拍，
+				 * 避免机械感。干活（work/done/fail）优先级最高，调度器在那些状态下不抢行。
+				 */
+				const PET_IDLE_ACTIONS = [
+				  { row: "wave", weight: 3, ms: 0 },
+				  { row: "jump", weight: 2, ms: 0 },
+				  { row: "wait", weight: 2, ms: 1800 },
+				  { row: "walkRight", weight: 3, ms: 1600 },
+				  { row: "walkLeft", weight: 3, ms: 1600 },
+				];
+				/**
+				 * 统一时钟。
+				 *
+				 * ⚠️ `requestAnimationFrame(fn)` 交给 fn 的是**页面相对时间**（与 performance.now 同源），
+				 *    不是 petNow()。两者混用会出现「holdUntil = petNow() + 1400，而 now 只有几千」——
+				 *    比较永远不成立，于是宠物切到 done/fail/wave 之后**再也回不到 idle**（实测复现）。
+				 *    所有时间比较一律走这一个函数。
+				 */
+				function petNow() {
+				  try {
+				    if (typeof performance !== "undefined" && typeof performance.now === "function") return performance.now();
+				  } catch { /* 退回 Date.now */ }
+				  return petNow();
+				}
+				/** 两次随机动作之间的间隔范围（毫秒）。 */
+				const PET_IDLE_GAP_MS = [3000, 7000];
 
 				/**
 				 * 声音：包内 `sounds/<事件>.ogg|mp3|wav` 优先（manifest.sounds 显式声明），
@@ -17533,7 +17622,7 @@ window.__ModuleLoader__.load({
 				  let frame = 0;
 				  let row = PET_ROW.idle;
 				  let acc = 0;
-				  let last = 0;
+				  let last = 0;   // rAF 时间戳（页面相对时间），不是 Date.now()
 				  let raf = 0;
 				  let dead = false;
 				  let idleSince = 0;
@@ -17544,7 +17633,16 @@ window.__ModuleLoader__.load({
 				  let activityTimer = null;
 				  /** 一次性动作（done/fail）播完自动回 idle 的时间戳。 */
 				  let holdUntil = 0;
-
+				  /** 下一次随机动作的时间点；0 = 立即重排。 */
+				  let nextActionAt = 0;
+				  /** 走动中的速度（px/帧，正=向右）。0 = 不走。 */
+				  let walkSpeed = 0;
+				  /** 走动剩余时长（毫秒）。 */
+				  let walkLeft = 0;
+				  /** 单击轮换到第几号轨道。 */
+				  let clickIdx = 0;
+
+				  let scaleCur = Number(scale) > 0 ? Number(scale) : 1;
 				  const cw = Math.max(1, Number(pet.cell && pet.cell.width) || 192);
 				  const ch = Math.max(1, Number(pet.cell && pet.cell.height) || 208);
 				  const cols = Math.max(1, Number(pet.columns) || 8);
@@ -17554,15 +17652,24 @@ window.__ModuleLoader__.load({
 				    const n = Number(frames[r]);
 				    return Number.isFinite(n) && n > 0 ? Math.min(cols, n) : cols;
 				  }
+				  /** 该行的轨道配置（按别名表找；找不到返回 null）。 */
+				  function trackOf(r) {
+				    const names = PET_TRACK_ALIASES[r] || [];
+				    for (const n of names) {
+				      const tr = pet.tracks && pet.tracks[n];
+				      if (tr && Array.isArray(tr.durations) && tr.durations.length) return tr;
+				    }
+				    return null;
+				  }
 				  function frameMs(r, f) {
-				    const t = pet.tracks && pet.tracks[Object.keys(PET_ROW)[r] === undefined ? "" : Object.keys(PET_ROW)[r]];
-				    const d = t && Array.isArray(t.durations) ? t.durations[f] : null;
+				    const tr = trackOf(r);
+				    const d = tr ? tr.durations[f] : null;
 				    return Number.isFinite(Number(d)) && Number(d) > 0 ? Number(d) : PET_DEFAULT_FRAME_MS;
 				  }
 
 				  function resize() {
-				    const w = Math.round(cw * scale);
-				    const h = Math.round(ch * scale);
+				    const w = Math.round(cw * scaleCur);
+				    const h = Math.round(ch * scaleCur);
 				    const dpr = Math.min(3, Math.max(1, (typeof window !== "undefined" && window.devicePixelRatio) || 1));
 				    canvas.width = Math.round(w * dpr);
 				    canvas.height = Math.round(h * dpr);
@@ -17581,16 +17688,43 @@ window.__ModuleLoader__.load({
 				    const sx = frame * cw;
 				    const sy = row * ch;
 				    try {
-				      ctx.clearRect(0, 0, cw * scale, ch * scale);
-				      ctx.drawImage(img, sx, sy, cw, ch, 0, 0, cw * scale, ch * scale);
+				      ctx.clearRect(0, 0, cw * scaleCur, ch * scaleCur);
+				      ctx.drawImage(img, sx, sy, cw, ch, 0, 0, cw * scaleCur, ch * scaleCur);
 				    } catch { /* 贴图还没解码完：下一帧再画 */ }
 				  }
 
 				  function tick(now) {
 				    if (dead) return;
 				    if (!last) last = now;
-				    acc += now - last;
+				    const dt = Math.max(0, Math.min(100, now - last));   // 切后台回来可能是几百毫秒，钳住
+				    acc += dt;
 				    last = now;
+				    // ── 走动：每帧挪一点，走到头或时间到就停下回 idle ──
+				    if (walkSpeed !== 0 && walkLeft > 0) {
+				      const p = pos();
+				      const maxX = Math.max(0, (window.innerWidth || 1920) - layerEl.offsetWidth);
+				      const nx = p.left + walkSpeed;
+				      if (nx <= 0 || nx >= maxX) {
+				        walkSpeed = -walkSpeed;
+				        setRow(walkSpeed > 0 ? PET_ROW.runRight : PET_ROW.runLeft);
+				        moveTo(Math.max(0, Math.min(maxX, nx)), p.top);
+				      } else {
+				        moveTo(nx, p.top);
+				      }
+				      walkLeft -= dt;
+				      if (walkLeft <= 0) {
+				        walkSpeed = 0;
+				        setRow(PET_ROW.idle);
+				        nextActionAt = petNow() + PET_IDLE_GAP_MS[0] + Math.random() * (PET_IDLE_GAP_MS[1] - PET_IDLE_GAP_MS[0]);
+				      }
+				    }
+				    // ── 日常动作调度：只在"真的闲着"时才演 ──
+				    if (!activity && walkSpeed === 0 && row === PET_ROW.idle && !holdUntil && now >= nextActionAt) {
+				      playIdleAction();
+				      const gap = PET_IDLE_GAP_MS[0] + Math.random() * (PET_IDLE_GAP_MS[1] - PET_IDLE_GAP_MS[0]);
+				      nextActionAt = petNow() + gap;
+				    }
+
 				    // 活动状态变化时先切行（work/done/fail 优先于 idle/wave）。
 				    if (activityTimer === null && typeof setInterval === "function") {
 				      activityTimer = setInterval(() => {
@@ -17599,11 +17733,13 @@ window.__ModuleLoader__.load({
 				        activity = nowActive;
 				        if (activity) {
 				          holdUntil = 0;
+				          walkSpeed = 0;
+				          walkLeft = 0;
 				          if (row !== PET_ROW.work) setRow(PET_ROW.work);
 				        } else if (row === PET_ROW.work) {
 				          // 干完活 → 完成行一小会儿，再回 idle（"被看见"的反馈）
 				          setRow(PET_ROW.done);
-				          holdUntil = Date.now() + 1600;
+				          holdUntil = petNow() + 1600;
 				          voice.play("done");
 				        }
 				      }, PET_ACTIVITY_POLL_MS);
@@ -17623,7 +17759,54 @@ window.__ModuleLoader__.load({
 				    draw();
 				    raf = (typeof requestAnimationFrame === "function")
 				      ? requestAnimationFrame(tick)
-				      : setTimeout(() => tick(Date.now()), 60);
+				      : setTimeout(() => tick(petNow()), 60);
+				  }
+
+				  /** 当前左上角（拖动/走动都读写这一对值）。 */
+				  function pos() {
+				    const left = parseFloat(layerEl.style.left);
+				    const top = parseFloat(layerEl.style.top);
+				    return {
+				      left: Number.isFinite(left) ? left : (window.innerWidth - layerEl.offsetWidth - 24),
+				      top: Number.isFinite(top) ? top : (window.innerHeight - layerEl.offsetHeight - 16),
+				    };
+				  }
+				  function moveTo(left, top) {
+				    const maxX = Math.max(0, (window.innerWidth || 1920) - layerEl.offsetWidth);
+				    const maxY = Math.max(0, (window.innerHeight || 1080) - layerEl.offsetHeight);
+				    const x = Math.max(0, Math.min(maxX, left));
+				    const y = Math.max(0, Math.min(maxY, top));
+				    layerEl.style.left = x + "px";
+				    layerEl.style.top = y + "px";
+				    layerEl.style.right = "auto";
+				    layerEl.style.bottom = "auto";
+				  }
+
+				  /** 从 idle 里挑一个动作演。走动会真的位移，演完自己停。 */
+				  function playIdleAction() {
+				    const total = PET_IDLE_ACTIONS.reduce((s, a) => s + a.weight, 0);
+				    let pick = Math.random() * total;
+				    let action = PET_IDLE_ACTIONS[0];
+				    for (const a of PET_IDLE_ACTIONS) { if ((pick -= a.weight) <= 0) { action = a; break; } }
+				    if (action.row === "walkRight" || action.row === "walkLeft") {
+				      const dir = action.row === "walkRight" ? 1 : -1;
+				      const p0 = pos();
+				      // 走到边上就掉头：撞墙不停在原地踏步，直接换方向。
+				      const maxX = Math.max(0, (window.innerWidth || 1920) - layerEl.offsetWidth);
+				      if ((dir > 0 && p0.left >= maxX - 2) || (dir < 0 && p0.left <= 2)) {
+				        setRow(dir > 0 ? PET_ROW.runLeft : PET_ROW.runRight);
+				        walkSpeed = -dir * (0.9 * scaleCur);
+				      } else {
+				        setRow(dir > 0 ? PET_ROW.runRight : PET_ROW.runLeft);
+				        walkSpeed = dir * (0.9 * scaleCur);
+				      }
+				      walkLeft = action.ms;
+				      return;
+				    }
+				    walkSpeed = 0;
+				    walkLeft = 0;
+				    setRow(PET_ROW[action.row] === undefined ? PET_ROW.idle : PET_ROW[action.row]);
+				    holdUntil = action.ms ? petNow() + action.ms : petNow() + 1400;
 				  }
 
 				  function setRow(next) {
@@ -17659,13 +17842,103 @@ window.__ModuleLoader__.load({
 				    dragging = null;
 				    if (!moved) {
 				      // 单击 = 挥手（给用户一个"它有反应"的反馈），之后自动回 idle
-				      setRow(PET_ROW.wave);
-				      voice.play("wave");
+				      walkSpeed = 0;
+				      walkLeft = 0;
+				      // 单击 = 演下一个动作（按 9 条轨道轮换），让用户能逐个看到它会什么。
+				      clickIdx = (clickIdx + 1) % PET_TRACK_ALIASES.length;
+				      const nextRow = clickIdx === 0 ? PET_ROW.idle : clickIdx;
+				      setRow(nextRow);
+				      holdUntil = petNow() + 1400;
+				      voice.play(nextRow === PET_ROW.fail ? "fail" : nextRow === PET_ROW.done ? "done" : "wave");
 				    } else {
 				      try { localStorage.setItem("wePetPos", JSON.stringify({ left: layerEl.style.left, top: layerEl.style.top })); } catch { /* ignore */ }
 				    }
 				  }
 
+				  /* ── 右键菜单：换宠物之外的全部互动都在这里 ────────────────────────────
+				   * 为什么自己做：宿主的页签要打开面板才能操作，而"摸它"这件事应该发生在宠物身上。
+				   * 菜单条目 = 9 条动作各一条（点一下立刻试演）+ 声音/大小/复位/隐藏。
+				   */
+				  let menu = null;
+				  function closeMenu() {
+				    if (menu && menu.parentNode) menu.parentNode.removeChild(menu);
+				    menu = null;
+				  }
+				  function buildMenuItem(label, onClick) {
+				    const b = document.createElement("button");
+				    b.type = "button";
+				    b.textContent = label;
+				    b.style.cssText = "display:block;width:100%;padding:6px 10px;background:transparent;border:0;color:inherit;text-align:left;font-size:12px;cursor:pointer;white-space:nowrap";
+				    b.addEventListener("mouseenter", () => { b.style.background = "rgba(255,255,255,0.10)"; });
+				    b.addEventListener("mouseleave", () => { b.style.background = "transparent"; });
+				    b.addEventListener("click", (ev) => { ev.stopPropagation(); onClick(); });
+				    return b;
+				  }
+				  function openMenu(clientX, clientY) {
+				    closeMenu();
+				    menu = document.createElement("div");
+				    menu.style.cssText = [
+				      "position:fixed", "z-index:2147482001", "min-width:150px", "padding:6px 0",
+				      "border-radius:8px", "font-size:12px", "color:#eee",
+				      "background:rgba(28,32,40,0.96)", "border:1px solid rgba(255,255,255,0.16)",
+				      "box-shadow:0 10px 30px rgba(0,0,0,0.45)", "backdrop-filter:blur(8px)",
+				    ].join(";");
+				    const titles = ["闲置", "向右走", "向左走", "挥手", "跳一下", "失败", "发呆", "干活", "完成"];
+				    const head = document.createElement("div");
+				    head.textContent = "试演动作";
+				    head.style.cssText = "padding:4px 10px 6px;opacity:0.55;font-size:11px";
+				    menu.appendChild(head);
+				    titles.forEach((name, r) => {
+				      menu.appendChild(buildMenuItem(name, () => {
+				        walkSpeed = 0; walkLeft = 0;
+				        setRow(r);
+				        holdUntil = petNow() + 1600;
+				        voice.play(r === PET_ROW.fail ? "fail" : r === PET_ROW.done ? "done" : "wave");
+				        closeMenu();
+				      }));
+				    });
+				    const hr = document.createElement("div");
+				    hr.style.cssText = "height:1px;margin:6px 0;background:rgba(255,255,255,0.14)";
+				    menu.appendChild(hr);
+				    menu.appendChild(buildMenuItem("再大一点", () => { applyScale(scale + 0.2); closeMenu(); }));
+				    menu.appendChild(buildMenuItem("再小一点", () => { applyScale(Math.max(0.5, scale - 0.2)); closeMenu(); }));
+				    menu.appendChild(buildMenuItem("回右下角", () => {
+				      try { localStorage.removeItem("wePetPos"); } catch { /* ignore */ }
+				      layerEl.style.left = ""; layerEl.style.top = "";
+				      layerEl.style.right = "24px"; layerEl.style.bottom = "16px";
+				      closeMenu();
+				    }));
+				    menu.appendChild(buildMenuItem("不显示它", () => {
+				      // 只隐藏本地这一层；真正的开关在面板里（下一次轮询会被尊重）。
+				      if (layerEl) layerEl.style.display = "none";
+				      closeMenu();
+				    }));
+				    document.body.appendChild(menu);
+				    const w = menu.offsetWidth || 160;
+				    const h = menu.offsetHeight || 320;
+				    const maxX = (window.innerWidth || 1920) - w - 8;
+				    const maxY = (window.innerHeight || 1080) - h - 8;
+				    menu.style.left = Math.max(8, Math.min(maxX, clientX)) + "px";
+				    menu.style.top = Math.max(8, Math.min(maxY, clientY)) + "px";
+				  }
+				  function onContextMenu(e) {
+				    e.preventDefault();
+				    openMenu(e.clientX, e.clientY);
+				  }
+				  function onDocDown(e) {
+				    if (menu && !menu.contains(e.target)) closeMenu();
+				  }
+				  /** 菜单里的缩放：改本地样式并写回配置（下一次轮询沿用）。 */
+				  function applyScale(next) {
+				    const v = Math.max(0.5, Math.min(3, Number(next) || 1));
+				    try { apiPostJson("/pets/config", { scale: v }, { parse: "always" }); } catch { /* 本地先变 */ }
+				    scaleCur = v;
+				    resize();
+				    draw();
+				  }
+
+				  canvas.addEventListener("contextmenu", onContextMenu);
+				  if (typeof document !== "undefined" && document.addEventListener) document.addEventListener("pointerdown", onDocDown);
 				  img.onload = () => { ready = true; resize(); draw(); };
 				  img.onerror = () => { destroy(); };
 				  img.src = apiUrl(pet.sheet || "/pets/sheet?v=" + encodeURIComponent(pet.dirId || pet.id));
@@ -17675,8 +17948,8 @@ window.__ModuleLoader__.load({
 				    window.addEventListener("pointermove", onPointerMove);
 				    window.addEventListener("pointerup", onPointerUp);
 				  }
-				  idleSince = Date.now();
-				  raf = (typeof requestAnimationFrame === "function") ? requestAnimationFrame(tick) : setTimeout(() => tick(Date.now()), 60);
+				  idleSince = petNow();
+				  raf = (typeof requestAnimationFrame === "function") ? requestAnimationFrame(tick) : setTimeout(() => tick(petNow()), 60);
 
 				  function destroy() {
 				    dead = true;
@@ -17685,6 +17958,9 @@ window.__ModuleLoader__.load({
 				    try { voice.destroy(); } catch { /* ignore */ }
 				    if (typeof cancelAnimationFrame === "function") cancelAnimationFrame(raf); else clearTimeout(raf);
 				    canvas.removeEventListener("pointerdown", onPointerDown);
+				    canvas.removeEventListener("contextmenu", onContextMenu);
+				    if (typeof document !== "undefined" && document.removeEventListener) document.removeEventListener("pointerdown", onDocDown);
+				    closeMenu();
 				    if (typeof window !== "undefined") {
 				      window.removeEventListener("pointermove", onPointerMove);
 				      window.removeEventListener("pointerup", onPointerUp);
@@ -17694,9 +17970,11 @@ window.__ModuleLoader__.load({
 				  return {
 				    destroy, setRow, resize,
 				    /** 外部事件注入（面板操作失败等）：一次性播放失败行并出声。 */
-				    fail() { setRow(PET_ROW.fail); holdUntil = Date.now() + 1600; voice.play("fail"); },
-				    cheer() { setRow(PET_ROW.done); holdUntil = Date.now() + 1600; voice.play("done"); },
+				    fail() { setRow(PET_ROW.fail); holdUntil = petNow() + 1600; voice.play("fail"); },
+				    cheer() { setRow(PET_ROW.done); holdUntil = petNow() + 1600; voice.play("done"); },
 				    get row() { return row; },
+				    /** 让下一次随机动作尽快发生（首次出现时用）。 */
+				    scheduleSoon() { nextActionAt = petNow() + 1200 + Math.random() * 1800; },
 				  };
 				}
 
@@ -17706,16 +17984,24 @@ window.__ModuleLoader__.load({
 				 * 它自己拉 `/folia/pets/list`（配置 + 已装宠物），所以**不依赖面板是否打开过** ——
 				 * 冷启动就能出宠物。
 				 */
+				/** 让刚出现的宠物在 1.2~3 秒后演第一个动作（实例内部按需读 nextActionAt）。 */
+				function nextActionSoon(instance) {
+				  try { if (instance && typeof instance.scheduleSoon === "function") instance.scheduleSoon(); } catch { /* ignore */ }
+				}
+
 				function mountPetLayer() {
 				  if (typeof document === "undefined" || !document.body) return null;
 				  let disposed = false;
 				  let instance = null;
 				  let layerEl = null;
+				  /** 当前实例对应的「宠物@大小」；变了就要销毁重建。 */
+				  let currentKey = "";
 
 				  function teardownDom() {
 				    if (instance) { try { instance.destroy(); } catch { /* ignore */ } instance = null; }
 				    if (layerEl && layerEl.parentNode) layerEl.parentNode.removeChild(layerEl);
 				    layerEl = null;
+				    currentKey = "";
 				  }
 
 				  async function sync() {
@@ -17731,7 +18017,12 @@ window.__ModuleLoader__.load({
 				    if (!cfg || !cfg.enabled || !pet) { teardownDom(); return; }
 
 				    const scale = Number(cfg.scale) > 0 ? Number(cfg.scale) : 1;
-				    if (layerEl) { layerEl.style.display = ""; if (instance) instance.resize(); return; }
+				    const key = String(pet.dirId || pet.id) + "@" + scale;
+				    // 换宠物 / 改大小 ⇒ **必须重建**：旧实例的贴图与几何都是上一只的。
+				    // （实测踩过：只在首次创建，于是点「使用」换了宠物而屏幕没变 —— 就是这里。）
+				    if (layerEl && currentKey === key) { layerEl.style.display = ""; return; }
+				    teardownDom();
+				    currentKey = key;
 
 				    layerEl = document.createElement("div");
 				    layerEl.id = PET_LAYER_ID;
@@ -17753,6 +18044,8 @@ window.__ModuleLoader__.load({
 				    layerEl.appendChild(canvas);
 				    document.body.appendChild(layerEl);
 				    instance = createPetLayer(layerEl, canvas, pet, scale, cfg);
+				    // 首次出现时排一个随机动作，别一上来就傻站着。
+				    nextActionSoon(instance);
 				  }
 
 				  sync();
@@ -17770,6 +18063,8 @@ window.__ModuleLoader__.load({
 				  };
 				}
 
+				// 仅供单测驱动（构建期内联时会剥掉 export，不影响产物）。
+
 				// ── 内联模块：src/quick-panel.js —— 快捷播放面板（官方侧栏 tab 与低版本抽屉共用同一份内容）：当前壁纸 + 轮播 + 列表快切 + 声音 + 设置入口。列表虚拟滚动（spacer + 可视窗口）（构建期注入；勿手改本段）──
 				/**
 				 * quick-panel.js — 快捷播放面板（侧边栏的**唯一**内容）：当前壁纸 + 轮播 + 三档页签

package/lib/routes/pets.js

@@ -21,7 +21,7 @@
  */
 import { createHash } from 'node:crypto';
 import { inflateRawSync } from 'node:zlib';
-import { createReadStream, existsSync, mkdirSync, readFileSync, readdirSync, rmSync, statSync, writeFileSync } from 'node:fs';
+import { cpSync, createReadStream, existsSync, mkdirSync, readFileSync, readdirSync, rmSync, statSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { basename, dirname, extname, join } from 'node:path';
 
@@ -50,6 +50,35 @@ function siteBase() {
 /** 站点上的桌宠分类 slug（站点 `/api/public/categories` 里就有这一条）。 */
 const PET_CATEGORY = 'desktop-pet';
 
+/**
+ * 别的宠物插件把用户下载的宠物放在 `$DSH_HOME/pets/<id>/`（dsh-pet 的公开契约）。
+ *
+ * 为什么提供"导入"而不是"共用目录"：共用会让两边的生命周期纠缠在一起（对方删一只、
+ * 我们这边跟着消失）。**复制一份进我们自己的目录**，两边互不影响，代价只是多占几 MB。
+ */
+function externalPetsDir() {
+  const home = process.env.DSH_HOME || join(process.env.APPDATA || homedir(), 'dsh-desktop', 'harness');
+  return join(home, 'pets');
+}
+
+/** 本机其它宠物插件目录里、我们还没装的那些（只读扫描，不写对方目录）。 */
+function listImportable() {
+  const src = externalPetsDir();
+  const out = [];
+  let names = [];
+  try { names = readdirSync(src); } catch { return out; }
+  const mine = new Set(listInstalled().map((p) => p.dirId));
+  for (const name of names) {
+    if (mine.has(name)) continue;
+    const dir = join(src, name);
+    try { if (!statSync(dir).isDirectory()) continue; } catch { continue; }
+    const pet = readPet(dir, name);
+    if (!pet) continue;
+    out.push({ id: name, name: pet.name, bytes: pet.bytes, columns: pet.columns, cell: pet.cell });
+  }
+  return out;
+}
+
 function ensureDir(p) {
   if (!existsSync(p)) mkdirSync(p, { recursive: true });
   return p;
@@ -355,6 +384,43 @@ export function registerPetsRoutes(webServer, c) {
     },
   }));
 
+  // ── GET /pets/importable（本机其它宠物插件里可导入的） ────────────────────
+  disposers.push(webServer.register({
+    kind: 'exact',
+    path: `${BASE}/pets/importable`,
+    handler: async (req, res) => {
+      let pets = [];
+      try { pets = listImportable(); } catch (e) { sendJson(res, 200, { ok: true, pets: [], error: String((e && e.message) || e) }); return; }
+      sendJson(res, 200, { ok: true, pets, dir: externalPetsDir() });
+    },
+  }));
+
+  // ── POST /pets/import（把本机另一只宠物复制进来） ─────────────────────────
+  disposers.push(webServer.register({
+    kind: 'exact',
+    path: `${BASE}/pets/import`,
+    handler: async (req, res) => {
+      if (req.method !== 'POST') { sendJson(res, 405, { ok: false, error: 'method' }); return; }
+      const text = await readBodyText(req);
+      let id = '';
+      try { id = String((JSON.parse(text || '{}') || {}).id || '').trim(); } catch { id = ''; }
+      if (!id || /[\\/]/.test(id) || id.includes('..') || id.length > 120) { sendJson(res, 400, { ok: false, error: 'bad-id' }); return; }
+      const src = join(externalPetsDir(), id);
+      if (!existsSync(src)) { sendJson(res, 404, { ok: false, error: 'not-found' }); return; }
+      if (!readPet(src, id)) { sendJson(res, 422, { ok: false, error: 'invalid-pet' }); return; }
+      const dst = join(dataRoot(), id);
+      try {
+        ensureDir(dirname(dst));
+        cpSync(src, dst, { recursive: true, force: true });
+      } catch (e) { sendJson(res, 500, { ok: false, error: 'copy-failed', detail: String((e && e.message) || e) }); return; }
+      const pet = readPet(dst, id);
+      if (!pet) { sendJson(res, 422, { ok: false, error: 'install-invalid' }); return; }
+      const cfg = writeConfig({ enabled: true, petId: id });
+      if (typeof log === 'function') log('[pets] imported ' + id + ' from ' + externalPetsDir());
+      sendJson(res, 200, { ok: true, id, pet, config: cfg });
+    },
+  }));
+
   // ── POST /pets/config（开关 / 选中 / 缩放） ───────────────────────────────
   disposers.push(webServer.register({
     kind: 'exact',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name":  "dsh-folia",
-    "version":  "4.3.0",
+    "version":  "4.4.0",
     "description":  "Folia 壁纸引擎：把本机 Wallpaper Engine 壁纸搬进 DSH 界面（场景实时渲染 / 视频 / 网页），内置液态玻璃与 Folia 吉祥物，并可从自建站点拉取壁纸。单包形态（组件已合并）。",
     "type":  "module",
     "engines":  {
@@ -192,7 +192,8 @@
                     "prepack":  "node scripts/prepare.mjs",
                     "test:boot":  "node test/boot-http.mjs",
                     "test:pets":  "node test/pets-http.mjs",
-                    "gate":  "node scripts/build-client.mjs \u0026\u0026 node test/run-guards.mjs smoke \u0026\u0026 node test/boot-http.mjs \u0026\u0026 node test/pets-http.mjs"
+                    "test:pets-layer":  "node test/pets-layer.mjs",
+                    "gate":  "node scripts/build-client.mjs \u0026\u0026 node test/run-guards.mjs smoke \u0026\u0026 node test/boot-http.mjs \u0026\u0026 node test/pets-http.mjs \u0026\u0026 node test/pets-layer.mjs"
                 },
     "peerDependencies":  {
                              "@deepseek-ai/cordis":  "^4.0.4",