@michengai/dsh-archive-manager 1.1.22 → 1.2.3

package/lib/index.js

@@ -1,4 +1,4 @@
-import { getOnlineUpdate, getSidebarEntry, getSidebarFavoriteStar, setOnlineUpdate, setSidebarEntry, setSidebarFavoriteStar } from "./plugin-settings.js";
+import { getEntryLocation, getOnlineUpdate, getSidebarFavoriteStar, setEntryLocation, setOnlineUpdate, setSidebarFavoriteStar } from "./plugin-settings.js";
 import { isTrustedUpdateRequest, rawService, registerPluginUpdater, releaseUpdateRoute } from "./plugin-updater.js";
 import { apply as installHost, inject as hostInject } from "./host-install.js";
 import { authorizeExplorerPath } from "./explorer-path-policy.js";
@@ -45,8 +45,8 @@ function registerSettingsRoutes(ctx, hostUpdateDisabled) {
     path: SIDEBAR_ENTRY_ENDPOINT,
     handler: async (request, response) => {
       if (request.method === "GET" || request.method === "HEAD") {
-        const enabled = await getSidebarEntry();
-        sendJson(response, 200, { ok: true, enabled });
+        const location = await getEntryLocation();
+        sendJson(response, 200, { ok: true, location, enabled: location !== "settings" });
         return;
       }
       if (request.method === "POST") {
@@ -55,12 +55,25 @@ function registerSettingsRoutes(ctx, hostUpdateDisabled) {
           return;
         }
         const body = await readJsonBody(request);
-        if (!body || typeof body.enabled !== "boolean") {
-          sendJson(response, 400, { ok: false, error: "enabled \u5FC5\u987B\u662F\u5E03\u5C14\u503C" });
+        if (!body) {
+          sendJson(response, 400, { ok: false, error: "\u8BF7\u6C42\u4F53\u4E0D\u80FD\u4E3A\u7A7A" });
           return;
         }
-        const enabled = await setSidebarEntry(body.enabled);
-        sendJson(response, 200, { ok: true, enabled });
+        if (typeof body.location === "string") {
+          if (body.location !== "both" && body.location !== "sidebar" && body.location !== "settings") {
+            sendJson(response, 400, { ok: false, error: "location \u5FC5\u987B\u662F both\u3001sidebar \u6216 settings" });
+            return;
+          }
+          const location = await setEntryLocation(body.location);
+          sendJson(response, 200, { ok: true, location, enabled: location !== "settings" });
+          return;
+        }
+        if (typeof body.enabled === "boolean") {
+          const location = await setEntryLocation(body.enabled ? "both" : "settings");
+          sendJson(response, 200, { ok: true, location, enabled: location !== "settings" });
+          return;
+        }
+        sendJson(response, 400, { ok: false, error: "\u7F3A\u5C11\u5408\u6CD5\u7684 location \u6216 enabled \u53C2\u6570" });
         return;
       }
       response.writeHead(405, { allow: "GET, HEAD, POST" });

package/lib/plugin-settings.js

@@ -58,41 +58,81 @@ async function replaceTextFile(file, next) {
 }
 async function readSettings() {
   const path = managerSettingsPath();
+  const defaultSettings = {
+    entryLocation: "settings",
+    sidebarEntry: false,
+    onlineUpdate: true,
+    sidebarFavoriteStar: true
+  };
   if (!existsSync(path)) {
-    return { sidebarEntry: false, onlineUpdate: true, sidebarFavoriteStar: true };
+    return defaultSettings;
   }
   try {
     const raw = await readFile(path, "utf8");
     const parsed = JSON.parse(raw);
     if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
-      return { sidebarEntry: false, onlineUpdate: true, sidebarFavoriteStar: true };
+      return defaultSettings;
     }
     const item = parsed;
+    let entryLocation;
+    if (item.entryLocation === "both" || item.entryLocation === "sidebar" || item.entryLocation === "settings") {
+      entryLocation = item.entryLocation;
+    } else if (item.sidebarEntry === true) {
+      entryLocation = "both";
+    } else {
+      entryLocation = "settings";
+    }
     return {
-      sidebarEntry: typeof item.sidebarEntry === "boolean" ? item.sidebarEntry : false,
+      entryLocation,
+      sidebarEntry: entryLocation !== "settings",
       onlineUpdate: typeof item.onlineUpdate === "boolean" ? item.onlineUpdate : true,
       sidebarFavoriteStar: typeof item.sidebarFavoriteStar === "boolean" ? item.sidebarFavoriteStar : true
     };
   } catch {
-    return { sidebarEntry: false, onlineUpdate: true, sidebarFavoriteStar: true };
+    return defaultSettings;
   }
 }
 async function writeSettings(next) {
   const path = managerSettingsPath();
-  const serialized = `${JSON.stringify(next, null, 2)}
+  const location = next.entryLocation ?? (next.sidebarEntry ? "both" : "settings");
+  const normalized = {
+    entryLocation: location,
+    sidebarEntry: location !== "settings",
+    onlineUpdate: next.onlineUpdate !== false,
+    sidebarFavoriteStar: next.sidebarFavoriteStar !== false
+  };
+  const serialized = `${JSON.stringify(normalized, null, 2)}
 `;
   await replaceTextFile(path, serialized);
 }
+async function getEntryLocation() {
+  const current = await readSettings();
+  return current.entryLocation ?? "settings";
+}
+async function setEntryLocation(location) {
+  if (location !== "both" && location !== "sidebar" && location !== "settings") {
+    throw new TypeError("entryLocation must be one of 'both', 'sidebar', or 'settings'");
+  }
+  return enqueueWrite(async () => {
+    const current = await readSettings();
+    current.entryLocation = location;
+    current.sidebarEntry = location !== "settings";
+    await writeSettings(current);
+    return location;
+  });
+}
 async function getSidebarEntry() {
   const current = await readSettings();
-  return current.sidebarEntry === true;
+  return current.entryLocation !== "settings";
 }
 async function setSidebarEntry(enabled) {
   if (typeof enabled !== "boolean") {
     throw new TypeError("sidebarEntry must be a boolean");
   }
   return enqueueWrite(async () => {
+    const location = enabled ? "both" : "settings";
     const current = await readSettings();
+    current.entryLocation = location;
     current.sidebarEntry = enabled;
     await writeSettings(current);
     return enabled;
@@ -129,11 +169,13 @@ async function setSidebarFavoriteStar(enabled) {
   });
 }
 export {
+  getEntryLocation,
   getOnlineUpdate,
   getSidebarEntry,
   getSidebarFavoriteStar,
   managerSettingsPath,
   readSettings,
+  setEntryLocation,
   setOnlineUpdate,
   setSidebarEntry,
   setSidebarFavoriteStar,

package/lib/sidebar-entry.js

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { IconArchiveOutlineMedium, Switch as PrimitiveSwitch } from "@deepseek-ai/dsh-client-ui-primitives";
+import { IconArchiveOutlineMedium, SegmentedControl, Switch as PrimitiveSwitch } from "@deepseek-ai/dsh-client-ui-primitives";
 const h = React.createElement;
 const BUNDLE_KEY = "@michengai/dsh-archive-manager";
 const SIDEBAR_PANEL_ID = "archived-sessions";
@@ -12,6 +12,7 @@ const sidebarEntryCss = `
 .dsham_bundle_label_box{display:flex;flex-direction:column;gap:2px;min-width:0;flex:1;text-align:left}
 .dsham_bundle_title{font-size:13px;font-weight:500;line-height:20px;color:var(--dsw-alias-label-primary)}
 .dsham_bundle_desc{font-size:12px;line-height:18px;color:var(--dsw-alias-label-secondary)}
+.dsham_bundle_error{font-size:12px;line-height:16px;color:var(--dsw-alias-state-error-primary,#ef4444);margin-top:2px}
 `;
 function ensureSidebarEntryStyle() {
   if (typeof document === "undefined" || typeof document.getElementById !== "function") return;
@@ -30,7 +31,10 @@ function ArchiveBundleConfigCard(props) {
   ensureSidebarEntryStyle();
   const {
     t,
-    enabled,
+    location: propLocation,
+    onLocationChange,
+    errorMessage,
+    enabled = false,
     onToggle,
     disabled,
     onlineUpdateEnabled = true,
@@ -41,21 +45,38 @@ function ArchiveBundleConfigCard(props) {
     onToggleSidebarFavoriteStar,
     sidebarFavoriteStarDisabled
   } = props;
+  const effectiveLocation = propLocation ?? (enabled ? "both" : "settings");
+  const handleLocationChange = (next) => {
+    if (next === "both" || next === "sidebar" || next === "settings") {
+      if (typeof onLocationChange === "function") {
+        onLocationChange(next);
+      } else if (typeof onToggle === "function") {
+        onToggle(next !== "settings");
+      }
+    }
+  };
   const rows = [
     h(
       "div",
-      { key: "sidebar-entry", className: "dsham_bundle_row" },
+      { key: "entry-location", className: "dsham_bundle_row" },
       h(
         "div",
         { className: "dsham_bundle_label_box" },
-        h("span", { className: "dsham_bundle_title" }, t("sidebar.entry.title")),
-        h("span", { className: "dsham_bundle_desc" }, t("sidebar.entry.desc"))
+        h("span", { className: "dsham_bundle_title" }, t("entry.location.title")),
+        h("span", { className: "dsham_bundle_desc" }, t("entry.location.desc")),
+        errorMessage ? h("span", { className: "dsham_bundle_error", role: "alert" }, errorMessage) : null
       ),
-      h(PrimitiveSwitch, {
-        checked: enabled,
-        onChange: onToggle,
-        label: t("sidebar.entry.toggle"),
-        disabled
+      h(SegmentedControl, {
+        id: "dsham-bundle-entry-location",
+        value: effectiveLocation,
+        onChange: handleLocationChange,
+        label: t("entry.location.title"),
+        disabled,
+        options: [
+          { value: "both", label: t("entry.location.both") },
+          { value: "sidebar", label: t("entry.location.sidebar") },
+          { value: "settings", label: t("entry.location.settings") }
+        ]
       })
     )
   ];
@@ -104,16 +125,18 @@ function ArchiveBundleConfigCard(props) {
   return h(React.Fragment, null, rows);
 }
 function ArchiveBundleConfigCardWrapper(props) {
-  const [enabled, setEnabled] = React.useState(props.getEnabled);
+  const [location, setLocation] = React.useState(props.getLocation);
   const [onlineUpdateEnabled, setOnlineUpdateEnabled] = React.useState(props.getOnlineUpdateEnabled ? props.getOnlineUpdateEnabled : () => true);
   const [onlineUpdateLocked, setOnlineUpdateLocked] = React.useState(props.getOnlineUpdateLocked ? props.getOnlineUpdateLocked : () => false);
   const [sidebarFavoriteStarEnabled, setSidebarFavoriteStarEnabled] = React.useState(props.getSidebarFavoriteStarEnabled ? props.getSidebarFavoriteStarEnabled : () => true);
-  const [savingSidebar, setSavingSidebar] = React.useState(false);
+  const [saveError, setSaveError] = React.useState(null);
+  const [savingLocation, setSavingLocation] = React.useState(false);
   const [savingUpdate, setSavingUpdate] = React.useState(false);
   const [savingFavoriteStar, setSavingFavoriteStar] = React.useState(false);
   React.useEffect(() => {
     const syncState = () => {
-      setEnabled(props.getEnabled());
+      setLocation(props.getLocation());
+      setSaveError(null);
       if (props.getOnlineUpdateEnabled) {
         setOnlineUpdateEnabled(props.getOnlineUpdateEnabled());
       }
@@ -127,13 +150,16 @@ function ArchiveBundleConfigCardWrapper(props) {
     syncState();
     return props.subscribe(syncState);
   }, [props]);
-  const onToggleSidebar = (next) => {
-    setSavingSidebar(true);
-    setEnabled(next);
-    props.setSidebar(next).catch(() => {
-      setEnabled(props.getEnabled());
+  const onLocationChange = (next) => {
+    setSavingLocation(true);
+    setSaveError(null);
+    setLocation(next);
+    props.setLocation(next).catch((err) => {
+      console.error("archive-manager: setLocation failed:", err);
+      setLocation(props.getLocation());
+      setSaveError(props.t("entry.location.saveFailed") || "\u4FDD\u5B58\u5165\u53E3\u8BBE\u7F6E\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u7F51\u7EDC\u6216\u91CD\u542F\u5BBF\u4E3B\u8FDB\u7A0B");
     }).finally(() => {
-      setSavingSidebar(false);
+      setSavingLocation(false);
     });
   };
   const onToggleOnlineUpdate = props.setOnlineUpdate ? (next) => {
@@ -161,9 +187,10 @@ function ArchiveBundleConfigCardWrapper(props) {
   } : void 0;
   return h(ArchiveBundleConfigCard, {
     t: props.t,
-    enabled,
-    disabled: savingSidebar,
-    onToggle: onToggleSidebar,
+    location,
+    errorMessage: saveError,
+    disabled: savingLocation,
+    onLocationChange,
     onlineUpdateEnabled,
     onlineUpdateDisabled: savingUpdate || onlineUpdateLocked,
     onlineUpdateLocked,
@@ -177,6 +204,9 @@ function setupSidebarEntry(ctx, options) {
   ensureSidebarEntryStyle();
   if (!ctx.locale) {
     return {
+      getLocation: () => "settings",
+      setLocation: async () => "settings",
+      isSettingsSectionEnabled: () => true,
       isEnabled: () => false,
       isSupported: () => false,
       setEnabled: async () => false,
@@ -190,7 +220,7 @@ function setupSidebarEntry(ctx, options) {
     };
   }
   const { callApi, renderPanel, ns } = options;
-  let sidebarEntryEnabled = false;
+  let entryLocation = "settings";
   let sidebarSupported = false;
   let mainSupported = false;
   let offPanel = null;
@@ -199,6 +229,8 @@ function setupSidebarEntry(ctx, options) {
   let destroyed = false;
   let layoutService;
   const listeners = /* @__PURE__ */ new Set();
+  const isSidebarEnabled = () => entryLocation === "both" || entryLocation === "sidebar";
+  const isSettingsSectionEnabled = () => entryLocation === "both" || entryLocation === "settings";
   const notify = () => {
     if (destroyed) return;
     for (const listener of listeners) {
@@ -209,7 +241,7 @@ function setupSidebarEntry(ctx, options) {
     }
   };
   const mountMain = () => {
-    if (destroyed || !mainSupported || !sidebarEntryEnabled || offPanel) return;
+    if (destroyed || !mainSupported || !isSidebarEnabled() || offPanel) return;
     const res = ctx.slots.register({
       name: "main",
       key: SIDEBAR_PANEL_ID,
@@ -232,7 +264,7 @@ function setupSidebarEntry(ctx, options) {
     }
   };
   const mountRow = () => {
-    if (destroyed || !sidebarSupported || !sidebarEntryEnabled || offRow) return;
+    if (destroyed || !sidebarSupported || !isSidebarEnabled() || offRow) return;
     const res = ctx.slots.register({
       name: "sidebar.panellist",
       id: SIDEBAR_PANEL_ID,
@@ -254,7 +286,7 @@ function setupSidebarEntry(ctx, options) {
   };
   const sync = () => {
     if (destroyed) return;
-    if (sidebarEntryEnabled) {
+    if (isSidebarEnabled()) {
       mountMain();
       mountRow();
     } else {
@@ -270,28 +302,45 @@ function setupSidebarEntry(ctx, options) {
       unmountMain();
     }
   };
-  const setEnabled = async (next) => {
-    if (destroyed) return sidebarEntryEnabled;
+  const setLocation = async (next) => {
+    if (destroyed) return entryLocation;
     const currentEpoch = ++epoch;
-    sidebarEntryEnabled = next;
+    const previous = entryLocation;
+    entryLocation = next;
     sync();
     notify();
+    if (typeof options.onLocationChange === "function") {
+      try {
+        options.onLocationChange(next);
+      } catch {
+      }
+    }
     try {
       await callApi("/sidebar-entry", {
         method: "POST",
         headers: { "content-type": "application/json" },
-        body: JSON.stringify({ enabled: next })
+        body: JSON.stringify({ location: next })
       });
       return next;
     } catch (err) {
       if (currentEpoch === epoch) {
-        sidebarEntryEnabled = !next;
+        entryLocation = previous;
         sync();
         notify();
+        if (typeof options.onLocationChange === "function") {
+          try {
+            options.onLocationChange(previous);
+          } catch {
+          }
+        }
       }
       throw err;
     }
   };
+  const setEnabled = async (next) => {
+    await setLocation(next ? "both" : "settings");
+    return isSidebarEnabled();
+  };
   let onlineUpdateEnabled = true;
   let onlineUpdateLocked = false;
   let updateEpoch = 0;
@@ -369,10 +418,20 @@ function setupSidebarEntry(ctx, options) {
   };
   const loadEpoch = epoch;
   callApi("/sidebar-entry").then((res) => {
-    if (!destroyed && epoch === loadEpoch && res && typeof res.enabled === "boolean") {
-      sidebarEntryEnabled = res.enabled;
+    if (!destroyed && epoch === loadEpoch && res) {
+      if (res.location === "both" || res.location === "sidebar" || res.location === "settings") {
+        entryLocation = res.location;
+      } else if (typeof res.enabled === "boolean") {
+        entryLocation = res.enabled ? "both" : "settings";
+      }
       sync();
       notify();
+      if (typeof options.onLocationChange === "function") {
+        try {
+          options.onLocationChange(entryLocation);
+        } catch {
+        }
+      }
     }
   }).catch(() => {
   });
@@ -439,7 +498,9 @@ function setupSidebarEntry(ctx, options) {
       if (ownerProps && ownerProps.view === "summary") return null;
       return h(ArchiveBundleConfigCardWrapper, {
         t: ctx.locale.bind(ns),
-        getEnabled: () => sidebarEntryEnabled,
+        getLocation: () => entryLocation,
+        setLocation,
+        getEnabled: () => isSidebarEnabled(),
         setSidebar: setEnabled,
         getOnlineUpdateEnabled: () => onlineUpdateEnabled,
         setOnlineUpdate,
@@ -456,7 +517,10 @@ function setupSidebarEntry(ctx, options) {
     });
   });
   return {
-    isEnabled: () => sidebarEntryEnabled,
+    getLocation: () => entryLocation,
+    setLocation,
+    isSettingsSectionEnabled,
+    isEnabled: () => isSidebarEnabled(),
     isSupported: () => sidebarSupported,
     setEnabled,
     isOnlineUpdateEnabled: () => onlineUpdateEnabled,
@@ -479,6 +543,7 @@ function setupSidebarEntry(ctx, options) {
 }
 export {
   ArchiveBundleConfigCard,
+  ArchiveBundleConfigCardWrapper,
   ArchiveSidebarIcon,
   BUNDLE_KEY,
   SIDEBAR_ENTRY_STYLE_ID,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michengai/dsh-archive-manager",
-  "version": "1.1.22",
+  "version": "1.2.3",
   "description": "归档、恢复、收藏和永久删除会话，并诊断损坏的会话日志。 · Archive, restore, favorite, and permanently delete sessions, and diagnose damaged session logs.",
   "type": "module",
   "packageManager": "pnpm@11.22.0",